0
0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-04 13:05:41 +08:00

2553 Commits

Author SHA1 Message Date
Pieter Hintjens
99f714445f Merge pull request #467 from hurtonm/code_cleanup
Code cleanup
2012-11-09 08:45:22 -08:00
Martin Hurton
66dc4d8b54 Don't pass flags to xrecv method 2012-11-09 17:18:14 +01:00
Martin Hurton
7865f96e97 Don't pass flags to xsend method 2012-11-09 17:18:10 +01:00
Pieter Hintjens
793895c477 Merge pull request #466 from hurtonm/code_cleanup
Simplify implementation of DEALER socket
2012-11-09 06:51:04 -08:00
Martin Hurton
b78800e467 Simplify implementation of DEALER socket 2012-11-09 15:45:25 +01:00
Martin Hurton
d1e0889ab0 Merge pull request #463 from hintjens/master
Addded ROUTER-ROUTER (back) as valid combination
2012-11-09 06:19:23 -08:00
Pieter Hintjens
3eaf4a967c Merge pull request #465 from steve-o/cmake-minor
Cmake minor version labeling and sync with 3.x
2012-11-09 06:13:18 -08:00
Steven McCoy
19a8ea4584 Update source list with raw codec. 2012-11-09 08:54:14 -05:00
Steven McCoy
3ba401d7da Bring along CMake patchset from zeromq3-x for adding minor version to Windows labeling. 2012-11-09 08:48:59 -05:00
Pieter Hintjens
de339785f2 Merge pull request #464 from hurtonm/code_cleanup
Code cleanup
2012-11-09 05:19:05 -08:00
Martin Hurton
ea19b7b658 Small cleanups 2012-11-09 14:12:11 +01:00
Martin Hurton
925a530663 Use const_cast operator to remove const modifier 2012-11-09 14:02:19 +01:00
Martin Hurton
82999f2d20 Don't forward identities to DEALER sockets 2012-11-09 13:49:38 +01:00
Pieter Hintjens
6290054f00 Added ROUTER-ROUTER as legal combination 2012-11-09 21:10:34 +09:00
Pieter Hintjens
ec0824142e Merge pull request #462 from hurtonm/raw_fixes
Fix raw mode on reconnect
2012-11-08 17:02:50 -08:00
Martin Hurton
c1e960b31d Never exchange identities for sockets in raw mode
Zeromq shall never send/receive socket identifiers for sockets in raw
mode. The existing implementation breaks this requirement after
reconnection.
2012-11-08 19:05:33 +01:00
Martin Hurton
aec47b3642 Extend ZMQ_ROUTER_RAW test
Add test when the zeromq socket connects to a TCP socket.
The test now fails due to bug in the zeromq library.
2012-11-08 19:05:27 +01:00
Pieter Hintjens
872ef76f3c Added DEALER-DEALER as legal combination 2012-11-07 17:23:37 +01:00
Pieter Hintjens
4e028ecb30 Merge pull request #461 from hurtonm/code_cleanup
session_base: code cleanup
2012-11-06 21:20:54 -08:00
Martin Hurton
e51a1f04c9 session_base: code cleanup
- add unlikely hints
- drop unnecessary assertion
- style fixes

