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

3679 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Olaf Mandel
c5cca55c78 Update build files to include metadata 
This became necessary after b9c274814
 2014-05-12 13:19:12 +02:00
Olaf Mandel
d58dfa4944 Update build files after plain_mechanism split 
This became necessary after 22d6a9740
 2014-05-12 13:00:27 +02:00
Pieter Hintjens
ec0094c474 Merge pull request #1027 from evoskuil/master 
Batched VS builds, updated libsodium imports
 2014-05-12 11:45:22 +02:00
evoskuil
bf169024b3 Batched VS builds. 2014-05-12 02:17:08 -07:00
evoskuil
5ab44f4874 Ignore error on concurrent file copy in parallel VS builds. 2014-05-12 02:13:47 -07:00
evoskuil
249a59a519 Updated libsodium imports. 2014-05-12 02:12:27 -07:00
Pieter Hintjens
dde45a98a6 Merge pull request #1026 from sdrsdr/identity_fd 
Documentation for ZMQ_IDENTITY_FD sockopt
 2014-05-12 11:00:02 +02:00
Pieter Hintjens
1d5bc80372 Merge pull request #1025 from ricnewton/master 
Update  cmake for split of plain_mechanism
 2014-05-12 10:59:44 +02:00
Stoian Ivanov
3d05df9aa5 Merge remote-tracking branch 'upstr/master' into identity_fd 2014-05-12 11:15:10 +03:00
Stoian Ivanov
a16d3dbb0e docu 2014-05-12 11:02:44 +03:00
Richard Newton
3f479f534e Merge pull request #1024 from sdrsdr/identity_fd 
Implement ZMQ_IDENTITY_FD sock option for linking socket identity to FD
 2014-05-12 08:53:48 +01:00
Richard Newton
1c4cea6c7f Update cmake for split of plain_mechanism 2014-05-12 08:51:13 +01:00
Stoian Ivanov
8fcefed43f patch cleanup 2014-05-12 10:40:24 +03:00
Stoian Ivanov
d5991d6728 merge to upstream 2014-05-12 10:24:31 +03:00
Pieter Hintjens
098d01b16f Merge pull request #1023 from hurtonm/master 
Split plain_mechanism into client and server part
 2014-05-12 07:16:38 +02:00
Martin Hurton
22d6a97403 Split plain_mechanism into client and server part 2014-05-12 06:10:56 +02:00
Pieter Hintjens
17cb14f79d Merge pull request #1022 from danielhtshih/master 
add untracked test_stream_timeout into .gitignore and tests/Makefile.am
 2014-05-11 18:02:16 +02:00
Daniel Shih
70b6516d96 add untracked test_stream_timeout into .gitignore and tests/Makefile.am 2014-05-11 23:46:51 +08:00
Stoian Ivanov
acb71e0096 store also here! 2014-05-10 14:06:37 +03:00
Joe Eli McIlvain
b6c577a9ec Mark failing test for issue #1015 as XFAIL 2014-05-09 14:06:17 -07:00
Joe Eli McIlvain
5cf74db6bb Add failing test reproducing issue #1015. 
There is a race condition when connect and bind on a new inproc
endpoint happen "simultaneously" in threads.  Causes the error:
  Assertion failed: ok (ctx.cpp:474)
 2014-05-09 11:02:01 -07:00
Pieter Hintjens
7ec7f70384 Merge pull request #1019 from willstrang/master 
Issue #1017: add ZMQ_HANDSHAKE_IVL time limit on connection handshake
 2014-05-09 17:01:07 +02:00
Will Strang
afe5fd87e9 Issue #1017: add ZMQ_HANDSHAKE_IVL time limit on connection handshake 2014-05-09 13:54:24 +00:00
Pieter Hintjens
1cf12ee612 Merge pull request #1018 from soundart/master 
curve: initialize crypto libs before usage
 2014-05-09 09:18:54 +02:00
Frank
b846f3075c ws 2014-05-09 00:07:02 +02:00
Frank
8962b7de45 removed return code check for now, got -1 in test_security_curve. 2014-05-09 00:04:20 +02:00
Frank
05ab9a848f find libsodium with cmake 2014-05-09 00:04:19 +02:00
Frank
2cdfa1fff3 initialize libsodium and tweetnacl 2014-05-09 00:04:19 +02:00
Pieter Hintjens
ba22eff6b4 Merge pull request #1016 from hurtonm/master 
NULL: Implement ERROR handling
 2014-05-07 16:58:50 +02:00
