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

3313 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pieter Hintjens
2db7cdc6a6 Merge pull request #999 from hurtonm/master 
Include ZMTP properties in message metadata
 2014-05-02 13:36:38 +02:00
Martin Hurton
8d82cc2a0b Include ZMTP properties in message metadata 
Metadata are built in stream_engine now.
This makes it easy to extend metadata with user-defined properties.
 2014-05-02 12:45:14 +02:00
Pieter Hintjens
55c06924c8 Merge pull request #998 from hurtonm/master 
Don't add empty metadata to received messages
 2014-05-02 09:11:55 +02:00
Martin Hurton
e95b477a87 Don't add empty metadata to received messages 2014-05-02 09:02:41 +02:00
Pieter Hintjens
f721a7ad07 Merge pull request #997 from soundart/master 
tweetnacl integration for curve
 2014-05-01 22:36:42 +02:00
Frank
351c845339 Merge branch 'master' of github.com:soundart/libzmq 
Conflicts:
	CMakeLists.txt
 2014-05-01 21:39:07 +02:00
Frank
551bcdae6c add metadata 2014-05-01 21:35:53 +02:00
Frank
01afdf8476 no tweetnacl for windows currently 2014-05-01 21:35:36 +02:00
Frank
63cc250d05 typo 2014-05-01 21:30:13 +02:00
Frank
e5a294ec02 tweetnacl integration 2014-05-01 21:30:02 +02:00
Pieter Hintjens
49f18d55cb Merge pull request #996 from hurtonm/master 
Add metadata to received messages
 2014-05-01 17:52:42 +02:00
Martin Hurton
b9c2748146 Add metadata to received messages 2014-05-01 17:30:51 +02:00
Ian Barber
62bb403eea Merge pull request #995 from hintjens/master 
Bumped ABI version to 4.0.0
 2014-05-01 15:23:10 +01:00
Pieter Hintjens
cac0f9838d Problem: generates incompatible libzmq.so.3.1.0 
See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=743508

The ABI in fact changed in two significant ways, one with inproc
connects, and one with socket monitoring

Solution: generate libzmq.so.4.0.0 library instead.

This change should be backported to zeromq-4.x
 2014-05-01 16:12:51 +02:00
Pieter Hintjens
79ef02538f Port 9999 is unsafe for tests 2014-05-01 11:23:41 +02:00
Stoian Ivanov
fe3e8c5c70 linking fd to pipe identity via socket option 2014-04-30 16:34:55 +03:00
Pieter Hintjens
408dea796f Merge pull request #993 from klnikita/src_addr_connect 
Allow to set up a source address and port for outgoing tcp connections in zmq_connect
 2014-04-30 14:57:08 +02:00
nikita kozlov
acb6807041 Allow to set up a source address and port for outgoing tcp connections in zmq_connect() 
Few examples:
tcp:://192.168.0.4:55555;192.168.0.254:1234
tcp:://192.168.0.4:0;192.168.0.254:1234
tcp:://eth2:55555;192.168.0.254:1234
 2014-04-30 14:43:37 +02:00
Pieter Hintjens
69d27b3338 Merge pull request #992 from hurtonm/master 
Define i_properties interface
 2014-04-30 14:38:44 +02:00
Martin Hurton
19c62b93fc Define i_properties interface 
- copy and move message operations are updated to maintain proper
  reference count of properties object
- zmq_msg_gets updated to use i_properties interface to fetch property
  value
- setter/getter added to msg_t class
 2014-04-30 14:20:29 +02:00
Pieter Hintjens
ddde62a68c Merge pull request #991 from hurtonm/master 
Update function prototype for zmq_msg_gets ()
 2014-04-30 14:07:56 +02:00
Martin Hurton
f81a1304ff Update function prototype for zmq_msg_gets () 
Added modifiers reflect the following properties:
- zmq_msg_gets () does not mutate property parameter
- zmq_msg_gets () returns a pointer to memory the caller should not
  modify
 2014-04-30 13:27:06 +02:00
Pieter Hintjens
c24b457ccf Merge pull request #988 from hurtonm/master 
Add pointer to properties into message structure
 2014-04-29 22:47:26 +02:00
Martin Hurton
724b2bb844 Add pointer to properties into message structure 2014-04-29 22:37:31 +02:00
Martin Hurton
26bf74972a Merge pull request #987 from hintjens/master 
Various small cleanups
 2014-04-29 22:36:31 +02:00
Pieter Hintjens
39ccfea036 Added more scaffolding for security 
- additional messages to help people debugging security errors
 2014-04-29 22:21:58 +02:00