There is no need to require the 'more' flag in the provided message
structure be 0 when pulling message from the session.
2012-11-07 01:07:51 +01:00
Ian Barber
5da971275d Merge pull request #460 from hintjens/master
Renamed ZMQ_ROUTER_RAW_SOCK to ZMQ_ROUTER_RAW
2012-11-06 07:05:52 -08:00
Pieter Hintjens
777c38ae32 Renamed raw option to ZMQ_ROUTER_RAW 2012-11-06 13:18:58 +01:00
Pieter Hintjens
80aef8dfda Merge pull request #459 from hurtonm/issue_459
Resolve LIBZMQ-459
2012-11-06 00:47:59 -08:00
Martin Hurton
41dc2e6049 Resolve LIBZMQ-459
Ref: https://zeromq.jira.com/browse/LIBZMQ-459
2012-11-06 09:35:55 +01:00
Martin Hurton
1348924251 Merge pull request #458 from vortechs2000/remove_cpp_comments_from_zmq_h
Older versions of C compilers don't like C++ comments
2012-11-05 09:41:56 -08:00
AJ Lewis
f67a199332 Older versions of C compilers don't like C++ comments
There's no need to exclude older compilers by putting C++ style
comments in the C API header.
2012-11-05 11:27:13 -06:00
Pieter Hintjens
2deb2e095e Merge pull request #457 from mjasperse/patch-1
Update builds/msvc/libzmq/libzmq.vcproj
2012-11-01 21:47:23 -07:00
mjasperse
1e60d17a23 Update builds/msvc/libzmq/libzmq.vcproj
Without the LinkDLL statement, command-line compile using vcbuild attempts to compile EXE and complains about entrypoint
The LinkDLL statement forces the linker to produce desired output
2012-11-02 11:29:46 +11:00
Ian Barber
cdd7cd10c9 Merge pull request #456 from hurtonm/issue_464
Resolve LIBZMQ-464
2012-11-01 07:04:17 -07:00
Martin Hurton
7c66e8f807 Resolve LIBZMQ-464 2012-11-01 14:37:42 +01:00
Ian Barber
04e716ac99 Merge pull request #455 from hintjens/master
zmq_getsockopt man page was malformatted
2012-10-31 01:16:05 -07:00
Pieter Hintjens
79da450b8b Fixed formatting in man page 2012-10-31 04:35:15 +01:00
Pieter Hintjens
0404b3b60a Merge pull request #454 from hurtonm/code_cleanup
Style fixes
2012-10-30 04:24:21 -07:00
Martin Hurton
9d8eb1f9b9 Style fixes 2012-10-30 12:18:30 +01:00
Pieter Hintjens
abbe34cdc2 Merge pull request #453 from hurtonm/issue_458
Resolve LIBZMQ-458
2012-10-30 03:12:46 -07:00
Martin Hurton
d16e0a5342 Resolve LIBZMQ-458
Ref: https://zeromq.jira.com/browse/LIBZMQ-458
2012-10-30 11:03:43 +01:00
Pieter Hintjens
4bc405a366 Merge pull request #452 from hshardeesi/master
New socket option (ZMQ_ROUTER_RAW_SOCK) for ZMQ_ROUTER sockets
2012-10-29 21:00:15 -07:00
Pieter Hintjens
7523b9ed29 Merge pull request #451 from hurtonm/use_correct_types_in_stream_engine
Use correct types when returning value in read/write methods
2012-10-29 03:21:33 -07:00
Pieter Hintjens
dcf0693d6e Merge pull request #450 from hurtonm/issue_447
Resolve LIBZMQ-447
2012-10-29 03:21:09 -07:00
Martin Hurton
3aa30329d1 Use correct types when returning value in read/write methods 2012-10-29 10:46:33 +01:00
Martin Hurton
03deb2c97a Resolve LIBZMQ-447 2012-10-29 10:15:51 +01:00
Hardeep
83387b4073 Added support for non-zmq tcp client connections to router socket.
- Created a new option ZMQ_ROUTER_RAW_SOCK
    - Added new raw_encoder and raw_decoder to receive and send messages in raw form to remote client
    - Added test case file tests/test_raw_sock.cpp

    o To create a raw router sock set the ZMQ_ROUTER_RAW_SOCK option
    o ZMQ_MSGMORE flag is ignored for non-id messages
    o To terminate a remote connection send id message followed by zero length data message
