3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-04 13:05:41 +08:00
Code Issues Projects Releases Wiki Activity
2,533 Commits 4 Branches 39 Tags 31 MiB
Commit Graph

2533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Ian Barber
cb35fd7bfe Attempt to fix disconnect not respecting linger 
Looks like linger is honoured properly, but shutting down the session
causes the pipe termination to come from that side - because the local
pipe then shuts down right away it seems to trigger a terminated on the
other end instead of waiting. This way we trigger the termination from
the local end and then terminate the session.
 2013-08-18 07:50:53 +01:00
Ian Barber
ed272fe56d Merge pull request #625 from ulikoehler/zmq_send_const 
Add zmq_send_const for constant data
 2013-08-17 23:27:17 -07:00
danielkr
f59c1a5c5a Update doc for ZMQ_CONFLATE socket option 2013-08-17 23:55:00 +03:00
danielkr
daa7a8021f Plug in dbuffer to serve the ZMQ_CONFLATE option 
ZMQ_CONFLATE option is passed to pipepair() which creates a usual
ypipe_t or ypipe_conflate_t and plugs it into pipe_t under a common
abstract base.
 2013-08-17 23:27:25 +03:00
danielkr
4c35b88acb Implement double buffer for conflate option 
Add simple double buffer implementation tailored to handle msg_t,
i.e invoke msg_t::close instead of destructor and so on.
Seems to me mutex is good enough at this point.
 2013-08-17 23:22:34 +03:00
danielkr
d020dd677f Declare ZMQ_CONFLATE option 2013-08-17 23:22:34 +03:00
danielkr
4eac7e3e4f Add scoped_lock_t syntactic sugar 2013-08-17 23:15:16 +03:00
danielkr
87c84a252a Add try_lock() to mutex_t 2013-08-17 23:15:16 +03:00
danielkr
503da83fce Add #include to string.h in blob.hpp 
Required for memmove(), memcpy()
 2013-08-17 23:15:15 +03:00
Uli Köhler
e23d3963d3 Fix doc typo 2013-08-17 20:39:10 +02:00
Uli Köhler
10becae7eb Added zmq_send_const test 2013-08-17 20:37:07 +02:00
Uli Köhler
e2c322cf80 Implemented zmq_send_const 2013-08-17 20:22:50 +02:00
Richard Newton
70a1fbee7a Fix running tests from cmake on linux. 2013-08-17 14:39:38 +01:00
Richard Newton
e1b2b649fb Merge branch 'master' of https://github.com/zeromq/libzmq 2013-08-17 14:23:42 +01:00
Richard Newton
a83baa9b0b Fix up threading code from port tests to windows. 2013-08-17 14:23:22 +01:00
Richard Newton
7f74fc7c99 Port tests to windows and add to cmake build. 2013-08-17 13:43:45 +01:00
Ian Barber
eccfede10d Merge pull request #623 from ricnewton/master 
Fix compile error on windows.
 2013-08-08 11:42:53 -07:00
Richard Newton
e16a6af0c7 Fix compile error on windows. 2013-08-08 17:27:49 +01:00
Ian Barber
749c391b34 Merge pull request #622 from ckamm/req-strict 
Rename ZMQ_REQ_SEND_RESETS -> ZMQ_REQ_STRICT.
 2013-08-03 12:42:53 -07:00
Christian Kamm
423ca36b17 Rename ZMQ_REQ_SEND_RESETS -> ZMQ_REQ_STRICT. 
It defaults to enabled. Switch it off to be able to send a new message
before the previous reply has been received.
 2013-08-03 14:35:18 +02:00
Pieter Hintjens
fe30cc6d99 Merge pull request #619 from ckamm/req-send-resets 
Add ZMQ_REQ_SEND_RESETS option.
 2013-08-03 02:44:53 -07:00
Martin Hurton
9f4526f59a Merge pull request #621 from hintjens/master 
Added note to clarify policy for embedded apps
 2013-07-29 06:11:03 -07:00
Pieter Hintjens
39ddc695bc Added note about tivotisation 2013-07-29 10:42:15 +02:00
Christian Kamm
f5c59556bd REQ: Unset reply_pipe if it terminates. 
* Fixes a terminate() call on a dangling pointer in the SEND_RESETS
  case.
* Fixes recv_reply_pipe() never receiving a message once the pipe it is
  waiting on is terminated.
 2013-07-29 09:35:15 +02:00
Christian Kamm
a0cc87a9d9 Add ZMQ_REQ_SEND_RESETS option. 
This allows making a new request on a REQ socket by sending a new
message. Without the option set, calling send() after the first message
is done will continue to return an EFSM error.

It's useful for when a REQ is not getting a response. Previously that
meant creating a new socket or switching to DEALER.
 2013-07-28 11:43:38 +02:00
