Commit Graph

1894 Commits

Author SHA1 Message Date
Arthur O'Dwyer
f718d2bead Fix a bug reported on the mailing list.
Both memcmp and strcmp return zero on equal, nonzero on nonequal;
so all of these tests were backwards.

The original committer fixed the failure by comparing 22 bytes instead
of the correct 21, so that the assertions would trigger only if the
22nd byte happened to match exactly --- which was rare.

The correct fix is to compare the right number of bytes with the
right sense.  (I think all of the ".addr" fields are null-terminated,
in which case it's more appropriate to use strcmp throughout.)
2012-08-23 12:56:00 -07:00
Pieter Hintjens
12833804c9 Merge pull request #409 from hurtonm/master
Exchange greeting messages for all socket types
2012-08-12 02:33:17 -07:00
Martin Hurton
1ab85f471a Exchange greeting messages for all socket types
Fixes #415.
2012-08-11 19:04:49 +02:00
Ian Barber
b32542e396 Merge pull request #403 from methodmissing/efault-zmq-poll
Revert zmq_poll NULL poll items check to 2.2 behavior - let the poll items count filter out empty poll sets and not return a sometimes unexpected EFAULT error status
2012-08-05 08:10:53 -07:00
Ian Barber
040d4d322d Merge pull request #408 from teotwaki/master
Fix reordering compile errors
2012-08-05 08:08:59 -07:00
Sebastian Lauwers
a622328a9c Fix reordering compile errors 2012-08-04 23:54:31 +02:00
Pieter Hintjens
5637ed08a5 Merge pull request #407 from methodmissing/LIBZMQ-399
Fix invalid address metadata for ZMQ_EVENT_DISCONNECTED
2012-08-04 04:21:49 -07:00
Lourens Naudé
9dc248f6ab Fix invalid address metadata for ZMQ_EVENT_DISCONNECTED 2012-08-04 11:41:33 +01:00
Ian Barber
1f22954762 Merge pull request #406 from hurtonm/master
Fix issue #406
2012-07-31 11:17:45 -07:00
Martin Hurton
9fab9937e5 Fix issue #406
When a peer reconnects, the router socket receives an identity
message containing this peer id. When this happens, the current
implementation crashes.

This patch makes a router socket to silently ignore all identity
messages coming from reconnected peers.
2012-07-31 18:59:13 +02:00
Pieter Hintjens
84560c1607 Merge pull request #405 from jimenezrick/master
Fix LIBZMQ-404: zmq_term not truly re-entrant
2012-07-29 00:45:20 -07:00
Ricardo Catalinas Jiménez
92bee5a6db Fix LIBZMQ-404: zmq_term not truly re-entrant
zmq_term can not safely be re-entered with pgm transport.
Fix proposed by Steven McCoy.
2012-07-28 11:09:04 +02:00
Ian Barber
631e12d4e5 Merge pull request #404 from mimetnet/master
Correction for LIBZMQ-335
2012-07-26 14:12:05 -07:00
Matthew Metnetsky
a0eb0bb7e6 signaler.cpp's Windows Lock should be in the "Global" namespace
That way it can be used more appropriately between processes.
2012-07-26 13:55:27 -04:00
Matthew Metnetsky
83537916f8 Fix issue 335
By assigning a SECURITY_DESCRIPTOR to the event we gain the ability to
share it between service and console programs. We also added
EVENT_MODIFY_STATE as a requirement to OpenEvent so we can SetEvent later
in the method.
2012-07-26 13:52:38 -04:00
Lourens Naudé
556074d438 Revert zmq_poll NULL poll items check to 2.2 behavior - let the poll items count filter out empty poll sets and not return a sometimes unexpected EFAULT error status 2012-07-24 02:22:27 +01:00
Pieter Hintjens
9be0c7e4b5 Merge pull request #402 from hurtonm/master
Small code cleanup
2012-07-17 23:59:59 -07:00
Martin Hurton
92827e45ee Small code cleanup 2012-07-18 01:53:43 +02:00
Ian Barber
bea0b4817b Merge pull request #401 from hurtonm/master
Fix issue #397
2012-07-13 07:14:27 -07:00
Martin Hurton
62b5b914f5 Always mark socket as retired when closing ipc_listener
When closing an ipc listener, the library may try to unlink
the associated file. When this fails, the underlying
socket is not marked as retired and this triggers
assertion failure.

Fixes issue #397
2012-07-13 15:46:05 +02:00
Ian Barber
43ee4396cf Merge pull request #400 from hurtonm/master
Be more conservative about when to generate ZMQ_EVENT_CLOSE_FAILED
2012-07-11 10:17:44 -07:00
Martin Hurton
c84ca01e95 Be more conservative about when to generate ZMQ_EVENT_CLOSE_FAILED
This also fixes a bug in tcp_connecter and tcp_listener, which
generated the event not when they failed to close the socket but
when the succeed to close it.
2012-07-11 19:02:31 +02:00
Pieter Hintjens
0533fb1ce1 Merge pull request #399 from hurtonm/master
Small cleanup
2012-07-11 08:02:01 -07:00
Martin Hurton
6ac5cf8697 Simplify code for writer activation in Router socket 2012-07-11 15:15:04 +02:00
Ian Barber
f8752bf9fc Merge pull request #398 from hurtonm/master
Rewrite event processing in io_thread
2012-07-06 10:50:00 -07:00
Martin Hurton
e37814eca4 Rewrite event processing in io_thread 2012-07-06 19:17:05 +02:00
Pieter Hintjens
823d14c7fc Merge pull request #397 from hurtonm/master
Code cleanup
2012-07-06 04:02:17 -07:00
Martin Hurtoň
37d1e84467 Merge pull request #396 from hintjens/master
Reverting fix for #393
2012-07-06 03:54:55 -07:00
Martin Hurton
86eaa9c8e7 Rewrite process_command's loop 2012-07-06 12:17:36 +02:00
Pieter Hintjens
8d64fc6af8 Reverted fix for #393, was already fixed 2012-07-06 17:33:41 +09:00
Ian Barber
73f960e739 Merge pull request #395 from hintjens/master
Fixed issue #393 - Android build error
2012-07-05 23:02:20 -07:00
Pieter Hintjens
9aa8452b80 Fixed issue #393, compilation warnings 2012-07-06 12:23:51 +09:00
Martin Hurtoň
77dd0a6fba Merge pull request #394 from hintjens/master
Fixed HWM doc on ZMQ_PULL
2012-07-04 05:20:51 -07:00
Pieter Hintjens
8d96a43975 Fixed documentation of HWM on ZMQ_PULL 2012-07-04 17:46:08 +09:00
Pieter Hintjens
e7f59297d0 Merge pull request #393 from cyrilh/master
Making Android&pyzmq friendly version with -avoid-version
2012-07-03 18:30:09 -07:00
Cyril Holweck
01919774dc Making Android&pyzmq friendly version with avoid-version 2012-07-03 12:20:37 +02:00
Pieter Hintjens
1ff5af098a Merge pull request #392 from hurtonm/master
mtrie clenaup
2012-07-02 06:54:26 -07:00
Martin Hurton
1b0e6ef8b4 mtrie: Code simplification 2012-07-02 08:32:23 +02:00
Martin Hurton
692648de96 mtrie: Do not throw exception on allocation failure 2012-07-02 06:11:29 +02:00
Chuck Remes
e471e5b401 Merge pull request #391 from methodmissing/monitor-manual-format
Let docs for zmq_ctx_set_monitor() respect a 80 char wide column width
2012-06-26 11:39:35 -07:00
Lourens Naudé
9ccbeb84fa Let docs for zmq_ctx_set_monitor() respect a 80 char wide column width 2012-06-26 19:35:59 +01:00
Pieter Hintjens
6a1bd3e1e7 Merge pull request #390 from hurtonm/master
Small code simplification
2012-06-25 18:03:07 -07:00
Martin Hurton
26e14d3064 Small code simplification 2012-06-26 02:05:52 +02:00
Pieter Hintjens
6f1229be6f Merge pull request #389 from hurtonm/master
Fix a bug in trie implementation
2012-06-25 05:09:00 -07:00
Martin Hurton
f8293df4c5 Fix a bug in trie implementation
When removing keys for a specified value, make sure we drop
empty node table. Failing to do this can lead to asserion failure.

Refs: http://lists.zeromq.org/pipermail/zeromq-dev/2012-June/017589.html
2012-06-25 13:39:12 +02:00
Pieter Hintjens
c251d940b3 Merge pull request #388 from minrk/forward-iovec
declare struct iovec
2012-06-23 18:40:58 -07:00
MinRK
a178817141 forward-declare struct iovec
avoids warnings of the form:

warning: 'struct iovec' declared inside parameter list
warning: its scope is only this definition or declaration, which is probably not what you want

when building downstream projects
2012-06-23 12:51:38 -07:00
Pieter Hintjens
b57b7debaa Merge pull request #386 from steve-o/err-handler
Fix missing ENETRESET for Jira #LIBZMQ-329.
2012-06-20 02:34:40 -07:00
Steven McCoy
fc335c59ea Fix missing ENETRESET for Jira #LIBZMQ-329. 2012-06-19 14:15:48 -04:00
Ian Barber
c60b0f579d Merge pull request #385 from jdc8/master
Missing semi-colon makes Windows compilation fail, Missing files in WIndows solution file
2012-06-19 08:46:49 -07:00