Martin Hurton
934560b559 NULL: Implement ERROR handling 
NULL mechanism sends ERROR command rather than READY command when ZAP
handler rejects the ZAP request (status code != "200"). The body of
ERROR command contains the status code as returned by ZAP handler.
 2014-05-07 16:49:56 +02:00
Pieter Hintjens
61d41156bc Merge pull request #1014 from evoskuil/master 
Integrate GSSAPI option in VS UI options and props.
 2014-05-07 08:53:18 +02:00
evoskuil
4e5921b7ab Update VS 2008/10/12/13 file distribution. 2014-05-06 15:26:27 -07:00
evoskuil
033040f7e0 Integrate GSSAPI option in VS UI options and props. 2014-05-06 15:23:32 -07:00
evoskuil
17735a4e6b Rename VS version resource file. 2014-05-06 15:21:29 -07:00
evoskuil
b0b6dd4043 Consolidate VS props to shared location. 2014-05-06 15:16:37 -07:00
Pieter Hintjens
4d640fe010 Merge pull request #1012 from hurtonm/master 
Update mechanism API so we can check for ERROR status
 2014-05-06 17:53:39 +02:00
Martin Hurton
43d8252446 Update gssapi mechanism 2014-05-06 17:49:26 +02:00
Martin Hurton
0be8144176 Update mechanism API so we can check for ERROR status 2014-05-06 17:08:56 +02:00
Pieter Hintjens
8672f3023a Merge pull request #1011 from fichtner/abstract_freebsd_again 
ipc: fail harder for abstract ipc on non-Linux
 2014-05-05 22:41:09 +02:00
Franco Fichtner
fff29a4a0c ipc: fail harder for abstract ipc on non-Linux 
Using 'ipc://@abstract-socket' on non-Linux platforms yields inconsistent
behaviour.  Abstract sockets don't exist, so the literal file is created.
The test previously failed, but for a different reason: this is not the
directory you are looking for.  Now, zmq_bind() will fail for the right
reason: the socket can't be created.  Put the XFAIL back.
 2014-05-05 23:26:06 +02:00
Pieter Hintjens
b745455415 Merge pull request #1010 from fichtner/abstract_freebsd 
tests: fix abstract ipc test by omitting slashes
 2014-05-05 22:14:35 +02:00
Franco Fichtner
69bd470103 tests: fix abstract ipc test by omitting slashes 2014-05-05 23:04:40 +02:00
Pieter Hintjens
4c4ca1f2f6 Merge pull request #1009 from fichtner/gss_freebsd 
gssapi: RFC 2744 mandates GSS_C_NT_HOSTBASED_SERVICE
 2014-05-05 21:16:38 +02:00
Franco Fichtner
8c09ae6e49 gssapi: RFC 2744 mandates GSS_C_NT_HOSTBASED_SERVICE 
Tested on FreeBSD 10.
 2014-05-05 22:03:53 +02:00
Pieter Hintjens
40cbbe3c9e Merge pull request #1008 from hurtonm/master 
Minor renaming
 2014-05-05 20:17:39 +02:00
Martin Hurton
dcd1f2038e Minor renaming 2014-05-05 19:52:53 +02:00
Pieter Hintjens
2c786a200c Merge pull request #1007 from tSed/sma/fork-fix 
Build-system: disable test_fork when fork() is not available
 2014-05-03 22:01:49 +02:00
Samuel Martin
d178c71e21 cmake: fix indentation 2014-05-03 21:55:03 +02:00
Samuel Martin
c83d4e01dd cmake: tests: disable test_fork if fork() is not available 
fork() support is optional and its availability is correctly detected at
contfigure time.

But test_fork was all always built, preventing build for targets that do
not provide fork() from building successfully.

This pacth fixes the CMakeLists.txt on this point.
 2014-05-03 21:55:03 +02:00
Samuel Martin
6fdafc458a autotools: tests: disable test_fork if fork() is not available 
fork() support is optional and its availability is correctly detected at
contfigure time.

But test_fork was all always built, preventing build for targets that do
not provide fork() from building successfully.

This pacth fixes the autotools on this point.
 2014-05-03 21:55:03 +02:00
Pieter Hintjens
87a08e1748 Merge pull request #1006 from hurtonm/master 
Remove i_properties interface
 2014-05-03 21:15:34 +02:00
Martin Hurton
f2807d11a0 Remove i_properties interface 
We use metadata_t directly. No need for generic interface now.
 2014-05-03 21:03:49 +02:00
