3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-07 21:05:34 +08:00
Code Issues Projects Releases Wiki Activity
5,376 Commits 4 Branches 39 Tags 31 MiB
Commit Graph

5376 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luca Boccassi
7005f22726 Bugfix release 4.2.1 
Finalize changelog and bump ABI revision
v4.2.1 		2016-12-31 15:55:48 +01:00
Kevin Sapper
086bb890c5 Merge pull request #2282 from bluca/event_test 
Problems: test_monitor failing, DRAFT events leaking when draft APIs are disabled
 2016-12-31 14:13:45 +01:00
Luca Boccassi
3f3601e855 Problem: handshake events not tested with curve 
Solution: check that the expected handshake success or failure events
are triggered in the curve security unit test
 2016-12-31 01:31:37 +01:00
Luca Boccassi
d50b5b80fd Problem: NEWS entry for ctx option does not point to docs 
Solution: fix it
 2016-12-30 23:53:20 +01:00
Luca Boccassi
fc748ec799 Problem: new monitor events not mentioned in NEWS 
Solution: add an entry
 2016-12-30 23:52:27 +01:00
Luca Boccassi
200649fd57 Problem: new handshake event monitoring undocumented 
Solution: add them to the event monitor manpage
 2016-12-30 23:40:22 +01:00
Luca Boccassi
2afba0085f Problem: documentation does not warn about ZMQ_EVENT_ALL and new events 
Solution: add a note pointing out that when new events are added the
ZMQ_EVENT_ALL mask will start returning them, so applications that
can't handle that transparently should not use it and instead pick
only the event types they want.
Creating a new event type and having monitors with ZMQ_EVENT_ALL
return them will not be considered a backward incompatible change
even though the flow of events will change.
 2016-12-30 23:27:56 +01:00
Luca Boccassi
c0e2bc4ef9 Problem: new DRAFT monitor events returned even without --enable-draft 
Solution: wrap the event triggering in the DRAFT ifdef as well as the
defines. This ensures that the event are returned only if the
library was built with DRAFTs enabled.

Also update the test case to expect the new events since it uses
the catch-all mask. Although the sequence of event is different and
this might be considered as an API breakage, using the catch-all
ZMQ_EVENT_ALL mask implies that, well, all events are monitored so
it's normal that new ones will be added.
Users that don't want this kind of behaviour to change can simply
monitor only the event that they care about.
 2016-12-30 23:21:14 +01:00
Luca Boccassi
0ebed80dc1 Merge pull request #2281 from vtellier/master 
Code formatting + reverted hard error handshake fail
 2016-12-30 21:00:17 +01:00
Vincent Tellier
48bc75e8a1 Code formatting + reverted hard error handshake fail 
- Moved new events in draft section + added to zmq_draft.h
 - Removed the remainning tabs
 - Reverted the hard error (back to soft error) in curve_server.cpp

=> The feature doesn't works anymore
 2016-12-30 18:34:33 +01:00
Luca Boccassi
0ad600c7de Merge pull request #2280 from vtellier/master 
Fixed issue #2227
 2016-12-30 17:15:18 +01:00
Vincent Tellier
b6e9e0c2d3 Fixed issue #2227 
Added two new monitoring events:
 - ZMQ_EVENT_HANDSHAKE_SUCCEED is raised once the encryption handshake succeed
 - ZMQ_EVENT_HANDSHAKE_FAILED is raised when it failed
Both events are raised on server and client side.
 2016-12-30 16:26:42 +01:00
Constantin Rack
64b07d8132 Merge pull request #2278 from bluca/msg_t_size_draft 2016-12-29 21:48:39 +01:00
Luca Boccassi
8c22ba246c Problem: bug fixes not mentioned in NEWS file 
Solution: add most relevant bug fixes since 4.2.0
 2016-12-29 21:07:39 +01:00