Ian Barber
637f794193 Merge pull request #620 from ckamm/req-id 
Add ZMQ_REQ_REQUEST_IDS option.
 2013-07-26 15:41:29 -07:00
Christian Kamm
b9646f2aac Add ZMQ_REQ_REQUEST_IDS option. 
* Documentation:
The default behavior of REQ sockets is to rely on the ordering of messages
to match requests and responses and that is usually sufficient. When this option
is set to 1, the REQ socket will prefix outgoing messages with an extra frame
containing a request id. That means the full message is (request id, 0,
user frames...). The REQ socket will discard all incoming messages that don't
begin with these two frames.

* Behavior change: When a REQ socket gets an invalid reply, it used to
  discard the message and return EAGAIN. REQ sockets still discard
  invalid messages, but keep looking at the next one automatically
  until a good one is found or there are no more messages.
* Add test_req_request_ids.
 2013-07-26 21:38:21 +02:00
Ian Barber
6473dfd8f4 Merge pull request #617 from hurtonm/zap_updates 
Zap updates
 2013-07-18 03:26:21 -07:00
Martin Hurton
4a5358f4d0 Implement ZAP for NULL mechanism 2013-07-18 10:59:39 +02:00
Martin Hurton
53bc53da04 Update PLAIN mechanism to the latest ZAP revision 2013-07-18 10:59:34 +02:00
Martin Hurton
d65231be1c Update CURVE mechanism to the latest ZAP revision 2013-07-18 10:59:31 +02:00
Martin Hurton
7541debe6d Add get_peer_ip_address utility function 
The functon returns string representation of peer's
IP address. We will need this to update ZAP implementation.
 2013-07-18 10:41:31 +02:00
Ian Barber
4944095262 Merge pull request #615 from hintjens/master 
Last step in test_spec_req is still failing; disabled it.
 2013-07-15 00:15:55 -07:00
Pieter Hintjens
1068bc0795 Merge pull request #616 from steve-o/master 
Add static libraries to CMake, minor housekeeping.
 2013-07-14 14:48:17 -07:00
Steven McCoy
409721b9d2 Add CMake support for static libraries. 2013-07-14 13:58:46 -04:00
Steven McCoy
21fe600848 Move CMake dependencies together. 2013-07-14 13:36:30 -04:00
Steven McCoy
ae86c56d74 README file moved to GitHub format and extension, drop from packaging and default to NEWS file for popup. 2013-07-14 13:26:55 -04:00
Pieter Hintjens
d46c2ee2fc Disabled last step in test_spec_req so build can complete 2013-07-14 13:04:31 +02:00
Pieter Hintjens
4fb004f59b Merge pull request #614 from ckamm/fix-spec-req-fail 
Fix intermittent failure in test_spec_req.
 2013-07-14 03:00:06 -07:00
Christian Kamm
7de23c0c8d Fix intermittent failure in test_spec_req. 
There still is a problem when a stale peer's message
arrives at the REQ just after a request was sent to that peer.
 2013-07-14 11:57:15 +02:00
Pieter Hintjens
bccf3d6126 Merge pull request #613 from ckamm/coding-style-spec-tests 
Fix coding style in spec tests.
 2013-07-14 02:32:20 -07:00
Pieter Hintjens
93b9f9021c Merge pull request #608 from ckamm/req-drops-unwanted 
REQ sockets drop replies from unasked peers.
 2013-07-14 02:30:21 -07:00
Christian Kamm
bbc9a61197 Fix coding style in spec tests. 2013-07-14 08:33:33 +02:00
Christian Kamm
c56d797bf9 REQ sockets drop replies from unasked peers. 
* Add lb_t::sendpipe() that returns the pipe that was used for sending,
  similar to fq_t::recvpipe().
* Add forwarder functions to dealer_t to access these two.
* Add logic to req_t to ignore replies on pipes that are not the one
  where the request was sent.
* Enable test in test_spec_req.
 2013-07-14 07:55:47 +02:00
Pieter Hintjens
524bd7ac76 Merge pull request #612 from ulikoehler/markdown 
Converted README to markdown
 2013-07-13 16:27:41 -07:00
Uli Köhler
6bf4ffe727 Converted README to markdown + added travis build img 2013-07-14 00:55:40 +02:00
Pieter Hintjens
7560910f50 Merge pull request #611 from pijyoi/master 
update Makefile to include new files
 2013-07-13 10:39:06 -07:00
KIU Shueng Chuan
0f28b72914 update to include stream.cpp and curve related 2013-07-13 14:31:46 +08:00
Ian Barber
5ac19647d9 Merge pull request #610 from hintjens/master 
Problem: new spec test cases don't all work
 2013-07-08 04:12:06 -07:00