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

1618 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sergey KHripchenko
2faa4c487f stupid bug. I feel ashamed ^) 2012-04-21 07:55:54 +04:00
Sergey KHripchenko
2eb6b32ef7 fixes for 
make[2]: Entering directory `/home/laotse/src/abs/zeromq-git/src/libzmq-build/src'
  CXX    libzmq_la-address.lo
address.cpp: In destructor 'zmq::address_t::~address_t()':
address.cpp:41:29: error: deleting object of polymorphic class type 'zmq::tcp_address_t' which has non-virtual destructor might cause undefined behaviour [-Werror=delete-non-virtual-dtor]
cc1plus: all warnings being treated as errors
 2012-04-20 19:16:26 +04:00
Sergey KHripchenko
489481857a 2nd try wuth sock->unbind() and sock->disconnect(). now with blackjack and const char*'s 2012-04-20 18:59:08 +04:00
Sergey KHripchenko
7b8e728e43 implement zmq_unbind(),zmq_disconnect(), zmq->sock->getsockopt(ZMQ_LAST_ENDPOINT_ID) 2012-04-18 23:42:11 +04: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
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
Pieter Hintjens
e276df2bdf Merge pull request #309 from hurtonm/fix_issue_335 
Fix issue #335
 2012-04-11 04:38:12 -07: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
Pieter Hintjens
899778dcb3 Merge pull request #308 from jdc8/master 
C++ style comments result in compile errors with non-c99 C compiler
 2012-04-10 06:07:08 -07:00
jdc8
177264d941 c++ style comments result in compile errors with non-c99 C compiler 2012-04-10 06:33:15 -04:00
Pieter Hintjens
f6330f3d8d Merge pull request #307 from mkoppanen/master 
Handle ETIMEDOUT
 2012-04-09 18:20:02 -07: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
4315467d7c documentation trimmed down to be just placeholders for who knows english better than me 2012-04-09 13:39:52 +04: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
Pieter Hintjens
4ab3c5a285 Merge pull request #305 from hurtonm/fix_identity_exchange_for_inproc_transport 
Fix identity exchange for inproc transport
 2012-04-05 07:17:29 -07: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
Pieter Hintjens
88db804bb9 Merge pull request #304 from hurtonm/flush_identity_message_for_inproc_transport 
Flush identity message for inproc transport
 2012-04-04 16:35:41 -07: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
Ian Barber
5bc9fd62c5 Merge pull request #303 from pieterh/master 
Fixed issue #351
 2012-04-04 06:45:26 -07:00
Pieter Hintjens
d8c58080a7 Fixed issue #351 2012-04-04 14:39:19 +01: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
Ian Barber
5c6e278887 Merge pull request #301 from hurtonm/router_rework_peer_identification 
router: reimplement peer identification
 2012-04-02 13:23:19 -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
Ian Barber
476c9b97c9 Merge pull request #299 from pieterh/master 
Added checking to zmq_ctx_set()
 2012-03-29 05:50:52 -07:00
Pieter Hintjens
9728706b10 Added optval checking in zmq_ctx_set 2012-03-29 07:46:46 -05:00
Ian Barber
3eaae8b21e Merge pull request #298 from pieterh/master 
Fixed issue (unknown) on zmq_init(-1)
 2012-03-28 23:35:04 -07: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
Ian Barber
8da7271042 Merge pull request #296 from hurtonm/fix_router_send 
Fix return value of send for router socket
 2012-03-28 03:50:02 -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
Ian Barber
ed65271c52 Merge pull request #295 from hurtonm/tcp_address_fixes_anc_cleanups 
Tcp address fixes anc cleanups
 2012-03-27 01:55:20 -07: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
Ian Barber
19f364e202 Merge pull request #294 from pieterh/master 
Fixed issue LIBZMQ-348 - Valgrind support
 2012-03-26 14:41:12 -07: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
Ian Barber
dc4d61f38b Merge pull request #292 from hurtonm/fix_issue_334 
Fixed issue #334
 2012-03-25 12:18:31 -07: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
Ian Barber
6d776d0865 Merge pull request #290 from pieterh/master 
Fixed issue #325
 2012-03-23 15:52:42 -07:00
Pieter Hintjens
ba798ee8f3 Fixed issue #325 2012-03-23 17:32:26 -05:00
Pieter Hintjens
82c06e4417 Fixed issue #325 2012-03-23 17:29:29 -05:00
Ian Barber
c861fb4c83 Merge pull request #289 from pieterh/master 
Makefile.am wasn't fixed, so libzmq was not building
 2012-03-22 15:20:53 -07:00
Pieter Hintjens
3585ec8aea Fixed Makefile for ROUTER/DEALER rename 2012-03-22 16:48:29 -05:00
Ian Barber
712e36d29c Merge pull request #288 from pieterh/master 
Mark sockets as invalid when closed, not reaped
 2012-03-22 14:44:43 -07: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
Ian Barber
6f720f0026 Merge pull request #287 from pieterh/master 
Completed internal renaming of XREP/XREQ to ROUTER/DEALER
 2012-03-22 13:30:48 -07:00
Pieter Hintjens
c12fedc70a Completed internal renaming of XREP/XREQ to ROUTER/DEALER 2012-03-22 11:36:19 -05:00
Ian Barber
0480ce1820 Merge pull request #286 from pieterh/master 
Fixed issue LIBZMQ-345 - race condition in ctx.socket/term allows segfault
 2012-03-22 09:09:15 -07: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
Ian Barber
84707d3feb Merge pull request #284 from pieterh/master 
Fixed issue LIBZMQ-344 - Implementation of ZMQ_FAIL_UNROUTABLE is broken
 2012-03-22 03:31:02 -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
Pieter Hintjens
58378c6a2c Merge pull request #280 from hurtonm/fix_ipc_connecter 
fix connection establishment for AF_UNIX sockets
 2012-03-20 12:50:43 -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
Chuck Remes
60e45f34b6 Merge pull request #279 from pieterh/master 
Wrote new ctx API, added ZMQ_MAX_SOCKETS and ZMQ_IO_THREADS
 2012-03-20 09:42:18 -07: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
Ian Barber
5973da4866 Merge pull request #277 from pieterh/master 
Removed sys:// logging infrastructure
 2012-03-20 00:28:19 -07:00
Pieter Hintjens
9426bd5baf Merge branch 'issue-336' 2012-03-19 23:15:15 -05:00
Mikko Koppanen
87fa8e78bf Merge pull request #276 from pieterh/master 
Removed last vestiges of thread-safe sockets
 2012-03-19 18:51:05 -07: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
Mikko Koppanen
8665f9a0b6 Merge pull request #275 from pieterh/master 
Fixed issue LIBZMQ-333 (zmq_devices is missing)
 2012-03-17 10:17:39 -07:00
Pieter Hintjens
9ccfbf8d30 Removed zmq.hpp, may add this back in separate commit 2012-03-17 11:12:11 -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
Pieter Hintjens
32c85e0ea3 Merge pull request #274 from Kobolog/master 
An options to choose the behavior for unroutable messages in ZMQ_ROUTER sockets
 2012-03-15 09:01:15 -07:00
Kobolog
cb70c5e75d fixed some typos 2012-03-15 15:15:44 +03:00
Kobolog
8095a129e8 man entry for the new option 2012-03-15 15:06:44 +03:00
Kobolog
df584a3be0 an option to fail on unroutable messages in ROUTER sockets 2012-03-15 14:57:38 +03:00
Ian Barber
62d27b7af3 Merge pull request #273 from BoresExpress/wm5 
Add WinCE support.
 2012-03-14 08:27:04 -07: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
Pieter Hintjens
f9674308e8 Merge pull request #272 from staticfloat/patch-1 
Eliminate unnecessary line break
 2012-03-12 15:22:00 -07:00
staticfloat
020f777e09 Eliminate unnecessary line break 2012-03-12 15:18:32 -07:00
Ian Barber
19d30969cf Merge pull request #271 from BoresExpress/bug1 
Changed wrong file name in VC++ project.
 2012-03-06 07:22:34 -08:00
boris@boressoft.ru
ce24bf04dd Changed wrong file name in VC++ project. 
Name of the file in the project does not match actual file name:
adress.cpp VS. address.cpp
 2012-03-06 18:21:55 +04:00