Pieter Hintjens
d1232d144a Fixed NULL security test 
Has some bits commented out due to #939, now work.

Note: there is an issue in libzmq when binding/unbinding or
connecting/disconnecting (I did not investigate deeper) the
same socket several times. Even closing the socket with zero
linger, zmq_ctx_term will block. The workaround in this test
case is to close the sockets for each test step.
 2014-04-29 12:13:54 +02:00
Pieter Hintjens
c6f8093bfb Added zmq_ctx_shutdown to Makefile 
- also removed deprecated man pages from Makefile
- they remain in repository for reference
 2014-04-29 12:06:57 +02:00
Pieter Hintjens
4307641f27 Merge pull request #986 from evoskuil/master 
Windows build/packaging updates.
 2014-04-28 19:58:51 +02:00
evoskuil
c1ac534e6e Change OpenEvent to OpenEventW (Windows builds Unicode only). 2014-04-28 10:49:02 -07:00
Ian Barber
2d6f5b0ec4 Merge pull request #985 from hintjens/master 
Cleaned up socket monitor code, tests, and man page
 2014-04-28 10:44:11 +01:00
Pieter Hintjens
9753de8566 Problem: zmq_socket_monitor code is dirty 
Specifically:

* zmq_event_t should not be used internally in libzmq, it was
  meant to be an outward facing structure.

* In 4.x, zmq_event_t does not correspond to monitor events, so
  I removed the structure entirely.

* man page for zmq_socket_monitor is incomplete and the example
  code was particularly nasty.

* test_monitor.cpp needed rewriting, it was not clean.
 2014-04-28 11:30:49 +02:00
Pieter Hintjens
97935c582e Added link to zmq_msg_gets 2014-04-28 11:30:49 +02:00
Pieter Hintjens
50afebe47c Merge pull request #984 from ricnewton/master 
Fix windows non-unicode build
 2014-04-27 14:38:20 +02:00
Richard Newton
bbaa85e7dd Fix windows non-unicode build 2014-04-27 13:29:20 +01:00
Pieter Hintjens
cb0e8f1a9f Merge pull request #983 from pijyoi/master 
update ZMQ_STREAM docs about connection notification
 2014-04-27 07:45:14 +02:00
KIU Shueng Chuan
d4c5dc9b1d update ZMQ_STREAM docs about connection notification 
Also the portion about how to close a connection does not only apply to
servers.
 2014-04-27 06:16:59 +08:00
evoskuil
2b9a5e49f4 Uupdate GSL referenece in packaging script. 2014-04-25 04:52:23 -07:00
Pieter Hintjens
763bf34e88 Merge pull request #981 from evoskuil/master 
Add gssapi files to msvc, use Windows Unicode APIs.
 2014-04-25 09:56:26 +02:00
evoskuil
e97bed3727 Add gssapi files to msvc project. 2014-04-25 00:46:44 -07:00
evoskuil
ca29709f38 Change TCHAR to Unicode, use safe swprintf to remove warning. 2014-04-25 00:43:47 -07:00
Pieter Hintjens
e37c206211 Merge pull request #980 from claws/fix_build_issue_when_missing_gssapi 
Fix build issue when missing gssapi
 2014-04-25 07:10:49 +02:00
Chris Laws
7abf2564f8 fixes for gssapi build issue 2014-04-25 13:48:39 +09:30
Chris Laws
09647fa916 src/gssapi_client.cpp 2014-04-25 13:47:07 +09:30
Pieter Hintjens
dd64f6432c Merge pull request #978 from connamara/gssapi 
GSSAPI/Kerberos Security Mechanism
 2014-04-25 00:53:51 +02:00
