3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-22 07:29:31 +08:00
Code Issues Projects Releases Wiki Activity
1,910 Commits 4 Branches 39 Tags 31 MiB
Commit Graph

1144 Commits

Author SHA1 Message Date
Ian Barber
95c018c0d3 Use full endpoint string in monitor response 
The endpoint was excluding the tcp://, causing tests to fail
 2012-08-26 16:29:40 +01:00
Ian Barber
94835581a4 Remove early return on terminated state 
Code as stands breaks shutdown process. It was a bugfix by Arthur to a
bad line which was testing for an impossible state - but afaics we do
actually want to flush in those states. It is possible I am wrong on
that though - if there are any shutdown issues introduced aroudn this
commit I would suggest further investigation around this flushing
behavior.
 2012-08-26 15:07:16 +01:00
Ian Barber
206e5f6f44 Incorrect function name in socket_base 
VA specific monitor event in socket base was named monitor_event rather
than va_monitor_event
 2012-08-26 14:29:09 +01:00
Ian Barber
f028379c1c Incorrect var name in monitor_event 
The call to the va version of the function was using 'event' instead of
'event_'
 2012-08-26 14:27:12 +01:00
Ian Barber
8bf541b252 Fixing incorrect argument order on va_start 
Compile was failing on the monitor_event function function due to the
va_start params being switched.
 2012-08-26 14:24:50 +01:00
Arthur O'Dwyer
7fadd708a0 Fix monitor_event() to work at all. 
There are three versions of monitor_event(), all taking
variadic arguments. The original code just has the first one
creating a va_list and passing that va_list variadically to
the second one... which creates a new va_list and passes it
variadically to the third one... and of course everything
blows up when we try to pull a non-va_list argument off the
stack.

The correct approach matches the C standard library's use
of printf/vprintf, scanf/vscanf, and so on. Once you make
a va_list, you must pass it only to functions which expect
a va_list parameter.
 2012-08-24 16:42:31 -07:00
Arthur O'Dwyer
537a802788 Add a missing null-check, turning a segfault into an assertion. 
Static analysis says:
src\tcp_address.cpp(297): error V595: The 'res' pointer was utilized before it was verified against nullptr. Check lines: 297, 301.
src\tcp_address.cpp(603): error V106: Implicit type conversion third argument 'full_bytes' of function 'memcmp' to memsize type.
src\tcp_address.cpp(603): error V526: The 'memcmp' function returns 0 if corresponding buffers are equal. Consider examining the condition for mistakes.

In fact the use of "memcmp" is correct, but the enclosing "if" isn't
necessary, and the compiler is happier if "full_bytes" is a size_t.
 2012-08-24 16:38:46 -07:00
Arthur O'Dwyer
6347d392fd Fix a bug in pipe_t::flush(). 
Static analysis says:
src\pipe.cpp(193): error V547: Expression is always false. Probably the '||' operator should be used here.

If flush() is called on a pipe whose state was
"terminated" or "double_terminated", the programmer's
intent was to return immediately. But in fact the
two conditions can never be true simultaneously, so
the early return never happens, and we may try to flush
a terminated pipe anyway.
 2012-08-24 16:36:19 -07:00
Arthur O'Dwyer
0886b7a26b Silence a compiler warning. 
Static analysis says:
src\fd.hpp(38): error V103: Implicit type conversion from memsize to 32-bit type.

Adding the explicit cast should shut it up.
 2012-08-24 16:33:48 -07:00
Arthur O'Dwyer
a48751b34b The "count_" out-parameter is doubled instead of unchanged. 
Static analysis says:
src\zmq.cpp(489): error V220: Suspicious sequence of types castings: memsize -> 32-bit integer -> memsize. The value being casted: '* count_'.
src\zmq.cpp(510): error V127: An overflow of the 32-bit 'nread' variable is possible inside a long cycle which utilizes a memsize-type loop counter.

