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

2582 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pieter Hintjens
193d0bb634 Fixed Z85 methods to be static and not pollute library 2013-09-15 17:30:18 +02:00
Pieter Hintjens
65ef76bb59 Minor simplification to makefile 2013-09-15 15:45:40 +02:00
Pieter Hintjens
90668517da Merge pull request #658 from ricnewton/inproc_connect_before_bind 
Support high water mark on inproc socket connect before bind.
 2013-09-15 06:19:00 -07:00
Richard Newton
4e6c56e081 Merge branch 'master' of https://github.com/zeromq/libzmq into inproc_connect_before_bind 2013-09-15 13:36:07 +01:00
Richard Newton
b9298823b4 Set hwm on connect socket before bind has happend to just that of connects hwm. 2013-09-15 13:35:44 +01:00
Richard Newton
7841b0dd0f Support high water mark on inproc socket connect before bind. 2013-09-14 17:27:18 +01:00
Richard Newton
133c32d5ed Merge pull request #657 from hintjens/master 
Build didn't work if libsodium wasn't installed
 2013-09-13 00:52:12 -07:00
Pieter Hintjens
0db2bbe29d Build didn't work if libsodium wasn't installed 2013-09-13 09:47:23 +02:00
Pieter Hintjens
3298e5a206 Merge pull request #656 from ricnewton/inproc_connect_before_bind 
Allow inproc sockets to connect before bind
 2013-09-12 13:46:37 -07:00
Richard Newton
b9c09064d5 Fix whitespace 2013-09-12 21:22:47 +01:00
Richard Newton
d5bd68b60b Merge branch 'master' of https://github.com/zeromq/libzmq into inproc_connect_before_bind 2013-09-12 21:09:30 +01:00
Richard Newton
379bcb0881 Send identities when connecting pending sockets. 2013-09-12 21:07:29 +01:00
Ian Barber
c1fabf5ca9 Merge pull request #655 from hintjens/master 
Fixed overwrite in zmq_getsockopt
 2013-09-12 10:27:57 -07:00
Richard Newton
7c3496a76a Fix race condition and support multiple socket connects before bind. 2013-09-12 18:09:37 +01:00
Pieter Hintjens
60f470450d Merge pull request #654 from lalebarde/master 
add exhaustive comparison in testutil bounce
 2013-09-12 09:53:26 -07:00
Laurent Alebarde
6c84a54388 add exhaustive comparison in testutil bounce 2013-09-12 18:17:31 +02:00
Pieter Hintjens
345bf146f1 Fixed overwrite in zmq_getsockopt 
On ZMQ_CURVE_xxxKEY fetches, would return 41 bytes into caller's 40-byte
buffer. Now these fetches only return 41 bytes if the caller explicitly
provides a 41-byte buffer (i.e. the option size is 41).
 2013-09-12 18:03:23 +02:00
Richard Newton
6fefa4166a Merge remote-tracking branch 'upstream/master' into inproc_connect_before_bind 2013-09-12 15:13:25 +01:00
Richard Newton
5f20d63665 First attempt at inproc connect before bind 2013-09-12 14:44:44 +01:00
Martin Hurton
168efb9739 Merge pull request #653 from mattconnolly/master 
Fix preprocessor typoe
 2013-09-12 05:21:25 -07:00
Pieter Hintjens
6ff65a8aa4 Builds and installs curve_keygen tool 2013-09-12 13:16:22 +02:00
Richard Newton
0d14efe73a Merge pull request #652 from hintjens/master 
Minor fixes to project packaging
 2013-09-12 03:56:27 -07:00
Pieter Hintjens
ac8c72cea6 Added test_ctx_destroy to .gitignore 2013-09-12 12:47:14 +02:00
Pieter Hintjens
d1ba8a50d2 Extended TravisCI build to use libsodium 2013-09-12 12:46:43 +02:00
Pieter Hintjens
52370bff44 Removed debugging printfs 2013-09-12 12:46:23 +02:00
Matt Connolly
0f9e5f6049 Fix preprocessor typoe 2013-09-12 20:30:16 +10:00
Pieter Hintjens
0f7141c21a Merge pull request #651 from ricnewton/master 
Fix Makefile.am for test_ctx_destroy
 2013-09-11 09:33:08 -07:00