Pieter Hintjens
c5cd92da68 Merge pull request #1005 from ricnewton/master 
Initialise _has_src_addr variable, fixes hang on Windows.
 2014-05-03 18:31:38 +02:00
Richard Newton
2f08477292 Initialise _has_src_addr variable, fixes hang on Windows. 2014-05-03 13:59:37 +01:00
Martin Hurton
f21116b7be Merge pull request #1003 from hintjens/master 
Added test_metadata
 2014-05-02 23:20:37 +02:00
Pieter Hintjens
b06474312d ZAP vs. ZMTP metadata priority fixed 2014-05-02 23:14:27 +02:00
Pieter Hintjens
c01365d486 Fixed man page example 2014-05-02 23:13:11 +02:00
Pieter Hintjens
bd4a76cc2a Problem: GSSAPI server doesn't parse ZAP user id 
Solution: add this to ZAP reply processing.
 2014-05-02 23:12:53 +02:00
Pieter Hintjens
0d13971c05 Fixed compile error in test_security_null 2014-05-02 22:28:19 +02:00
Pieter Hintjens
84ed81c014 Added test_metadata 
- also prioritize ZAP metadata over ZMTP metadata in case application
  uses same names.
 2014-05-02 22:21:50 +02:00
Ian Barber
dd6c752822 Merge pull request #1001 from hintjens/master 
These commits broke regression tests, so I'm reverting them.
 2014-05-02 17:46:34 +01:00
Pieter Hintjens
ded00177b3 Revert "Add code to investigate data race" 
This reverts commit 5e0facda17b986943f0fe40a2dc6c98611655c35.
 2014-05-02 16:50:16 +02:00
Pieter Hintjens
d190325e4d Revert "Enlarge the race window for some test cases" 
This reverts commit 2a84d2597469d272794a1fb5fb43c6260f335195.

Broke regression test on test_hwm.cpp.
 2014-05-02 16:49:03 +02:00
Pieter Hintjens
0bc669b106 Merge pull request #1000 from daveab/feature/divide_by_zero_investigation 
Feature/divide by zero investigation
 2014-05-02 16:31:48 +02:00
dave b
2a84d25974 Enlarge the race window for some test cases 
These changes cause an assertion in lb_sendpipe() when executing the test_security_plain testcase.
 2014-05-02 14:32:14 +01:00
dave b
5e0facda17 Add code to investigate data race 
Provides control of race windows and logging for some of the interesting transitions.
 2014-05-02 14:27:33 +01:00
Pieter Hintjens
2db7cdc6a6 Merge pull request #999 from hurtonm/master 
Include ZMTP properties in message metadata
 2014-05-02 13:36:38 +02:00
Martin Hurton
8d82cc2a0b Include ZMTP properties in message metadata 
Metadata are built in stream_engine now.
This makes it easy to extend metadata with user-defined properties.
 2014-05-02 12:45:14 +02:00
Pieter Hintjens
55c06924c8 Merge pull request #998 from hurtonm/master 
Don't add empty metadata to received messages
 2014-05-02 09:11:55 +02:00
Martin Hurton
e95b477a87 Don't add empty metadata to received messages 2014-05-02 09:02:41 +02:00
Pieter Hintjens
f721a7ad07 Merge pull request #997 from soundart/master 
tweetnacl integration for curve
 2014-05-01 22:36:42 +02:00
Frank
351c845339 Merge branch 'master' of github.com:soundart/libzmq 
Conflicts:
	CMakeLists.txt
 2014-05-01 21:39:07 +02:00
Frank
551bcdae6c add metadata 2014-05-01 21:35:53 +02:00
Frank
01afdf8476 no tweetnacl for windows currently 2014-05-01 21:35:36 +02:00
Frank
63cc250d05 typo 2014-05-01 21:30:13 +02:00
Frank
e5a294ec02 tweetnacl integration 2014-05-01 21:30:02 +02:00
Pieter Hintjens
49f18d55cb Merge pull request #996 from hurtonm/master 
Add metadata to received messages
 2014-05-01 17:52:42 +02:00
Martin Hurton
b9c2748146 Add metadata to received messages 2014-05-01 17:30:51 +02:00
Ian Barber
62bb403eea Merge pull request #995 from hintjens/master 
Bumped ABI version to 4.0.0
 2014-05-01 15:23:10 +01:00
Pieter Hintjens
cac0f9838d Problem: generates incompatible libzmq.so.3.1.0 
See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=743508

