Commit Graph

3319 Commits

Author SHA1 Message Date
Pieter Hintjens
96501d7271 Merge pull request #1051 from hurtonm/master
Small code cleanup
2014-05-20 22:20:57 +02:00
Martin Hurton
5f4145e7cb Small code cleanup
- add const modifier to address parameter of event generating functions
2014-05-20 21:48:59 +02:00
Martin Hurton
6bdedcbca3 Merge pull request #1049 from hintjens/master
Minor fixes
2014-05-20 16:12:38 +02:00
Pieter Hintjens
4b67919f93 Minor trim of man page title 2014-05-20 15:42:35 +02:00
Pieter Hintjens
11175a33f1 Problem: security tests block on zmq_send
The expect_bounce_fail () helper assumed that messages could always
be sent. However in some cases zmq_send() blocks, due to there not
being any outgoing pipe. This changed in 77f5f7, where previously
there would be a pipe that kept trying to reconnect forever.

Solution: use a send timeout and check for EAGAIN if sending failed.
2014-05-20 15:42:35 +02:00
Pieter Hintjens
a1fbd97330 Merge pull request #1048 from hurtonm/master
PLAIN: Small simplification
2014-05-19 21:04:40 +02:00
Martin Hurton
32b3daad7e PLAIN: Small simplification 2014-05-19 20:45:42 +02:00
Pieter Hintjens
155feccb3f Merge pull request #1047 from mrvn/pull-testutil-expect_bounce_fail-send-timeout
Add a send timeout in expect_bounce_fail()
2014-05-19 17:52:27 +02:00
Pieter Hintjens
11357df0e0 Merge pull request #1046 from mrvn/pull-testutil-set-alarm
Set an alarm(60) in setup_test_environment() when not on windows so test...
2014-05-19 17:51:42 +02:00
Goswin von Brederlow
2ba5af6d83 Set an alarm(60) in setup_test_environment() when not on windows so tests
will not block too long if they go wrong.
2014-05-19 17:03:41 +02:00
Goswin von Brederlow
0ebf94e429 Add a send timeout in expect_bounce_fail() so tests for authentication
failures don't block.
2014-05-19 17:03:24 +02:00
Pieter Hintjens
77f5f7adae Merge pull request #1043 from hurtonm/dont_reconnect_on_protocol_errors
Don't reconnect on protocol errors
2014-05-18 10:53:32 +02:00
Pieter Hintjens
de639c34ae Merge pull request #1042 from hurtonm/master
Fix bug in reporting protocol errors
2014-05-18 10:09:38 +02:00
Martin Hurton
045dab91a5 Merge pull request #1037 from hintjens/master
Problem: artificial restriction on binary identities
2014-05-18 09:14:06 +02:00
Martin Hurton
9a53f334d2 Don't reconnect on protocol errors 2014-05-18 08:49:29 +02:00
Martin Hurton
ed076d4620 Fix bug in reporting protocol errors 2014-05-18 08:30:40 +02:00
Pieter Hintjens
bac001cc85 Merge pull request #1041 from hurtonm/master
Tell the session why the engine has stopped
2014-05-18 00:21:22 +02:00
Martin Hurton
7d3fa3afcb Tell the session why the engine has stopped 2014-05-17 21:04:38 +02:00
Pieter Hintjens
a9a15ccf6f Use different endpoint for each test step 2014-05-16 16:00:37 +02:00
Pieter Hintjens
aad54b2a8b Whitespace fixes 2014-05-16 16:00:37 +02:00
Pieter Hintjens
a178097f95 Problem: artificial restriction on binary identities
Applications that use ZMQ_IDENTITY can be trapped by the artificial
restriction on not using a binary zero as first byte. It's specially
nasty on random generated identities, e.g. UUIDs, as the chance of a
binary zero is low, so it will pass 255 out of 256 times.

Solution: remove the restriction.
2014-05-16 16:00:37 +02:00
Pieter Hintjens
adddda17cf Merge pull request #1038 from hurtonm/master
CURVE: Implement server-side ERROR handling
2014-05-16 07:54:21 +02:00
Martin Hurton
bd73119e2b CURVE: Implement server-side ERROR handling 2014-05-16 07:25:29 +02:00
Pieter Hintjens
4f571edf1b Merge pull request #1036 from hurtonm/master
CURVE: Implement client-side ERROR handling
2014-05-15 07:15:41 +02:00
Martin Hurton
0750303bfe CURVE: Implement client-side ERROR handling 2014-05-15 06:39:45 +02:00
Pieter Hintjens
0975be6ed7 Merge pull request #1035 from hurtonm/master
Prefix error-reason with length in ERROR command
2014-05-14 14:16:26 +02:00
Martin Hurton
410f891599 Prefix error-reason with length in ERROR command 2014-05-14 14:13:13 +02:00
Pieter Hintjens
6dbc70516c Merge pull request #1034 from hurtonm/master
NULL: Correct ERROR command format
2014-05-14 07:13:00 +02:00
Martin Hurton
dd6a4fe806 NULL: Correct ERROR command format 2014-05-14 06:52:55 +02:00
Pieter Hintjens
2ff098f6ae Merge pull request #1033 from hurtonm/master
Finish ERROR handling for PLAIN mechanism
2014-05-14 06:45:43 +02:00
Martin Hurton
164ff4be6b Remove debugging output 2014-05-14 06:35:08 +02:00
Martin Hurton
57546f4ecb PLAIN: Implement ERROR handling in server 2014-05-14 06:23:47 +02:00
Martin Hurton
8651b55797 PLAIN: Fix parsing of ERROR command 2014-05-14 06:23:47 +02:00
Pieter Hintjens
3338c76bac Merge pull request #1032 from hurtonm/master
PLAIN: Implement ERROR handling in client
2014-05-13 19:14:36 +02:00
Martin Hurton
6b8513744c PLAIN: Implement ERROR handling in client 2014-05-13 18:34:48 +02:00
Pieter Hintjens
8c4e049564 Merge pull request #1031 from sdrsdr/identity_fd
test case for zmq_getsockopt/ZMQ_IDENTITY_FD
2014-05-13 14:24:29 +02:00
Stoian Ivanov
14e8e8af33 Merge branch 'master' of https://github.com/zeromq/libzmq into identity_fd 2014-05-13 15:21:02 +03:00
Stoian Ivanov
6f5e7714cf test case for zmq_getsockopt/ZMQ_IDENTITY_FD 2014-05-13 15:19:48 +03:00
Pieter Hintjens
c6dec22717 Merge pull request #1030 from evoskuil/master
Simplify VS project configs and harden MSBUILD script
2014-05-13 12:31:51 +02:00
evoskuil
3aa6c1eab0 Optimize VS projects and common props. 2014-05-13 03:17:48 -07:00
evoskuil
7e7508a8d9 Harden MSBUILD base script against various VS installations. 2014-05-13 03:17:34 -07:00
Pieter Hintjens
09b17c13c2 Merge pull request #1029 from olafmandel/master
Update cmake, mingw32 and msvc builds
2014-05-12 14:50:34 +02:00
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