Commit Graph

5734 Commits

Author SHA1 Message Date
Doron Somech
f5da4b1c6c Merge pull request #2603 from bluca/xpub_manual_subs
Problem: XPUB_MANUAL subscriptions not removed on peer term
2017-06-22 11:46:31 +03:00
Luca Boccassi
3536c4b9c4 Problem: XPUB_MANUAL subscriptions not removed on peer term
Solution: remove the pipe from the real trie when a peer disconnects.
Also add a unit test that exercises the behaviour by reconnecting
a different socket and sending a message that matches.
Fixes #2601 and introduced by #2042
2017-06-22 01:02:08 +01:00
Luca Boccassi
8e2027983a Problem: XPUB_MANUAL takes effect for the next bind
Solution: fix unit test to bind after setting the option.
2017-06-22 00:58:44 +01:00
Joe Eli McIlvain
2d83acceff Merge pull request #2596 from bluca/zap_curve
Problems: ZAP can be set up incorrectly, CURVE and GSSAPI can be used only with ZAP
2017-06-15 11:51:43 -07:00
Luca Boccassi
35fce88fee Merge pull request #2599 from ibancg/master
Problem: cannot cross-compile with Mingw-w64
2017-06-14 15:28:02 +01:00
Iban Cereijo
d040dc18b5 Problem: CMake evaluation fails with Mingw-w64
Solution: we can use 'CMAKE_SYSTEM_VERSION' instead of
'${CMAKE_SYSTEM_VERSION}' for the 'if' clauses.

CMake fails to evaluate condition when CMAKE_SYSTEM_VERSION is
empty, which can happen with a default installation of Mingw-w64
in Linux.
2017-06-14 15:55:29 +02:00
Iban Cereijo
2c4e5364aa Problem: missing Ws2_32.lib when cross compiling
Solution: use lower case ws2_32.lib to enable cross compilation
from platforms with case-sensitive filesystems.

When cross compiling the tests with Mingw-w64, CMake cannot
locate Ws2_32.lib
2017-06-14 15:54:03 +02:00
Luca Boccassi
6ad0b08da9 Problem: GSSAPI can no longer be used without ZAP
Solution: do not fail if ZAP is not enabled.
GSSAPI already provides authentication and can be used separately,
so it is a valid use case.
2017-06-13 22:56:49 +01:00
Luca Boccassi
0ce18eac25 Problem: CURVE can no longer be used without ZAP
Solution: revert change that made ZAP mandatory.
The "Stonehouse" pattern, where CURVE is used only for encryption and
without authentication, is a valid use case so we should still
support it.
Also restore CURVE testing in the test_heartbeat.

Fixes #2594
2017-06-13 22:56:32 +01:00
Luca Boccassi
33695d1da8 Problem: ZAP is allowed to be configured incorrectly or not to work
Solution: if inproc://zeromq.zap.01 exists, which means ZAP is
enabled, abort immediately if it cannot be used (eg: out of memory)
or it is configured incorrectly (eg: wrong socket type).
Otherwise authentication failures will simply be ignored and
unauthorised peers will be allowed to slip in.
2017-06-13 22:56:31 +01:00
Doron Somech
10a9ba0926 Merge pull request #2593 from ilovexyz/dev
fix bug: #2592 dish client does not resend subscriptions to radio server after radio server restart
2017-06-12 07:34:28 +03:00
sunddy
af598f2e1c fix bug: dish client does not resend subscriptions to radio server after radio server restart
problem: for zmq radio/dish pattern, if the radio process restarts, the dish will not resend subscriptions to radio. And the result is that the dish will never receive any more messages.