The ABI in fact changed in two significant ways, one with inproc
connects, and one with socket monitoring

Solution: generate libzmq.so.4.0.0 library instead.

This change should be backported to zeromq-4.x
 2014-05-01 16:12:51 +02:00
Pieter Hintjens
79ef02538f Port 9999 is unsafe for tests 2014-05-01 11:23:41 +02:00
Stoian Ivanov
fe3e8c5c70 linking fd to pipe identity via socket option 2014-04-30 16:34:55 +03:00
Pieter Hintjens
408dea796f Merge pull request #993 from klnikita/src_addr_connect 
Allow to set up a source address and port for outgoing tcp connections in zmq_connect
 2014-04-30 14:57:08 +02:00
nikita kozlov
acb6807041 Allow to set up a source address and port for outgoing tcp connections in zmq_connect() 
Few examples:
tcp:://192.168.0.4:55555;192.168.0.254:1234
tcp:://192.168.0.4:0;192.168.0.254:1234
tcp:://eth2:55555;192.168.0.254:1234
 2014-04-30 14:43:37 +02:00
Pieter Hintjens
69d27b3338 Merge pull request #992 from hurtonm/master 
Define i_properties interface
 2014-04-30 14:38:44 +02:00
Martin Hurton
19c62b93fc Define i_properties interface 
- copy and move message operations are updated to maintain proper
  reference count of properties object
- zmq_msg_gets updated to use i_properties interface to fetch property
  value
- setter/getter added to msg_t class
 2014-04-30 14:20:29 +02:00
Pieter Hintjens
ddde62a68c Merge pull request #991 from hurtonm/master 
Update function prototype for zmq_msg_gets ()
 2014-04-30 14:07:56 +02:00
Martin Hurton
f81a1304ff Update function prototype for zmq_msg_gets () 
Added modifiers reflect the following properties:
- zmq_msg_gets () does not mutate property parameter
- zmq_msg_gets () returns a pointer to memory the caller should not
  modify
 2014-04-30 13:27:06 +02:00
Pieter Hintjens
c24b457ccf Merge pull request #988 from hurtonm/master 
Add pointer to properties into message structure
 2014-04-29 22:47:26 +02:00
Martin Hurton
724b2bb844 Add pointer to properties into message structure 2014-04-29 22:37:31 +02:00
Martin Hurton
26bf74972a Merge pull request #987 from hintjens/master 
Various small cleanups
 2014-04-29 22:36:31 +02:00
Pieter Hintjens
39ccfea036 Added more scaffolding for security 
- additional messages to help people debugging security errors
 2014-04-29 22:21:58 +02:00
Pieter Hintjens
d1232d144a Fixed NULL security test 
Has some bits commented out due to #939, now work.

Note: there is an issue in libzmq when binding/unbinding or
connecting/disconnecting (I did not investigate deeper) the
same socket several times. Even closing the socket with zero
linger, zmq_ctx_term will block. The workaround in this test
case is to close the sockets for each test step.
 2014-04-29 12:13:54 +02:00
Pieter Hintjens
c6f8093bfb Added zmq_ctx_shutdown to Makefile 
- also removed deprecated man pages from Makefile
- they remain in repository for reference
 2014-04-29 12:06:57 +02:00
Pieter Hintjens
4307641f27 Merge pull request #986 from evoskuil/master 
Windows build/packaging updates.
 2014-04-28 19:58:51 +02:00
evoskuil
c1ac534e6e Change OpenEvent to OpenEventW (Windows builds Unicode only). 2014-04-28 10:49:02 -07:00
Ian Barber
2d6f5b0ec4 Merge pull request #985 from hintjens/master 
Cleaned up socket monitor code, tests, and man page
 2014-04-28 10:44:11 +01:00
Pieter Hintjens
9753de8566 Problem: zmq_socket_monitor code is dirty 
Specifically:

* zmq_event_t should not be used internally in libzmq, it was
  meant to be an outward facing structure.

* In 4.x, zmq_event_t does not correspond to monitor events, so
  I removed the structure entirely.

* man page for zmq_socket_monitor is incomplete and the example
  code was particularly nasty.

* test_monitor.cpp needed rewriting, it was not clean.
 2014-04-28 11:30:49 +02:00
Pieter Hintjens
97935c582e Added link to zmq_msg_gets 2014-04-28 11:30:49 +02:00
Pieter Hintjens
50afebe47c Merge pull request #984 from ricnewton/master 
Fix windows non-unicode build
 2014-04-27 14:38:20 +02:00