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

2394 Commits

Author SHA1 Message Date
Martin Hurton
95d36f42ee Merge pull request #484 from pijyoi/master
fix wrong boolean operator in router_raw test code
2012-12-07 01:54:56 -08:00
KIU Shueng Chuan
6706efba28 fix wrong boolean operator 2012-12-07 17:45:05 +08:00
Martin Hurton
ebd1bf9bcf Merge pull request #482 from sradomski/master
Close pipes for inproc sockets on zmq_disconnect
2012-12-04 14:05:48 -08:00
Stefan Radomski
21345ffa50 Break early when pipe to be removed was found 2012-12-04 17:40:43 +01:00
Stefan Radomski
f9770e93ef Fixed iterator when erasing from inprocs multimap 2012-12-04 17:31:46 +01:00
Stefan Radomski
624dd1e5b5 Removal of terminated pipes from inproc and ignoring peer ends 2012-12-04 17:10:32 +01:00
Stefan Radomski
66c22456b9 Close pipes for inproc sockets on zmq_disconnect
- fixes LIBZMQ-476 and LIBZMQ-475
2012-12-04 15:14:21 +01:00
Pieter Hintjens
b2f6741bcb Merge pull request #481 from ianbarber/master
Simplify test_connect_delay
2012-12-01 00:53:02 -08:00
Ian Barber
75161b5c62 Serialise test_connect_delay
Simplify the test connect delay test script, removing the threads and
moving to a serialised version. AFAICS this should provide the same
test, but without the race conditions that happened with the previous
test.
2012-11-30 23:07:12 +00:00
Martin Hurton
013a99daab Merge pull request #480 from vperron/master
Tiny fix
2012-11-30 13:41:54 -08:00
Victor Perron
3fc8c7073d Same fix, in-line style 2012-11-30 22:16:20 +01:00
Victor Perron
33f42efb48 Change NULL to 0 to keep compatibility with some cross-compiling GCC
versions
2012-11-30 21:39:22 +01:00
Pieter Hintjens
a4a731652a Merge pull request #479 from ianbarber/master
Update RPM spec file
2012-11-26 08:23:43 -08:00
Ian Barber
1d11f196b1 Update SPEC file
Update the RPM spec file with Justin Cook's changes to fix the build for 3.2.2. (https://zeromq.jira.com/browse/LIBZMQ-473)
2012-11-26 16:12:25 +00:00
Pieter Hintjens
cae5d3b817 Merge pull request #478 from methodmissing/event-messages-3.2
Event message memory corruption fixes
2012-11-22 01:16:55 -08:00
Martin Hurton
d1cbf96cde Merge pull request #477 from hintjens/master
Added autogen.sh hint to INSTALL
2012-11-22 00:03:02 -08:00
Pieter Hintjens
e6da46ff8c Added autogen.sh hint 2012-11-22 12:09:02 +09:00
Lourens Naudé
359a505949 Prefer malloc to new for event address allocation as per Martin's recommendation 2012-11-22 00:12:17 +00:00
Pieter Hintjens
a28322cd0c Merge pull request #476 from hurtonm/master
Check decoder's state function for NULL before calling it
2012-11-21 14:15:59 -08:00
Martin Hurton
a8721c3c04 Check decoder's state function for NULL before calling it
Fixes bug reported by Peter Friend
(http://lists.zeromq.org/pipermail/zeromq-dev/2012-November/019425.html)
2012-11-21 22:58:05 +01:00
Lourens Naudé
b1f4850153 Let socket event messages initialize with zmq_msg_init_data and let the framework handle cleanup 2012-11-21 18:27:53 +00:00
Lourens Naudé
f78ca629b5 Merge branch 'master' of github.com:zeromq/libzmq 2012-11-21 18:04:05 +00:00
Pieter Hintjens
8db8c45b18 Merge pull request #475 from ianbarber/master
Add ZMTP link to zmq_tcp doc.
2012-11-20 13:27:43 -08:00
Ian Barber
be4cc2f80a Update zmq_tcp to include a reference to RFC
Include a note with a link to ZMQ RFC 15 for the ZMTP protocol
description.
2012-11-20 19:13:28 +00:00
Ian Barber
7e6c304a98 Merge pull request #474 from hintjens/master
Fixed doc for SNDHWM
2012-11-19 02:40:36 -08:00
Pieter Hintjens
1489857973 Fixed ZMQ_SNDHWM description 2012-11-19 16:32:58 +09:00
Pieter Hintjens
7533ebb33d Clarified that SNDHWM is per part, not message 2012-11-19 10:20:56 +09:00
Lourens Naudé
6d245eb6bc Copy monitor specific event endpoints to event messages as the engine etc. can be released at anytime 2012-11-17 11:29:47 +00:00
Lourens Naudé
ce4d321684 Revert "Merge pull request #473 from methodmissing/fix-engine-endpoint"
This reverts commit 1a18c7b0a816e10f8a8a770b2141d47f661f0302, reversing
changes made to bef9a41bdb991b867981317e0e20ee174ecd6fea.
2012-11-17 10:06:09 +00:00
Ian Barber
1a18c7b0a8 Merge pull request #473 from methodmissing/fix-engine-endpoint
[LIBZMQ-450] Copy the stream engine endpoint - string reference caused memory corruption
2012-11-16 13:06:24 -08:00
Lourens Naudé
fdf162a117 [LIBZMQ-450] Copy the stream engine endpoint - string reference caused memory corruption 2012-11-16 17:21:07 +00:00
Pieter Hintjens
bef9a41bdb Merge pull request #472 from jgm-radez/master
Issue 468
2012-11-15 17:58:44 -08:00
John Muehlhausen
b8d5d3fa69 Issue 468
XPUB "verbose" mode excludes unsubscriptions
2012-11-15 15:30:30 -06:00
Pieter Hintjens
01b9bc3663 Merge pull request #471 from methodmissing/fix-disconnect-event-addr
Fix addresses on triggered events
2012-11-14 02:12:29 -08:00
Lourens Naudé
5205415beb Fix addresses on triggered events 2012-11-14 09:51:24 +00:00
Martin Hurton
37f8ce69c1 Merge pull request #470 from cdolan/master
Fixed test compilation issue by using memset/memmove rather than bzero/bcopy
2012-11-13 12:13:58 -08:00
Christopher Dolan
6559da3033 Use memset/memmove rather than bzero/bcopy 2012-11-13 19:33:18 +00:00
Ian Barber
30eaadddc3 Merge pull request #469 from hurtonm/code_cleanup
Minor code cleanup
2012-11-13 04:29:44 -08:00
Martin Hurton
9013ee0d52 Minor code cleanup 2012-11-13 13:06:29 +01:00
Pieter Hintjens
c179ad1173 Merge pull request #468 from hurtonm/issue_465
Resolve LIBZMQ-465
2012-11-13 03:56:01 -08:00
Martin Hurton
c543b2ce8c Resolve LIBZMQ-465 2012-11-13 12:33:30 +01:00
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