Chris Busbey
d1334d9df8 using latest copyright header 2014-04-24 14:39:29 -07:00
Chris Busbey
634c8abe29 encrypt option on gss ready 2014-04-24 14:21:33 -07:00
Chris Busbey
27591d2da6 ZMQ_GSSAPI_PLAINTEXT option for disabling encryption 2014-04-24 14:21:33 -07:00
Chris Busbey
18da8a7402 encode and decode ready message 2014-04-24 14:20:54 -07:00
Chris Busbey
2e1645a519 principle->principal 2014-04-24 14:20:53 -07:00
Chris Busbey
87834dd63f fixed up comments from pr 2014-04-24 14:18:58 -07:00
Chris Busbey
5441db3d7d configurable principle and service principle (for client) 2014-04-24 14:18:58 -07:00
Chris Busbey
4e6880ec95 gss mech sends principle as part of zap request 2014-04-24 14:17:36 -07:00
Chris Busbey
be62be0fa4 gss encode/decode 'more' flag 2014-04-24 14:17:36 -07:00
Chris Busbey
778c72b9ed :fixed client state transition bug 2014-04-24 14:17:36 -07:00
Chris Busbey
04db842dcc added ready for meta data exchange at end of gss handshake 2014-04-24 14:17:36 -07:00
Mike Gatny
761508bf4b Added comments to methods. 2014-04-24 14:17:36 -07:00
Mike Gatny
3c414c4aac GSSAPI mechanism now fully working with encryption 2014-04-24 14:17:36 -07:00
Mike Gatny
eb2862525b Methods to send/recv gssapi-wrapped messages 2014-04-24 14:17:36 -07:00
Mike Gatny
1445516c41 Establishing GSSAPI sec context is working now 2014-04-24 14:17:36 -07:00
Mike Gatny
6290ba168f Added gss produce/process routines. 
For exchanging tokens.
 2014-04-24 14:17:05 -07:00
Mike Gatny
c00b8c347b Refactored common impl into gssapi_mechanism_base. 
E.g., both client and server need to produce and process GSSAPI tokens.
 2014-04-24 14:17:05 -07:00
Mike Gatny
a4a0dc6644 Split up gssapi mechanism into client and server. 2014-04-24 14:17:05 -07:00
Mike Gatny
abcb224318 stubbed in TOKEN command 2014-04-24 14:17:05 -07:00
Mike Gatny
4b1c851db4 Stubbed in gssapi security mechanism. 2014-04-24 14:17:05 -07:00
Pieter Hintjens
d1bdd45e80 Merge pull request #975 from evoskuil/master 
Update file tools versioning in VS projects.
 2014-04-17 18:21:35 +02:00
evoskuil
1ee980c191 Update filter file tool versions. 2014-04-15 01:43:24 -07:00
evoskuil
5a76db6f27 Merge branch 'zeromq/master' 
Conflicts:
	builds/msvc/vs2010/inproc_lat/inproc_lat.props
	builds/msvc/vs2010/inproc_thr/inproc_thr.props
	builds/msvc/vs2010/libsodium.import.props
	builds/msvc/vs2010/libzmq.import.props
	builds/msvc/vs2010/libzmq/libzmq.props
	builds/msvc/vs2010/local_lat/local_lat.props
	builds/msvc/vs2010/local_thr/local_thr.props
	builds/msvc/vs2010/properties/Common.props
	builds/msvc/vs2010/properties/Console.props
	builds/msvc/vs2010/properties/ConsoleDebugDynamic.props
	builds/msvc/vs2010/properties/ConsoleDebugLinkTimeCodeGeneration.props
	builds/msvc/vs2010/properties/ConsoleDebugStatic.props
	builds/msvc/vs2010/properties/ConsoleReleaseDynamic.props
	builds/msvc/vs2010/properties/ConsoleReleaseLinkTimeCodeGeneration.props
	builds/msvc/vs2010/properties/ConsoleReleaseStatic.props
	builds/msvc/vs2010/properties/Debug.props
	builds/msvc/vs2010/properties/Dynamic.props
	builds/msvc/vs2010/properties/DynamicDebug.props
	builds/msvc/vs2010/properties/DynamicRelease.props
	builds/msvc/vs2010/properties/LinkTimeCodeGeneration.props
	builds/msvc/vs2010/properties/Release.props
	builds/msvc/vs2010/properties/Static.props
	builds/msvc/vs2010/properties/StaticDebug.props
	builds/msvc/vs2010/properties/StaticDebugLinkTimeCodeGeneration.props
	builds/msvc/vs2010/properties/StaticLinkTimeCodeGeneration.props
	builds/msvc/vs2010/properties/StaticRelease.props
	builds/msvc/vs2010/properties/StaticReleaseLinkTimeCodeGeneration.props
	builds/msvc/vs2010/properties/Win32.props
	builds/msvc/vs2010/properties/x64.props
	builds/msvc/vs2010/remote_lat/remote_lat.props
	builds/msvc/vs2010/remote_thr/remote_thr.props
 2014-04-14 23:47:55 -07:00
evoskuil
d03a1b0d5b Fix platform tools versioning on project files. 2014-04-14 19:19:30 -07:00
evoskuil
bd45b74dd3 Remove versioning from VS .props files. 2014-04-14 19:18:36 -07:00
Pieter Hintjens
cfe2036008 Merge pull request #974 from xantares/master 
Fixed mingw poll detection
 2014-04-14 21:54:19 +02:00
