generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-09 19:17:41 +01:00
Code Issues Projects Releases Wiki Activity
1,714 Commits 4 Branches 39 Tags 41 MiB
f7bd543c36
Commit Graph

1029 Commits

Author SHA1 Message Date
Ian Barber
d56b75219f Merge pull request #316 from pieterh/master 
Fixed issue #358
 2012-04-19 01:35:08 -07:00
Pieter Hintjens
8837852546 Merge pull request #317 from shripchenko/master 
implement zmq_unbind(),zmq_disconnect(), zmq->sock->getsockopt(ZMQ_LAST_ENDPOINT_ID)
 2012-04-18 13:58:45 -07:00
Sergey KHripchenko
7b8e728e43 implement zmq_unbind(),zmq_disconnect(), zmq->sock->getsockopt(ZMQ_LAST_ENDPOINT_ID) 2012-04-18 23:42:11 +04:00
Pieter Hintjens
318d55fd10 Fixed issue LIBZMQ-358 2012-04-18 13:14:07 -05:00
Ian Barber
36e9c4ac84 Merge pull request #315 from shripchenko/master 
fix bug in zmq::tcp_address_t::resolve_interface() where resolved interface ip overwrited by 0.0.0.0
 2012-04-18 04:10:29 -07:00
Sergey KHripchenko
b89a53ee7a fix bug in zmq::tcp_address_t::resolve_interface() where all resolved interface ip's overwrited by 0.0.0.0 2012-04-18 14:06:39 +04:00
Ian Barber
5b3008957d port of patch by Martin Sustrik to libxs: This patch instantiate a clock_t instance for each XS 
socket. Thus, it is shared between subsequent calls
to xs_recv (and xs_send). That in turn significantly
limits the number of invocations of  getimeofday (or similar)
when timeouts are used and recv/send is called in a
tight loop.
 2012-04-17 10:10:22 +01:00
Sergey KHripchenko
c77dc98b5c some spaces cleanups + delete unused anymore zmq::max_sockets + some minor code chages 2012-04-13 13:26:57 +04:00
Sergey KHripchenko
acba6bdd6c Implement ZMQ_TCP_ACCEPT_FILTER setsockopt() for listening TCP sockets. 
Assign arbitrary number of filters that will be applied for each new TCP transport
connection on a listening socket.
If no filters applied, then TCP transport allows connections from any ip.
If at least one filter is applied then new connection source ip should be matched.
To clear all filters call zmq_setsockopt(socket, ZMQ_TCP_ACCEPT_FILTER, NULL, 0).
Filter is a null-terminated string with ipv6 or ipv4 CIDR.

For example:
localhost
127.0.0.1
mail.ru/24
::1
::1/128
3ffe:1::
3ffe:1::/56

Returns -1 if the filter couldn't be assigned(format error or ipv6 filter with ZMQ_IPV4ONLY set)

P.S.
The only thing that worries me is that I had to re-enable 'default assign by reference constructor/operator'
for 'tcp_address_t' (and for my inherited class tcp_address_mask_t) to store it in std::vector in 'options_t'...
 2012-04-12 18:37:14 +04:00
Martin Hurton
cfa6f4bf51 Fix issue #335 
The CreateEvent function requests EVENT_ALL_ACCESS access rights
when the event object already exists. This causes problems
when the event object is created from a service.
The solution is to call OpenEvent function when the CreateEvent
failed due to access control.
The proper solution would be to use CreateEventEx function, but
this one is not available on Windows XP.
 2012-04-11 11:41:10 +02:00
Mikko Koppanen
70cf2d41ba ETIMEDOUT is a valid error code here. Fixes intermittent assertion failure on laggy networks 2012-04-10 09:55:10 +09:00
Pieter Hintjens
3cd0b1b647 Merge pull request #306 from shripchenko/master 
Implement ZMQ_TCP_KEEPALIVE* family of options to adjust TCP keepalives
 2012-04-09 10:14:35 -07:00
Sergey KHripchenko
4b303402a7 more flexible keepalive options detection + awful options documentation 2012-04-06 20:04:35 +04:00
Sergey KHripchenko
0c3d917926 initial implementation of tuning TCP keep-alives for TCP socket 
currently not fully cross-platform
work on linux
possibly work in *bsd
and could be enhanced to work on windows
 2012-04-05 19:39:53 +04:00
Martin Hurton
12c0c6aa74 Fix identity exchange for inproc transport 
The socket connecting using the inproc transport never
received the identity of the remote peer.
 2012-04-05 16:00:41 +02:00
Martin Hurton
b41036aa2a Flush identity message for inproc transport 
The scoket implementation for inproc transfer failed to flush
identity message. The result was that the identity message
was not delivered until after the user sent the first message.

The identity message was never delivered if the user
used the socket only to receive messages.
 2012-04-05 01:19:13 +02:00
Pieter Hintjens
a969028977 Merge pull request #302 from hurtonm/router_bugfix 
Fix error in router socket introduced in the previous commit
 2012-04-03 00:34:21 -07:00
Martin Hurton
9a60b3a2a1 Fix error in router socket introduced in the previous commit 2012-04-03 09:29:33 +02:00
Ian Barber
2faedd9e08 Merge pull request #300 from hurtonm/router_send_fixes 
router: always respect message boundaries
 2012-04-02 13:23:52 -07:00
Martin Hurton
600488fa9c router: always respect message boundaries 
The current implementaion of router socket does not
handle the full pipe and unroutable messages properly.
Namely, in those cases, the socket could route some
message parts into a wrong connection.
 2012-04-02 21:07:32 +02:00
Martin Hurton
f037290dc3 router: reimplement peer identification 
The new implementation allows one to send messages through
a router socket to a peer even before receiving
messages from this peer.

Fixes issue #304
 2012-04-02 20:45:10 +02:00
Pieter Hintjens
9728706b10 Added optval checking in zmq_ctx_set 2012-03-29 07:46:46 -05:00
Pieter Hintjens
eb8217bb28 Fixed zmq_init(-1) issue 2012-03-29 00:47:17 -05:00
Ian Barber
cecc790ca3 Merge pull request #297 from hurtonm/code_cleanup 
Code cleanup
 2012-03-28 03:51:13 -07:00
Martin Hurton
1e2564a55f Fix return value of send for router socket 2012-03-28 07:45:57 +02:00
Martin Hurton
77d93d70f0 Simplify use of posix_assert in mutex.hpp 
It is the job of the posix_assert macro to check
the value. No need to do it twice.

The patch also fixes some whitespace problems.
 2012-03-28 07:28:43 +02:00
Martin Hurton
e7674025e5 Remove the launch_sibling method 
The method is not used anymore.
 2012-03-28 07:28:43 +02:00
Martin Hurton
6f47f1281b Do not pass a message to the check_write method 
The check_write method does not use the passed message.
The parameter was needed to implement the swap.
As the swap is not supported anymore, it is safe to remove this parameter.
 2012-03-28 07:28:42 +02:00
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 941be8d217.
 - 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 e646ce43c1.
 2012-02-14 18:43:33 -06:00
Pieter Hintjens
afe8cd503f Revert "fix warn unused" 
- anonymous contributor

This reverts commit 7b7d404269.
 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