Bugfixes and ZeroMQ3 compatibility by Peter Fokkinga.

Author: skinkie

universal-sub-pubsub.c

@@ -1,13 +1,15 @@
-/* This software is the client component of the ND-OV system
- * each multipart message it receives from the ND-OV system
- * consisting of an envelope and its data, is received and
- * rebroadcasted to all connected clients of the serviceprovider.
+/* This software is the client component of the ND-OV system.
+ * Each multipart message it receives from the ND-OV system
+ * consisting of an envelope and its data is rebroadcasted 
+ * to all connected clients of the serviceprovider.
  *
- * Requirements: zeromq2
+ * Requirements: zeromq2 or zeromq3.2
  * gcc -lzmq -o universal-sub-pubsub universal-sub-pubsub.c
  *
  * Changes:
  *  - Initial version <[email protected]>
+ *  - zeromq 3.2 compatibility added, 
+ *    pubsub binding bugfix  <[email protected]>
  */
 
 #include <stdio.h>
@@ -38,9 +40,14 @@ int main (int argc, char *argv[]) {
 
     /* Apply a high water mark at the PubSub */
     uint64_t hwm   = 255;
+    #if ZMQ_VERSION >= ZMQ_MAKE_VERSION(3,0,0)
+    zmq_setsockopt(pubsub, ZMQ_SNDHWM, &hwm, sizeof(hwm));
+    zmq_setsockopt(pubsub, ZMQ_RCVHWM, &hwm, sizeof(hwm));
+    #else
     zmq_setsockopt(pubsub, ZMQ_HWM, &hwm, sizeof(hwm));
+    #endif
 
-    zmq_bind (pubsub,   argv[2]);
+    zmq_bind (pubsub, argv[argc - 1]);
     zmq_connect (subscriber, argv[1]);
 
     /* Apply the subscriptions */
@@ -54,14 +61,26 @@ int main (int argc, char *argv[]) {
             zmq_msg_t part;
             int rc = zmq_msg_init (&part);
             assert (rc == 0);
+
             /* Block until a message is available to be received from the socket */
+            #if ZMQ_VERSION >= ZMQ_MAKE_VERSION(3,0,0)
+            rc = zmq_recvmsg (subscriber, &part, 0);
+            #else
             rc = zmq_recv (subscriber, &part, 0);
+            #endif
             assert (rc == 0);
+
             /* Determine if more message parts are to follow */
             rc = zmq_getsockopt (subscriber, ZMQ_RCVMORE, &more, &more_size);
             assert (rc == 0);
+
             /* Send the message, when more is set, apply the flag, otherwise don't */
+            #if ZMQ_VERSION >= ZMQ_MAKE_VERSION(3,0,0)
+            zmq_sendmsg (pubsub, &part, (more ? ZMQ_SNDMORE : 0));
+            #else
             zmq_send (pubsub, &part, (more ? ZMQ_SNDMORE : 0));
+            #endif
+
             zmq_msg_close (&part);
         } while (more);
     }