xantares
ce4c4f2a05 Fixed mingw poll detection 2014-04-14 21:49:57 +02:00
Pieter Hintjens
98a64716ab Merge pull request #973 from HughPowell/master 
Change ToolsVersion to 4.0 for VS2010
 2014-04-14 21:40:14 +02:00
Hugh Powell
213d111def Reference default locations for libsodium for VS2010 2014-04-14 20:13:39 +01:00
Hugh Powell
6cb742c7bb Change ToolsVersion to 4.0 for VS2010 2014-04-14 20:01:47 +01:00
Pieter Hintjens
6409c0ec1c Merge pull request #972 from mditzel/master 
Fix issue #971
 2014-04-14 14:13:49 +02:00
Maarten Ditzel
802d1bcb03 Fix issue #971 2014-04-14 13:56:01 +02:00
Maarten Ditzel
91e77e6aa4 Fix issue #969 2014-04-13 15:25:22 +02:00
Pieter Hintjens
d40580c368 Merge pull request #970 from mditzel/master 
Fix issue #969
 2014-04-13 14:31:40 +02:00
Ian Barber
52cfab3e21 Merge pull request #968 from hintjens/master 
Fixed issue #967
 2014-04-10 10:11:23 +01:00
Pieter Hintjens
407b7fb474 Removed duplicate zmq_z85_* methods from zmq.h 
Fixes #967
 2014-04-10 09:43:16 +02:00
Ian Barber
b9823a1388 Merge pull request #965 from evoskuil/master 
Update VS build configurations.
 2014-04-09 12:18:05 +01:00
evoskuil
51be440a28 Update VS build configurations. 2014-04-09 03:27:27 -07:00
Pieter Hintjens
f9ef2dd343 Merge pull request #964 from evoskuil/master 
Incorporate libsodium option and linkage, generalize, update packaging.
 2014-04-08 06:22:08 +01:00
evoskuil
c392c266df Merge branch 'evoskuil/master' 2014-04-07 19:40:31 -07:00
evoskuil
34f4851c23 Incorporate libsodium option and linkage, generalize, update packaging. 2014-04-07 19:38:59 -07:00
Pieter Hintjens
dd227d7a11 Merge pull request #961 from evoskuil/master 
Update NuGet packaging metadata.
 2014-04-07 08:46:28 +02:00
evoskuil
f01b48c484 Update packaging metadata. 2014-04-06 22:53:36 -07:00
Pieter Hintjens
28c074ee63 Merge pull request #960 from evoskuil/master 
Rationalize and update Visual Studio projects and packaging.
 2014-04-06 13:32:20 +02:00
evoskuil
b7675eaace Update packaging metadata. 2014-04-06 03:41:35 -07:00
evoskuil
69fa001bab Merge branch 'evoskuil/master' 2014-04-06 02:52:06 -07:00
evoskuil
e01801f5b9 Rationalize and update Visual Studio projects and packaging. 2014-04-06 02:39:15 -07:00
Pieter Hintjens
8fcda0d5da Cleaned up XFAIL on resources 
- this failing test was confusing users
- ZMTP v3.0 now does not define resources at all
- resources, along with other unimplemented aspects moved to
  RFC 37 ZMTP v3.1
 2014-04-05 15:32:43 +02:00
Pieter Hintjens
84bf625477 Merge pull request #959 from evoskuil/master 
Update and add executable projects to VS2013 solution.
 2014-04-04 12:31:42 +02:00
evoskuil
cbbfa14798 Merge branch 'zeromq/master' 2014-04-04 01:18:30 -07:00
evoskuil
5d0701d71d Add executable projects to VS2013 solution. 2014-04-04 01:17:25 -07:00
evoskuil
2ad6469cb2 Modify MSVC link incremental setting for deconfliction with LTCG flag. 2014-04-04 01:15:51 -07:00
Pieter Hintjens
c1f7e1f48a Merge pull request #958 from hurtonm/master 
Resolve issue #939
 2014-04-03 20:19:22 +02:00
Martin Hurton
a53d703160 Resolve issue #939 
This bug is caused by fq which can terminate pipe before sending all
frames of a message first. So sometimes two messages were mixed and this
confused ZAP handler.

This patch just modifies one pipe parameter so that socket consumes all
messages before dropping the pipe.
 2014-04-03 19:52:42 +02:00
Pieter Hintjens
7140bf041a Merge pull request #957 from jkryl/master 
sockets created by accept are leaked to child processes (ticket #956)
 2014-04-02 18:31:31 +02:00