Richard Newton
8e6b5ad17e Fix Makefile.am for test_ctx_destroy 2013-09-11 15:02:16 +01:00
Pieter Hintjens
bba0dd19a1 Merge pull request #650 from ricnewton/master 
Implement non-blocking shutdown command
 2013-09-10 07:03:40 -07:00
Richard Newton
ccf0e61b77 Merge remote-tracking branch 'upstream/master' 2013-09-10 13:30:11 +01:00
Richard Newton
64e1c181f7 Implement non-blocking shutdown command that unblocks other threads waiting on blocking operations. 2013-09-10 13:30:00 +01:00
Martin Hurton
25c89cace1 Merge pull request #649 from hintjens/master 
Fixed minor error in NULL mechanism (spec was wrong)
 2013-09-09 12:12:36 -07:00
Pieter Hintjens
6725c4644f Added ZMQ_ZAP_DOMAIN socket option 
* This is passed to the ZAP handler in the 'domain' field

* If not set, or empty, then NULL security does not call the ZAP handler

* This resolves the phantom ZAP request syndrome seen with sockets where
  security was never intended (e.g. in test cases)

* This means if you install a ZAP handler, it will not get any requests
  for new connections until you take some explicit action, which can be
  setting a username/password for PLAIN, a key for CURVE, or the domain
  for NULL.
 2013-09-09 20:40:34 +02:00
Pieter Hintjens
c45d91a106 Fixed comments on curve_keygen tool 2013-09-09 19:58:31 +02:00
Pieter Hintjens
635a03d240 Was sending NULL mechanism name with extra null (fixed) 2013-09-09 19:58:18 +02:00
Pieter Hintjens
4edad54537 Merge pull request #648 from ricnewton/master 
Fix tests on windows
 2013-09-06 03:19:45 -07:00
Richard Newton
a601b3f6f4 Remove windows debug code. 2013-09-06 10:25:00 +01:00
Richard Newton
7485b09cba Fix tests on windows 2013-09-06 10:08:11 +01:00
Martin Hurton
498dc37988 Merge pull request #645 from hintjens/master 
Updated libzmq to match RFCs
 2013-09-06 00:54:51 -07:00
Pieter Hintjens
4c75306023 Fixed test_stream case 
- was not looping to read all input from peer
- broke on OS/X specifically
 2013-09-06 09:22:09 +02:00
Pieter Hintjens
9dd324aab2 z85 encoding buffer overrun 2013-09-05 15:18:42 +02:00
Pieter Hintjens
1f03710980 Merge pull request #647 from sebastien/master 
Clarified zmq_socket.txt ZMQ_STREAM section, added HTTP server example
 2013-09-04 12:12:28 -07:00
Sebastien Pierre
11deee4e3e Merge branch 'master' of github.com:sebastien/libzmq 2013-09-04 15:02:50 -04:00
Sebastien Pierre
f9188841b0 Clarified zmq_socket.txt ZMQ_STREAM section, added example 2013-09-04 14:58:07 -04:00
Pieter Hintjens
0a9261472f Removed test_raw_socket 2013-09-04 19:41:33 +02:00
Pieter Hintjens
32fa426e61 Added system check at start of selftests 
- tests that system can provide at least 1,000 sockets
- we could expand on this but this covers the main case of OS/X
  having a too-low default limit of 256 handles per process
 2013-09-04 19:38:15 +02:00
Pieter Hintjens
7b02f1c966 Merge pull request #646 from minrk/xfail-linger 
mark test_linger as expected failure
 2013-09-04 09:42:39 -07:00
MinRK
bb348858f1 mark test_linger as expected failure 
rather than pretending it passes
 2013-09-04 09:40:08 -07:00
Pieter Hintjens
6612280946 Removed temporary patch on tests/Makefile.am 2013-09-04 18:10:47 +02:00
Pieter Hintjens
28b0a5fa27 Updated libzmq to match RFC 23, 24, 25, 26 
* Command names changed from null terminated to length-specified
* Command frames use the correct flag (bit 2)
* test_stream acts as test case for command frames
* Some code cleanups
 2013-09-04 17:59:45 +02:00
Pieter Hintjens
1844a27c82 Removed test_raw_sock test case (replaced by test_stream) 2013-09-04 15:00:05 +02:00
Pieter Hintjens
ef207e45ce Merge pull request #644 from ipechorin/master 
Fix MSVC 2008 and 2010 project files
 2013-09-04 04:19:34 -07:00
