Pieter Hintjens
ba1ae7d639
Merge pull request #595 from hurtonm/master
...
Another ZMQ_STREAM simplification
2013-06-28 02:28:23 -07:00
Martin Hurton
7b27c125dc
Simplify ZMQ_STREAM socket implementation, part II
2013-06-28 11:24:14 +02:00
Pieter Hintjens
dd14d4e01b
Minor whitespace fixes in man page
2013-06-28 10:16:56 +02:00
Pieter Hintjens
c4ae74f816
Fixed zmq_errno function definition
2013-06-28 10:16:56 +02:00
Pieter Hintjens
fe2753da0a
Merge pull request #594 from hurtonm/master
...
Simplify ZMQ_STREAM socket implementation
2013-06-28 01:15:02 -07:00
Martin Hurton
a1bb5e83ff
Simplify ZMQ_STREAM socket implementation
2013-06-28 09:48:54 +02:00
Martin Hurton
d8f1376008
Merge pull request #593 from hintjens/master
...
Problem: ROUTER+RAW was not a clean API
2013-06-27 14:09:04 -07:00
Pieter Hintjens
ad77937956
Added ZMQ_STREAM socket type
...
- designed for TCP clients and servers
- added HTTP client / server example in tests/test_stream.cpp
- same as ZMQ_ROUTER + ZMQ_ROUTER_RAW + ZMQ_ROUTER_MANDATORY
- includes b893ce set ZMQ_IDENTITY on outgoing connect
- deprecates ZMQ_ROUTER_RAW
2013-06-27 20:53:15 +02:00
Pieter Hintjens
4a4d222ec4
Merge pull request #592 from gavinmcniff/master
...
Store identity for raw socket
2013-06-23 23:29:44 -07:00
Gavin
b893ce2503
Store identity for raw socket
...
Identity stored during connect procedure. Can be read using
zmq_getsockopt and used as the identity frame when sending messages.
This allows the implementation of a raw socket client.
2013-06-23 18:16:33 +01:00
Ian Barber
e9d11c6611
Merge pull request #591 from hurtonm/master
...
Rename parse_properties to parse_metadata
2013-06-23 01:07:59 -07:00
Martin Hurton
b12be41736
Rename parse_properties to parse_metadata
2013-06-23 09:01:52 +02:00
Ian Barber
ec943ac5de
Merge pull request #590 from hurtonm/master
...
Refactor how properties are parsed
2013-06-22 14:19:02 -07:00
Martin Hurton
99d4974580
Refactor how properties are parsed
2013-06-22 19:02:08 +02:00
Martin Hurton
19cf076f8c
Merge pull request #589 from ianbarber/master
...
Add test for CURVE mechanism
2013-06-22 08:28:03 -07:00
Ian Barber
13df8e6546
Merge branch 'master' of git://github.com/zeromq/libzmq
2013-06-22 16:19:26 +01:00
Ian Barber
211bf2b08e
Added security curve test
...
Test is skipped if no libsodium.
Added warning if libsodium not configured
2013-06-22 16:17:25 +01:00
Pieter Hintjens
73e195279a
Merge pull request #588 from hurtonm/master
...
Small code cleanup
2013-06-22 07:25:26 -07:00
Martin Hurton
084e8792de
Small cleanup in pipe.cpp
2013-06-22 16:15:35 +02:00
Ian Barber
2bf51247fe
Merge pull request #587 from hurtonm/master
...
Make ZAP optional for CURVE mechanism
2013-06-22 07:14:28 -07:00
Martin Hurton
fa0f0e21b8
Make ZAP optional for PLAIN mechanism
2013-06-22 16:05:46 +02:00
Pieter Hintjens
8bb79b5eb1
Merge pull request #586 from hurtonm/master
...
Make ZAP optional for CURVE mechanism
2013-06-22 06:42:26 -07:00
Martin Hurton
5975e00fd1
Make ZAP optional for CURVE mechanism
2013-06-22 15:36:21 +02:00
Ian Barber
acaaaa5351
Merge pull request #585 from hintjens/master
...
Problem: allows CURVE security even if libzmq was built without libsodium
2013-06-22 05:19:01 -07:00
Pieter Hintjens
fadfcac1de
Fixed compile error, needed unistd.h
2013-06-22 13:50:22 +02:00
Pieter Hintjens
1ea06883c0
Fixed spelling in comments
2013-06-22 13:39:24 +02:00
Pieter Hintjens
fb43d5a0fe
Whitespace fix to man page
2013-06-22 13:39:24 +02:00
Pieter Hintjens
f4848ddb32
Prints message and exits if app tries to use CURVE without libsodium
2013-06-22 13:39:24 +02:00
Pieter Hintjens
675bd4640b
Merge pull request #584 from hurtonm/master
...
Fix test_disconnect_inproc to work on ILP64 systems
2013-06-22 04:18:27 -07:00
Martin Hurton
1b86324396
Fix test_disconnect_inproc to work on ILP64 systems
2013-06-22 13:05:46 +02:00
Pieter Hintjens
9eb2521537
Merge pull request #583 from ianbarber/master
...
Small stream engine issue and test_monitor tidy up
2013-06-22 03:25:44 -07:00
Ian Barber
694543e3a2
Merge branch 'master' of git://github.com/zeromq/libzmq
2013-06-22 10:59:16 +01:00
Ian Barber
f4c51db842
Fix small streamengine issue w/ term and handshake
...
Also tidy up monitor test a little.
2013-06-22 10:58:16 +01:00
Pieter Hintjens
91bc74089f
Merge pull request #582 from hurtonm/master
...
Implement CurveZMQ message encryption and authentication
2013-06-22 02:57:34 -07:00
Martin Hurton
8af208fab7
Implement ZMTP/3.0 CURVE mechanism
2013-06-22 11:48:44 +02:00
Martin Hurton
e4a211870c
Implement CurveZMQ message encryption and authentication
2013-06-22 11:46:40 +02:00
Martin Hurton
c9638fceb4
Merge pull request #581 from hintjens/master
...
Problem: code isn't setting mechanism to CURVE properly
2013-06-22 02:12:39 -07:00
Pieter Hintjens
8c0ded5076
Properly set mechanism to CURVE when setting a curve option
2013-06-22 11:05:01 +02:00
Ian Barber
c5078ea1b8
Merge pull request #580 from hurtonm/master
...
Stop ZMTP handshake when an unexpected message comes
2013-06-22 01:08:35 -07:00
Martin Hurton
20a7978d67
Stop ZMTP handshake when an unexpected message comes
2013-06-22 08:12:11 +02:00
Pieter Hintjens
92b02b98cd
Merge pull request #579 from ianbarber/master
...
Clean up socket_type_string
2013-06-21 09:00:18 -07:00
Ian Barber
cabf4e658f
Comments to clarify the socket name function
2013-06-21 16:56:45 +01:00
Ian Barber
1fe7820629
Merge pull request #577 from hintjens/master
...
API for CURVE configuration
2013-06-20 11:09:20 -07:00
Pieter Hintjens
c5a9fa5b5e
Merge pull request #578 from gonzus/master
...
Changes to sanity tag in ctx
2013-06-20 09:47:22 -07:00
Gonzalo Diethelm
3b355fec9a
Introduced private constants for the context sanity tag values.
...
Ignored more MSVC intermmediate files.
2013-06-20 12:43:32 -04:00
Pieter Hintjens
10f69c1500
Clarified man pages on mixed security
2013-06-20 18:30:30 +02:00
Pieter Hintjens
d9bb16725e
Added options for CURVE security
...
- ZMQ_CURVE_PUBLICKEY for clients and servers
- ZMQ_CURVE_SECRETKEY for clients
- ZMQ_CURVE_SERVERKEY for clients
- ZMQ_CURVE_SERVER for servers
- added tools/curve_keygen.c as example
- updated man pages
2013-06-20 18:09:12 +02:00
Pieter Hintjens
65c84abdb5
Merge pull request #576 from hurtonm/zmtp_curve
...
Implement ZMTP/3.0 CURVE handshake
2013-06-20 05:27:49 -07:00
Martin Hurton
37b99c0b4b
Implement ZMTP/3.0 CURVE handshake
2013-06-20 13:36:12 +02:00
Pieter Hintjens
9273022260
Merge pull request #575 from murphybytes/master
...
Missing files in cmake generated build.
2013-06-17 06:38:33 -07:00
