3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-31 01:43:02 +08:00
Code Issues Projects Releases Wiki Activity
2,317 Commits 4 Branches 39 Tags 31 MiB
Commit Graph

2317 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
shripchenko
910b469224 Merge branch 'master' of https://github.com/shripchenko/libzmq 2013-05-21 10:26:11 -07:00
shripchenko
ed3a115da9 Add ROUTER socket option to introduce self(send an empty message) to new peers, to allow ROUTER<->ROUTER auto-discovery problem. 2013-05-21 10:25:21 -07:00
root
ec7f711c58 Add ROUTER socket option to introduce self(send an empty message) to new peers, to allow ROUTER<->ROUTER auto-discovery problem. 2013-05-21 10:20:24 -07:00
Pieter Hintjens
d113495500 Merge pull request #560 from hintjens/master 
Working on Travis builds
 2013-05-21 09:03:51 -07:00
Pieter Hintjens
4112693051 Cleaned up router option code 
- made consistent with options.cpp code
- added trace print for ongoing issue with Travis CI builds
 2013-05-21 15:15:16 +02:00
Ian Barber
536ea4fc24 Merge pull request #559 from hintjens/master 
Adding support for Travis CI
 2013-05-21 00:39:58 -07:00
Pieter Hintjens
bf96cb44e2 Fixed name of Travis file 2013-05-21 09:32:13 +02:00
Pieter Hintjens
59a164d2b5 Added support for Travis CI 2013-05-21 09:20:39 +02:00
Martin Hurton
e9e44c6b09 Merge pull request #558 from hintjens/master 
stdint.h isn't available on all platforms
 2013-05-19 02:05:57 -07:00
Pieter Hintjens
31ee92f2fd stdint.h is not available on all platforms 2013-05-19 10:01:33 +01:00
Pieter Hintjens
73562112b8 Whitespace fixes 2013-05-18 11:53:20 +01:00
Pieter Hintjens
fa5c0e18e3 Trivial fix to man page 2013-05-18 11:53:10 +01:00
Martin Hurton
5d2a8b18e5 Merge pull request #557 from hintjens/master 
Added as_server to options
 2013-05-17 09:46:53 -07:00
Pieter Hintjens
f06abca046 Disable failing test for now 2013-05-17 17:26:54 +01:00
Pieter Hintjens
f909b9c722 plain_mechanism now uses options.as_server 
- we need to switch to PLAIN according to options.mechanism
- we need to catch case when both peers are as-server (or neither is)
- and to use username/password from options, for client
 2013-05-17 17:21:59 +01:00
Pieter Hintjens
da1e9a178a Cleaned up test pingpong code 2013-05-17 17:20:33 +01:00
Pieter Hintjens
342e576ec8 Merge pull request #556 from hurtonm/master 
Use socket options to select security mechanism
 2013-05-17 09:20:16 -07:00
Martin Hurton
182a224bb0 Use socket options to select security mechanism 2013-05-17 15:49:59 +02:00
Pieter Hintjens
fbcbb06b46 Merge pull request #555 from hintjens/master 
Added options for PLAIN security
 2013-05-15 08:56:06 -07:00
Pieter Hintjens
e1f797b048 Added configuration for PLAIN security 
* ZMQ_PLAIN_SERVER, ZMQ_PLAIN_USERNAME, ZMQ_PLAIN_PASSWORD options
* Man page changes to zmq_setsockopt and zmq_getsockopt
* Man pages for ZMQ_NULL, ZMQ_PLAIN, and ZMQ_CURVE
* Test program test_security
 2013-05-15 17:55:21 +02:00
Pieter Hintjens
8ea779c8f7 Fixed sizeof usage in man pages 2013-05-15 14:11:22 +02:00
Pieter Hintjens
593010fbeb Merge pull request #554 from hurtonm/master 
Implement ZMTP/3.0 PLAIN mechanism
 2013-05-14 14:02:52 -07:00
Martin Hurton
4eecda8af3 Implement ZMTP/3.0 PLAIN mechanism 
This implements protocol handshake.
We still need to design and implement 1) API changes so a user
can set username and password, and 2) a mechanism for engine
to authenticate users.
 2013-05-14 11:20:13 +02:00
Martin Hurton
d47295db70 Abstract security mechanism 2013-05-14 10:52:52 +02:00
Ian Barber
131b0a7148 Merge pull request #553 from hintjens/master 
Some changes to building and packaging
 2013-05-08 11:51:02 -07:00
Pieter Hintjens
e918fd4d69 Use correct libsodium call for detection 2013-05-07 14:47:07 +02:00
Pieter Hintjens
ff268b7c8a Fixed packaging for Windows - was missing errno sources 2013-05-07 14:44:55 +02:00
Pieter Hintjens
fa346fddd3 Added configure check for libsodium 2013-04-28 18:38:15 +02:00
Pieter Hintjens
3ef3b9405c Merge pull request #552 from hurtonm/master 
Implement ZMTP/3.0 NULL mechanism
 2013-04-28 09:37:23 -07:00
