Permalink
Browse files

Renamed raw option to ZMQ_ROUTER_RAW

  • Loading branch information...
1 parent 80aef8d commit 777c38ae32a5d1799b3275d38ff8d587c885dd55 @hintjens hintjens committed Nov 6, 2012
Showing with 21 additions and 4 deletions.
  1. +17 −0 doc/zmq_setsockopt.txt
  2. +1 −1 include/zmq.h
  3. +2 −2 src/router.cpp
  4. +1 −1 tests/test_raw_sock.cpp
View
@@ -381,6 +381,23 @@ Default value:: 0
Applicable socket types:: ZMQ_ROUTER
+ZMQ_ROUTER_RAW: switch ROUTER socket to raw mode
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Sets the raw mode on the 'ROUTER', when set to 1. When the ROUTER socket is in
+raw mode, and when using the tcp:// transport, it will read and write TCP data
+without 0MQ framing. This lets 0MQ applications talk to non-0MQ applications.
+When using raw mode, you cannot set explicit identities, and the ZMQ_MSGMORE
+flag is ignored when sending data messages. In raw mode you can close a specific
+connection by sending it a zero-length message (following the identity frame).
+
+[horizontal]
+Option value type:: int
+Option value unit:: 0, 1
+Default value:: 0
+Applicable socket types:: ZMQ_ROUTER
+
+
ZMQ_XPUB_VERBOSE: provide all subscription messages on XPUB sockets
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
View
@@ -250,7 +250,7 @@ ZMQ_EXPORT int zmq_msg_set (zmq_msg_t *msg, int option, int optval);
#define ZMQ_TCP_ACCEPT_FILTER 38
#define ZMQ_DELAY_ATTACH_ON_CONNECT 39
#define ZMQ_XPUB_VERBOSE 40
-#define ZMQ_ROUTER_RAW_SOCK 41
+#define ZMQ_ROUTER_RAW 41
/* Message options */
View
@@ -79,15 +79,15 @@ int zmq::router_t::xsetsockopt (int option_, const void *optval_,
size_t optvallen_)
{
if (option_ != ZMQ_ROUTER_MANDATORY
- && option_ != ZMQ_ROUTER_RAW_SOCK) {
+ && option_ != ZMQ_ROUTER_RAW) {
errno = EINVAL;
return -1;
}
if (optvallen_ != sizeof (int) || *static_cast <const int*> (optval_) < 0) {
errno = EINVAL;
return -1;
}
- if (option_ == ZMQ_ROUTER_RAW_SOCK) {
+ if (option_ == ZMQ_ROUTER_RAW) {
raw_sock = *static_cast <const int*> (optval_);
if (raw_sock) {
options.recv_identity = false;
View
@@ -110,7 +110,7 @@ int main ()
assert (sb);
int raw_sock = 1;
- int rc = zmq_setsockopt (sb, ZMQ_ROUTER_RAW_SOCK, &raw_sock, sizeof raw_sock);
+ int rc = zmq_setsockopt (sb, ZMQ_ROUTER_RAW, &raw_sock, sizeof raw_sock);
assert (rc == 0);
rc = zmq_bind (sb, "tcp://127.0.0.1:5555");
assert (rc == 0);

0 comments on commit 777c38a

Please sign in to comment.