3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-15 10:18:01 +08:00
Code Issues Projects Releases Wiki Activity
3,621 Commits 4 Branches 39 Tags 31 MiB
Commit Graph

3621 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pieter Hintjens
20e3a9f535 Merge pull request #12 from rodgert/master 
resolve #1296 Remove of ZMQ_IDENTITY_FD socket option
 2015-01-14 13:30:20 +01:00
Constantin Rack
67afb90ba8 Merge pull request #13 from hintjens/master 
Problem: patch version was not updated yet for 4.1.1
 2015-01-11 21:55:38 +01:00
Pieter Hintjens
79e3de21c3 Problem: patch version was not updated yet for 4.1.1 
Solution: ZMQ_VERSION_PATCH is now 1
 2015-01-11 21:54:05 +01:00
Thomas Rodgers
8f236dc55e resolve #1296 Remove of ZMQ_IDENTITY_FD socket option 
Revert "linking fd to pipe identity via socket option"

This reverts commit fe3e8c5c70dc3fbcb0244c5f4c52dcd71b80f858.

Conflicts:
	include/zmq.h
	src/pipe.hpp
	src/session_base.cpp
 2015-01-09 18:14:22 -06:00
Pieter Hintjens
4a8bf129b3 Merge pull request #11 from hintjens/master 
Problem: zmq_epgm man page is confusing and redundant
 2014-12-07 17:08:24 +01:00
Pieter Hintjens
c477182735 Problem: zmq_epgm man page is confusing and redundant 
Solution: delete it. The epgm:// transport is documented in zmq_pgm.
 2014-12-07 17:07:22 +01:00
Pieter Hintjens
b272cca3e8 Merge pull request #10 from hintjens/master 
Backported fix for #1273 (protocol downgrade attack)
 2014-12-05 09:10:26 +01:00
Pieter Hintjens
61a3242085 Updated NEWS for #1273 2014-12-05 09:09:05 +01:00
Phillip Mienk
934973acf0 Alter --with-libsodium default. 2014-12-05 08:50:59 +01:00
Pieter Hintjens
e28b752aad Fixed .gitignore for test files 2014-12-04 14:01:56 +01:00
Pieter Hintjens
aa91fec015 Updated news for issue #1273 2014-12-04 13:43:41 +01:00
Min RK
fffaf6fd42 craft vanilla socket security test messages 
use explicit ZMTP/1.0 anonymous greeting
rather than HTTP request that just happened to work
 2014-12-04 13:42:27 +01:00
Min RK
4cff7bf372 allow vanilla socket security tests to run on Windows 
- add ws2tcpip.h
- alias close->closesocket
- increment port in sec_null test
 2014-12-04 13:42:19 +01:00
Min RK
14c94c0df9 add session->zap_enabled() 
checks mechanism != NULL, or NULL + non-empty zap_domain
 2014-12-04 13:42:15 +01:00
Min RK
56e09c80f8 reject old ZMTP connections if auth enabled 
auth mechanisms were only enabled when ZMTP handshake
is latest version, meaning that connections from old sockets
would skip authentication altogether
 2014-12-04 13:42:07 +01:00
Min RK
3c1a710d06 Resolved conflict when picking c35c0ca 2014-12-04 13:42:00 +01:00
Pieter Hintjens
66c8b70c7d Merge pull request #9 from hintjens/master 
Updated for issue #1213
 2014-11-08 10:32:53 +01:00
Pieter Hintjens
b1cba6b8b6 Updated for issue #1213 2014-11-08 10:32:34 +01:00
Pieter Hintjens
06d5d6010e Merge pull request #8 from hintjens/master 
Fix builds/msvc/Makefile.am to include all properties files in the build
 2014-11-08 10:29:45 +01:00
Dan Mick
8a2052cc52 Fix builds/msvc/Makefile.am to include all properties files in the build 
I attempted to fix up the properties files manifests in the Makefile,
but neglected the end-of-line escape characters.  It was good enough
to pass whatever make dist on Linux did, but I had no Windows build
env to test in.  The broken change was in commit de4a442.

Signed-off-by: Dan Mick <dan.mick@inktank.com>
 2014-11-08 10:29:08 +01:00
Pieter Hintjens
a90183d0de Merge pull request #7 from hintjens/master 
Problem: zmq_ctx_term has insane behavior by default
 2014-11-06 10:58:20 +01:00
Pieter Hintjens
88c9a4e5ec Problem: zmq_ctx_term has insane behavior by default 
Solution: document this with a clear warning. It would be
nicer perhaps to change the default LINGER to e.g. a few
seconds. However this could break existing applications.
 2014-11-06 10:57:12 +01:00
Pieter Hintjens
ef71d6f930 Merge pull request #6 from lysyloren/master 
Unbind socket with real endpoint when binding by wild-card * address
 2014-10-29 17:00:46 +01:00