I've silenced the warning on line 489 and ignored the other.
But also, it looks to me like there's a serious bug here: The
out-parameter "count_" is never set to zero before we start
incrementing it. So its final value will always be between
1 and 2 times its initial value. The fix seems obvious.
 2012-08-24 16:30:42 -07:00
Arthur O'Dwyer
28c9255d46 Fix an error in the inline assembly for Thumb2. 
Notice that ZeroMQ has never been compiled for Thumb2 before,
and I personally don't make any guarantees that it will actually
behave correctly once compiled. But after this patch, it is at
least *possible* to compile it for Thumb2.

(Thumb2 is the target for most iOS devices.)
 2012-08-23 12:49:21 -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
Sebastian Lauwers
a622328a9c Fix reordering compile errors 2012-08-04 23:54:31 +02:00
Lourens Naudé
9dc248f6ab Fix invalid address metadata for ZMQ_EVENT_DISCONNECTED 2012-08-04 11:41:33 +01: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
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
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
Martin Hurton
92827e45ee Small code cleanup 2012-07-18 01:53:43 +02: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
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
Martin Hurton
6ac5cf8697 Simplify code for writer activation in Router socket 2012-07-11 15:15:04 +02: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 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
Cyril Holweck
01919774dc Making Android&pyzmq friendly version with avoid-version 2012-07-03 12:20:37 +02: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
Martin Hurton
26e14d3064 Small code simplification 2012-06-26 02:05:52 +02: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
jdc8
98ee759dad Added missing semi-colon. 2012-06-19 09:37:06 -04:00
Kobolog
829d0003be Verbose ROUTER socket behavior patch 2012-06-17 02:33:43 +04:00
Martin Hurton
7d99129411 Fix open_socket to return -1 (INVALID_SOCKET on Windows) on error 2012-06-16 21:46:20 +02:00
Martin Hurton
919bd9628d {tcp|ipc}_connecter: check whether socket is valid before closing it 
Calling close () when the underlying socket is invalid
triggers an assertion failure.
 2012-06-15 02:38:47 +02:00
Martin Hurton
ec9f8994a7 Simplify {tcp|ipc}_connecter 
Make start_connecting () to have singe exit point.
 2012-06-15 02:03:20 +02:00
Martin Hurton
e0fed9d29a Simplify {tcp|ipc}_connecter 
The patch is meant to make the code easier to understand.
The 'wait' attribute is replaced by 'delayed_start'
and 'timer_started' attributes. The former is constant and
is initialized in the constructor. The latter is a flag
reflecting whether a timer has been started and changes during
the lifetime of the object.
 2012-06-15 01:55:13 +02:00
Javier Lopez
eb6c668c2a libzmq3.x not compiling on Android crosscompiler 
- Android crosscompiler shows a warning about two signed/unsigned checks
  on compilation, this patch adds casts to avoid this, so zmq3.x can
  compile on it.
 2012-06-14 12:14:55 -07:00
Steven McCoy
acbb99383f Add additional Windows Sockets Error Codes. 2012-06-13 19:42:11 -04:00
Martin Hurton
75d67286cc {tcp|ipc}_listener: close socket when set_address () fails 2012-06-13 14:49:43 +02:00
Steven McCoy
b2e56c5e4f Add ZeroMQ branding. 2012-06-12 21:30:24 -04:00
Ian Barber
bc9ae715c3 Add asserts and rename pipe set 
Rename the pipeset to terminating_pipes, as suggested by Martin H. Adds
asserts to test the pipe is contained in the terminating set where
appropriate.
 2012-06-12 17:56:39 +01:00
Ian Barber
e5904e63ce Allow blocking while connect() is completing 
This patch, salvaged from a trainwreck accidental merge earlier, adds a
new sockopt, ZMQ_DELAY_ATTACH_ON_CONNECT which prevents a end point
being available to push messages to until it has fully connected, making
connect work more like bind. This also applies to reconnecting sockets,
which may cause message loss of in-queue messages, so it is sensible to
use this in conjunction with a low HWM and potentially an alternative
acknowledgement path.

