Commit Graph

122 Commits

Author SHA1 Message Date
Pieter Hintjens
ce806eec82 Merge pull request #38 from justinboswell/master
Fixed misaligned structure cast
2014-08-06 21:06:29 +02:00
Justin Boswell
0c0f3ae451 Fixed misaligned structure cast
zmq_event_t is often padded (due to a uint16_t as its first member), and thus you cannot re-interpret bytewise packed message buffers as zmq_event_t, it must be read manually. This was resulting in the value always being garbage, which is troublesome if you wish to inspect a SOCKET, for example.
2014-08-06 14:49:59 -04:00
Pieter Hintjens
ee47ae4cdd Merge pull request #36 from cosmoharrigan/patch-1
Fix for #34
2014-03-21 07:40:49 +02:00
Cosmo Harrigan
04d2897605 Fix for #34
As of right now, the steerable proxy functionality requires version 4.1.0.
2014-03-20 22:35:50 -07:00
Pieter Hintjens
35d6bb5128 Merge pull request #33 from cosmoharrigan/proxy
Add proxy_steerable interface for zmq_proxy_steerable in versions >= 4.0.4
2014-03-18 07:10:29 +01:00
Cosmo Harrigan
9683327efc Add proxy_steerable interface for zmq_proxy_steerable in versions >= 4.0.4 2014-03-17 18:20:51 -07:00
Pieter Hintjens
77b55a27b0 Merge pull request #32 from madevgeny/master
Fixed assert on Win8.1. Thanks to jonwfreeman.
2014-03-14 10:13:21 +01:00
evgeny
2658780e3a Fixed assert on Win8.1. Thanks to jonwfreeman. 2014-03-14 13:06:11 +04:00
Pieter Hintjens
b4b7d9f64f Merge pull request #30 from madevgeny/master
Added parameter to set the max number of sockets.
2014-03-03 18:11:18 +01:00
evgeny
1b7948c6d9 Added parameter to set the max number of sockets. 2014-03-03 19:21:18 +04:00
taurel
2358037407 Merge pull request #27 from jonnydee/master
monitor_t: Avoid compiler warnings resulting from unused method parameters.
2013-07-19 00:09:56 -07:00
Jonny Dee
6c17af22b7 monitor_t: Avoid compiler warnings resulting from unused method parameters. 2013-07-18 23:52:44 +02:00
Richard Newton
495eba101c Merge pull request #26 from mrothe/patch-1
Revert "Fix missing include".
2013-07-17 05:42:00 -07:00
Markus Rothe
830d2ede86 Revert "Fix missing include".
Don't include <string> twice. Another include was introduced in 938e4ab0.

