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