0
0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-22 07:29:31 +08:00

951 Commits

Author SHA1 Message Date
Martin Hurton
9c46e87588 tcp_address: minor cleanups 2012-03-27 07:44:39 +02:00
Martin Hurton
700e08c3c2 tcp_address: make port number conversion more robust
This still rejects 00 as port number.
2012-03-27 07:44:10 +02:00
Martin Hurton
c428f6aece tcp_address: check address length before manipulating it 2012-03-27 07:37:28 +02:00
Pieter Hintjens
2bcc300a0f Fixed issue #348 2012-03-26 16:31:12 -05:00
Ian Barber
4c93fc2587 Merge pull request #291 from rcxdude/bugfix
Fix for issue #307
2012-03-26 08:12:53 -07:00
Ian Barber
64732aeca3 Merge pull request #293 from hurtonm/fix_getaddrinfo_for_ipv6_on_freebsd
Don't set the AI_V4MAPPED flag on FreeBSD
2012-03-26 08:12:12 -07:00
Martin Hurton
c2e9997a3c Don't set the AI_V4MAPPED flag on FreeBSD
The problem is that even though the AI_V4MAPPED flag is defined
on FreeBSD, the getaddrinfo function does not support it and
returns EAI_BADFLAGS.

The patch also sets the flag on Windows if it is defined there.
This is true for Windows Vista and later.