This reverts commit f1fd8f8f6a.
2013-07-17 13:59:06 +02:00
Andrey Sibiryov
f43e83e34e Merge pull request #22 from ricnewton/monitor_updates
Move monitoring functionality out of socket_t and into monitor_t
2013-07-16 06:10:47 -07:00
taurel
ce4a4a311e Merge pull request #19 from hintjens/master
Added license and contribution policy link
2013-07-16 05:09:01 -07:00
Andrey Sibiryov
7975875acd Merge pull request #23 from cjuniet/master
Fix missing include
2013-07-16 04:18:56 -07:00
Pieter Hintjens
3f7bab2f63 Merge pull request #25 from csteifel/master
Updated to use new zmq_ctx_* functions to create context
2013-07-13 14:07:14 -07:00
Colin Steifel
6a04e4a7f3 Changed context_t to use new zmq_ctx_* functions 2013-07-13 14:52:51 -04:00
Kobolog
abb3bd2c75 Merge pull request #24 from csteifel/master
Added ability to check for more (multipart)
2013-07-12 15:26:04 -07:00
Colin Steifel
b9d239b0db Adding space between function and args to conform with style 2013-07-12 17:59:42 -04:00
Colin Steifel
9751701d7a Changed from static_cast to != to avoid warnings 2013-07-12 17:36:23 -04:00
Colin Steifel
b6839cd50d Adding ability to check for multipart messages 2013-07-12 17:02:10 -04:00
Christophe Juniet
f1fd8f8f6a Fix missing include
Add a missing include for std::string.
2013-07-04 18:46:52 +02:00
Richard Newton
32546c6538 Convert all tabs to spaces to match formatting style for rest of the file. 2013-07-01 13:33:28 +01:00
Richard Newton
666cc7ae4e Implement monitor aborting. This relies on having the new ZMQ_EVENT_MONITOR_STOPPED event. 2013-07-01 13:31:33 +01:00
Richard Newton
37d5ecd7e2 Add event called after we have connected up our paired socket, we are guaranteed to get monitor events after this point.
This is useful if you are spawning the monitor to a different thread and need to wait until monitor has started before opening the socket.
2013-06-28 18:31:00 +01:00
Richard Newton
938e4ab07b Rework monitor to support both new (3.3 and above) and old ways montior events work. 2013-06-28 17:32:49 +01:00
Richard Newton
dfea887ecb Parse event structure as data for event handlers. 2013-06-28 14:07:27 +01:00
Richard Newton
61a21bb082 Avoid a memcpy in monitor_t 2013-06-28 12:34:18 +01:00
Richard Newton
b34444d273 Rework monitor_t. 2013-06-28 12:22:21 +01:00
Pieter Hintjens
c36e3065d2 Merge pull request #18 from Kobolog/master
Prevent -Wunused-value warnings from non-debug ZMQ_ASSERT macro
2013-06-27 10:55:54 -07:00
Pieter Hintjens
b009df6499 Merge pull request #17 from grefab/master
Allowing for unbind and disconnect
2013-06-27 10:55:43 -07:00
Pieter Hintjens
d5cf3c9410 Merge pull request #15 from montoyaedu/master
Added monitor_t class
2013-06-27 10:55:23 -07:00
Pieter Hintjens
56482ca7c8 Merge pull request #20 from taurel/master
Add a disconnect method to the socket_t class
2013-06-27 10:54:34 -07:00
Emmanuel Taurel
3afc98efa1 Add a disconnect method (interface to the zmq_disconnect call) in the socket_t class 2013-06-26 17:04:45 +02:00
Pieter Hintjens
4c8fbb9acb Added license and link to C4.1 contribution policy 2013-05-10 07:39:40 -04:00
Andrey Sibiryov
2fe20236f5 prevent unused expression result warnings from non-debug ZMQ_ASSERT macro expansion 2013-04-06 04:14:30 +04:00
Gregor Fabritius
2798087c2e added possibility to disconnect. 2013-02-23 22:01:31 +01:00
Gregor Fabritius
de8059f190 added possibility to unbind. 2013-02-23 19:50:59 +01:00
Ian Barber
b232978003 Merge pull request #14 from robertmaynard/master
Define ZMQ_DELETED_FUNCTION on older clang versions.
2013-02-13 11:59:36 -08:00
Ian Barber
34dd3a1f36 Merge pull request #13 from jdswinbank/master
Adding a wrapper for zmq_proxy()
2013-02-13 11:56:38 -08:00
H. Eduardo Montoya Sánchez
f30f92b392 syntax & bug fixing
modified monitor_t interface
2013-01-30 17:30:05 +01:00
H. Eduardo Montoya Sánchez
bcdf163fa8 work in progress... 2013-01-30 15:22:54 +01:00
Montoya Edu
9f7a5f18d1 Update zmq.hpp
corrected monitor_t::on_event_unknown prototype
corrected indentation
2013-01-29 19:14:17 +01:00
Montoya Edu
b1dacd8d0f Update zmq.hpp
work in progress...
added monitor_t class
added monitor() method
2013-01-29 19:11:33 +01:00
Robert Maynard
a5174232d5 Correctly define ZMQ_DELETED_FUNCTION when using older clang compilers.
If you are using a version of clang that doesn't support cxx_deleted_functions
we need to define ZMQ_DELETED_FUNCTION to be empty.
2013-01-09 10:19:11 -05:00
John Swinbank
cc25ef9c52 Interface to zmq_proxy() 2013-01-05 15:50:28 +01:00
Pieter Hintjens
127c255d65 Merge pull request #10 from ricnewton/explicit-constructors
Make single parameter constructors explicit
2013-01-05 03:22:29 -08:00
Pieter Hintjens
052c656138 Merge pull request #12 from arsenm/master
Don't use the deprecated versions of functions
2013-01-05 03:21:38 -08:00