lysyloren
ed6bf9f178 Unbind socket with real endpoint when binding by wild-card * address 2014-10-29 10:17:30 +01:00
Pieter Hintjens
acd55c7464 Merge pull request #5 from johntconklin/master 
backport configure and rpmbuild fixes.
 2014-10-28 13:38:51 +01:00
J.T. Conklin
a87c0d495f Support both --enable-eventfd and --disable-eventfd options. 2014-10-28 05:10:06 -07:00
J.T. Conklin
3b9049f163 Correct libgssapi_krb5 packages. 2014-10-28 04:56:32 -07:00
J.T. Conklin
3592c1ec1a Pass --with/--without-libgssapi_krb5 to configure. 2014-10-28 04:56:14 -07:00
Phillip Mienk
c0579448d8 Add support for --with/--without libgssapi_krb5 2014-10-28 04:55:54 -07:00
Phillip Mienk
0b1b5f283f Add --with-libgssapi_krb5 to match libsodium and pgm. 2014-10-28 04:55:32 -07:00
Pieter Hintjens
95fa16f3ef Merge pull request #4 from hintjens/master 
Backported fixes from master
 2014-10-23 10:30:00 +02:00
Pieter Hintjens
68f16a06ae Backported pull request #1225 2014-10-23 10:29:37 +02:00
Martin Hurton
03c35d2659 Fix issue #1224 2014-10-23 10:28:19 +02:00
Pieter Hintjens
966256d1b6 Merge pull request #3 from johntconklin/master 
Cherry-picked configure and rpmbuild fixes from libzmq/master
 2014-10-19 18:33:39 +02:00
J.T. Conklin
663781fbd4 Support both --with-* and --without-* options for libsodium and pgm 2014-10-19 09:06:46 -07:00
J.T. Conklin
1251d06dcc Append to libzmq_la_CPPFLAGS and libzmq_la_LIBADD. 2014-10-19 09:06:15 -07:00
Phillip Mienk
bf950e4241 Correct declaration of HAVE_LIBSODIUM. 2014-10-19 09:04:45 -07:00
Phillip Mienk
2b36c01870 Require pkg-config, use pkg-config to pull seek libsodium. 2014-10-19 09:04:32 -07:00
J.T. Conklin
08a5014e73 Add support for --with/--without libsodium and --with/--without pgm 
command line options.
 2014-10-19 08:55:59 -07:00
J.T. Conklin
7daeb846ec Remove build and runtime dependencies on e2fsprogs and e2fsprogs-devel. 2014-10-18 11:44:40 -07:00
Pieter Hintjens
779a2c1e76 Updated NEWS for #1208 2014-10-16 06:49:33 +02:00
Pieter Hintjens
f67b723ed4 Merge pull request #2 from pmienk/master 
Reduce automake recursion; simplify pgm dependency
 2014-10-16 06:44:54 +02:00
Phillip Mienk
6f9ad96225 Remove local pgm configuration option, cleanup configure.ac, remove unused Makefile.am instances. 2014-10-15 18:33:33 -07:00
Phillip Mienk
898ef212fa Partial migration to nonrecursive make. 2014-10-15 18:33:33 -07:00
Pieter Hintjens
8185c8039e Updated change history 2014-10-14 16:31:37 +02:00
Pieter Hintjens
f31aafd63c Marked TCP and IPC filters as deprecated (ZAP) 2014-10-14 16:29:15 +02:00
Pieter Hintjens
25af7d9768 Updated for release 4.1.0 2014-10-14 10:57:23 +02:00
Pieter Hintjens
3aa5a9d409 Merge pull request #1202 from pavel-pimenov/fix-pvs-studio 
PVS Studio small fix
v4.1.0 		2014-10-09 10:46:58 +02:00
Pavel Pimenov
18ee219ce7 Fix V815 Decreased performance. Consider replacing the expression 'peer_address = ""' with 'peer_address.clear()'. stream_engine.cpp 99 2014-10-09 09:41:49 +04:00
Pavel Pimenov
0e3d40c806 Fix V815 Decreased performance. Consider replacing the expression 'options.socks_proxy_address != ""' with '!options.socks_proxy_address.empty()'. session_base.cpp 497 2014-10-09 09:40:59 +04:00
Pavel Pimenov
0b541b789a Fix V803 Decreased performance. In case 'it' is iterator it's more effective to use prefix form of increment. 
Replace iterator++ with ++iterator. stream_engine.cpp
    http://www.viva64.com/en/d/0165/print/
 2014-10-09 09:37:55 +04:00
Pieter Hintjens
432c8496ea Merge pull request #1201 from johntconklin/master 
Remove build and runtime dependencies on uuid and uuid-devel.
 2014-10-07 09:26:07 +02:00