Ivan Pechorin
873d80c9fe fix MSVC 2008 project: include the source files added recently 2013-09-04 15:13:14 +04:00
Ivan Pechorin
e071d3a4ae fix MSVC10 project: include the source files added recently 2013-09-04 15:00:59 +04:00
Pieter Hintjens
7561ff70f3 Merge pull request #643 from ricnewton/master 
Fix cmake file for security tests
 2013-09-02 16:10:07 -07:00
Richard Newton
4696f002ca Fix cmake file for security tests 2013-09-02 23:41:17 +01:00
Ian Barber
0ff896d094 Merge pull request #642 from hintjens/master 
Fixed ZAP authentication
 2013-09-02 10:30:49 -07:00
Pieter Hintjens
fb67e160a1 Fixed ZAP authentication 
- if ZAP server returns anything except 200, connection is closed
- all security tests now pass correctly
- test_security_curve now does proper client key authentication using test key
- test_security_plain now does proper password authentication
 2013-09-02 18:21:36 +02:00
Ian Barber
3a50aa4473 Merge pull request #641 from hintjens/master 
Fixed regression tests
 2013-09-02 08:32:09 -07:00
Pieter Hintjens
fba5612026 Fixed 'make check' failures 
- Split off NULL security check from PLAIN
- Cleaned up test_linger code a little
- Got all tests to pass, added TODOs for outstanding issues
- Added ZAP authentication for NULL test case
- NULL mechanism was not passing server identity - fixed
- cleaned up test_security_plain and removed option double-checks (made code ugly)
- lowered timeout on expect_bounce_fail to 150 msec to speed up checks
- removed all sleeps from test_fork and simplified code (it still passes :-)
 2013-09-02 17:22:24 +02:00
Pieter Hintjens
01b336f1f1 Whitespace fixes 2013-09-02 15:08:40 +02:00
Pieter Hintjens
c128fac7a7 Merge pull request #639 from minrk/test_linger 
add test_linger
 2013-09-02 06:06:58 -07:00
Pieter Hintjens
6fa274ebef Merge pull request #640 from mattconnolly/fork 
Adding ability for a context to be terminated in a forked child process
 2013-09-02 06:06:31 -07:00
Pieter Hintjens
282765cab4 Merge pull request #628 from ianbarber/master 
Remove delay options
 2013-09-02 06:04:51 -07:00
Matt Connolly
1771755888 test_fork.cpp: adding missing headers for linux 2013-09-02 07:13:46 +10:00
MinRK
c646ac96c0 cast rc to size_t for comparisons 
avoids -Wall failures comparing int to uint
 2013-09-01 13:50:18 -07:00
Matt Connolly
c3adc86d6b Fix unused variable when using eventfd 2013-09-02 06:49:30 +10:00
Pieter Hintjens
ca8ac83e97 Merge pull request #637 from minrk/test_plain_inauth 
test failed auth for both PLAIN and CURVE
 2013-09-01 10:18:50 -07:00
Matt Connolly
a3d9d01af8 test_fork: update test to verify communication between parent and child 2013-09-01 20:42:19 +10:00
Matt Connolly
ff2900fd52 Terminate context in a child process of fork() to replace file descriptors to not interfere with parent process's context 2013-09-01 20:42:15 +10:00
Matt Connolly
0478ee04f4 Adding test showing failure to close socket/context in forked child 2013-09-01 20:42:10 +10:00
MinRK
58b370df69 add test_linger 
tests that default LINGER (-1) ensures message delivery.

Note: it fails for large messages ( > 1MB, depending on the system).
 2013-08-31 18:27:50 -07:00
Ian Barber
8ef7fbb4a4 Merge pull request #638 from shawnjgoff/master 
Change name of icanhasall to subscribe_to_all
 2013-08-31 13:35:21 -07:00
Shawn J. Goff
6a18f59532 Change name of icanhasall to subscribe_to_all 
icanhasall is cute (for now), but the effect of the variable is clear
only after tracking down its origin reading the commit. This change is
intended to make it easier for people to have some intuition about its
effect from its name.
 2013-08-31 10:02:05 -04:00
MinRK
9d94640edc test failed CURVE auth 
adds expect_bounce_fail test function

which is like bounce, but fails if messages arrive.
 2013-08-30 17:56:59 -07:00