Notes on most of the individual commits can be found the repository log.
 2012-06-12 15:34:48 +01:00
Ian Barber
95cbad3841 Revert "After speaking with Ben Gray and the discussion on the mailing list, this is an attempt to create a sockopt to allow connecting pipes to not immediately be available for traffic. The problem is in a PUSH to many PULL situation, where there is a connect to a PULL which is not there. This connect will immediately create a pipe (unlike bind), and traffic will be load balanced to that pipe. This means if there is a persistently unavailable end point then the traffic will queue until HWM is hit, and older messages will be lost." 
This reverts commit fe3fb419fe249d7015a6c864d18464d434a55468.
 2012-06-12 14:53:57 +01:00
Ian Barber
a563d494bb Revert "Remove extra brackets as suggested by Martin H, and fix up a comment which was missing a word" 
This reverts commit b79aaaf473c4ef61bbd45e711d48fceb06dc9ad1.
 2012-06-12 14:53:38 +01:00
Ian Barber
cc230cfe60 Revert "And another typo on the same comment" 
This reverts commit 297af954514d9b2097c5e2df980bbe16dd72e761.
 2012-06-12 14:52:38 +01:00
Ian Barber
5b167aa896 Revert "Remove the extra outpipe handling as the session is quite capable of delaying the creation of the pipe until the connection has happened. Simply don't build the pipe, and let it do that automatically." 
This reverts commit 06485d9200ac697896dc4bd162fa4f8b4c2ddaf6.
 2012-06-12 14:52:18 +01:00
Ian Barber
81b8362a59 Revert "Fix a number of whitespace issues in various parts of the code, add validation to most calls on the test and take a first stab at implementing the reconnection pipe blocking." 
This reverts commit 6f6466f0884a169fd25a48195dd9a4e2135818e6.
 2012-06-12 14:51:50 +01:00
Ian Barber
48d3977632 Revert "Fix condition so that PGM and EPGM sockets always create pipes immediately, even if delay_attach_on_connect is set. This allows passing through the icanhasall flag, and is realistic given the fact those protocols should be able to connect immediately" 
This reverts commit b5ace39e2a48b906237d869f4f819f1a28a8cee7.
 2012-06-12 14:51:33 +01:00
Ian Barber
72bae207a3 Revert "Rebinding on reconnection to allow for the pipe blocking will set the event sink again, which will cause an assert to be triggered. I have modified that to allow for setting the same sink to be OK. I believe this should be ok - on termination, if a pipe hasn't reconnected, it would just attempt to be erased from the pipes list again, which is reasonable" 
This reverts commit 1566091bc6cbf2a69b19243be3906c6d92ac339a.
 2012-06-12 14:51:05 +01:00
Ian Barber
f0920caf02 Revert "On the advice of Martin Hurton, removed the new command type and just terminated the pipe in a reconnect situation, and notified the socket of the same. This handles the blocking properly, but at the cost of potentially losing in flight messages. However, this is a reasonable trade off given how much simpler it makes the patch." 
This reverts commit c13f1d52ff9ed51a651ad8bcc9379e82d9318e86.
 2012-06-12 14:50:50 +01:00
Ian Barber
b020bd4ba8 Revert "Remove unnecessary extra test in pipe assertion - now we are terminating pipes we don't need to allow the case in which a pipe is rebound to the same sink" 
This reverts commit 29f8d9ca15f679132302ca5a9016692c2be1d6b2.
 2012-06-12 14:49:44 +01:00
Ian Barber
956cfd9f75 Revert "Fix incorrect whitespace in if statement" 
This reverts commit 55cbdfcf261b41f6a9b71bb26ce7336da7f73eec.
 2012-06-12 14:49:21 +01:00