Luca Boccassi
113feb60a2 Problem: ZMQ_MSG_T_SIZE draft but not in DRAFT section 
Solution: move it there, add it to src/zmq_draft.h and clarify in the
documentation and in the NEWS file that this option is not yet stable
 2016-12-29 21:07:39 +01:00
Luca Boccassi
715f87fec7 Merge pull request #2277 from bluca/automake_1.14 
Problem: debian build fails with automake < 1.14
 2016-12-28 16:36:58 +01:00
Luca Boccassi
47c7d8ee50 Problem: debian build fails with automake < 1.14 
Solution: create config subdir as a workaround if building the
packages with automake < 1.14
 2016-12-28 00:55:17 +01:00
Constantin Rack
ef88b8c760 Merge pull request #2276 from bluca/sodium_pkg 2016-12-27 16:28:08 +01:00
Luca Boccassi
bbae5d0f9a Problem: dpkg-query might fail in CI build and fail the build 
Solution: rework the bash test to avoid build failures as intended
and make it an easier one-liner
 2016-12-27 14:45:45 +01:00
Constantin Rack
b2a2bb8609 Merge pull request #2275 from bluca/travis_pkg 2016-12-27 12:51:19 +01:00
Luca Boccassi
b1137b7672 Problem: documentation build not tested on Travis 
Solution: install asciidoc and xmlto in the libsodium build run, since
it already refreshes APT to download other packages, so the delay is
smaller
 2016-12-27 12:20:18 +01:00
Luca Boccassi
822def9b2b Problem: Travis rebuilds libsodium every time 
Solution: use packages on Ubuntu and brews on OSX. The packages and
the brews are always kept up to date, so it's no use to rebuild the
libsodium stable branch manually everytime.
 2016-12-27 11:48:38 +01:00
Luca Boccassi
a1220b7fd4 Problem: Travis OSX workaround for libtool no longer needed 
Solution: Revert "Problem: Travis CI OSX builds are broken"

This reverts commit 531b3bf7c3ed5f29760c89b7152a2c85a4a9d8bd.
 2016-12-27 11:28:09 +01:00
Luca Boccassi
1f86019e3f Problem: Travis installs packages when not needed 
Solution: narrow down the matrix to install valgrind and lcov only
for the test runs that use them.
CMake is part of the default image so no need to install it at all.
 2016-12-27 11:27:33 +01:00
Constantin Rack
5871ea5df8 Merge pull request #2274 from bluca/cloexec 2016-12-26 20:18:12 +01:00
Luca Boccassi
06055a7b74 Problem: cmake does not run test_zmq_poll_fd 
Solution: add it to the list
 2016-12-26 19:20:09 +01:00
Luca Boccassi
6e708ce144 Problem: socketpair leaks file on fork+exec 
Solution: if available, call socketpair with SOCK_CLOEXEC flag to
make the process close the socket on fork+exec
 2016-12-26 19:13:02 +01:00
Luca Boccassi
f287c7a2aa Problem: eventfd leaks socket on fork+exec 
Solution: if available, use eventfd with EFD_CLOEXEC flag to make
the process close the socket on fork+exec
 2016-12-26 19:08:27 +01:00
Luca Boccassi
211898d243 Problem: epoll leaks socket on fork+exec 
Solution: if available, use epoll_create1 with EPOLL_CLOEXEC flag to
make the process close the socket on fork+exec
 2016-12-26 19:08:27 +01:00
Constantin Rack
16439e42d2 Merge pull request #2272 from bluca/document_read_after_free 2016-12-26 15:24:44 +01:00
Constantin Rack
d68e2e018e Merge pull request #2273 from bluca/docs 2016-12-26 15:12:40 +01:00
Luca Boccassi
3dc016cab3 Problem: no documentation for ZMQ_SOCKS_PROXY 
Solution: add paragraphs to zmq_get/setsockopt man pages
 2016-12-26 14:54:58 +01:00
Luca Boccassi
baf32a1985 Problem: no documentation for zmq_curve_public 
Solution: add manpage
 2016-12-26 14:54:58 +01:00
