0
0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-29 08:39:42 +08:00

1961 Commits

Author SHA1 Message Date
Pieter Hintjens
2440863292 Merge pull request #433 from michelp/reject-no-fds-avail
Ported from libxs revision 123c0f5387ecef287dd11f4dc790fb76ee1c0f67
2012-09-30 12:21:15 -07:00
Michel Pelletier
b84d0119b5 Ported from libxs revision 123c0f5387ecef287dd11f4dc790fb76ee1c0f67
Handle insufficient resources on accept() decently

    If accept() call fails due to insuffient OS resources
    the new connection is rejected.
2012-09-30 11:52:43 -07:00
Pieter Hintjens
81482ec84a Merge pull request #432 from hurtonm/master
Make socket IO more robust
2012-09-29 03:28:18 -07:00
Martin Hurton
82d7238f08 Make socket IO more robust
See also https://zeromq.jira.com/browse/LIBZMQ-433
2012-09-29 11:36:52 +02:00
Ian Barber
343ec62282 Merge pull request #431 from ipechorin/master
Forward-port fix for LIBZMQ-211
2012-09-26 23:29:18 -07:00
Ian Barber
5b83fe778c Merge pull request #430 from ipechorin/master
Update MSVC2008 project after recent changes; fix compilation errors
2012-09-26 12:27:43 -07:00
Ivan Pechorin
725f141fd7 Fix LIBZMQ-211: REP socket asserting when getting malformed request
REP socket demands at least an empty address stack. The server asserted on (msg_->flags () & msg_t::more) in rep.cpp:75 when receiving a malformed request without empty part.