solution: in session_base_t::reconnect (), take ZMQ_DISH into consideration when invoking hiccup method.
2017-06-12 12:26:21 +08:00
BJovke
99805931e4 Merge pull request #2591 from laplaceyang/pr_cancel_timer_in_reconnect
fix bug: coredump if set linger and immediate together
2017-06-02 10:25:18 +02:00
laplaceyang
67a6594fc0 fix bug: coredump if set linger and immediate together
In function session_base_t::reconnect, if we set immediate to 1 and set linger, we will get into first block of reconnect function, and set pipe to NULL, but we forget to cancel timer of linger. Once timer tiggered, we will get coredump. Solution: cancel timer in the end of set pipe to NULL
2017-06-02 11:36:41 +08:00
Constantin Rack
bcc30f2ab0 Merge pull request #2584 from GreatFruitOmsk/master
RELICENSE: Ilya Kulakov
2017-05-23 19:40:34 +02:00
Ilya Kulakov
545135fb8d RELICENSE: Ilya Kulakov
Refs #2376
2017-05-23 10:38:13 -07:00
Constantin Rack
ec56eaaeb6 Merge pull request #2583 from timou/wincmake
Suppress linker warning 4221 for MSVC
2017-05-20 21:08:58 +02:00
Tim Ebringer
293a18257a Suppress linker warning 4221 for MSVC
Some #define switches cause the body of entire files to be omitted. This
causes a linker warning on Visual Studio 2017, for example

    warning LNK4221: This object file does not define any previously
    undefined public symbols, so it will not be used by any link
    operation that consumes this library

Since this is warning us about something that shouldn't be
earth-shattering news, we add a linker flag to suppress this warning on
MSVC builds.
2017-05-20 14:29:58 -04:00
Doron Somech
92339a4d9d Merge pull request #2582 from bluca/test_poller_use_after_free
Problem: use-after-free in test_poller
2017-05-18 15:37:31 +03:00
Luca Boccassi
17637536b8 Problem: use-after-free in test_poller
Solution: remove server socket from poller before closing it
Fixes #2581
2017-05-18 13:10:19 +01:00
Luca Boccassi
bc8ad8860b Merge pull request #2580 from diorcety/ninja
Use OBJECT_DEPENDS and OBJECT_OUTPUTS for precompiled.hpp
2017-05-18 11:33:05 +01:00
Yann Diorcet
f66c49a62b Fix precompiled 2017-05-18 12:02:07 +02:00
Luca Boccassi
6ad533bec4 Merge pull request #2578 from rkfg/dev
Problem: abort at socket creation on Android with jzmq
2017-05-17 14:09:14 +01:00
rkfg
72b4b6830f Problem: abort at socket creation on Android with jzmq
Solution: don't set thread name on Android

Setting a thread name on Android may fail with "permission
denied" error and abort the process due to failed assertion.
Tested on Android 5 and 6 (two phones).
Strangely enough, it only happens on signed APKs and is fine
in debug. Using JeroMQ is not an option as we need TCP keepalive
settings and authentication which JeroMQ doesn't support.
2017-05-17 15:05:37 +03:00
Doron Somech
8e1facc73e Merge pull request #2577 from bluca/rep_leak
Problem: REP leaves label msgs for dead REQ in pipe
2017-05-17 11:53:49 +03:00
Luca Boccassi
bdc676f687 Problem: REP leaves label msgs for dead REQ in pipe
Solution: roll back the pipe if writing messages other than the
first fails in router::xsend. Roll it back also when the pipe is
terminating.
Also add test case that reproduces the memory leak when ran with
valgrind.
Fixes #2567
2017-05-17 09:18:15 +01:00
Luca Boccassi
766c47ffdd Merge pull request #2575 from zeromq/revert-2572-rep_leak
Revert "Problem: REP leaves label msgs for dead REQ in pipe"
2017-05-16 10:31:23 +01:00
BJovke
1489fc1ac5 Revert "Problem: REP leaves label msgs for dead REQ in pipe" 2017-05-16 11:20:03 +02:00
BJovke
75cc2015d1 Merge pull request #2572 from bluca/rep_leak
Problem: REP leaves label msgs for dead REQ in pipe
2017-05-16 10:28:24 +02:00
Luca Boccassi
0999fdd885 Problem: REP leaves label msgs for dead REQ in pipe
Solution: roll back the pipe if writing messages other than the
first fails in router::xsend.
Also add test case that reproduces the memory leak when ran with
valgrind.
Fixes #2567
2017-05-10 23:44:03 +01:00
Luca Boccassi
d17581929c Merge pull request #2570 from jruffin/master-relicense
Added the license grant for jruffin
2017-05-10 11:57:03 +01:00
Julien Ruffin
30dac3807f Added the license grant for jruffin 2017-05-10 12:50:41 +02:00
Doron Somech
b7e8a3d699 Merge pull request #2566 from leonarf/leonarf-relicense
license right grant from Leonard Michelet
2017-05-08 19:02:31 +03:00
Leonard
7dc06fdfb2 license right grant from Leonard Michelet 2017-05-08 17:42:55 +02:00
Doron Somech
f0df483fa7 Merge pull request #2564 from rotty/master
Relicensing grant from rotty
2017-05-07 15:34:58 +03:00
Andreas Rottmann
806bc9dd08 Relicensing grant from rotty 2017-05-07 14:05:55 +02:00
Luca Boccassi
fb92cd30a1 Merge pull request #2562 from pijyoi/fix_init_fdset
Problem: not using official api FD_ZERO to init fd_set
2017-05-06 10:51:51 +01:00
KIU Shueng Chuan
d11f501dc1 problem: not using official api FD_ZERO to init fd_set
solution: fix it