J.T. Conklin
fbce7a2407 Remove build and runtime dependencies on uuid and uuid-devel. 2014-10-07 00:11:53 -07:00
Pieter Hintjens
cb9a0d2af4 Merge pull request #1200 from dmick/master 
Fix up spec build
 2014-10-02 21:31:47 +02:00
Dan Mick
dfd021b133 builds/redhat/zeromq.spec: fix manpage lists 
Signed-off-by: Dan Mick <dmick@redhat.com>
 2014-10-01 20:50:04 -07:00
Dan Mick
8fde2d646c src/Makefile.am: libzmq.vers must go in dist tarball 
Signed-off-by: Dan Mick <dmick@redhat.com>
 2014-10-01 20:49:38 -07:00
Dan Mick
2a0fa6baf5 builds/redhat/zeromq.spec: missing '%' 
Signed-off-by: Dan Mick <dmick@redhat.com>
 2014-10-01 20:49:00 -07:00
Dan Mick
de4a442263 builds/msvc/Makefile.am: fix up project file/property file paths 
Signed-off-by: Dan Mick <dmick@redhat.com>
 2014-10-01 15:53:15 -07:00
Dan Mick
91cc9a2fd0 src/Makefile.am: i_properties.hpp removed some time ago 
Signed-off-by: Dan Mick <dmick@localhost.localdomain>
 2014-10-01 15:39:03 -07:00
Dan Mick
d3c391c3d4 zeromq.spec.in: shared library version bump 
Signed-off-by: Dan Mick <dmick@redhat.com>
 2014-09-30 23:22:57 -07:00
Dan Mick
6e53253d11 zeromq.spec.in: Missing build dependencies in specfile: asciidoc, xmlto 
Signed-off-by: Dan Mick <dmick@redhat.com>
 2014-09-30 23:21:06 -07:00
Pieter Hintjens
43028c7229 Merge pull request #1198 from toussa/master 
Problem : Build failed with MinGW on windows
 2014-09-24 17:34:36 +02:00
Michaël Paul
7c5906d138 Problem : Build failed with MinGW on windows 2014-09-24 15:46:43 +02:00
Pieter Hintjens
ca0a216f52 Merge pull request #1196 from evoskuil/master 
Update NuGet package.
 2014-09-24 11:55:46 +02:00
evoskuil
cf4c03cf01 Update NuGet package. 2014-09-23 14:58:37 -07:00
Pieter Hintjens
e40d4b2376 Merge pull request #1189 from steamraven/master 
Problem: curve messages can be replayed
 2014-09-20 10:22:33 +02:00
Matthew Hawn
0900a48921 Problem: curve messages can be replayed 
Solution: ensure message short nonces are strictly increasing and validate them
 2014-09-19 18:07:57 -06:00
Martin Hurton
fe4396c597 Merge pull request #1188 from hintjens/master 
Problem: stream_engine.cpp security can be downgraded
 2014-09-19 20:16:09 +02:00
Pieter Hintjens
77f14aad95 Problem: stream_engine.cpp security can be downgraded 
Solution: accept only the mechanism defined by the socket options.

I've not tested this yet, so it's a speculative fix.
 2014-09-19 19:24:45 +02:00
Martin Hurton
8e9005d591 Merge pull request #1186 from hintjens/master 
Problem: test_security_curve does't try wrong mechanisms
 2014-09-18 10:09:49 +02:00
Pieter Hintjens
57ade6d5bb Problem: test_security_curve does't try wrong mechanisms 
Solution: check that it rejects attempts to connect to a CURVE server
using NULL or PLAIN client.
 2014-09-18 07:32:07 +02:00
