Commit Graph

3219 Commits

Author SHA1 Message Date
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
Pieter Hintjens
ded00177b3 Revert "Add code to investigate data race"
This reverts commit 5e0facda17.
2014-05-02 16:50:16 +02:00
Pieter Hintjens
d190325e4d Revert "Enlarge the race window for some test cases"
This reverts commit 2a84d25974.

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
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
Richard Newton
bbaa85e7dd Fix windows non-unicode build 2014-04-27 13:29:20 +01:00
Pieter Hintjens
cb0e8f1a9f Merge pull request #983 from pijyoi/master
update ZMQ_STREAM docs about connection notification
2014-04-27 07:45:14 +02:00
KIU Shueng Chuan
d4c5dc9b1d update ZMQ_STREAM docs about connection notification
Also the portion about how to close a connection does not only apply to
servers.
2014-04-27 06:16:59 +08:00
evoskuil
2b9a5e49f4 Uupdate GSL referenece in packaging script. 2014-04-25 04:52:23 -07:00
Pieter Hintjens
763bf34e88 Merge pull request #981 from evoskuil/master
Add gssapi files to msvc, use Windows Unicode APIs.
2014-04-25 09:56:26 +02:00
evoskuil
e97bed3727 Add gssapi files to msvc project. 2014-04-25 00:46:44 -07:00
evoskuil
ca29709f38 Change TCHAR to Unicode, use safe swprintf to remove warning. 2014-04-25 00:43:47 -07:00
Pieter Hintjens
e37c206211 Merge pull request #980 from claws/fix_build_issue_when_missing_gssapi
Fix build issue when missing gssapi
2014-04-25 07:10:49 +02:00
Chris Laws
7abf2564f8 fixes for gssapi build issue 2014-04-25 13:48:39 +09:30
Chris Laws
09647fa916 src/gssapi_client.cpp 2014-04-25 13:47:07 +09:30