Ian Barber
74175decb4 Revert "Removing unnecessary outpipe values that had been used for reconnecting existing pipes - no longer needed when using a pipe term for the delay_attach situation." 
This reverts commit ace7c99b917dd66f1fcaed3cbb50c988b7e33b09.
 2012-06-12 14:48:24 +01:00
Ian Barber
440af0022d Revert "Restoring comment for clarity" 
This reverts commit 09956dee939a06c0734004aa3f39c491ec49c6f8.
 2012-06-12 14:48:00 +01:00
Ian Barber
8968b294e0 Revert "When detaching a pipe, as well as checking the delay on connect sockopt is set, also ensure that the protocol is not pgm or epgm as we are not implementing the functionality for multicase types" 
This reverts commit 5008f385bab2dd89c68d7ff93e0c5b303c6043e8.
 2012-06-12 14:47:27 +01:00
Ian Barber
836fa4b7ca Revert "The previous code to block the socket from receiving on that pipe during a disconnect was vulnerable to a race condition. This code calls with the terminate functions of both ends of the pipe - I believe this should be safer. This required storing a pointer to the socket end of the pipe" 
This reverts commit 336f72720a99195942ced5c6aad2bb8e0baa3f32.
 2012-06-12 14:47:10 +01:00
Ian Barber
2c6f26153e Revert "Reverted to a simpler shutdown. This seems to disconnect and reconnect the pipe properly, but there is a problem in overall shutdown when the pipe has blocked and reconnected - the session seems to get terminated() called on it only in shutdown for the original pipe, by which point it has been replaced. I am not sure at the moment why this only happens then, but this does mean this patch is broken at the moment" 
This reverts commit b84b007981d9247bcc7bd000e4aeb56baed56de2.
 2012-06-12 14:46:38 +01:00
Ian Barber
3ae68d67a4 Revert "Use the hiccup mechanism to notify the socket end of the pair of the change in state, and have it shutdown that end, and shutdown the local end normally. This seems to resolve the shutdown and race condition issues." 
This reverts commit 67497a26439239fdb95652b46d7e4e41fe672b31.
 2012-06-12 14:46:23 +01:00
Ian Barber
f5a072fee1 Revert "Code formatting, and clean up so that xhiccuped is only handled in case the pipe isn't terminating" 
This reverts commit 5da289cd5bf0f3c367d3eb091ac66e5f4ce2b97c.
 2012-06-12 14:46:01 +01:00
Ian Barber
6eeaf15179 Revert "Remove unnecessary condition in assert" 
This reverts commit 3053f7e368149044e5d5887e78fc96c1b9f33141.
 2012-06-12 14:45:36 +01:00
Ian Barber
c9926f6f24 Revert "As Martin pointed out, there is a race condition in the old code where a pipe could start shutting down after disconnection, but the new one could connect first. This connection would not get a pipe created for it, so the messages could never flow. The simplest way round this would be a flag, but it is possibly for a very bouncy but fast connection to go up and down twice I imagine, so instead I have added a counter. This starts at zero, and will null out the pipe if terminate is called while it is zero. On a disconnect situation the counter is incremented, and the pipe is the not nulled if the value is non zero. In the terminated function it is decremented for each pipe that is shut down, and the assertion that the terminated pipe == the current pipe is skipped while it is non-zero. This should deal with the race condition and not allow any extra terminated() calls without hitting the assertion." 
This reverts commit a5f7300da6aa2224638fc932fe5ca3624189b1c1.
 2012-06-12 14:45:14 +01:00
Ian Barber
19da88be67 Revert "Filter read and write activated calls from the pipe to the session, and delay shutdown in terminated until the final pipe is shutdown." 
This reverts commit a90c1db7d2c0d32f9a0177d46502505efac654a5.
 2012-06-12 14:44:41 +01:00
Ian Barber
eb14890d23 Revert "Revert "Merge branch 'master' of github.com:ianbarber/libzmq"" 
This reverts commit 029d3dfae2c2bf9e10c7f05d78593f481569bbd7.
 2012-06-12 14:43:18 +01:00
