From dee8b2360ac0084165401dd61fc485226402124d Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Mon, 31 Oct 2011 15:44:42 +0100 Subject: New style ROUTER socket removed. Signed-off-by: Martin Sustrik --- include/zmq.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/zmq.h') diff --git a/include/zmq.h b/include/zmq.h index e236b2a..a262d01 100644 --- a/include/zmq.h +++ b/include/zmq.h @@ -162,7 +162,6 @@ ZMQ_EXPORT int zmq_term (void *context); #define ZMQ_PUSH 8 #define ZMQ_XPUB 9 #define ZMQ_XSUB 10 -#define ZMQ_ROUTER 13 /* Socket options. */ #define ZMQ_AFFINITY 4 -- cgit v1.2.3 From 9227c389331c26d24e515bdd46867013f0cbd641 Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Mon, 31 Oct 2011 15:51:11 +0100 Subject: ROUTER and DEALER are aliases for XREP and XREQ Signed-off-by: Martin Sustrik --- include/zmq.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/zmq.h') diff --git a/include/zmq.h b/include/zmq.h index a262d01..3ddad7e 100644 --- a/include/zmq.h +++ b/include/zmq.h @@ -163,6 +163,9 @@ ZMQ_EXPORT int zmq_term (void *context); #define ZMQ_XPUB 9 #define ZMQ_XSUB 10 +#define ZMQ_ROUTER ZMQ_XREP +#define ZMQ_DEALER ZMQ_XREQ + /* Socket options. */ #define ZMQ_AFFINITY 4 #define ZMQ_SUBSCRIBE 6 -- cgit v1.2.3 From ac7717b7b35f441fc3aeeb1528e63f147c00913a Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Mon, 31 Oct 2011 16:20:30 +0100 Subject: 250bpm copyrights added Signed-off-by: Martin Sustrik --- include/zmq.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/zmq.h') diff --git a/include/zmq.h b/include/zmq.h index 3ddad7e..bb80d86 100644 --- a/include/zmq.h +++ b/include/zmq.h @@ -1,4 +1,5 @@ /* + Copyright (c) 2009-2011 250bpm s.r.o. Copyright (c) 2007-2011 iMatix Corporation Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file -- cgit v1.2.3 From 7842c7107358324e8c5b9af7272e6dcab8c97931 Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Tue, 1 Nov 2011 13:39:54 +0100 Subject: LABELS and COMMANDs removed Signed-off-by: Martin Sustrik --- include/zmq.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'include/zmq.h') diff --git a/include/zmq.h b/include/zmq.h index bb80d86..55bb793 100644 --- a/include/zmq.h +++ b/include/zmq.h @@ -1,6 +1,7 @@ /* Copyright (c) 2009-2011 250bpm s.r.o. Copyright (c) 2007-2011 iMatix Corporation + Copyright (c) 2011 VMware, Inc. Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file This file is part of 0MQ. @@ -189,15 +190,11 @@ ZMQ_EXPORT int zmq_term (void *context); #define ZMQ_MULTICAST_HOPS 25 #define ZMQ_RCVTIMEO 27 #define ZMQ_SNDTIMEO 28 -#define ZMQ_RCVLABEL 29 -#define ZMQ_RCVCMD 30 #define ZMQ_IPV4ONLY 31 /* Send/recv options. */ #define ZMQ_DONTWAIT 1 #define ZMQ_SNDMORE 2 -#define ZMQ_SNDLABEL 4 -#define ZMQ_SNDCMD 8 ZMQ_EXPORT void *zmq_socket (void *context, int type); ZMQ_EXPORT int zmq_close (void *s); -- cgit v1.2.3 From 8e21d64c974344b5b2b83cac85d12c51392fe74b Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Tue, 1 Nov 2011 18:06:11 +0100 Subject: Copyright dates adjusted to reflect reality Signed-off-by: Martin Sustrik --- include/zmq.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/zmq.h') diff --git a/include/zmq.h b/include/zmq.h index 55bb793..e6fc45c 100644 --- a/include/zmq.h +++ b/include/zmq.h @@ -1,6 +1,6 @@ /* Copyright (c) 2009-2011 250bpm s.r.o. - Copyright (c) 2007-2011 iMatix Corporation + Copyright (c) 2007-2010 iMatix Corporation Copyright (c) 2011 VMware, Inc. Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file -- cgit v1.2.3 From d20ea25b8c63e148fe48cc2b85bac9c896f1073b Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Wed, 2 Nov 2011 14:33:58 +0100 Subject: ZMQ_IDENTITY option re-introduced Signed-off-by: Martin Sustrik --- include/zmq.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/zmq.h') diff --git a/include/zmq.h b/include/zmq.h index e6fc45c..09ed89c 100644 --- a/include/zmq.h +++ b/include/zmq.h @@ -170,6 +170,7 @@ ZMQ_EXPORT int zmq_term (void *context); /* Socket options. */ #define ZMQ_AFFINITY 4 +#define ZMQ_IDENTITY 5 #define ZMQ_SUBSCRIBE 6 #define ZMQ_UNSUBSCRIBE 7 #define ZMQ_RATE 8 -- cgit v1.2.3