Fixes issue #331.
2012-03-26 00:14:17 +02:00
Martin Hurton
00b4571bf1 Fixed issue #334 2012-03-25 20:06:06 +02:00
Douglas Young
084e1c2193 Fix for issue #307
dist was skipping over pipes when one failed because the non-working pipe got
swapped with a working pipe but the write was never retried on that pipe
2012-03-25 18:11:14 +01:00
Pieter Hintjens
82c06e4417 Fixed issue #325 2012-03-23 17:29:29 -05:00
Pieter Hintjens
3585ec8aea Fixed Makefile for ROUTER/DEALER rename 2012-03-22 16:48:29 -05:00
Pieter Hintjens
27c28bdc2e Mark sockets as invalid when closed, not when destroyed
Previously, sockets were still "valid" after being closed and only marked
as invalid when destroyed. This meant programs could access closed sockets.
Now the socket is marked "invalid" when closed.
2012-03-22 15:56:30 -05:00
Pieter Hintjens
c12fedc70a Completed internal renaming of XREP/XREQ to ROUTER/DEALER 2012-03-22 11:36:19 -05:00
Pieter Hintjens
75809b27da Fixed issue LIBZMQ-345 - race condition in ctx.socket/term allows segfault 2012-03-22 11:04:01 -05:00
Ian Barber
3b483a8dd7 Merge pull request #285 from hurtonm/ctx_patches
Ctx patches
2012-03-22 03:32:43 -07:00
Martin Hurton
151d0717bb Minor cleanups
* corrects whitespace errors
* fixes spelling errors in comments
* prefers #ifdef to #if defined
2012-03-22 07:47:39 +01:00
Martin Hurton
ae2b938330 register_endpoint: simplify locking 2012-03-22 07:47:39 +01:00
Martin Hurton
e56f698023 choose_io_thread: do not assert when no I/O thread was chosen 2012-03-22 07:47:39 +01:00
Martin Hurton
f944336ee0 Fix race condition in find_endpoint 2012-03-22 07:47:38 +01:00
Pieter Hintjens
860e1d24c0 Fixed issue #344 2012-03-21 17:49:50 -05:00
Ian Barber
8a64d80fba Merge pull request #283 from pieterh/master
Fixed issue LIBZMQ-343 - zmq_msg_get/set are too complex
2012-03-21 13:21:21 -07:00
Pieter Hintjens
f26e4ab784 Simplified zmq_msg_get/set functions
* Return integer property
* Fixed up man pages, which were inaccurate
* Fixed test case
2012-03-21 14:19:40 -05:00
Ian Barber
0afd8a87d5 Merge pull request #281 from pieterh/master
Applied patch for issue #293 - zmq 2.1 doesn't follow the ZMTP/1.0 spec
2012-03-20 13:14:59 -07:00
Pieter Hintjens
cd57c43880 Merge pull request #282 from hurtonm/remove_unused_variable
remove unused variable
2012-03-20 12:50:57 -07:00
Martin Hurton
35233f9e2f remove unused variable 2012-03-20 19:34:10 +01:00
Martin Hurton
0a6fc02702 fix connection establishment for AF_UNIX sockets 2012-03-20 19:04:12 +01:00
Pieter Hintjens
6dd102cded Fixed issue #293 2012-03-20 10:53:51 -05:00
Pieter Hintjens
1e4c5b293a Merge branch 'issue-337' 2012-03-20 10:18:15 -05:00
Pieter Hintjens
7d6d2f9408 Merge pull request #278 from taurel/master
Disable reconnection option
2012-03-20 07:06:33 -07:00
Emmanuel Taurel
107581213c Disable reconnection option
Add value -1 to the ZMQ_RECONNECT_IVL to disable the reconnection algorithm
2012-03-20 09:22:27 +01:00
Pieter Hintjens
6e71a54b1e Fixed issues #337, #341, and #340
* Implemented new ctx API (_new, _destroy, _get, _set)
* Removed 'typesafe' macros from zmq.h
* Added support for MAX_SOCKETS (was tied into change for #337)
* Created new man pages
2012-03-19 19:41:20 -05:00
Pieter Hintjens
bdefa181ed Fixed issue 336 2012-03-19 16:15:09 -05:00
Pieter Hintjens
06dd31c56a Removed last vestiges of thread-safe sockets 2012-03-19 15:50:53 -05:00
Pieter Hintjens
9ac40c47d7 Fixed issue LIBZMQ-333
- reverted commit 941be8d2175332cb720f390f93d07a0870db8824.
 - fixed zmq_device implementation for latest socket_base class
 - added back zmq_device.3 man page
2012-03-16 16:39:11 -05:00
Kobolog
cb70c5e75d fixed some typos 2012-03-15 15:15:44 +03:00
Kobolog
df584a3be0 an option to fail on unroutable messages in ROUTER sockets 2012-03-15 14:57:38 +03:00
boris@boressoft.ru
318ba8836f Add WinCE support.
* Added two new files: errno.hpp and errno.cpp. They are required to use errno functionality on WM.
* zmq.cpp, msg.h: removed inclusion of errno.h because it is included in zmq.h that is also included by .cpp.
* windows.hpp: process.h is included only for desktop builds.
* thread.cpp: on CE CreateThread is used instead of __beginthreadex
* socket_base.cpp, clock.cpp: on CE include cmnintrin.h instead on intrin.h
* signaler.cpp: on Windows should use special macro around event name (for unicode builds)
* err.hpp: make it include errno.hpp (my file) instead on errno.h when building for CE
* err.cpp: use FormatMessage when building for CE (because CE does not have ANSI API functions)
* zmq.h: do not include errno.h whe building for CE
* libzmq.vcproj: add tro new files
2012-03-14 19:12:28 +04:00
Rob Gagnon
3aabbbaefa Fix IPC transport domain socket stream file not being removed when connection is closed 2012-03-01 21:49:46 +00:00
Ben Gray
5820438b64 update lower bound flag when removing topics 2012-02-27 16:06:56 +00:00
Ian Barber
3f8322beff Merge pull request #268 from gimaker/compact-trie-table
Fixed a bug in the mtrie table compaction logic.
2012-02-27 03:00:49 -08:00
Staffan Gimåker
3485b3ef40 Fixed a bug in the mtrie table compaction logic.
Signed-off-by: Staffan Gimåker <staffan@spotify.com>
2012-02-27 11:51:30 +01:00
Mikko Koppanen
1824574f9b Minor fixes to get_address code to fix build on solaris and freebsd. Also service doesnt need to be discovered here 2012-02-20 04:26:25 +00:00
Mikko Koppanen
33a18f0f90 More fixes based on CentOS 6.2 results 2012-02-18 23:07:27 +00:00
Mikko Koppanen
d00d4843be More fixes for ZMQ_LAST_ENDPOINT. Added a test 2012-02-18 20:44:41 +00:00
Mikko Koppanen
b0573486c7 Fixes for tcp_listener::get_address 2012-02-18 19:48:09 +00:00
Ian Barber
06140daf29 Merge pull request #261 from mkoppanen/windows-build
Windows build
2012-02-17 14:38:02 -08:00
Mikko Koppanen
1bf4067cd8 More fixes for win build 2012-02-17 22:07:52 +00:00
Mikko Koppanen
51b59b40dd Fix build on windows 2012-02-17 22:06:10 +00:00
Mikko Koppanen
9a4fd8a305 Needs explicit cast on solaris 2012-02-17 21:55:06 +00:00
Mikko Koppanen
56aa49ff3d Fix build on solaris 2012-02-17 21:45:17 +00:00
skaller
38e74c9e84 Remove thread safe socket stuff from C binding. 2012-02-18 02:34:18 +11:00
Mikko Koppanen
da1920d944 Revert NULL checks in the API 2012-02-17 09:48:04 +00:00
Pieter Hintjens
ccdb7a6305 Minor cleanups
* Fixed use of ssize_t in zmq_msg_t class
* Corrected error after merge, old reference to inner_fctname (broke build)
2012-02-16 15:55:18 -06:00
Chuck Remes
a457be315b Merge pull request #246 from pieterh/arguments
Return EFAULT if required arguments are null
2012-02-16 13:20:33 -08:00
Chuck Remes
9321dfb845 Merge pull request #248 from pieterh/scattered
Renamed scatter/gather methods, cleaned up source
2012-02-16 13:19:11 -08:00
Ian Barber
2da76a3003 Updating to use getnameinfo rather than inet_ntop 2012-02-16 21:05:02 +00:00
Pieter Hintjens
4b62344023 Merge pull request #252 from gimaker/compact-trie-table
Compact the trie/mtrie node tables where possible, to reduce memory usag...
2012-02-16 10:49:23 -08:00
Pieter Hintjens
c9d124b27e Merge pull request #251 from gimaker/sub-sndhwn-assert
Drop subscription messages when reaching the SNDHWM rather than assertin...
2012-02-16 10:45:13 -08:00
Pieter Hintjens
bfbe556e00 Merge pull request #250 from gimaker/connect-assert
Resolve addresses in the calling thread on connect.
2012-02-16 10:35:48 -08:00
Pieter Hintjens
3ee99ae81f Renamed scatter/gather methods, cleaned up source 2012-02-16 12:30:37 -06:00
Pieter Hintjens
02b81d42ce Changed return type of zmq_msg_size to ssize_t to allow error return 2012-02-16 12:25:58 -06:00
Pieter Hintjens
dc09da4569 Return EFAULT if required arguments are null 2012-02-16 12:25:17 -06:00
Mikko Koppanen
2f44faa7ce Merge pull request #247 from pieterh/sendrecv
Added zmq_msg_send/recv functions
2012-02-16 08:58:03 -08:00
Staffan Gimåker
2cd04c54df Compact the trie/mtrie node tables where possible, to reduce memory usage.
Signed-off-by: Staffan Gimåker <staffan@spotify.com>
2012-02-16 15:56:19 +01:00
Staffan Gimåker
e18f9da012 Drop subscription messages when reaching the SNDHWM rather than asserting.
This matches the behaviour of zmq_setsockopt(ZMQ_SUBSCRIBE, ...), which also
silently drops subscription messages if the SNDHWM is reached.

Signed-off-by: Staffan Gimåker <staffan@spotify.com>
2012-02-16 14:49:47 +01:00
Staffan Gimåker
b9fb48f47b Resolve addresses in the calling thread on connect.
This allows us to actually report an error to the caller on resolve
failure, rather than asserting later on in the io thread.

Signed-off-by: Staffan Gimåker <staffan@spotify.com>
2012-02-16 14:42:55 +01:00
Pieter Hintjens
d092f2615c Renamed peek/poke to get/set 2012-02-15 19:28:29 -06:00
Pieter Hintjens
dcc1725a90 Renamed zmq_getmsgopt to zmq_msg_peek
* Added zmq_msg_poke for orthogonality
* Added zmq_msg_more for simplicity
* Fixed up man pages and test program
2012-02-15 18:44:28 -06:00
Pieter Hintjens
fb4748f257 Added zmq_msg_send/recv functions 2012-02-15 15:37:35 -06:00
Pieter Hintjens
a50a8aa364 Revert "more checks for parameters of API functions"
This reverts commit e646ce43c155f9710aa4486abd2daf6d4a30ca5b.
2012-02-14 18:43:33 -06:00
Pieter Hintjens
afe8cd503f Revert "fix warn unused"
- anonymous contributor

This reverts commit 7b7d404269cc9bb28e1954ed38dbeb8f63079fd1.
2012-02-14 18:43:33 -06:00
Ian Barber
b6c97230ed Merge branch 'master' of https://github.com/zeromq/libzmq 2012-02-14 23:10:15 +00:00
Ian Barber
b5d3373905 Moving to std::string in options 2012-02-14 23:10:06 +00:00
Pieter Hintjens
a908ccbf35 Merge pull request #241 from skaller/master
provide type safe sockets and contexts
2012-02-13 08:55:58 -08:00
niXman
e646ce43c1 more checks for parameters of API functions 2012-02-12 20:10:52 +04:00
skaller
4807935605 Implement type safe sockets and contexts. 2012-02-12 10:15:51 +11:00
Ian Barber
770f84331f Allowing value 0, and moving code to get_address functions based on feedback 2012-02-11 15:09:03 +00:00
Ian Barber
91bf4944da Merge branch 'master' of https://github.com/zeromq/libzmq 2012-02-11 15:08:23 +00:00
niXman
7b7d404269 fix warn unused 2012-02-10 13:39:34 +04:00
Ian Barber
7fa14f3823 Merge branch 'master' of https://github.com/zeromq/libzmq 2012-02-08 22:06:50 +00:00
Ian Barber
7b32c9cb51 Adding ZMQ_LAST_ENDPOINT for wildcard support on TCP and IPC sockets 2012-02-08 22:06:46 +00:00
skaller
c3f7543ebe Fix uio support.
We have to use an incomplete type in the interface.
The definition of iovec is only in the implementation.
This appears to following existing practice in 0MQ.
It seems a bit flakey that zmq.h is not included in zmq.cpp,
which is normal practice to ensure the implementation matches
the specified interface. YMMV. I follow 0MQ style.
2012-02-08 13:15:47 +11:00
skaller
970a005399 Provide interface.
Also move iovec definition from implementation to interface.
Not clear to me at present if an incomplete type should
be used to avoid gratuitously including <sys/uio.h> in
the interface. The interface can't be used with this include.
2012-02-08 12:58:35 +11:00
skaller
383a49dadf Implement zmq_recvmmsg. 2012-02-08 11:45:36 +11:00
skaller
531835bba8 Implement zmq_sendv.
Posix style send multiple messages using scatter/gather array.
2012-02-08 03:20:25 +11:00
skaller
759b2e01fd Fix comments to conform to style guide. 2012-02-04 12:34:06 +11:00
skaller
520ad3c2d7 Set and arrange propagation of thread safe sockets flag.
We use a distinct context initialisation function to specify
all sockets derived therefrom will be thread safe.

However the inheritance is done exclusively in the C interface.
This is not really correct, but it is chosen to minimise
interference with the existing C++ code, including any
construct or other calls within the C++ code base.
Semantically the C++ code should be unchanged,
physically some data structures and extra methods are
provided by they're only used from the C binding.
2012-02-04 02:17:35 +11:00
skaller
988efbc73a Thread Safe Sockets.
1. Reorganise C API socket functions to eliminate bad practice
of public functions calling other public functions. This should
be done for msg's too but hasn't been in this patch.

2. Reorganise code in C API socket functions so that the
socket is cast on one line, the C++ function called on
the next with the result retained, then the result is returned.

This makes the code much simpler to read and also allows
pre- and post- call hooks to be inserted easily.

3. Insert pre- and post- call hooks which set and release
a mutex iff the thread_safe flag is on.

4. Add the thread_safe_flag to base_socket_t initialised to
false to preserve existing semantics. Add an accessor for
the flag, add a mutex, and add lock and unlock functions.

Note: as yet no code to actually set the flag.
2012-02-04 01:41:09 +11:00
skaller
4dd6ce0639 Add mission ; character 2012-02-04 00:10:01 +11:00
Daniel Norberg
79f753bf56 xpub: free received subscription messages 2012-02-03 11:04:46 +01:00
Chuck Remes
93db782a1d Merge branch 'libzmq-268' of git://git.lucina.net/libzmq 2012-02-02 14:17:30 -06:00
Chuck Remes
762bcff73f Merge branch 'libzmq-303' of git://git.lucina.net/libzmq 2012-02-02 14:14:56 -06:00
Chuck Remes
c54ad48c9b Merge branch 'libzmq-205' of git://git.lucina.net/libzmq 2012-02-02 14:09:37 -06:00
Martin Lucina
0319cb2cd1 Fix data loss for PUB/SUB and unidirectional transports (LIBZMQ-268)
With the introduction of subscription forwarding, the first message sent
on a PUB socket using a unidirectional transport (e.g. PGM) is always
lost due to the "subscribe to all" being done asynchronously.

This patch fixes the problem and also refactors the code to have a single
point where the "subscribe to all" is performed.

Signed-off-by: Martin Lucina <martin@lucina.net>
2012-02-02 13:07:48 +01:00
Staffan Gimåker
e6c97c5ecc Reduce memory usage of mtrie.
Signed-off-by: Staffan Gimåker <staffan@spotify.com>
2012-01-30 09:47:33 +01:00
Martin Lucina
1925c92fe9 Merge branches 'libzmq-205' and 'libzmq-303' 2012-01-30 01:57:18 +01:00
Pieter Hintjens
281dcd2544 Merge pull request #221 from fidlej/master
Updated connector open() doc strings.
2012-01-27 14:48:43 -08:00
Pieter Hintjens
676d4f4e18 Merge pull request #222 from gimaker/trie-pruning
Fix for LIBZMQ-305
2012-01-27 14:48:17 -08:00
Pieter Hintjens
0c94cd036a Merge pull request #223 from gimaker/libzmq-310
Throw away unexpected data received by XPUB sockets, rather than asserting
2012-01-27 14:47:36 -08:00
Pieter Hintjens
95f6a07403 Merge pull request #224 from vortechs2000/master
Patch from Mikko Koppanen for #LIBZMQ-301
2012-01-27 14:47:14 -08:00