Laurent Alebarde
99b13638eb
add doc to zmq_proxy_steerable
2013-10-18 16:35:54 +02:00
Pieter Hintjens
5f1a9a4ae5
Merge pull request #713 from ricnewton/master
...
Use consistant integer type in raw_decoder
2013-10-18 06:37:16 -07:00
Laurent Alebarde
5250bdab9f
add tests/test_proxy in gitignore
2013-10-18 15:22:53 +02:00
Richard Newton
1b8daed9db
Use consistant integer type in raw_decoder
2013-10-18 14:20:30 +01:00
Richard Newton
1bb982ecc2
Merge branch 'master' of https://github.com/zeromq/libzmq
2013-10-18 14:09:39 +01:00
Laurent Alebarde
e33a382f8d
new zmq_proxy is zmq_proxy_steerable to respect C API
2013-10-18 15:01:05 +02:00
Laurent Alebarde
1b75d1ecb5
add proxy control flow and test
2013-10-18 11:12:48 +02:00
Pieter Hintjens
3b628fd85a
Merge pull request #710 from jenshz/patch-1
...
Update zmq_msg_init_data.txt
2013-10-14 11:28:37 -07:00
Jens Henrik Hertz
f0a0e4d817
Update zmq_msg_init_data.txt
2013-10-14 20:27:23 +02:00
Pieter Hintjens
6139a66eee
Merge pull request #709 from hintjens/master
...
Temporary workaround for broken libsodium install
2013-10-13 05:46:55 -07:00
Pieter Hintjens
097c2c8f8b
Temporary workaround for broken libsodium install
2013-10-13 14:45:58 +02:00
Ian Barber
ff90fa7f4d
Merge pull request #708 from hurtonm/master
...
Load identity message to decoder at start
2013-10-11 06:33:04 -07:00
Martin Hurton
7ecab54ac3
Load identity message to decoder at start
2013-10-11 14:32:38 +02:00
Pieter Hintjens
9bb4215cfe
Merge pull request #707 from xantares/master
...
Fixed out-of-source build
2013-10-11 02:45:35 -07:00
xantares
b2d52a3730
Fixed out-of-source build
2013-10-10 22:08:54 +02:00
Pieter Hintjens
82ab836306
Merge pull request #706 from hurtonm/master
...
Rename engine's methods to improve code readability
2013-10-09 11:44:32 -07:00
Martin Hurton
b35c08beb4
Rename engine's methods to improve code readability
2013-10-09 20:26:38 +02:00
Ian Barber
63e0fe915e
Merge pull request #705 from hintjens/master
...
Fixed doc for IDENTITY socket option
2013-10-09 11:20:46 -07:00
Pieter Hintjens
50a1973ee6
Identity can only be set on sockets that can connect to ROUTER
2013-10-09 19:53:18 +02:00
Pieter Hintjens
cc2282556a
Update NEWS
2013-10-08 17:54:01 +02:00
Richard Newton
1b6ca34d16
Merge pull request #703 from hintjens/master
...
Reverted use of enums for zmq.h constants (too painful for binding authors)
2013-10-08 06:05:42 -07:00
Pieter Hintjens
b7eb1cdcce
Revert "replace macro constants with enum types for user facing constants"
...
This reverts commit d4bb6d693f0542bbf35bc1b6810100d5b2a901a8.
2013-10-08 14:51:19 +02:00
Pieter Hintjens
b0085a7f29
Revert "distinguish between options and defaults"
...
This reverts commit e7804c5027633d18558c05b550ea11c46fb37c42.
2013-10-08 14:51:00 +02:00
Pieter Hintjens
2cf6d52310
Fixed NEWS for 4.0.1 release
2013-10-08 10:48:37 +02:00
Pieter Hintjens
c629b6c7b0
Merge pull request #702 from hintjens/master
...
Updated NEWS for 4.0.1 release
2013-10-08 01:48:16 -07:00
Pieter Hintjens
6ef68be04f
Updated NEWS for 4.0.1 release
2013-10-08 10:36:33 +02:00
Pieter Hintjens
756010343d
Merge pull request #701 from ezhikus/master
...
Typo in type name "emTPy_slots_t"
2013-10-07 22:36:01 -07:00
Volodymyr Korniichuk
433ea35b6c
Typo in type name "emTPy_slots_t"
...
https://zeromq.jira.com/browse/LIBZMQ-565
2013-10-08 00:40:30 +03:00
Pieter Hintjens
283e52357c
Merge pull request #700 from hashstat/master
...
Add documentation on Linux ipc abstract namespace support and a bug fix.
2013-10-07 11:50:36 -07:00
Brandon Carpenter
62e26b3242
Add tests/test_abstract_ipc to .gitignore.
2013-10-07 10:55:40 -07:00
Brandon Carpenter
e0f4d603c2
Fix detection of abstract ipc pathname and length calculation.
...
Abstract socket pathnames must have a NULL character in the first
position, but the second character must also be checked to differentiate
an abstract name from the empty string. The address length must also
indicate the length of the pathname because the kernel uses the entire
address as the name, including NULL characters. ZMQ uses
NULL-terminated strings for the address, so the abstract address length
is the length of the string following the initial NULL byte plus 3; two
bytes for the address family and one for the initial NULL character.
2013-10-07 10:42:39 -07:00
Brandon Carpenter
ae7fad48a8
Add note on Linux abstract namespace to ipc documentation.
2013-10-07 10:41:20 -07:00
Pieter Hintjens
1a20220817
Merge pull request #699 from ezhikus/free_and_delete
...
It is safe to "free(NULL)" and "delete NULL"
2013-10-05 00:22:26 -07:00
Pieter Hintjens
bacc9aeeae
Merge pull request #698 from hashstat/master
...
Add abstract namespace support for IPC sockets on Linux.
2013-10-05 00:14:09 -07:00
Volodymyr Korniichuk
7a960ff29c
useless checks were removed
2013-10-04 21:54:52 +03:00
Brandon Carpenter
f499c89528
Add test for abstract namespace support in ipc sockets on Linux.
...
See issue 567.
2013-10-04 11:33:52 -07:00
Brandon Carpenter
31cdbd2afa
Add abstract namespace support for IPC sockets on Linux.
...
Converts an initial strudel or "at sign" (@) in the Unix socket path to
a NULL character ('\0') indicating that the socket uses the abstract
namespace instead of the filesystem namespace. For instance, binding a
socket to 'ipc://@/tmp/tester' will not create a file associated with
the socket whereas binding to 'ipc:///tmp/tester' will create the file
/tmp/tester. See issue 567 for more information.
2013-10-04 11:33:52 -07:00
Ian Barber
23e58e30d5
Merge pull request #697 from pijyoi/master
...
bugfixes for mingw compilation
2013-10-04 10:13:46 -07:00
KIU Shueng Chuan
55bfe7dbab
WinSock2.h filename should be all lowercase
2013-10-05 00:51:47 +08:00
KIU Shueng Chuan
79c2598a08
test for _MSC_VER before using MSVC specific code
2013-10-05 00:48:52 +08:00
Pieter Hintjens
d33a3ad0fd
Merge pull request #696 from calid/enum-constants
...
replace macro constants with enum types for user facing constants
2013-10-04 01:58:48 -07:00
Dylan Cali
e7804c5027
distinguish between options and defaults
2013-10-04 02:21:35 -05:00
Pieter Hintjens
6934766cf8
Merge pull request #695 from hurtonm/master
...
Stop curve handshake when cookie box verification fails
2013-10-04 00:07:25 -07:00
Dylan Cali
d4bb6d693f
replace macro constants with enum types for user facing constants
2013-10-04 01:45:42 -05:00
Martin Hurton
88882e31cd
Stop curve handshake when cookie box verification fails
2013-10-04 08:21:43 +02:00
Richard Newton
21129c7501
Merge pull request #694 from hintjens/master
...
Clarified that zmq.h constants are part of the public contract
2013-10-02 03:30:11 -07:00
Pieter Hintjens
edeedc6dd8
Disabled randomly failing part of test
2013-10-02 12:15:31 +02:00
Pieter Hintjens
d37d32fb0c
Clarified that zmq.h constants are part of the public contract
2013-10-02 12:05:14 +02:00
Richard Newton
cd030ef1c2
Merge pull request #693 from calid/doc-fix
...
fix minor typo in zmq_ctx_get doc example
2013-10-02 01:10:43 -07:00
Dylan Cali
0b4ce80853
fix minor typo in zmq_ctx_get doc example
2013-10-02 02:59:44 -05:00
Richard Newton
73ae948abb
Merge pull request #692 from hintjens/master
...
Packaging for zmq_curve_keypair function
2013-09-30 09:56:26 -07:00
Pieter Hintjens
fd4d125d8e
Packaging for zmq_curve_keypair function
...
* Added new man page for this
* Added test case, in tests/test_security_curve.cpp
* Noted in zmq_utils.h that these methods are documented
2013-09-30 15:14:02 +02:00
Pieter Hintjens
ead6826cc1
Merge pull request #691 from minrk/curve_keygen
...
Expose zmq_curve_keypair via zmq_utils
2013-09-29 13:19:26 -07:00
MinRK
4577956964
return NULL and set EINVAL on bad z85 input
...
asserts aren't appropriate for checking user input.
2013-09-29 13:07:51 -07:00
MinRK
87254abc9f
use zmq_curve_keypair in curve_keygen
2013-09-29 13:05:27 -07:00
MinRK
d1a927a92e
add zmq_curve_keypair to zmq_utils
2013-09-29 13:02:39 -07:00
Pieter Hintjens
30d34888e0
Merge pull request #690 from mattconnolly/master
...
config for libsodium in alternate path, using CPP flags for both C and C...
2013-09-29 04:22:24 -07:00
Matt Connolly
7660b78e12
config for libsodium in alternate path, using CPP flags for both C and C++ sources.
2013-09-29 21:20:14 +10:00
Pieter Hintjens
6c25d2f880
Merge pull request #689 from minrk/curve_keygen
...
include missing platform.hpp in curve_keygen
2013-09-29 02:29:53 -07:00
MinRK
cf4bfd48cf
include missing platform.hpp in curve_keygen
...
it was excluded, so HAVE_SODIUM would never be defined,
leading to curve_keygen always reporting "recompile with libsodium"
2013-09-28 15:42:52 -07:00
MinRK
3d7b2b4c04
declare z85_encode / decode in zmq_utils
...
they are used by curve_keygen, but not available
2013-09-28 15:42:00 -07:00
Pieter Hintjens
f1002e9492
Merge pull request #688 from mattconnolly/master
...
This pull requests fixes building on SmartOS and possibly other Solaris-like systems
2013-09-27 04:30:24 -07:00
Matt Connolly
848ce1adb1
Disable compiler warning for Solaris
2013-09-27 11:20:09 +00:00
Matt Connolly
aa84e85153
Add '-lssp' linker flag for Solaris. Check for libraries after host specific setup.
2013-09-27 11:12:16 +00:00
Richard Newton
2af23cf40c
Merge pull request #687 from hintjens/master
...
Updated CMake project for test_issue_566
2013-09-26 05:39:17 -07:00
Pieter Hintjens
015b43f969
Updated CMake project for test_issue_566
2013-09-26 14:32:47 +02:00
Martin Hurton
d568e7f587
Merge pull request #686 from hintjens/master
...
Added test case for issue 566
2013-09-26 05:30:59 -07:00
Pieter Hintjens
e42a0a4074
Added test case for issue 566
...
* Tests dealer-to-router connection 100 times
* This was failing in ZMQ v4.0.0 RC1
2013-09-26 14:18:40 +02:00
Richard Newton
5271bc9db3
Merge pull request #685 from hintjens/master
...
Build/test errors on OS/X with clang++
2013-09-26 02:45:14 -07:00
Pieter Hintjens
26d5ac4075
curve_keygen needed assert.h
2013-09-26 11:35:52 +02:00
Pieter Hintjens
9d51155ce2
Build/test errors on OS/X with clang++
2013-09-26 11:33:44 +02:00
Pieter Hintjens
9827a1278b
Merge pull request #684 from hurtonm/master
...
Call flush after writing the identity message
2013-09-26 01:01:47 -07:00
Martin Hurton
be25cfdf35
Call flush after writing the identity message
2013-09-26 09:40:23 +02:00
Richard Newton
f06bf8d25b
Merge branch 'master' of https://github.com/zeromq/libzmq
2013-09-25 13:27:20 +01:00
Richard Newton
b0b2567fcf
Merge pull request #683 from hintjens/master
...
Updated libzmq CURVE to track RFC 27
2013-09-24 08:11:17 -07:00
Pieter Hintjens
82149dde19
Updated libzmq CURVE to track RFC 27
...
* The INITIATE command vouch box is Box[C',S](C->S') instead of Box[C'](C->S),
as recommended by https://codesinchaos.wordpress.com/2012/09/09/curvecp-1/ ,
to reduce the risk of client impersonation.
* Mirrors the change in libcurve and CurveZMQ specifications.
2013-09-24 15:31:10 +02:00
Pieter Hintjens
cc2823e240
Merge pull request #682 from hintjens/master
...
Fixed build for MSVC 2008
2013-09-24 03:48:09 -07:00
Pieter Hintjens
51fe8cfe52
Merge pull request #681 from ipechorin/master
...
stdint.h is not available on all platforms
2013-09-24 03:32:34 -07:00
Pieter Hintjens
b3346fb37a
Fixed build for MSVC 2008
2013-09-24 12:29:21 +02:00
Ivan Pechorin
b504aad160
stdint.h is not available on all platforms
2013-09-24 14:10:31 +04:00
Richard Newton
5f0a8dcffe
Merge pull request #680 from hintjens/master
...
Bumped library version and age
2013-09-24 00:24:45 -07:00
Pieter Hintjens
186b713aba
Bumped library version and age
2013-09-24 09:10:39 +02:00
Pieter Hintjens
920385c40f
Merge pull request #679 from mattconnolly/master
...
Update configure: Allow libsodium to be installed in a custom path
2013-09-23 23:00:33 -07:00
Matt Connolly
12eef06e45
Update configure: Allow libsodium to be installed in a custom path
2013-09-24 08:07:43 +10:00
Matt Connolly
7b5da7dc09
git ignore test run output files: tests/test*.{log|trs}
2013-09-24 08:07:10 +10:00
Richard Newton
9db0791cd5
Revert "Copy platform.hpp into src directory in cmake build."
...
This reverts commit 11b699e73cbda47ff450554ebca2385d20a0b75a.
2013-09-23 08:29:34 +01:00
Richard Newton
efbe7d45fa
Merge branch 'master' of https://github.com/zeromq/libzmq
2013-09-23 08:28:34 +01:00
Richard Newton
0e7124b656
Merge pull request #678 from hintjens/master
...
Move away from port 8080 which is occupied on some boxes
2013-09-20 14:27:11 -07:00
Pieter Hintjens
f36a49de6d
Move away from port 8080 which is occupied on some boxes
2013-09-20 23:16:29 +02:00
Richard Newton
59f1fbc9a2
Merge pull request #677 from vortechs2000/fix_aix
...
Revert "Reference platform.h by ../src/platform.h - AIX is ignoring -I flags"
2013-09-20 12:45:00 -07:00
AJ Lewis
e3e7efedbe
Revert "Reference platform.h by ../src/platform.h - AIX is ignoring -I flags"
...
This reverts commit 015d9564ee16959847a30a0ec3b080f718f40678.
2013-09-20 14:38:11 -05:00
Richard Newton
aa2aab1785
Merge pull request #674 from hintjens/master
...
Fixed packaging (makefiles were wrong)
2013-09-20 12:13:11 -07:00
Richard Newton
11b699e73c
Copy platform.hpp into src directory in cmake build.
2013-09-20 19:34:31 +01:00
Pieter Hintjens
1293f1b956
Merge pull request #675 from vortechs2000/fix_aix
...
Reference platform.h by ../src/platform.h - AIX is ignoring -I flags
2013-09-20 09:54:00 -07:00
AJ Lewis
015d9564ee
Reference platform.h by ../src/platform.h - AIX is ignoring -I flags
2013-09-20 11:48:18 -05:00
Pieter Hintjens
b49aa7a65d
Updated NEWS for 4.0.0 release
2013-09-20 17:28:19 +02:00
Pieter Hintjens
0d3f9eb592
Missing file from Makefile.am
2013-09-20 16:40:40 +02:00
Pieter Hintjens
21157f7d85
Next version off libzmq master is 4.1.0
2013-09-20 15:59:16 +02:00
Pieter Hintjens
84a013e3de
Fixed packaging for source distribution
2013-09-20 15:58:55 +02:00
Richard Newton
1a9ea3e24a
Merge pull request #673 from hintjens/master
...
Renamed new socket options to be clearer
2013-09-20 06:41:30 -07:00