Luca Boccassi
a06f97d73a Problem: fix for read-after-free not documented 
Solution: add a comment as it's easy to miss and very tempting to
"optimize"
 2016-12-25 18:01:55 +01:00
Luca Boccassi
dc39ceb347 Merge pull request #2268 from imkos/master 
Mingw32 Compile
 2016-12-22 13:55:03 +01:00
Kos
43941052a9 add link libsodium.a 2016-12-22 14:25:00 +08:00
Kos
edad90f770 mingw32 fix 2016-12-22 09:35:49 +08:00
Luca Boccassi
fe3756defa Merge pull request #2266 from Cziken/master 
Problem: Duplicated code
 2016-12-19 18:07:37 +01:00
Wojciech Kula
ee72493e14 Problem: Duplicated code 
Solution: set_curve_key method in options_t struct with little
improvement in switch-case block
 2016-12-19 12:13:14 +01:00
Constantin Rack
7a8180ece7 Merge pull request #2265 from bluca/contribution_notice_github 
Problem: contributing guidelines unclear for new devs
 2016-12-18 16:52:15 +01:00
Luca Boccassi
e6b1f56131 Problem: contributing guidelines unclear for new devs 
Solution: port Github PR template from CZMQ
 2016-12-18 11:46:08 +00:00
Constantin Rack
2dec320b22 Merge pull request #2263 from bluca/revert_curve_break 2016-12-16 18:12:37 +01:00
Luca Boccassi
48e9e24726 Problem: #2262 broke curve 
Solution: Revert "Problem: Duplicated code"

This reverts commit 022eeaf33d50f8a1515a28ffb8c8cafd843ca064.
 2016-12-16 16:50:17 +00:00
Constantin Rack
2aa09d34ff Merge pull request #2262 from Cziken/master 
Problem: Duplicated code
 2016-12-16 17:32:27 +01:00
Wojciech Kula
022eeaf33d Problem: Duplicated code 
Solution: set_curve_key method in options_t struct with little
improvement in switch-case block
 2016-12-16 17:09:53 +01:00
