rbczmq 1.7.1 → 1.7.2

data/ext/zeromq/src/options.hpp

@@ -1,8 +1,5 @@
 /*
-    Copyright (c) 2009-2011 250bpm s.r.o.
-    Copyright (c) 2007-2009 iMatix Corporation
-    Copyright (c) 2011 VMware, Inc.
-    Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
@@ -31,9 +28,13 @@
 #include "tcp_address.hpp"
 #include "../include/zmq.h"
 
+//  Normal base 256 key is 32 bytes
+#define CURVE_KEYSIZE       32
+//  Key encoded using Z85 is 40 bytes
+#define CURVE_KEYSIZE_Z85   40
+
 namespace zmq
 {
-
     struct options_t
     {
         options_t ();
@@ -52,10 +53,7 @@ namespace zmq
         unsigned char identity_size;
         unsigned char identity [256];
 
-        // Last socket endpoint resolved URI
-        std::string last_endpoint;
-
-        //  Maximum tranfer rate [kb/s]. Default 100kb/s.
+        //  Maximum transfer rate [kb/s]. Default 100kb/s.
         int rate;
 
         //  Reliability time interval [ms]. Default 10 seconds.
@@ -92,22 +90,12 @@ namespace zmq
         int rcvtimeo;
         int sndtimeo;
 
-        //  If 1, indicates the use of IPv4 sockets only, it will not be
-        //  possible to communicate with IPv6-only hosts. If 0, the socket can
-        //  connect to and accept connections from both IPv4 and IPv6 hosts.
-        int ipv4only;
-        
+        //  If true, IPv6 is enabled (as well as IPv4)
+        bool ipv6;
+
         //  If 1, connecting pipes are not attached immediately, meaning a send()
         //  on a socket with only connecting pipes would block
-        int delay_attach_on_connect;
-
-        //  If true, session reads all the pending messages from the pipe and
-        //  sends them to the network when socket is closed.
-        bool delay_on_close;
-
-        //  If true, socket reads all the messages from the pipe and delivers
-        //  them to the user when the peer terminates.
-        bool delay_on_disconnect;
+        int immediate;
 
         //  If 1, (X)SUB socket should filter the messages. If 0, it should not.
         bool filter;
@@ -115,6 +103,9 @@ namespace zmq
         //  If true, the identity message is forwarded to the socket.
         bool recv_identity;
 
+        // if true, router socket accepts non-zmq tcp connections
+        bool raw_sock;
+
         //  TCP keep-alive settings.
         //  Defaults to -1 = do not change socket options
         int tcp_keepalive;
@@ -126,10 +117,33 @@ namespace zmq
         typedef std::vector <tcp_address_mask_t> tcp_accept_filters_t;
         tcp_accept_filters_t tcp_accept_filters;
 
+        //  Security mechanism for all connections on this socket
+        int mechanism;
+
+        //  If peer is acting as server for PLAIN or CURVE mechanisms
+        int as_server;
+
+        //  ZAP authentication domain
+        std::string zap_domain;
+
+        //  Security credentials for PLAIN mechanism
+        std::string plain_username;
+        std::string plain_password;
+
+        //  Security credentials for CURVE mechanism
+        uint8_t curve_public_key [CURVE_KEYSIZE];
+        uint8_t curve_secret_key [CURVE_KEYSIZE];
+        uint8_t curve_server_key [CURVE_KEYSIZE];
+
         //  ID of the socket.
         int socket_id;
-    };
 
+        //  If true, socket conflates outgoing/incoming messages.
+        //  Applicable to dealer, push/pull, pub/sub socket types.
+        //  Cannot receive multi-part messages.
+        //  Ignores hwm
+        bool conflate;
+    };
 }
 
 #endif

data/ext/zeromq/src/own.cpp

@@ -1,6 +1,5 @@
 /*
-    Copyright (c) 2010-2011 250bpm s.r.o.
-    Copyright (c) 2010-2011 Other contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 

data/ext/zeromq/src/own.hpp

@@ -1,6 +1,5 @@
 /*
-    Copyright (c) 2010-2011 250bpm s.r.o.
-    Copyright (c) 2010-2011 Other contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 

data/ext/zeromq/src/pair.cpp

@@ -1,7 +1,5 @@
 /*
-    Copyright (c) 2009-2011 250bpm s.r.o.
-    Copyright (c) 2007-2009 iMatix Corporation
-    Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
@@ -36,10 +34,10 @@ zmq::pair_t::~pair_t ()
     zmq_assert (!pipe);
 }
 
-void zmq::pair_t::xattach_pipe (pipe_t *pipe_, bool icanhasall_)
+void zmq::pair_t::xattach_pipe (pipe_t *pipe_, bool subscribe_to_all_)
 {
-    // icanhasall_ is unused
-    (void)icanhasall_;
+    // subscribe_to_all_ is unused
+    (void)subscribe_to_all_;
 
     zmq_assert (pipe_ != NULL);
 
@@ -51,7 +49,7 @@ void zmq::pair_t::xattach_pipe (pipe_t *pipe_, bool icanhasall_)
         pipe_->terminate (false);
 }
 
-void zmq::pair_t::xterminated (pipe_t *pipe_)
+void zmq::pair_t::xpipe_terminated (pipe_t *pipe_)
 {
     if (pipe_ == pipe)
         pipe = NULL;
@@ -69,14 +67,14 @@ void zmq::pair_t::xwrite_activated (pipe_t *)
     //  There's nothing to do here.
 }
 
-int zmq::pair_t::xsend (msg_t *msg_, int flags_)
+int zmq::pair_t::xsend (msg_t *msg_)
 {
     if (!pipe || !pipe->write (msg_)) {
         errno = EAGAIN;
         return -1;
     }
 
-    if (!(flags_ & ZMQ_SNDMORE))
+    if (!(msg_->flags () & msg_t::more))
         pipe->flush ();
 
     //  Detach the original message from the data buffer.
@@ -86,11 +84,8 @@ int zmq::pair_t::xsend (msg_t *msg_, int flags_)
     return 0;
 }
 
-int zmq::pair_t::xrecv (msg_t *msg_, int flags_)
+int zmq::pair_t::xrecv (msg_t *msg_)
 {
-    // flags_ is unused
-    (void)flags_;
-
     //  Deallocate old content of the message.
     int rc = msg_->close ();
     errno_assert (rc == 0);
@@ -122,15 +117,3 @@ bool zmq::pair_t::xhas_out ()
 
     return pipe->check_write ();
 }
-
-zmq::pair_session_t::pair_session_t (io_thread_t *io_thread_, bool connect_,
-      socket_base_t *socket_, const options_t &options_,
-      const address_t *addr_) :
-    session_base_t (io_thread_, connect_, socket_, options_, addr_)
-{
-}
-
-zmq::pair_session_t::~pair_session_t ()
-{
-}
-

data/ext/zeromq/src/pair.hpp

@@ -1,7 +1,5 @@
 /*
-    Copyright (c) 2009-2011 250bpm s.r.o.
-    Copyright (c) 2007-2009 iMatix Corporation
-    Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
@@ -42,14 +40,14 @@ namespace zmq
         ~pair_t ();
 
         //  Overloads of functions from socket_base_t.
-        void xattach_pipe (zmq::pipe_t *pipe_, bool icanhasall_);
-        int xsend (zmq::msg_t *msg_, int flags_);
-        int xrecv (zmq::msg_t *msg_, int flags_);
+        void xattach_pipe (zmq::pipe_t *pipe_, bool subscribe_to_all_);
+        int xsend (zmq::msg_t *msg_);
+        int xrecv (zmq::msg_t *msg_);
         bool xhas_in ();
         bool xhas_out ();
         void xread_activated (zmq::pipe_t *pipe_);
         void xwrite_activated (zmq::pipe_t *pipe_);
-        void xterminated (zmq::pipe_t *pipe_);
+        void xpipe_terminated (zmq::pipe_t *pipe_);
 
     private:
 
@@ -59,21 +57,6 @@ namespace zmq
         const pair_t &operator = (const pair_t&);
     };
 
-    class pair_session_t : public session_base_t
-    {
-    public:
-
-        pair_session_t (zmq::io_thread_t *io_thread_, bool connect_,
-            socket_base_t *socket_, const options_t &options_,
-            const address_t *addr_);
-        ~pair_session_t ();
-
-    private:
-
-        pair_session_t (const pair_session_t&);
-        const pair_session_t &operator = (const pair_session_t&);
-    };
-
 }
 
 #endif

data/ext/zeromq/src/pgm_receiver.cpp

@@ -1,8 +1,5 @@
 /*
-    Copyright (c) 2009-2011 250bpm s.r.o.
-    Copyright (c) 2007-2009 iMatix Corporation
-    Copyright (c) 2010-2011 Miru Limited
-    Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
@@ -32,6 +29,7 @@
 
 #include "pgm_receiver.hpp"
 #include "session_base.hpp"
+#include "v1_decoder.hpp"
 #include "stdint.hpp"
 #include "wire.hpp"
 #include "err.hpp"
@@ -43,8 +41,8 @@ zmq::pgm_receiver_t::pgm_receiver_t (class io_thread_t *parent_,
     pgm_socket (true, options_),
     options (options_),
     session (NULL),
-    mru_decoder (NULL),
-    pending_bytes (0)
+    active_tsi (NULL),
+    insize (0)
 {
 }
 
@@ -85,9 +83,7 @@ void zmq::pgm_receiver_t::unplug ()
             delete it->second.decoder;
     }
     peers.clear ();
-
-    mru_decoder = NULL;
-    pending_bytes = 0;
+    active_tsi = NULL;
 
     if (has_rx_timer) {
         cancel_timer (rx_timer_id);
@@ -113,49 +109,47 @@ void zmq::pgm_receiver_t::activate_out ()
 
 void zmq::pgm_receiver_t::activate_in ()
 {
-    //  It is possible that the most recently used decoder
-    //  processed the whole buffer but failed to write
-    //  the last message into the pipe.
-    if (pending_bytes == 0) {
-        if (mru_decoder != NULL) {
-            mru_decoder->process_buffer (NULL, 0);
-            session->flush ();
+    zmq_assert (session != NULL);
+    zmq_assert (active_tsi != NULL);
+
+    const peers_t::iterator it = peers.find (*active_tsi);
+    zmq_assert (it != peers.end ());
+    zmq_assert (it->second.joined);
+
+    //  Push the pending message into the session.
+    int rc = session->push_msg (it->second.decoder->msg ());
+    errno_assert (rc == 0);
+
+    if (insize > 0) {
+        rc = process_input (it->second.decoder);
+        if (rc == -1) {
+            //  HWM reached; we will try later.
+            if (errno == EAGAIN) {
+                session->flush ();
+                return;
+            }
+            //  Data error. Delete message decoder, mark the
+            //  peer as not joined and drop remaining data.
+            it->second.joined = false;
+            delete it->second.decoder;
+            it->second.decoder = NULL;
+            insize = 0;
         }
-
-        //  Resume polling.
-        set_pollin (pipe_handle);
-        set_pollin (socket_handle);
-
-        return;
     }
 
-    zmq_assert (mru_decoder != NULL);
-    zmq_assert (pending_ptr != NULL);
-
-    //  Ask the decoder to process remaining data.
-    size_t n = mru_decoder->process_buffer (pending_ptr, pending_bytes);
-    pending_bytes -= n;
-    session->flush ();
-
-    if (pending_bytes > 0)
-        return;
-
     //  Resume polling.
     set_pollin (pipe_handle);
     set_pollin (socket_handle);
 
+    active_tsi = NULL;
     in_event ();
 }
 
 void zmq::pgm_receiver_t::in_event ()
 {
     // Read data from the underlying pgm_socket.
-    unsigned char *data = NULL;
     const pgm_tsi_t *tsi = NULL;
 
-    if (pending_bytes > 0)
-        return;
-
     if (has_rx_timer) {
         cancel_timer (rx_timer_id);
         has_rx_timer = false;
@@ -169,7 +163,7 @@ void zmq::pgm_receiver_t::in_event ()
         //  Note the workaround made not to break strict-aliasing rules.
         void *tmp = NULL;
         ssize_t received = pgm_socket.receive (&tmp, &tsi);
-        data = (unsigned char*) tmp;
+        inpos = (unsigned char*) tmp;
 
         //  No data to process. This may happen if the packet received is
         //  neither ODATA nor ODATA.
@@ -189,8 +183,6 @@ void zmq::pgm_receiver_t::in_event ()
         if (received == -1) {
             if (it != peers.end ()) {
                 it->second.joined = false;
-                if (it->second.decoder == mru_decoder)
-                    mru_decoder = NULL;
                 if (it->second.decoder != NULL) {
                     delete it->second.decoder;
                     it->second.decoder = NULL;
@@ -205,11 +197,13 @@ void zmq::pgm_receiver_t::in_event ()
             it = peers.insert (peers_t::value_type (*tsi, peer_info)).first;
         }
 
+        insize = static_cast <size_t> (received);
+
         //  Read the offset of the fist message in the current packet.
-        zmq_assert ((size_t) received >= sizeof (uint16_t));
-        uint16_t offset = get_uint16 (data);
-        data += sizeof (uint16_t);
-        received -= sizeof (uint16_t);
+        zmq_assert (insize >= sizeof (uint16_t));
+        uint16_t offset = get_uint16 (inpos);
+        inpos += sizeof (uint16_t);
+        insize -= sizeof (uint16_t);
 
         //  Join the stream if needed.
         if (!it->second.joined) {
@@ -219,42 +213,38 @@ void zmq::pgm_receiver_t::in_event ()
             if (offset == 0xffff)
                 continue;
 
-            zmq_assert (offset <= received);
+            zmq_assert (offset <= insize);
             zmq_assert (it->second.decoder == NULL);
 
             //  We have to move data to the begining of the first message.
-            data += offset;
-            received -= offset;
+            inpos += offset;
+            insize -= offset;
 
             //  Mark the stream as joined.
             it->second.joined = true;
 
             //  Create and connect decoder for the peer.
-            it->second.decoder = new (std::nothrow) decoder_t (0,
-                options.maxmsgsize);
+            it->second.decoder = new (std::nothrow)
+                v1_decoder_t (0, options.maxmsgsize);
             alloc_assert (it->second.decoder);
-            it->second.decoder->set_msg_sink (session);
         }
 
-        mru_decoder = it->second.decoder;
-
-        //  Push all the data to the decoder.
-        ssize_t processed = it->second.decoder->process_buffer (data, received);
-        if (processed < received) {
-            //  Save some state so we can resume the decoding process later.
-            pending_bytes = received - processed;
-            pending_ptr = data + processed;
-            //  Stop polling.
-            reset_pollin (pipe_handle);
-            reset_pollin (socket_handle);
-
-            //  Reset outstanding timer.
-            if (has_rx_timer) {
-                cancel_timer (rx_timer_id);
-                has_rx_timer = false;
+        int rc = process_input (it->second.decoder);
+        if (rc == -1) {
+            if (errno == EAGAIN) {
+                active_tsi = tsi;
+
+                //  Stop polling.
+                reset_pollin (pipe_handle);
+                reset_pollin (socket_handle);
+
+                break;
             }
 
-            break;
+            it->second.joined = false;
+            delete it->second.decoder;
+            it->second.decoder = NULL;
+            insize = 0;
         }
     }
 
@@ -262,6 +252,29 @@ void zmq::pgm_receiver_t::in_event ()
     session->flush ();
 }
 
+int zmq::pgm_receiver_t::process_input (v1_decoder_t *decoder)
+{
+    zmq_assert (session != NULL);
+
+    while (insize > 0) {
+        size_t n = 0;
+        int rc = decoder->decode (inpos, insize, n);
+        if (rc == -1)
+            return -1;
+        inpos += n;
+        insize -= n;
+        if (rc == 0)
+            break;
+        rc = session->push_msg (decoder->msg ());
+        if (rc == -1) {
+            errno_assert (errno == EAGAIN);
+            return -1;
+        }
+    }
+    return 0;
+}
+
+
 void zmq::pgm_receiver_t::timer_event (int token)
 {
     zmq_assert (token == rx_timer_id);