Ian Barber
bdd4e1351d Revert "Revert "Merge branch 'master' of github.com:zeromq/libzmq"" 
This reverts commit dde69fb9fb928db1850eb209db7aed79e26777fb.
 2012-06-12 14:28:32 +01:00
Ian Barber
029d3dfae2 Revert "Merge branch 'master' of github.com:ianbarber/libzmq" 
This reverts commit 33459029793474d14cdb48f85ad2c58dc7ed156f, reversing
changes made to 889b0e6f29f0cce566339b13b8a44f3b97836b6e.
 2012-06-12 14:13:17 +01:00
Ian Barber
dde69fb9fb Revert "Merge branch 'master' of github.com:zeromq/libzmq" 
This reverts commit 7b10586558268479e62ed901f3d8d76916bc6c8a, reversing
changes made to 33459029793474d14cdb48f85ad2c58dc7ed156f.
 2012-06-12 14:12:03 +01:00
Ian Barber
6117a2b099 Revert "Replace incomplete count with a std::set" 
This reverts commit 4aa5ba3d119b98c8f1e4e682a6ee7c57d460cc55.
Unintentional merge
 2012-06-12 14:07:54 +01:00
Ian Barber
4aa5ba3d11 Replace incomplete count with a std::set 
This commit removes the countdown flag and adds a set to store the pipes
that are currently being disconnected.
 2012-06-12 12:13:21 +01:00
Ian Barber
7b10586558 Merge branch 'master' of github.com:zeromq/libzmq 2012-06-12 11:34:24 +01:00
Ian Barber
b448de926b Merge pull request #371 from hurtonm/fix_race_condition_in_connecters 
Fix race conditions in {tcp,ipc}_connecter
 2012-06-11 23:57:21 -07:00
Martin Hurton
3ec8e576d9 Fix race conditions in {tcp,ipc}_connecter 
Once the object has been terminated, it is unsafe for this object
to refer to its parent.

The bug was responsible for occasional
test_shutdown_stress failures.
 2012-06-12 01:47:31 +02:00
Ian Barber
a90c1db7d2 Filter read and write activated calls from the pipe to the session, and delay shutdown in terminated until the final pipe is shutdown. 2012-06-11 07:58:59 +01:00
Ian Barber
a5f7300da6 As Martin pointed out, there is a race condition in the old code where a pipe could start shutting down after disconnection, but the new one could connect first. This connection would not get a pipe created for it, so the messages could never flow. The simplest way round this would be a flag, but it is possibly for a very bouncy but fast connection to go up and down twice I imagine, so instead I have added a counter. This starts at zero, and will null out the pipe if terminate is called while it is zero. On a disconnect situation the counter is incremented, and the pipe is the not nulled if the value is non zero. In the terminated function it is decremented for each pipe that is shut down, and the assertion that the terminated pipe == the current pipe is skipped while it is non-zero. This should deal with the race condition and not allow any extra terminated() calls without hitting the assertion. 2012-06-10 19:57:02 +01:00
Ian Barber
841cf69eb7 Merge branch 'master' of https://github.com/zeromq/libzmq 2012-06-10 19:18:18 +01:00
Martin Hurton
1f53697211 Use struct keyword consistently with sockaddr and sockaddr_in 2012-06-10 02:29:49 +02:00
Pieter Hintjens
e9bfd76f87 Merge pull request #368 from hurtonm/code_cleanup 
Small code simplification
 2012-06-09 07:13:30 -07:00
Martin Hurton
602c50117c Small code simplification 2012-06-09 14:21:01 +02:00
Martin Hurton
796212a985 Fix the message decoder to ignore reserved flags. 
Failing to clear the reserved flags, the decoder may produce
messages with 'identity' and 'shared' flags set.
This unintended modification of message flags can lead to memory
errors or asserion failures.

