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
John Murphy
9bd8d9a726
added missing files required to build
2013-06-16 18:42:51 -05:00
Ian Barber
1195092c61
Merge pull request #574 from pijyoi/master
...
fix memory leak in ipc_listener wildcard
2013-06-15 01:27:38 -07:00
xinchuan
38327927ce
fix memory leak in tempnam() usage
2013-06-15 16:11:50 +08:00
Pieter Hintjens
5c54bc358e
Merge pull request #573 from shripchenko/master
...
another iteration on ZMQ_PROBE_ROUTER
2013-06-10 03:34:23 -07:00
shripchenko
627190c8be
another iteration on ZMQ_PROBE_ROUTER
...
now it properly works for ROUTER
2013-06-10 02:31:00 -07:00
Martin Hurton
6b8569d78a
Merge pull request #572 from hintjens/master
...
Updated ZAP PLAIN request to follow latest draft
2013-06-07 07:33:25 -07:00
Pieter Hintjens
6ff51ee909
Updated ZAP request for changed protocol draft
...
- username and password sent as two string frames
- fixed test case to match
2013-06-07 15:50:36 +02:00
Pieter Hintjens
656ff5b208
Small fixes to documentation
...
- REQ and REP sockets don't have HWM issues
- ZMQ_DONTWAIT applies to DEALER and PUSH only
2013-06-07 13:28:47 +02:00
Ian Barber
210fcbbbeb
Merge pull request #571 from hurtonm/master
...
Add ZAP support
2013-06-06 04:41:55 -07:00
Martin Hurton
2928c91a6d
Implement ZAP and integrate it with PLAIN mechanism
2013-06-06 13:28:21 +02:00
Martin Hurton
4e47084dd4
Minor cleanups
2013-06-06 13:28:21 +02:00
Martin Hurton
c3e40736de
Rename terminated->pipe_terminated
2013-06-06 13:28:21 +02:00
Ian Barber
7a43c02aaf
Merge pull request #570 from hintjens/master
...
Packaging of probe function
2013-06-06 01:18:37 -07:00
Pieter Hintjens
a9679da764
Packaging on ZMQ_PROBE_ROUTER
...
- renamed to ZMQ_PROBE_ROUTER
2013-06-05 15:55:15 +02:00
Pieter Hintjens
2344131db3
Packaging of ZMQ_PROBE
...
- Cleaned up man page a little
- Wrote test case tests/test_router_probe.cpp
2013-06-05 15:29:40 +02:00
Pieter Hintjens
dbd58f8e15
Fixed out-of-date reference
2013-06-05 15:29:40 +02:00
shripchenko
9c980e17dd
changed option name. +documentation changes
2013-06-05 15:29:40 +02:00