Martin Hurton
2bf89bd0f8 Merge pull request #1185 from banburybill/master 
Fix hang terminating PGM ZMQ_SUB (#822).
 2014-09-17 18:39:45 +02:00
Jim Hague
94943bab3b Fix hang terminating PGM ZMQ_SUB (#822). 2014-09-17 17:21:44 +01:00
Martin Hurton
19712d3fbb Merge pull request #1181 from whoshuu/patch-1 
Fix non-constant-expression narrowing
 2014-09-17 00:41:29 +02:00
Huu Nguyen
5642366f10 Fix non-constant-expression narrowing 
For OS X, the microseconds field is implemented as an int type. The implicit narrowing in the initializer list throws a compiler error for some compilers with C++11 support turned on. The specific error message is: "error: non-constant-expression cannot be narrowed from type 'long' to '__darwin_suseconds_t' (aka 'int') in initializer list [-Wc++11-narrowing]".

Tested on Clang 5.1.0 and Mac OS X 10.9.4.
 2014-09-16 14:34:11 -07:00
Pieter Hintjens
4b70793f1f Merge pull request #1179 from hurtonm/master 
Stop session's timer when pipe terminates
 2014-09-12 17:25:47 +02:00
Martin Hurton
50e0915f98 Stop session's timer when pipe terminates 2014-09-12 16:53:05 +02:00
Pieter Hintjens
be9fecdbc3 Merge pull request #1178 from evoskuil/master 
Update nuget package.
 2014-09-12 07:22:51 +02:00
evoskuil
a8e900c7b3 Update nuget package 2014-09-11 17:31:48 -07:00
Pieter Hintjens
c897af508d Merge pull request #1177 from hurtonm/master 
Code cleanup
 2014-09-11 16:16:43 +02:00
Martin Hurton
5a497d7d0c Code cleanup 2014-09-11 16:01:56 +02:00
Martin Hurton
41a9968c2e Merge pull request #1176 from hintjens/master 
Problem: undocumented limit on IPC paths in Linux is 107 chars
 2014-09-10 10:08:04 +02:00
Pieter Hintjens
51c8c1d67a Problem: undocumented limit on IPC paths in Linux is 107 chars 
Solution: document the limit of 113 chars including ipc://. We might
fix this in libzmq by shortening an over-long IPC pathname into a
unique string; so long as this is done consistently in bind and in
connect, it will save applications from weird failures when they
use external data to generate IPC pathnames.
 2014-09-10 09:38:04 +02:00
Pieter Hintjens
cca297c313 Merge pull request #1173 from evoskuil/master 
Fix configure warning.
 2014-09-04 07:09:43 +02:00
evoskuil
8cd85857fb Fix potential redefinition of common DEBUG symbol, replace tabs. 2014-09-02 23:39:33 -07:00
Pieter Hintjens
2c1d5f5a96 Merge pull request #1174 from jbreams/master 
Clean up after using randombytes from libsodium
 2014-08-31 20:34:10 +02:00
Jonathan Reams
d1881acbdc Clean up after using randombytes from libsodium 
When Curve authentication is used, libsodium opens a file
descriptor to /dev/urandom to generate random bytes. When
the ZMQ context terminates, it should ensure that file gets
closed.
 2014-08-31 13:30:44 -04:00
anonymous
992dca6ba7 Fix configure warning. 2014-08-30 21:38:54 -07:00
Pieter Hintjens
83c6bc20db Merge pull request #1172 from evoskuil/master 
Fix clang build break from unused var.
 2014-08-29 10:06:58 +02:00
evoskuil
d76536eb70 Default Travis clang build fails on unused variable 'MAX_SENDS'. 2014-08-28 18:25:35 -07:00
evoskuil
2208907a88 Hide VS turd. 2014-08-28 18:21:51 -07:00
Martin Hurton
21e20127b6 Merge pull request #1171 from hintjens/master 
Problem: nodrop code is ugly
 2014-08-27 13:58:56 +02:00
Pieter Hintjens
f15146b5d2 Problem: nodrop code is ugly 
It's bad practice to start by testing all exceptional conditions
and then dropping through to the 'normal' condition. Apart from
being inefficient, it's deceptive to the user. Conditional code
should always try to show the natural expectation of the code,
with exceptional cases coming last.

Solution: clean up this code.
 2014-08-27 13:51:25 +02:00
Martin Hurton
128bed472b Merge pull request #1170 from hintjens/master 
Fixed issues with xpub nodrop property
 2014-08-27 13:25:27 +02:00
Pieter Hintjens
2584c3a724 Added test cases to .gitignore 2014-08-27 12:06:54 +02:00
Pieter Hintjens
35040aaf18 Problem: issues with nodrop property 
- not initialized before use
- name is nasty (boolean variables should not have negative names)

Solution: rename to 'lossy' and initialize to 'true'.
 2014-08-27 12:06:54 +02:00
Pieter Hintjens
81485c7688 Merge pull request #1168 from ricnewton/master 
Fix test broken when we changed FD_SETSIZE.
 2014-08-26 11:14:09 +02:00
Richard Newton
8926cb3ddb Fix test broken when we changed FD_SETSIZE. 2014-08-26 08:36:51 +01:00
Richard Newton
3811b0b1ef Merge pull request #1166 from hintjens/master 
Problem: FD_SETSIZE 1024 is too restrictive under Windows
 2014-08-26 08:29:47 +01:00
Pieter Hintjens
1acc1b1582 Problem: FD_SETSIZE 1024 is too restrictive under Windows 
Solution: increased to 4096 by default for all MSVC builds, for MinGW,
and for CMake.

Note: this is a speculative change, it needs confirmation before we
can keep it. Particularly, there is some doubt that changing this in
libzmq will affect upstream applications using libzmq.dll.
 2014-08-23 13:59:53 +02:00