This patch makes a REP socket to discard and silently ignore such malformed requests.
2012-09-26 16:49:38 +04:00
Pieter Hintjens
a49e392e34 Merge pull request #429 from ipechorin/dcf683aacb533634c273bb2f51fa3ceaadf89202
Update MSVC2010 project after recent renames and additions
2012-09-26 05:24:41 -07:00
Ivan Pechorin
9b58372a38 Fix compilation using MSVC 2008: its <algorithm> defines wrong min/max without NOMINMAX
Visual Studio 2008 compiler defines min/max as macros in its <algorithm> even if <windows.h> is not included at all. This patch defines NOMINMAX to remove these macros and fix compilation on Visual Studio 2008.
2012-09-26 16:09:55 +04:00
Ivan Pechorin
396b4e3046 Fix compilation using MSVC 2008: stdint.h is not present in this compiler
This patch fixes the two headers added recently to include our own "stdint.hpp" instead of system <stdint.h> because the latter is not available in Visual Studio versions prior to 2010.
2012-09-26 16:06:20 +04:00
Ivan Pechorin
4de27b6c10 Update MSVC2008 project after recent renames and additions
This patch updates MSVC2008 project after device was renamed to proxy and new files were added (tcp.cpp, v1_encoder.cpp and v1_decoder.cpp).
2012-09-26 16:04:00 +04:00
Pieter Hintjens
2eb849ccda Merge pull request #428 from ipechorin/9056c13e1ebbfd7798ddd7b5cfdb9950933c710e
Use <stdint.h> shipped with Visual Studio 2010 and later
2012-09-26 04:48:02 -07:00
Ivan Pechorin
dcf683aacb Update MSVC2010 project after recent renames and additions
This patch updates MSVC2010 project after device was renamed to proxy and new files were added (v1_encoder.cpp and v1_decoder.cpp).
2012-09-26 15:25:16 +04:00
Ivan Pechorin
9056c13e1e Use <stdint.h> shipped with Visual Studio 2010 and later
Visual Studio didn’t have <stdint.h> until 2010, therefore we had a bunch of typedefs for int8_t, int16_t and the likes in "stdint.hpp". This patch limits these typedefs to Visual Studio versions older than 2010 and uses compiler-shipped <stdint.h> on 2010 and newer.
2012-09-26 15:13:13 +04:00
Pieter Hintjens
ff264cb044 Merge pull request #427 from ianbarber/master
Init msg in pgm_receiver drop subs
2012-09-25 23:44:40 -07:00
Ian Barber
afa4933c1e Init message in drop subscription
Fixes reported issue with PGM receiver on 32bit Suse where asserts
were hit due to the msg flags not being zeroed.
2012-09-25 22:58:25 +01:00
Pieter Hintjens
2a209140f7 Merge pull request #426 from methodmissing/fix-monitor
Fix monitor
2012-09-25 13:49:27 -07:00
Lourens Naudé
b1776e234b Merge branch 'master' into fix-monitor 2012-09-25 01:26:32 +01:00
Pieter Hintjens
a6c6054ef2 Merge pull request #425 from Astellar/zmq_msg_t
zmq_msg_t will now typedef a named struct.
2012-09-21 09:09:00 -07:00
Astellar
7bf516ded7 zmq_msg_t will now typedef a named struct.
This change allows forward declaration of struct zmq_msg_t.
2012-09-21 19:57:50 +04:00
Lourens Naudé
8a57e4a5d7 Merge branch 'master' into fix-monitor 2012-09-21 12:55:01 +01:00
Lourens Naudé
759d453368 Significantly reworked the monitoring infrastructure with a more granular per socket API and to play well with monitoring endpoints in application threads 2012-09-21 12:53:31 +01:00
Pieter Hintjens
d981c91f80 Merge pull request #424 from vaughan0/patch-1
Update doc/zmq_msg_get.txt
2012-09-20 11:41:27 -07:00
Vaughan Newton
f6a840b65b Update doc/zmq_msg_get.txt 2012-09-20 21:39:45 +03:00
Ian Barber
86eb7bcae0 Merge pull request #423 from jmgao/patch-1
Add pthread.h include to test_connect_delay.cpp
2012-09-18 13:52:52 -07:00
Joshua Gao
67d88bcb41 Add pthread.h include to test_connect_delay.cpp
This test case uses pthreads, but doesn't include the header.
2012-09-18 13:46:48 -07:00
Ian Barber
7a40df6d3a Merge pull request #422 from hintjens/master
Replaced device concept with proxy concept
2012-09-07 03:25:31 -07:00
Pieter Hintjens
5db28752f3 Removed 'device' concept and introduced proxies
* zmq_device is now a wrapper that calls zmq_proxy
* zmq_proxy adds capture socket
2012-09-07 18:38:50 +09:00
Pieter Hintjens
f074f6b6b9 Merge pull request #412 from Quuxplusone/test-release-builds-too
Add "#undef NDEBUG" to all tests.
2012-09-06 19:56:46 -07:00
Arthur O'Dwyer
cf20932df0 Add "#undef NDEBUG" to all tests.
This change makes sure that even if the tests are built in a
"release" configuration (with optimizations and NDEBUG turned on),
the assertions won't get compiled out of the tests themselves.

The C standard guarantees that the most recent inclusion of
<assert.h> is the one that counts, so it's important that the
"#undef NDEBUG/#include <assert.h>" come as the last thing in
the block of header files.

"testutil.hpp" includes <assert.h>, so I've left <assert.h> out
of any test that #includes "testutil.hpp", just for the sake of
brevity.
2012-09-06 10:03:12 -07:00
Pieter Hintjens
aaac4b84cb Code cleanups 2012-09-06 18:20:33 +09:00
Ian Barber
84728cd961 Merge pull request #421 from hurtonm/master
New message encoder/decoder + code simplification
2012-09-05 12:59:28 -07:00
Martin Hurton
2a41c8d7b4 Simplify initial handshaking 2012-09-05 20:17:34 +02:00
Martin Hurton
3f6148abdf Implement new message encoder/decoder
This is supposed to become part of the ZMTP/1.1.

