Merge pull request #58 from hintjens/master

Addded ROUTER-ROUTER and DEALER-DEALER (back) as valid combinations
This commit is contained in:
Pieter Hintjens 2012-11-13 17:03:48 -08:00
commit f976e8cc98

View File

@ -130,7 +130,7 @@ Deprecated alias: 'ZMQ_XREQ'.
[horizontal]
.Summary of ZMQ_DEALER characteristics
Compatible peer sockets:: 'ZMQ_ROUTER', 'ZMQ_REP'
Compatible peer sockets:: 'ZMQ_ROUTER', 'ZMQ_REP', 'ZMQ_DEALER'
Direction:: Bidirectional
Send/receive pattern:: Unrestricted
Outgoing routing strategy:: Round-robin
@ -166,7 +166,7 @@ Deprecated alias: 'ZMQ_XREP'.
[horizontal]
.Summary of ZMQ_ROUTER characteristics
Compatible peer sockets:: 'ZMQ_DEALER', 'ZMQ_REQ'
Compatible peer sockets:: 'ZMQ_DEALER', 'ZMQ_REQ', 'ZMQ_ROUTER'
Direction:: Bidirectional
Send/receive pattern:: Unrestricted
Outgoing routing strategy:: See text