Fixes issue #309
 2012-06-09 13:39:44 +02:00
Ian Barber
3053f7e368 Remove unnecessary condition in assert 2012-06-09 00:08:14 +01:00
Ian Barber
5da289cd5b Code formatting, and clean up so that xhiccuped is only handled in case the pipe isn't terminating 2012-06-09 00:07:30 +01:00
Ian Barber
0bf1d0262e Merge branch 'master' of https://github.com/zeromq/libzmq 2012-06-08 23:55:58 +01:00
Ian Barber
67497a2643 Use the hiccup mechanism to notify the socket end of the pair of the change in state, and have it shutdown that end, and shutdown the local end normally. This seems to resolve the shutdown and race condition issues. 2012-06-08 23:55:42 +01:00
Hiten P
db13fbf4a9 Consolidate TCP-specific common code into their own files. 
The TCP keepalive tuning code has been moved into the newly added
files; this also allows future TCP-specific code to be added into
these files, without bloating the IP level code and establishes a
known file structure for other IP-based transports.

Remember: this is a no-op change, hence no API or functionality
was changed as part of this commit.
 2012-06-08 18:18:52 +01:00
Ian Barber
b84b007981 Reverted to a simpler shutdown. This seems to disconnect and reconnect the pipe properly, but there is a problem in overall shutdown when the pipe has blocked and reconnected - the session seems to get terminated() called on it only in shutdown for the original pipe, by which point it has been replaced. I am not sure at the moment why this only happens then, but this does mean this patch is broken at the moment 2012-06-06 23:12:56 +01:00
Ian Barber
1dcedf7ab1 Merge pull request #364 from AlexBio/fix_unused_variable 
Remove unused variable which causes build to fail with -Werror
 2012-06-06 07:16:29 -07:00
Alessandro Ghedini
4bd78bb4cf Check if SO_NOSIGPIPE is defined 2012-06-06 15:08:00 +02:00
Alessandro Ghedini
271ced98cf Remove unused variable which causes build to fail with -Werror 2012-06-06 15:06:13 +02:00
Ian Barber
336f72720a The previous code to block the socket from receiving on that pipe during a disconnect was vulnerable to a race condition. This code calls with the terminate functions of both ends of the pipe - I believe this should be safer. This required storing a pointer to the socket end of the pipe 2012-06-05 21:44:23 +01:00
Ian Barber
5008f385ba When detaching a pipe, as well as checking the delay on connect sockopt is set, also ensure that the protocol is not pgm or epgm as we are not implementing the functionality for multicase types 2012-06-05 18:41:38 +01:00
Ian Barber
4d4674e088 Merge pull request #360 from vortechs2000/fix_hpux 
Fix build on HPUX 11iv3
 2012-06-05 10:33:34 -07:00
Ian Barber
09d18e4b3c Merge branch 'master' of https://github.com/zeromq/libzmq 2012-06-05 18:32:15 +01:00
AJ Lewis
97c48ccda6 Fix build on HPUX 11iv3 
The socket length variable for getsockname and accept must be an
(int *) instead of a (socklen_t *) on HPUX.

Signed-off-by: AJ Lewis <aj.lewis@quantum.com>
 2012-06-05 09:44:02 -05:00
AJ Lewis
616bcf9fc2 Fix up build on AIX7 
Copy logic from zmq.cpp into device.cpp for getting poll.h included.

Ensure that zmq.h is included *after* poll.h in both zmq.cpp and
device.cpp.

Signed-off-by: AJ Lewis <aj.lewis@quantum.com>
 2012-06-05 09:15:37 -05:00
Ian Barber
09956dee93 Restoring comment for clarity 2012-06-04 11:41:20 +01:00
Ian Barber
ace7c99b91 Removing unnecessary outpipe values that had been used for reconnecting existing pipes - no longer needed when using a pipe term for the delay_attach situation. 2012-06-04 11:40:14 +01:00