Brandon Carpenter
56b17100d4
Merge branch 'master' of https://github.com/zeromq/libzmq
2013-12-06 11:00:14 -08:00
Brandon Carpenter
f0bd333728
Move {SO,LOCAL}_PEERCRED checks to C++ context.
2013-12-06 10:59:07 -08:00
Brandon Carpenter
dc5528cba6
Enable building IPC filtering with cmake.
2013-12-06 10:55:44 -08:00
Pieter Hintjens
4a4db83e55
Merge pull request #780 from hashstat/master
...
Shortened ZMQ_IPC_ACCEPT_FILTER_[UGP]ID to ZMQ_IPC_FILTER_[UGP]ID.
2013-12-06 10:52:39 -08:00
Brandon Carpenter
dc9b1309b9
Shortened ZMQ_IPC_ACCEPT_FILTER_[UGP]ID to ZMQ_IPC_FILTER_[UGP]ID.
2013-12-06 09:58:10 -08:00
Pieter Hintjens
0a9a4fa904
Merge pull request #779 from hashstat/master
...
Fix failing test case in test_filter_ipc.
2013-12-06 05:30:48 -08:00
Brandon Carpenter
af808203d7
Fix failing test case in test_filter_ipc.
...
Add explicit check for primary group.
2013-12-06 00:46:14 -08:00
Pieter Hintjens
f5b6bd70f3
Merge pull request #775 from pijyoi/master
...
use enum retired_fd instead of -1
2013-12-05 03:25:12 -08:00
Pieter Hintjens
e48ca50663
Merge pull request #774 from shubred1/master
...
Updated documentation for zmq_disconnect() and zmq_setsockopt().
2013-12-05 03:23:12 -08:00
Pieter Hintjens
b7de0424fc
Merge pull request #773 from hashstat/master
...
Add IPC accept filter support
2013-12-05 03:20:05 -08:00
KIU Shueng Chuan
fd8d6d471f
use enum retired_fd instead of -1
...
using -1 causes a warning on Windows platform because SOCKET is unsigned.
2013-12-05 07:04:21 +08:00
Brandon Carpenter
2252322acc
Add IPC accept filter socket options.
...
Adds ZMQ_IPC_ACCEPT_FILTER_{PID,UID,GID} socket options to add processs,
user, and group IDs to the IPC filter sets. Fixes LIBZMQ-568.
2013-12-04 14:23:13 -08:00
Brandon Carpenter
8662f44efa
Intial IPC accept filter support.
...
Adds sets of process (Linux only), user, and group IDs for filtering
connections from peer processes over IPC transport. If all of the
filter sets are empty, every connection is accepted. Otherwise,
credentials for a connecting process are checked against the filter sets
and the connection is only accepted if a match is found.
This commit is part of LIBZMQ-568 and only adds the filter sets and
implements the filter in the IPC accept method. The interface for
adding IDs to filter sets are included in a separate commit.
IPC accept filtering is supported only on Linux and OS X.
2013-12-04 14:12:29 -08:00
Shane Hubred
c7693bedea
Updated documentation for zmq_disconnect() and zmq_setsockopt().
2013-12-04 15:02:49 -06:00
Richard Newton
a9492a0852
Merge pull request #770 from hurtonm/master
...
Code cleanup
2013-12-03 08:38:15 -08:00
Martin Hurton
973d13d545
Code cleanup
2013-12-03 15:59:34 +01:00
Pieter Hintjens
39e2b79912
Merge pull request #768 from Talksum/master
...
changing zmq_proxy_steerable to not use null terminated strings
2013-12-01 13:13:07 -08:00
Brian Knox
ff292d62d0
changing zmq_proxy_steerable to not use null terminated strings
2013-12-01 20:29:03 +00:00
Pieter Hintjens
0f6e737ff8
Merge pull request #766 from hurtonm/master
...
Fix issue #763
2013-12-01 02:48:32 -08:00
Martin Hurton
cf14c54102
Fix issue #763
2013-11-30 21:25:18 +01:00
Pieter Hintjens
243aba265b
Merge pull request #765 from pijyoi/master
...
make win32 signaler support ephemeral ports
2013-11-28 02:43:45 -08:00
KIU Shueng Chuan
bd41087ab9
make win32 signaler support ephemeral ports
2013-11-28 18:25:28 +08:00
Pieter Hintjens
a9eb6f792b
Merge pull request #762 from ricnewton/master
...
Fix windows build for type of service.
2013-11-25 01:32:51 -08:00
Richard Newton
abbe704d9e
Fix windows build for type of service.
2013-11-25 09:25:23 +00:00
Pieter Hintjens
3cddcbaadc
Merge pull request #761 from claws/add_dscp_sockopt
...
Add ability to set Differential Services Code Point socket option
2013-11-24 22:50:18 -08:00
Chris Laws
a4385e6105
tidy up
2013-11-25 13:40:05 +10:30
Chris Laws
38bceca9ca
Add ability to set and get DSCP socket option
2013-11-25 13:31:21 +10:30
Pieter Hintjens
b91ef997ce
Merge pull request #760 from shancat/move_linger_test
...
Move linger test to issue repo.
2013-11-24 13:02:47 -08:00
Shannen Saez
8f97f621a8
Move linger test to issue repo.
...
See https://github.com/zeromq/issues/pull/7
Signed-off-by: Shannen Saez <shannenlaptop@gmail.com>
2013-11-25 14:37:47 +11:00
Richard Newton
7c2c02862e
Merge pull request #759 from hintjens/master
...
Moved version macros to top for better visibility
2013-11-24 08:19:02 -08:00
Pieter Hintjens
75a293d379
Moved version macros to top for better visibility
2013-11-24 12:47:24 +01:00
Richard Newton
46c5a239cb
Merge pull request #758 from hintjens/master
...
Fixed test_many_sockets
2013-11-19 08:15:50 -08:00
Pieter Hintjens
4d22d456a9
Reverting path change on platform.hpp, this broke some builds
2013-11-19 17:11:15 +01:00
Pieter Hintjens
f98fbd5ad8
Fixed test_many_sockets
...
* failed on systems where process could not allocate 1024 sockets by default
* include path for platform.hpp was wrong; fixed it
2013-11-19 16:51:06 +01:00
Pieter Hintjens
0ee76912e7
Merge pull request #756 from 0x6d686b/master
...
Fixed typo in documentation about zmq_proxy_steerable()
2013-11-15 06:33:52 -08:00
Mathias Hablützel
3535a1d7ea
Fixed typo in documentation about zmq_proxy_steerable()
2013-11-15 15:31:09 +01:00
Pieter Hintjens
a0bde50887
Merge pull request #755 from hintjens/master
...
Added links to RFCs for socket patterns
2013-11-13 04:58:37 -08:00
Pieter Hintjens
c89518d33d
Added links to RFCs for socket patterns
2013-11-13 13:57:57 +01:00
Pieter Hintjens
4a7f07a19a
Merge pull request #754 from pijyoi/master
...
remove all asserts during critical section for win32 make_fdpair codepath
2013-11-11 10:42:08 -08:00
Ian Barber
e3ddda7a1f
Merge pull request #753 from pijyoi/master
...
handle bind error in make_fdpair() win32 codepath
2013-11-11 09:13:09 -08:00
KIU Shueng Chuan
7bd0b6ada1
remove all asserts during critical section
...
the size of the critical section is reduced by only entering the critical
section right before the bind().
2013-11-12 01:12:24 +08:00
Ian Barber
ba33fb748b
Merge pull request #752 from ricnewton/master
...
Revert "Make FD_SETSIZE = ZMQ_MAX_SOCKETS_DFLT + 1 so there is room for ...
2013-11-11 09:10:51 -08:00
KIU Shueng Chuan
cf8ba925b4
return error to caller on bind error
2013-11-12 00:07:06 +08:00
Richard Newton
5f8067cd1b
Fix signed/unsigned comparison
2013-11-11 13:54:58 +00:00
Richard Newton
dee333b2ed
Fix signed/unsigned comparison
2013-11-11 13:53:25 +00:00
Ian Barber
51fa803d63
Merge pull request #751 from psl-felipefarinon/master
...
Removing C++11 code.
2013-11-11 05:51:12 -08:00
Richard Newton
7c51429440
Reduce default maximum number of sockets by 1 so there is room for the reaper socket.
2013-11-11 13:41:42 +00:00
Richard Newton
f77b96e4d9
Revert "Make FD_SETSIZE = ZMQ_MAX_SOCKETS_DFLT + 1 so there is room for the repear socket."
...
This reverts commit 0b92831b2a
2013-11-11 13:09:23 +00:00
psl-felipefarinon
31cf53f025
issue #583 removing C++11 code.
2013-11-11 10:20:28 -02:00
Pieter Hintjens
dc339f4c6d
Merge pull request #750 from mattconnolly/master
...
Update signaler make_fdpair to set file descriptors to -1 when too many ...
2013-11-10 04:10:12 -08:00