In particular, on Windows, using FD_ZERO is much more efficient than
zeroing out the whole structure.
2017-05-06 08:03:09 +08:00
Constantin Rack
0a66acb31b Merge pull request #2560 from bluca/tests_ports
Problems: cannot use wildcard port with source address, tests bind to hardcoded TCP ports, ASAN CI run could use some improvements
2017-05-05 08:23:07 +02:00
Constantin Rack
18651d1699 Merge pull request #2561 from flub/master
Grant permission to relicense to MPL
2017-05-03 19:50:54 +02:00
Floris Bruynooghe
3241875b7b Grant permission to relicense to MPL 2017-05-03 19:46:20 +02:00
Luca Boccassi
655fbfc399 Problem: ASAN test doesn't print good traces with GCC 4.8
Solution: add Ubuntu toolchain PPA and use GCC 6
2017-05-01 22:57:05 +01:00
Luca Boccassi
86f9f1df7a Problem: CI doesn't build with debugging symbols
Solution: pass -g so that valgrind/asan can print useful backtraces
2017-05-01 22:57:05 +01:00
Luca Boccassi
11e2e5f6b5 Problem: address sanitizer support in CI is hacky
Solution: import better solution from zproject and add a new autoconf
option
2017-05-01 22:57:05 +01:00
Luca Boccassi
6d76106cde Problem: test_many_sockets is flacky on OSX
Solution: mark it as XFAIL. We tried many times to tweak the system
settings from the CI script but it still fails.
2017-05-01 22:57:05 +01:00
Luca Boccassi
463c2d75ae Problem: CI builds and test runs not done in parallel
Solution: run make with -j5, as now the tests support it.
2017-05-01 22:57:05 +01:00
Luca Boccassi
48792f8006 Problem: CI runs libsodium tests
Solution: don't, libzmq's CI tests are not responsible for testing
libsodium stable releases. Save some time in the CI.
2017-05-01 22:57:05 +01:00
Luca Boccassi
b29d46b6a5 Problem: tests use same IPC endpoint
Solution: use either a wildcard IPC, or where the codepath needs to
be tested a file named after the test, so that it is unique and there
is no clash on the filesystem, allowing parallel test runs.
2017-05-01 22:57:05 +01:00
Luca Boccassi
5934919f3e Problem: tests bind to hardcoded TCP ports
Solution: use ZMQ_LAST_ENDPOINT in most places. This alllows running
tests in paralle, and on over-booked shared machines where many of
the ports would be already in use.
Keep 3 tests with an hardcoded port, as there are some code paths that
require it (eg: connect before bind), but list those ports in
tests/testutil.hpp as macros so that they do not overlap and still
allow parallel runs.

These changes were inspired by a patch uploaded to Ubuntu by the
package maintainer, Steve Langasek <steve.langasek@ubuntu.com>.
Thank you Steve!
2017-05-01 22:57:05 +01:00
Luca Boccassi
2c2c813824 Merge pull request #2559 from michicc/master
RELICENSE: Grant from michicc
2017-05-01 21:53:41 +01:00