2012-10-29 00:03:36 -07:00
Ian Barber
19f77a1ccf Merge pull request #449 from hintjens/master
Fixed code formatting
2012-10-27 18:25:42 -07:00
Pieter Hintjens
0bf8a4d2d2 Code formatting 2012-10-28 07:36:18 +09:00
Pieter Hintjens
6b45262086 Merge pull request #448 from jgm-radez/master
resolve issue 456
2012-10-27 14:01:48 -07:00
John Muehlhausen
500f6cffe3 patch for issue 456
Do not filter out duplicate subscriptions on the XSUB side of
XSUB/XPUB, so that ZMQ_XPUB_VERBOSE doesn't get blocked by forwarding
devices (as long as the devices all use ZMQ_XPUB_VERBOSE)
2012-10-27 15:51:03 -05:00
Ian Barber
bb59dc1b2a Merge pull request #447 from hintjens/master
Cleanups to man pages
2012-10-26 19:50:32 -07:00
Pieter Hintjens
171897f4e8 Cleanups to man pages 2012-10-27 09:43:19 +09:00
Pieter Hintjens
0b13872ff4 Merge pull request #446 from hurtonm/issue_452
Resolve LIBZMQ-452
2012-10-25 02:21:31 -07:00
Pieter Hintjens
01be614593 Merge pull request #445 from hurtonm/issue_417
Resolve LIBZMQ-417
2012-10-25 02:15:46 -07:00
Martin Hurton
ef794925b4 Resolve LIBZMQ-452
Ref: https://zeromq.jira.com/browse/LIBZMQ-452
2012-10-25 09:13:48 +02:00
Martin Hurton
4824237761 Resolve LIBZMQ-417
Ref: https://zeromq.jira.com/browse/LIBZMQ-417
2012-10-25 09:13:09 +02:00
Pieter Hintjens
d2ee38acfe Merge pull request #444 from vortechs2000/fix_aix
Fix Build Regression #449: Move socket_base.hpp and err.hpp after poll.h include
2012-10-24 06:50:02 -07:00
AJ Lewis
422c418a15 Move socket_base.hpp and err.hpp after poll.h include
These two headers also include zmq.h somewhere in their dependency
chain, so must be included after poll.h is included for builds to work
on AIX.
2012-10-24 08:37:00 -05:00
Ian Barber
2675a9d31b Merge pull request #443 from hintjens/master
Fixed whitespace and style
2012-10-23 18:02:48 -07:00
Pieter Hintjens
4ba34c9d70 Whitespace and style fixes 2012-10-24 09:18:52 +09:00
Ian Barber
7abb6ccb6a Merge pull request #442 from hintjens/master
Fixed build regression #449
2012-10-19 15:05:23 -07:00
Pieter Hintjens
066606322c Added unbind/disconnect man pages, notes to deprecated methods 2012-10-19 16:23:21 +09:00
Pieter Hintjens
ee21fac8b8 Added ZMQ_FAIL_UNROUTABLE alias back as deprecated 2012-10-19 15:16:36 +09:00
Pieter Hintjens
a3889d00c3 Fixed issue #451 2012-10-19 15:09:52 +09:00
Pieter Hintjens
45c063725b Fixed issue #449 2012-10-18 11:32:13 +09:00
Ian Barber
7f63fc6579 Merge pull request #441 from hintjens/master
Fixed build regression
2012-10-17 19:21:26 -07:00
Pieter Hintjens
96811575c3 Fixed issue #448 2012-10-18 11:04:51 +09:00
Ian Barber
9bab346690 Merge pull request #440 from hintjens/master
Packages did not build - fixed
2012-10-15 23:32:16 -07:00
Pieter Hintjens
3a43bd7354 Several include files were missing 2012-10-16 10:01:26 +09:00
Ian Barber
6e676af45e Merge pull request #439 from hintjens/master
Updated master version to 3.2.2
2012-10-15 04:33:24 -07:00
Pieter Hintjens
351eff5448 Bumped version to 3.3.0 2012-10-15 13:23:00 +09:00
Pieter Hintjens
8e7892b72f Upated version for next release 2012-10-15 13:06:19 +09:00
Pieter Hintjens
a7b2e9d017 Upated NEWS for 3.2.1 v3.2.1 2012-10-15 12:52:54 +09:00
Pieter Hintjens
cdcaca2dc4 Merge pull request #438 from steve-o/master
Duplicate CMake patch set from zeromq3-x
2012-10-12 19:58:55 -07:00
Steven McCoy
c62fb89ed8 Update to libzmq source set. 2012-10-12 22:48:02 -04:00
Steve-o
7a1a5f9f7f Update AsciiDoc version details with CMake detected ZeroMQ version. 2012-10-12 22:46:59 -04:00
Steve-o
8ddb9fc7ea Enable parallel make and LTO by default. 2012-10-12 22:46:58 -04:00
Steve-o
dfe7d15a88 MSVC11 not getting defined in CMake 2.8.9, punt to version string. 2012-10-12 22:46:57 -04:00
Steve-o
ebe4eab477 Detect compiler version to tag libraries. 2012-10-12 22:46:55 -04:00
Steve-o
046c8ec7eb Add metadata to CMake options; mark executables advanced to hide from default view; fix WoW64 redirections. 2012-10-12 22:46:54 -04:00
Steve-o
56bb3df1f6 Detect ZeroMQ version at build time; hide NSIS dependencies in new cmake folder. 2012-10-12 22:46:52 -04:00
Steve-o
b42e45adb8 Make OpenPGM a CMake option, default disabled. 2012-10-12 22:46:51 -04:00
Steve-o
c53cf0d239 Minor refactor of CMake build script. 2012-10-12 22:46:50 -04:00
John Murphy
000d1a5fba Update CMakeLists.txt
Removed check for COPYING.txt
2012-10-12 22:46:48 -04:00
John Murphy
58f7c2179f added artificacts for windows and openpgm build 2012-10-12 22:46:47 -04:00
Ian Barber
73537e67e3 Merge pull request #437 from rohanbedarkar/master
Explicit comments
2012-10-11 13:39:04 -07:00
Rohan
93a7a37893 fixed trailing whitespace 2012-10-11 09:32:54 -05:00
Rohan
a438e63498 explicit comments on multicast loopback 2012-10-10 16:22:52 -05:00
rohanbedarkar
11c22912d7 commented out TOS related opt for PGM 2012-10-10 10:08:06 -05:00
Ian Barber
1ef63bc2ad Merge pull request #436 from hintjens/master
Renamed ZMQ_ROUTER_BEHAVIOR to ZMQ_ROUTER_MANDATORY
2012-10-09 02:19:41 -07:00
Pieter Hintjens
983ee761b1 Renamed ZMQ_ROUTER_BEHAVIOR to ZMQ_ROUTER_MANDATORY for clarity 2012-10-08 16:36:35 +09:00
Ian Barber
db690e3d99 Merge pull request #435 from hintjens/master
Added ZMQ_XPUB_VERBOSE option
2012-10-07 12:48:18 -07:00
Pieter Hintjens
f87bf38293 Fixed issue #443 2012-10-08 00:57:43 +09:00
Pieter Hintjens
e41e071b05 Merge pull request #434 from vaughan0/master
Small documentation error I noticed
2012-10-06 04:26:20 -07:00
Vaughan Newton
ce53fe0337 Minor documentation fix: zmq_msg_recv instead of zmq_msg_send 2012-10-06 13:15:17 +02:00
Pieter Hintjens
d6e0ae24f3 Prepared for release 3.2.1 2012-10-01 22:52:24 +02:00
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