Cziken
d514bb598a Fixed handling of WSAEWOULDBLOCK to be generic (#2260) 
* Fixed handling of WSAEWOULDBLOCK to be generic

I don't know what was the intention of this early if statement but
now this is properly evaluated in wsa_error_no function if this is
performance issue I suggest moving evaluating this error code to the
beginning of wsa_error_no.

* Fixed handling of WSAEWOULDBLOCK to be generic

Introduced default pointer to const char * and overrides this as NULL
if function is called by zmq::wsa_error()

* Fixed handling of WSAEWOULDBLOCK to be generic

Introduced default pointer to const char * and overrides this as NULL
if function is called by zmq::wsa_error()
 2016-12-16 15:51:00 +01:00
Luca Boccassi
2b565088d0 Merge pull request #2257 from minrk/check-event 
zmq_poll: only compare FD when neither item is a zmq socket
 2016-12-15 14:20:46 +01:00
Min RK
0abdc28c84 only compare FD when neither item is a zmq socket 2016-12-15 14:05:40 +01:00
Luca Boccassi
1910ef8d3e Merge pull request #2256 from laplaceyang/pr_zmq4_pub_with_zmtp_v1_sub 
fix bug zmq4.x PUB msg to ZMTP1.0 SUB server
 2016-12-15 14:02:50 +01:00
Min RK
02a6079968 Merge pull request #2255 from bluca/poll_fd_testcase 
Problem: no mixed FD and zmq socket zmq_poll test
 2016-12-15 13:39:20 +01:00
laplaceyang
8e8fdcc9ed fix bug zmq4.x PUB msg to ZMTP1.0 SUB server 2016-12-15 20:29:58 +08:00
Luca Boccassi
272d340c1f Problem: no mixed FD and zmq socket zmq_poll test 
Solution: add one
 2016-12-15 12:03:48 +00:00
Luca Boccassi
f9d231437a Merge pull request #2251 from hnwyllmm/master 
misuse of 'close'
 2016-12-13 12:43:07 +01:00
Laughing
a4e448d586 misuse of 'close' 
use 'pollset_destroy' instead of 'close' to release pollset_fd
 2016-12-13 11:09:01 +08:00
Constantin Rack
9052862619 Merge pull request #2250 from bluca/poll_regression 
Problem: check for item.fd causes zloop_poller regression
 2016-12-11 07:51:31 +01:00
Luca Boccassi
72176d5fbe Problem: check for item.fd causes zloop_poller regression 
Solution: fix the check for the socket.
This regression happens when using zloop with zmq_pollitem_it with
only file descriptors registerted through zloop_poller.
 2016-12-10 23:49:18 +00:00
Luca Boccassi
c47e017bdd Merge pull request #2249 from pavel-pimenov/fix-v817 
"%" -> '%'
 2016-12-10 16:01:38 +01:00
pavel.pimenov
4d6fbe17e0 "%" -> '%' 2016-12-10 17:27:42 +03:00
Luca Boccassi
39947d55c7 Merge pull request #2248 from pavel-pimenov/fix-precompiled 
Add #include "precompiled.hpp"
 2016-12-10 14:57:14 +01:00
pavel.pimenov
eff42fa321 Add #include "precompiled.hpp" 2016-12-10 16:44:51 +03:00
Constantin Rack
f64d3ad1e7 Merge pull request #2247 from bluca/trusty_unwind 
Problem: there is no libunwind-dev on Ubuntu 14.04LTS
 2016-12-09 20:57:01 +01:00
Luca Boccassi
379028fbd9 Problem: there is no libunwind-dev on Ubuntu 14.04LTS 
Solution: depend on libunwind-dev | libunwind8-dev | libunwind7-dev
 2016-12-09 18:42:19 +00:00
Luca Boccassi
ad4a1bd0f3 Merge pull request #2245 from anass-b/builds-vs2017 
Build support for VS2017, Windows SDK 10.0.14393.0, toolset v141
 2016-12-09 10:41:07 +01:00
Anass Bouassaba
ad045512b9 Build support for VS2017, Windows SDK 10.0.14393.0, toolset v141 2016-12-09 09:21:11 +01:00
Luca Boccassi
d4076578a3 Merge pull request #2244 from rotty/wip/fix-mstcpip-include 
Fix #include case for <mstcpip.h>
 2016-12-08 16:50:03 +01:00
Andreas Rottmann
365ca8595d Fix #include case for <mstcpip.h> 
On native Windows, the file system is case-insensitive, so this this
doesn't matter there.

However, when compiling on a case-sensitive filesystem, such as when
cross-compiling from a Unixoid using mingw, we have to use the case
the file is supplied with, which is all lowercase.
 2016-12-08 16:35:44 +01:00
Constantin Rack
519940d07c Merge pull request #2241 from bluca/aix_test 
Problem: test_stream_exceeds_buffer fails to build on AIX
 2016-12-07 05:46:34 +01:00
Luca Boccassi
dcec022358 Problem: test_stream_exceeds_buffer does not build on AIX 
Solution: add missing includes
 2016-12-06 20:34:10 +00:00
Luca Boccassi
8325355d73 Problem: test_stream_exceeds_buffer has redundant includes 
Solution: remove them as they are already in testutil.hpp
 2016-12-06 20:33:46 +00:00
Constantin Rack
5e03ad6d87 Merge pull request #2240 from bluca/aix_poll 
Problem: 4.2.0 won't compile on AIX 7.1
 2016-12-06 19:34:20 +01:00
Luca Boccassi
57db5f2a5c Problem: 4.2.0 won't compile on AIX 7.1 
Solution: restore inclusion of poll.h if using poll before zmq.h as
it was originally, as AIX redefines the POSIX structures and provides
compatibility macros.
Also add alternative aliases for 32 bit AIX's pollitem struct:
  events -> reqevents
  revents -> rtnevents
 2016-12-05 22:50:10 +00:00
Luca Boccassi
3f8e6c0812 Merge pull request #2239 from loachfish/master 
avoid crashing in the multi-thread operation for std::vector
 2016-12-05 14:22:28 +01:00
Justin.Hung
52ebffd715 avoid crashing in the multi-thread operation for std::vector 
1. stl container is not thread safety
2. rm_fd() and loop() end to clear the retired event source will in multi-thread operation
3. may be crashed in reaper thread to delete the items in the std::vector as the source is nullptr
 2016-12-05 09:28:05 +08:00
Constantin Rack
42c63368e6 Merge pull request #2238 from bluca/revert 
Problem: PR #2236 breaks the build
 2016-12-04 07:42:47 +01:00
Luca Boccassi
e46d91d41f Problem: PR #2236 breaks the build 
Solution: Revert "avoid crashing in the multi-thread operation for std::vector"

This reverts commit e1368bdac804a49de101725ede1f900aebe82c10.
 2016-12-03 22:10:19 +00:00
Constantin Rack
324f10494a Merge pull request #2236 from loachfish/master 
avoid crashing in the multi-thread operation for std::vector
 2016-12-03 16:09:56 +01:00
Justin.Hung
e1368bdac8 avoid crashing in the multi-thread operation for std::vector 
1. stl container is not thread safety
2. rm_fd() and loop() end to clear the retired event source will in multi-thread operation
3. may be crashed in reaper thread to delete the items in the std::vector as the source is nullptr
 2016-12-02 17:33:13 +08:00
Constantin Rack
9a20f42f62 Merge pull request #2235 from bluca/cmake_soversion 
Problem: CMake build uses library version as the ABI version
 2016-12-02 07:32:55 +01:00
Luca Boccassi
abeaba1557 Problem: CMake build uses library version as the ABI version 
Solution: set SOVERSION in CMakeLists to match the SONAME generated
by libtool so that there is no mismatch between the output of the
*NIX build systems.

Before:
$ ls -l
total 2696
lrwxrwxrwx 1 luca luca      15 Dec  1 22:36 libzmq.so -> libzmq.so.4.2.0
lrwxrwxrwx 1 luca luca      15 Dec  1 22:36 libzmq.so.4.2.0 -> libzmq.so.4.2.1
-rwxr-xr-x 1 luca luca  906168 Dec  1 22:36 libzmq.so.4.2.1
$ readelf -d libzmq.so.4.2.1 | grep SONAME
 0x000000000000000e (SONAME)    Library soname: [libzmq.so.4.2.0]

After:
$ ls -l
total 2700
lrwxrwxrwx 1 luca luca      15 Dec  1 22:31 libzmq.so -> libzmq.so.5.1.0
-rwxr-xr-x 1 luca luca  906168 Dec  1 22:31 libzmq.so.4.2.1
lrwxrwxrwx 1 luca luca      15 Dec  1 22:31 libzmq.so.5.1.0 -> libzmq.so.4.2.1
$ readelf -d libzmq.so.4.2.1 | grep SONAME
 0x000000000000000e (SONAME)    Library soname: [libzmq.so.5.1.0]
 2016-12-01 22:36:40 +00:00
Laughing
febf801584 bug fix: AIX pollset error (#2233) 
* bug fix: AIX pollset error

buf fix:  AIX only, pollset 'rm_fd' set fd_table to null first then set pe->fd to retired_fd

* remove extra spaces

remove extra spaces
 2016-12-01 11:59:23 +01:00
Constantin Rack
294bdb4eb6 Merge pull request #2231 from bluca/windows_ipv6_tos 
Problem: Windows does not support IPV6_TCLASS
 2016-11-30 21:07:32 +01:00
Luca Boccassi
33fcd2d6ca Problem: Windows does not support IPV6_TCLASS 
Solution: don't use it on Windows.
There is a Windows-specific API for ToS, even IPv4 does not work and
it's just a silent no-op on that platform.
 2016-11-30 11:09:12 +00:00
Constantin Rack
4a24805f70 Merge pull request #2225 from bluca/select_broken 
Problem: select broken
 2016-11-24 20:00:33 +01:00
Luca Boccassi
121c9d16f5 Problem: select.cpp/hpp build fails with reorder error 
Solution: initialise class variables in the same order they are
declared
 2016-11-24 13:07:47 +00:00
Luca Boccassi
ba74890f2f Problem: cannot pick select for poller 
Solution: fix acinclude.m4 snippet that checks if select is
available to stop it erroring out.
 2016-11-24 12:44:51 +00:00
Luca Boccassi
e6572fac80 Merge pull request #2222 from SuperFluffy/doc_explain_context 
Add a single sentence explaining what a context is
 2016-11-21 14:17:36 +01:00
Richard Janis Goldschmidt
ec25fd2ada Add a single sentence explaining what a context is 2016-11-21 14:11:33 +01:00
Luca Boccassi
53bf6dfcf0 Merge pull request #2221 from minrk/check-socket 
only compare pollitem.fd if pollitem.socket is NULL
 2016-11-21 12:17:01 +01:00
Min RK
f302d8a7b6 only compare pollitem.fd if pollitem.socket is NULL 
item.fd should be ignored if item.socket is defined.

Failing to check .socket could cause false-matches, raising EINVAL in zmq_poller_modify_fd.
 2016-11-21 11:47:50 +01:00
Constantin Rack
185fed3966 Merge pull request #2220 from bluca/zmq_msg_size 
Problem: size of zmq_msg_t is not known to FFI wrappers
 2016-11-20 14:59:45 +01:00
Luca Boccassi
8a286bb842 Problem: no documentation for ZMQ_MSG_T_SIZE ctx option 
Solution: mention it in zmq_ctx_get manpage
 2016-11-20 12:51:25 +00:00
Luca Boccassi
b480457283 Problem: ZMQ_MSG_T_SIZE is not mentioned in NEWS 
Solution: mention it as it's a new public API (still draft until release)
 2016-11-20 12:50:45 +00:00
Luca Boccassi
670bec56d8 Problem: size of zmq_msg_t is not known to FFI wrappers 
Solution: add a ZMQ_MSG_T_SIZE context read-only option so that
wrappers can call zmq_ctx_get (ctx, ZMQ_MSG_T_SIZE) to get the
size at runtime.
 2016-11-20 12:24:03 +00:00
Constantin Rack
3db69212b7 Merge pull request #2216 from rotty/master 
Document terminating NUL behavior in API more explicitly
 2016-11-16 20:03:18 +01:00
Andreas Rottmann
5d176cbe98 Document terminating NUL behavior in API more explicitly 
This addresses #2169.
 2016-11-16 19:56:18 +01:00
Constantin Rack
93ccb5a16d Merge pull request #2215 from Bklyn/udp-bugfix 
Problem: inconsistent indentation and tabs in code
 2016-11-15 20:41:32 +01:00
Caleb Epstein
10181d7641 Untabify 2016-11-15 14:33:47 -05:00
Luca Boccassi
5879f729dd Merge pull request #2214 from Bklyn/udp-bugfix 
Problem: multicast is spelled incorrectly in udp_address class
 2016-11-15 20:13:21 +01:00
Caleb Epstein
f577ceab4b Problem: multicast is spelled incorrectly in udp_address class 
Solution: Fix typo of 'mutlicast' -> 'multicast'
 2016-11-15 14:06:34 -05:00
Constantin Rack
ace95327a3 Merge pull request #2213 from Bklyn/udp-bugfix 
Fix htons copy pasta
 2016-11-15 19:55:54 +01:00