rbczmq 1.7.1 → 1.7.2

data/ext/zeromq/src/epoll.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.
 

data/ext/zeromq/src/epoll.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.
 

data/ext/zeromq/src/err.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.
 
@@ -203,7 +201,7 @@ const char *zmq::wsa_error_no (int no_)
 void zmq::win_error (char *buffer_, size_t buffer_size_)
 {
     DWORD errcode = GetLastError ();
-#if defined WINCE
+#if defined _WIN32_WCE
     DWORD rc = FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM |
         FORMAT_MESSAGE_IGNORE_INSERTS, NULL, errcode, MAKELANGID(LANG_NEUTRAL,
         SUBLANG_DEFAULT), (LPWSTR)buffer_, buffer_size_ / sizeof(wchar_t), NULL );

data/ext/zeromq/src/err.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.
 
@@ -26,7 +24,7 @@
 #include "../include/zmq.h"
 
 #include <assert.h>
-#if defined WINCE
+#if defined _WIN32_WCE
 #include "..\builds\msvc\errno.hpp"
 #else
 #include <errno.h>
@@ -44,6 +42,11 @@
 #include <netdb.h>
 #endif
 
+// EPROTO is not used by OpenBSD and maybe other platforms.
+#ifndef EPROTO
+#define EPROTO 0
+#endif
+
 namespace zmq
 {
     const char *errno_to_string (int errno_);

data/ext/zeromq/src/fd.hpp

@@ -1,6 +1,5 @@
 /*
-    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.
 

data/ext/zeromq/src/fq.cpp

@@ -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.
 
@@ -44,7 +41,7 @@ void zmq::fq_t::attach (pipe_t *pipe_)
     active++;
 }
 
-void zmq::fq_t::terminated (pipe_t *pipe_)
+void zmq::fq_t::pipe_terminated (pipe_t *pipe_)
 {
     const pipes_t::size_type index = pipes.index (pipe_);
 

data/ext/zeromq/src/fq.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,7 +40,7 @@ namespace zmq
 
         void attach (pipe_t *pipe_);
         void activated (pipe_t *pipe_);
-        void terminated (pipe_t *pipe_);
+        void pipe_terminated (pipe_t *pipe_);
 
         int recv (msg_t *msg_);
         int recvpipe (msg_t *msg_, pipe_t **pipe_);

data/ext/zeromq/src/i_decoder.hpp

@@ -1,6 +1,5 @@
 /*
-    Copyright (c) 2007-2012 iMatix Corporation
-    Copyright (c) 2007-2012 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.
 
@@ -26,22 +25,25 @@
 namespace zmq
 {
 
-    class i_msg_sink;
+    class msg_t;
 
     //  Interface to be implemented by message decoder.
 
-    struct i_decoder
+    class i_decoder
     {
+    public:
         virtual ~i_decoder () {}
 
-        virtual void set_msg_sink (i_msg_sink *msg_sink_) = 0;
-
         virtual void get_buffer (unsigned char **data_, size_t *size_) = 0;
 
-        virtual size_t process_buffer (unsigned char *data_, size_t size_) = 0;
-
-        virtual bool stalled () = 0;
+        //  Decodes data pointed to by data_.
+        //  When a message is decoded, 1 is returned.
+        //  When the decoder needs more data, 0 is returnd.
+        //  On error, -1 is returned and errno is set accordingly.
+        virtual int decode (const unsigned char *data_, size_t size_,
+                            size_t &processed) = 0;
 
+        virtual msg_t *msg () = 0;
     };
 
 }

data/ext/zeromq/src/i_encoder.hpp

@@ -1,6 +1,5 @@
 /*
-    Copyright (c) 2007-2012 iMatix Corporation
-    Copyright (c) 2007-2012 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.
 
@@ -27,7 +26,7 @@ namespace zmq
 {
 
     //  Forward declaration
-    class i_msg_source;
+    class msg_t;
 
     //  Interface to be implemented by message encoder.
 
@@ -35,17 +34,14 @@ namespace zmq
     {
         virtual ~i_encoder () {}
 
-        //  Set message producer.
-        virtual void set_msg_source (i_msg_source *msg_source_) = 0;
-
         //  The function returns a batch of binary data. The data
         //  are filled to a supplied buffer. If no buffer is supplied (data_
         //  is NULL) encoder will provide buffer of its own.
-        //  If offset is not NULL, it is filled by offset of the first message
-        //  in the batch.If there's no beginning of a message in the batch,
-        //  offset is set to -1.
-        virtual void get_data (unsigned char **data_, size_t *size_,
-            int *offset_ = NULL) = 0;
+        //  Function returns 0 when a new message is required.
+        virtual size_t encode (unsigned char **data_, size_t size) = 0;
+
+        //  Load a new message into encoder.
+        virtual void load_msg (msg_t *msg_) = 0;
 
         virtual bool has_data () = 0;
     };

data/ext/zeromq/src/i_engine.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.
 
@@ -48,6 +46,8 @@ namespace zmq
         //  This method is called by the session to signalise that there
         //  are messages to send available.
         virtual void activate_out () = 0;
+
+        virtual void zap_msg_available () = 0;
     };
 
 }

data/ext/zeromq/src/i_poll_events.hpp

@@ -1,7 +1,5 @@
 /*
-    Copyright (c) 2010-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.
 

data/ext/zeromq/src/io_object.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.
 

data/ext/zeromq/src/io_object.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.
 

data/ext/zeromq/src/io_thread.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.
 

data/ext/zeromq/src/io_thread.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.
 

data/ext/zeromq/src/ip.cpp

@@ -1,7 +1,5 @@
 /*
-    Copyright (c) 2010-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.
 
@@ -29,6 +27,7 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <netdb.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #endif
@@ -73,11 +72,11 @@ zmq::fd_t zmq::open_socket (int domain_, int type_, int protocol_)
 
 void zmq::unblock_socket (fd_t s_)
 {
-#ifdef ZMQ_HAVE_WINDOWS
+#if defined ZMQ_HAVE_WINDOWS
     u_long nonblock = 1;
     int rc = ioctlsocket (s_, FIONBIO, &nonblock);
     wsa_assert (rc != SOCKET_ERROR);
-#elif ZMQ_HAVE_OPENVMS
+#elif defined ZMQ_HAVE_OPENVMS
     int nonblock = 1;
     int rc = ioctl (s_, FIONBIO, &nonblock);
     errno_assert (rc != -1);
@@ -92,6 +91,8 @@ void zmq::unblock_socket (fd_t s_)
 
 void zmq::enable_ipv4_mapping (fd_t s_)
 {
+  (void) s_;
+
 #ifdef IPV6_V6ONLY
 #ifdef ZMQ_HAVE_WINDOWS
     DWORD flag = 0;
@@ -107,3 +108,43 @@ void zmq::enable_ipv4_mapping (fd_t s_)
 #endif
 #endif
 }
+
+bool zmq::get_peer_ip_address (fd_t sockfd_, std::string &ip_addr_)
+{
+    int rc;
+    struct sockaddr_storage ss;
+
+#if defined ZMQ_HAVE_HPUX || defined ZMQ_HAVE_WINDOWS
+    int addrlen = static_cast <int> (sizeof ss);
+#else
+    socklen_t addrlen = sizeof ss;
+#endif
+    rc = getpeername (sockfd_, (struct sockaddr*) &ss, &addrlen);
+#ifdef ZMQ_HAVE_WINDOWS
+    if (rc == SOCKET_ERROR) {
+        wsa_assert (WSAGetLastError () != WSANOTINITIALISED &&
+                    WSAGetLastError () != WSAEFAULT &&
+                    WSAGetLastError () != WSAEINPROGRESS &&
+                    WSAGetLastError () != WSAENOTSOCK);
+        return false;
+    }
+#else
+    if (rc == -1) {
+        errno_assert (errno != EBADF &&
+                      errno != EFAULT &&
+                      errno != EINVAL &&
+                      errno != ENOTCONN &&
+                      errno != ENOTSOCK);
+        return false;
+    }
+#endif
+
+    char host [NI_MAXHOST];
+    rc = getnameinfo ((struct sockaddr*) &ss, addrlen, host, sizeof host,
+        NULL, 0, NI_NUMERICHOST);
+    if (rc != 0)
+        return false;
+
+    ip_addr_ = host;
+    return true;
+}

data/ext/zeromq/src/ip.hpp

@@ -1,7 +1,5 @@
 /*
-    Copyright (c) 2010-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.
 
@@ -22,6 +20,7 @@
 #ifndef __ZMQ_IP_HPP_INCLUDED__
 #define __ZMQ_IP_HPP_INCLUDED__
 
+#include <string>
 #include "fd.hpp"
 
 namespace zmq
@@ -36,6 +35,10 @@ namespace zmq
     //  Enable IPv4-mapping of addresses in case it is disabled by default.
     void enable_ipv4_mapping (fd_t s_);
 
+    //  Returns string representation of peer's address.
+    //  Socket sockfd_ must be connected. Returns true iff successful.
+    bool get_peer_ip_address (fd_t sockfd_, std::string &ip_addr_);
+
 }
 
-#endif 
+#endif

data/ext/zeromq/src/ipc_address.cpp

@@ -1,6 +1,5 @@
 /*
-    Copyright (c) 2011 250bpm s.r.o.
-    Copyright (c) 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.
 
@@ -55,6 +54,10 @@ int zmq::ipc_address_t::resolve (const char *path_)
 
     address.sun_family = AF_UNIX;
     strcpy (address.sun_path, path_);
+#if defined ZMQ_HAVE_LINUX
+    if (*path_ == '@')
+        *address.sun_path = '\0';
+#endif
     return 0;
 }
 
@@ -66,7 +69,15 @@ int zmq::ipc_address_t::to_string (std::string &addr_)
     }
 
     std::stringstream s;
+#if !defined ZMQ_HAVE_LINUX
     s << "ipc://" << address.sun_path;
+#else
+    s << "ipc://";
+    if (*address.sun_path)
+       s << address.sun_path;
+    else
+       s << "@" << address.sun_path + 1;
+#endif
     addr_ = s.str ();
     return 0;
 }

data/ext/zeromq/src/ipc_address.hpp

@@ -1,6 +1,5 @@
 /*
-    Copyright (c) 2011 250bpm s.r.o.
-    Copyright (c) 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/ipc_connecter.cpp

@@ -1,6 +1,5 @@
 /*
-    Copyright (c) 2011 250bpm s.r.o.
-    Copyright (c) 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.
 
@@ -113,7 +112,8 @@ void zmq::ipc_connecter_t::out_event ()
         return;
     }
     //  Create the engine object for this connection.
-    stream_engine_t *engine = new (std::nothrow) stream_engine_t (fd, options, endpoint);
+    stream_engine_t *engine = new (std::nothrow)
+        stream_engine_t (fd, options, endpoint);
     alloc_assert (engine);
 
     //  Attach the engine to the corresponding session object.

data/ext/zeromq/src/ipc_connecter.hpp

@@ -1,6 +1,5 @@
 /*
-    Copyright (c) 2011 250bpm s.r.o.
-    Copyright (c) 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.