The main differences from the ZMTP/1.0 framing protocol are:
- flags field comes first, followed by the length field
- long messages are signaled using a flag rather then 0xff escape
- length field does not include the flags field, 0 is a valid value
2012-09-05 20:17:22 +02:00
Martin Hurton
8672f5829e Introduce abstract interface for message encoder/decoder 2012-09-05 18:31:27 +02:00
Pieter Hintjens
a224c97329 Merge pull request #420 from ianbarber/master
Fix some PGM refactor breakages
2012-09-04 16:03:58 -07:00
Ian Barber
d7331b7b1f Fixing PGM issues
Hopefully fixed LIBZMQ-427 - there was a slight typo in the init_address
refactor. The encoder refactoring had also broken pgm_sender and
receiver, but just required updating to use the new functions.
2012-09-04 23:24:48 +01:00
Ian Barber
d0687876c0 Merge pull request #419 from hurtonm/code_cleanup
Code cleanup
2012-09-03 13:58:06 -07:00
Martin Hurton
9d17ead33d Remove superfluous statement 2012-09-03 19:26:52 +02:00
Martin Hurton
7e6db47e65 Remove unused member variable 2012-09-03 19:07:57 +02:00
Ian Barber
9143ac5156 Merge pull request #418 from hurtonm/versioned_ztp
Introduce versioning into ZTP
2012-09-02 15:24:09 -07:00
Martin Hurton
d9307c9ff0 Make ZMQ interoperate with ZMQ 2.x SUB sockets
Since ZMQ 2.x does not support subscription forwarding, it's not
possible to use ZMQ 2.x SUB socket to receive messages from a PUB
socket.

This patch adds some compatibility layer so that ZMQ 2.x SUB socket
receives messages from PUB socket.
2012-09-02 22:46:26 +02:00
Martin Hurton
dfc0222ee6 Decouple encoder_t and decoder_t from session_base_t
This patch introduces i_msg_sink and i_msg_source interfaces. This
allows us to make message encoder and decoder more general.
2012-09-02 22:46:26 +02:00
Martin Hurton
1bca4f6f03 Extend ZTP/1.0 protocol
The new protocol adds support for protocol version and  exchanges the
socket type, so that the library can reject a connection when the
sockets do not match.

The protocol was designed so that it's possible to detect and fully
support ZTP/1.0 peers.

When a new connection is set up, peers exchange greeting messages. The
greeting message encodes both the protocol verion and the socket type.
The format of the greeting message is as follows:

    greeting    = tag1, adaptation, tag2, version, length, socket_type
    tag1        = BYTE / 0xff
    adaptation  = 8 BYTES
    tag2        = BYTE / 0x7f
    version     = BYTE / 1
    length      = BYTE / 1
    socket_type = BYTE

The protocol does not define the value of adaptation field.

When interoperability with ZTP/1.0 peers is required, the adaptaion
encodes, in network byte order, the length of identity message increased
by 1. When adaptaion consists of eight zeros, the current
implementatatio of 0MQ 2.x closes the connection.

This patch supports both ZTP/1.0 and new protocol.
2012-09-02 22:46:26 +02:00
Mikko Koppanen
6347f8b0c9 Merge pull request #416 from hintjens/master
Fixed COPYING.LESSER
2012-08-28 04:40:38 -07:00
Pieter Hintjens
ab8248847c Fixed license to remove references to X11 code 2012-08-28 20:39:38 +09:00
Pieter Hintjens
c959f526f1 Merge pull request #415 from Quuxplusone/unused-parameters
Silence all "unused parameter" warnings from Clang.
2012-08-27 16:34:31 -07:00
Arthur O'Dwyer
08f6a9e7e8 Remove unused argc/argv parameters in tests. 2012-08-27 16:10:47 -07:00
Arthur O'Dwyer
c29aef4dd8 Verify the value of the "void *s" passed to the monitor function.
This formerly unused parameter actually represents the socket
on which the event was received. As such, we should check that
its value makes sense: it must be either "rep" or "req", and in
the case of some kinds of events, it must be specifically one
or the other.

After this change, "s" is no longer unused.
2012-08-27 16:06:51 -07:00
Arthur O'Dwyer
3b984d40e9 Silence all "unused parameter" warnings from Clang.
Compiling without warnings is a good goal, because it makes
new warnings (which probably indicate bugs) stand out rather
than getting lost in the spam.

My fixes fall into two categories:

    - Adding (void) casts of unused parameters, where their
      unusedness seems like a TODO (or in some cases a bug?).

    - Removing parameter names altogether, where the function
      is clearly a stub that will never use its parameters.

Should be no change in behavior.
2012-08-27 16:05:51 -07:00