Martin Hurton
a7032e9ca8 Update test_raw_sock to work with ZMTP/3.0 2013-04-28 14:13:40 +02:00
Martin Hurton
cd4d8bb15a Implement ZMTP/3.0 NULL mechanism 2013-04-28 14:13:40 +02:00
Ian Barber
df01235871 Merge pull request #551 from hintjens/master 
zmq_msg_close clarification in man pages
 2013-04-27 06:27:24 -07:00
Pieter Hintjens
cb2ee7a5c2 Fixed up test_iov case 2013-04-27 14:53:14 +02:00
Pieter Hintjens
7e129a405c Clarified zmq_msg_close not needed after zmq_msg_send 2013-04-27 14:53:14 +02:00
Pieter Hintjens
522765be1e Merge pull request #550 from JonDyte/iovec 
Experimental function zmq_recviov doesnt work correctly in a couple of c...
 2013-04-25 14:28:11 -07:00
Jon Dyte
56ead84490 Experimental function zmq_recviov doesnt work correctly in a couple of cases 
1) VSM - you cannot hand out the 'data' address as it was not allocated on the heap
2) for other messages the 'data' address cannot be handed out either, as it not the address
originally returned by malloc and hence cannot be passed to 'free'.
see msg.cpp
u.lmsg.content = (content_t*) malloc (sizeof (content_t) + size_);
....
u.lmsg.content->data = u.lmsg.content + 1;

So the function is changed to always malloc a data buffer and copy the data into it.
There is a possible optimisation using memmove for the non-VSM case but that is not done yet.
 2013-04-25 21:58:26 +01:00
Martin Hurton
0bf5a31494 Merge pull request #549 from methodmissing/sigpipe-declare-err 
Fix return code redeclaration for platforms with SO_NOSIGPIPE
 2013-04-23 17:20:04 -07:00
Lourens Naudé
b5e5e10126 Fix return code redeclaration for platforms with SO_NOSIGPIPE 2013-04-23 23:01:14 +01:00
Ian Barber
9703dd806a Merge pull request #548 from hintjens/master 
Fixed issue LIBZMQ-526
 2013-04-23 05:28:25 -07:00
Pieter Hintjens
710f38f1cc Fixed syntax error 2013-04-22 15:12:53 +02:00
Pieter Hintjens
f4dbccd4fb Fix for LIBZMQ-526 2013-04-22 14:51:09 +02:00
Martin Hurton
0880d5b8ed Merge pull request #547 from hintjens/master 
Fixed issue LIBZMQ-525
 2013-04-18 08:30:50 -07:00
Pieter Hintjens
f0cf4095b5 Fixed issue #525 - multipart upstreaming from xsub to xpub 2013-04-18 17:23:57 +02:00
Ian Barber
d0c58d2409 Merge pull request #546 from hintjens/master 
Throughput perf test was borked, fixed it
 2013-04-15 11:01:37 -07:00
Pieter Hintjens
9df7c70aba Cleaned up copyright statements in perftest tools 2013-04-15 18:50:42 +02:00
Pieter Hintjens
c980820d29 I'm reverting the various changes to the throughput test programs since as far 
as I can see, these didn't work any more. At the very least, the command line
API was broken and forced the user to enter new, exotic arguments. Patches
should not break existing APIs. But also, the internals of these programs had
become weird.

If we want to build more complex performance tests, that's fine, but we should
make new programs, not break the old ones. We need minimal, safe performance
tests in 0MQ.

Also, the code was quite horrid. So it's gone. If anyone wants to bring it back
please make the code neat, and build new APIs instead of breaking the old ones.

Cheers
Pieter
 2013-04-15 18:50:42 +02:00
Pieter Hintjens
67e02ca8bc Use of named authors on man pages is no longer a good idea since it puts off 
contributors and doesn't reflect the real process. I've taken out all named
authors and referred to the contribution policy. Hopefully this will improve
the contributions to the man pages.
 2013-04-15 18:50:42 +02:00
Pieter Hintjens
f4a07b3951 Merge pull request #545 from hurtonm/master 
Interoperate with higher versions of ZMTP protocol
 2013-04-14 14:27:32 -07:00
Martin Hurton
e52c436252 Interoperate with higher versions of ZMTP protocol 2013-04-14 22:59:50 +02:00
Pieter Hintjens
c5721f9988 Merge pull request #544 from steve-o/libzmq-446 
[#LIBZMQ-446] Silence error on setting PGM_TOS on REL 4.
 2013-04-13 02:55:02 -07:00