MinRK
0cac56fe52 test PLAIN auth with failed login 
This test fails because PLAIN authentication doesn't actually reject connections
 2013-08-30 15:28:16 -07:00
Pieter Hintjens
82a00e3a98 Merge pull request #636 from ricnewton/master 
Disable failing tests on windows.
 2013-08-30 13:38:27 -07:00
Richard Newton
da52806d68 Disable failing tests on windows. 2013-08-30 19:04:32 +01:00
Martin Hurton
22f05fa2fa Merge pull request #635 from guidog/master 
Fixed silly port number.
 2013-08-29 12:37:15 -07:00
Guido Goldstein
93a068a832 Fixed silly port number. 2013-08-29 20:55:23 +02:00
Martin Hurton
4ca6ab26fa Merge pull request #634 from guidog/master 
Fixed markup so documentation can be built.
 2013-08-29 04:54:55 -07:00
Guido Goldstein
455739f942 Fixed markup so documentation can be built. 2013-08-29 09:35:17 +02:00
Pieter Hintjens
83e547f09f Merge pull request #633 from eburkitt/vs2012-clean-compile 
get to clean compile under vs2012
 2013-08-24 14:31:16 -07:00
Evan Burkitt
eaf227d4de get to clean compile under vs2012 
Added some missing (but existing in branch) files to libzmq11 project needed
to compile as static library by VS2012 (at least), and fixed some warnings.
One warning remains in raw_decoder.cpp, which I'm leaving for now because I'm
not sure how project owners would like to fix it.
 2013-08-23 17:14:03 -07:00
Pieter Hintjens
2e9385ac02 Merge pull request #631 from jrossi/master 
Add the Socket Identity info to the ZAP Messages
 2013-08-21 01:35:43 -07:00
Ian Barber
436cad37ec fix type on HWM 2013-08-20 22:49:19 +01:00
Ian Barber
a9baa051dd Merge in master changes 2013-08-20 22:48:04 +01:00
Ian Barber
d485404aab Merge pull request #626 from dkrikun/master 
Add ZMQ_CONFLATE socket option
 2013-08-20 14:37:52 -07:00
Jeremy Rossi
19ca8a0fc0 Add the Socket Identity info to the ZAP Messages 
This change adds the socket identity infomartion from the socket to the
zap frames.  In doing this the ZAP is able preform different operations
based on different sockets.  This is not compaitable with the current ZAP
RFC, but that can be updated.  As the ZAP rfc is currently draft for I
did not change the version number.

Tests also modified and passing.
 2013-08-20 13:48:05 -04:00
Ian Barber
cb6b5a65fc Merge pull request #629 from ulikoehler/init_data_assert 
Minor doc & assert fixes
 2013-08-19 05:55:07 -07:00
Uli Köhler
fd8b0fec07 Re-add comment line from cmsg branch 2013-08-19 14:49:29 +02:00
Uli Köhler
a28c38efa5 Fix spaces before comments 2013-08-19 14:45:29 +02:00
danielkr
3f3777d05b Add test for ZMQ_CONFLATE option 2013-08-19 15:34:11 +03:00
Uli Köhler
9c2740d9fa Minor fixes to doc ; added zmq_msg_init_data() assert preventing deferred segfault 2013-08-19 14:28:28 +02:00
Ian Barber
bcfe863fd4 Merge pull request #630 from ulikoehler/cmsg 
Optimized zmq::msg_t for constant messages
 2013-08-19 01:11:07 -07:00
danielkr
da4a70d59d Fix indentation 2013-08-19 08:18:20 +03:00
Uli Köhler
121a838a0c Added message type for constant messages 2013-08-18 23:40:38 +02:00
Ian Barber
531d3ebc09 Remove delay options 
These were exposed to users, but have subsequently been removed as
sockopts. They are currently only being used by ZAP, so I've moved it to
a simpl function call (actually it's only used in one case even in that,
so there may be a further simplification possible there).
 2013-08-18 11:16:21 +01:00
Pieter Hintjens
b3ca7fd425 Merge pull request #627 from ianbarber/master 
Attempt to fix disconnect not respecting linger
 2013-08-18 00:58:03 -07:00
Pieter Hintjens
1011e8ad20 Merge pull request #624 from ricnewton/master 
Port tests to windows and add to cmake build.
 2013-08-18 00:51:39 -07:00