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

3208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pieter Hintjens
ecb9770947 Merge pull request #809 from hurtonm/master 
Simplify ypipe_t and ypipe_base_t template parameters
 2014-01-06 04:46:52 -08:00
Martin Hurton
96f5fddc45 Simplify ypipe_t and ypipe_base_t template parameters 2014-01-06 11:34:00 +01:00
Pieter Hintjens
c7e3efba6b Merge pull request #808 from sradomski/master 
Allow clients to get remote endpoint per message for TCP connections
 2014-01-06 01:48:39 -08:00
Stefan Radomski
823b7ebeb0 Removed dead code 2014-01-06 10:33:58 +01:00
Stefan Radomski
f30fb8501e Expose remote FD via zmq_msg_get(&msg, ZMQ_SRCFD) 
This patch allows client applications to retrieve the remote endpoint from a message that originated from a tcp socket
 2014-01-06 10:31:42 +01:00
Pieter Hintjens
08d897b174 Merge pull request #804 from mattconnolly/master 
Update test_filter_ipc to not use abstract socket.
 2014-01-02 22:13:46 -08:00
Matt Connolly
8c3e645013 Update test_filter_ipc to not use abstract socket. 
This fixes the test on Mac OS X and SmartOS (probably other Solarises).
Also updates the sockets using ipc: to use DEALER sockets instead
of PAIR sockets.
 2014-01-03 10:42:57 +10:00
Pieter Hintjens
b5d2239a4e Merge pull request #803 from vortechs2000/fix-libzmq-576 
Fix LIBZMQ-576 - Revert "Merge pull request #510 from miniway/master"
 2014-01-02 13:10:17 -08:00
AJ Lewis
cd2827fb36 Fix LIBZMQ-576 - Revert "Merge pull request #510 from miniway/master" 
This reverts commit f27eb67e1abb0484c41050e454404cce30647b63, reversing
changes made to a3ae0d4c16c892a4e6c96d626a7c8b7068450336.

https://zeromq.jira.com/browse/LIBZMQ-576

Conflicts:
	src/stream_engine.cpp

Conflicts were around additional defaults to the constructor after the
'terminating' default.  The additional defaults were left alone, and
the 'terminating' default was removed.
 2014-01-02 11:05:39 -06:00
Ian Barber
2fa49e96d2 Merge pull request #800 from hintjens/master 
Minor cosmetic fixes
 2014-01-02 03:19:45 -08:00
Pieter Hintjens
b3b9e046ee Updated copyright statements for 2014 2014-01-02 12:00:57 +01:00
Pieter Hintjens
ff45caabd1 Fixed copyrights on TIPC code 
- corporate copyright statements sit in AUTHORS file
 2014-01-02 11:54:13 +01:00
Pieter Hintjens
5bf96f64b0 Removed ZMQ_ZAP_IPC_CREDS option 
- This seems redundant; is there a use case for NOT providing
  the IPC credentials to the ZAP authenticator?

- More, why is IPC authentication done via libzmq instead of ZAP?
  Is it because we're missing the transport type on the ZAP request?
 2014-01-01 17:39:14 +01:00
Pieter Hintjens
adf5b45d71 Reordered socket options 
- put into alphabetical order
- there was no consistency in previous ordering
 2014-01-01 16:28:30 +01:00
Pieter Hintjens
3ad8c61190 Whitespace fixes 2014-01-01 15:36:47 +01:00
Pieter Hintjens
49a2902c82 Fixed issue #801 2014-01-01 15:36:47 +01:00
Pieter Hintjens
9d9592f830 Whitespace fixes 
Minor layout fix

Whitespace fix
 2014-01-01 15:36:33 +01:00
Pieter Hintjens
384f8522aa Merge pull request #799 from lodagro/patch-1 
fix doc typo
 2013-12-24 08:29:34 -08:00
