Commit Graph

2871 Commits

Author SHA1 Message Date
Trevor Bernard
754ae1b115 Add Trevor Bernard to AUTHORS 2013-12-14 23:40:39 -04:00
Trevor Bernard
10a6641ef2 Fix issue #788 - Only allow a single connect per endpoint for SUB, REQ, and DEALER sockets 2013-12-14 23:40:34 -04:00
Richard Newton
02a8d1ea4c Merge pull request #785 from pijyoi/mutex_signaler
support signaler_port in config.hpp set to value other than 0 and 5905
2013-12-12 05:29:02 -08:00
Richard Newton
e14c9bcb23 Merge pull request #786 from algernon/hotfix/curve_keygen.cpp
tools/: Link curve_keygen with a c++ linker
2013-12-12 05:24:43 -08:00
Gergely Nagy
b50ed02a20 tools/: Link curve_keygen with a c++ linker
When trying to linking curve_keygen as if it was a C program, linking
fails (at least with gcc 4.8 on Debian testing) because it can't find
C++ symbols. Linking with g++ instead fixes the issue.

To achieve this, the source is renamed to curve_keygen.cpp, and
tools/Makefile.am is updated accordingly.

Signed-off-by: Gergely Nagy <algernon@balabit.hu>
2013-12-12 11:44:12 +01:00
KIU Shueng Chuan
7f22995e35 use mutex implementation if fixed signaler_port!=5905 2013-12-12 00:39:01 +08:00
Pieter Hintjens
b4395d15f9 Merge pull request #782 from hashstat/master
Add support for extending ZAP request address with IPC peer credentials.
2013-12-06 14:41:41 -08:00
Brandon Carpenter
a018ef5e86 Add support for extending ZAP request address with IPC peer credentials.
Another take on LIBZMQ-568 to allow filtering IPC connections, this time
using ZAP.  This change is backward compatible.  If the
ZMQ_ZAP_IPC_CREDS option is set, the user, group, and process IDs of the
peer process are appended to the address (separated by colons) of a ZAP
request; otherwise, nothing changes.  See LIBZMQ-568 and zmq_setsockopt
documentation for more information.
2013-12-06 14:28:44 -08:00
Pieter Hintjens
0f3703a3ee Merge pull request #781 from hashstat/master
Enable building IPC filtering with cmake and another small autoconf fix.
2013-12-06 13:03:58 -08:00
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