Wouter Overmeire
a5f4d823a5 fix doc typo 2013-12-24 15:00:43 +01:00
Pieter Hintjens
5a0d21297e Merge pull request #798 from pijyoi/master 
doc bugfix: ZMQ_MSGMORE should be ZMQ_SNDMORE
 2013-12-23 09:09:57 -08:00
KIU Shueng Chuan
5fa3f0a045 doc bugfix: ZMQ_MSGMORE should be ZMQ_SNDMORE 2013-12-23 23:06:18 +08:00
Pieter Hintjens
b5aa2b0f1c Merge pull request #797 from agronholm/master 
Fixed setting TCP keepalive parameters on Windows
 2013-12-22 02:24:15 -08:00
Alex Grönholm
b554757cf0 Fixed setting TCP keepalive parameters on Windows 2013-12-22 02:55:18 +02:00
Ian Barber
93e26efd5d Merge pull request #796 from hintjens/master 
Fixes to IPC wildcarding & test cases
 2013-12-20 13:36:30 -08:00
Pieter Hintjens
311b6bf9f7 Test was sometimes failing 
- was not waiting long enough at socket close
- increased to 50 msec
 2013-12-20 14:34:29 +01:00
Pieter Hintjens
bf3702395c Fixed wildcard IPC endpoint and added test case 2013-12-20 14:28:54 +01:00
Pieter Hintjens
62f3fdf3b7 Fixed indentation 2013-12-20 14:17:35 +01:00
Ian Barber
32f3fb490a Merge pull request #794 from hintjens/master 
Fixed use of deprecated tempnam
 2013-12-20 00:49:23 -08:00
Pieter Hintjens
8ba1311e34 Fixed use of deprecated tempnam 2013-12-19 21:06:32 +01:00
Pieter Hintjens
cf69781570 Added release notes for 4.0.3 2013-12-19 21:06:32 +01:00
Pieter Hintjens
fc93902c4e Merge pull request #793 from minrk/test_resource 
add failing test for binding to resources
 2013-12-19 00:00:46 -08:00
MinRK
f4c5c9e890 add failing test for binding to resources 2013-12-18 16:37:37 -08:00
Pieter Hintjens
b4591202d2 Merge pull request #791 from moteus/patch-1 
Update doc for zmq_proxy_steerable [ci skip]
 2013-12-17 05:41:24 -08:00
Alexey Melnichuk
b7a2248e22 Update doc for zmq_proxy_steerable [ci skip] 2013-12-17 15:27:55 +03:00
Pieter Hintjens
5401c35267 Merge pull request #790 from trevorbernard/master 
Add tests/test_zap_ipc_creds to .gitignore
 2013-12-15 00:16:37 -08:00
Pieter Hintjens
dc2ab43297 Merge pull request #789 from trevorbernard/single-connect 
Single connect
 2013-12-15 00:16:09 -08:00
Trevor Bernard
dfcf2950fc Add tests/test_zap_ipc_creds to .gitignore 2013-12-15 00:02:41 -04:00
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
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 0b92831b2a82c3bbc0e9371662c546b94915a3ea.
 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
Matt Connolly
f06645c5f1 Update signaler make_fdpair to set file descriptors to -1 when too many files are open using socketpair. 2013-11-10 21:16:12 +10:00
Pieter Hintjens
1719b63f1d Merge pull request #749 from davipt/fix-001-test_many_sockets_and_mac_open 
Fix socket creation above sistem limits for all 'other' OS not covered b...
 2013-11-10 02:25:04 -08:00
Bruno D. Rodrigues
750426037d Fix socket creation above sistem limits for all 'other' OS not covered by eventfd, windows or vms; enhanced test to create sockets up to a bigger limit to really test hitting the OS limit 2013-11-10 10:19:19 +00:00
Ian Barber
2b989ded67 Merge pull request #748 from hintjens/master 
Added ignore test case
 2013-11-09 04:11:50 -08:00