rbczmq 1.7.1 → 1.7.2

data/ext/zeromq/src/zmq_utils.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.
 
@@ -21,19 +19,21 @@
 
 #include "platform.hpp"
 
-#include "../include/zmq_utils.h"
-
-#include <stdlib.h>
-
-#include "stdint.hpp"
 #include "clock.hpp"
 #include "err.hpp"
+#include "thread.hpp"
+#include <assert.h>
+#include "../include/zmq_utils.h"
 
 #if !defined ZMQ_HAVE_WINDOWS
 #include <unistd.h>
 #else
 #include "windows.hpp"
 #endif
+#ifdef HAVE_LIBSODIUM
+#   include <sodium.h>
+#endif
+
 
 void zmq_sleep (int seconds_)
 {
@@ -59,3 +59,141 @@ unsigned long zmq_stopwatch_stop (void *watch_)
     free (watch_);
     return (unsigned long) (end - start);
 }
+
+void *zmq_threadstart(zmq_thread_fn* func, void* arg)
+{
+    zmq::thread_t* thread = new zmq::thread_t;
+    thread->start(func, arg);
+    return thread;
+}
+
+void zmq_threadclose(void* thread)
+{
+    zmq::thread_t* pThread = static_cast<zmq::thread_t*>(thread);
+    pThread->stop();
+    delete pThread;
+}
+
+//  Z85 codec, taken from 0MQ RFC project, implements RFC32 Z85 encoding
+
+//  Maps base 256 to base 85
+static char encoder [85 + 1] = {
+    "0123456789" "abcdefghij" "klmnopqrst" "uvwxyzABCD"
+    "EFGHIJKLMN" "OPQRSTUVWX" "YZ.-:+=^!/" "*?&<>()[]{" 
+    "}@%$#"
+};
+
+//  Maps base 85 to base 256
+//  We chop off lower 32 and higher 128 ranges
+static uint8_t decoder [96] = {
+    0x00, 0x44, 0x00, 0x54, 0x53, 0x52, 0x48, 0x00, 
+    0x4B, 0x4C, 0x46, 0x41, 0x00, 0x3F, 0x3E, 0x45, 
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 
+    0x08, 0x09, 0x40, 0x00, 0x49, 0x42, 0x4A, 0x47, 
+    0x51, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 
+    0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 0x31, 0x32, 
+    0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 
+    0x3B, 0x3C, 0x3D, 0x4D, 0x00, 0x4E, 0x43, 0x00, 
+    0x00, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 
+    0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 
+    0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 
+    0x21, 0x22, 0x23, 0x4F, 0x00, 0x50, 0x00, 0x00
+};
+
+//  --------------------------------------------------------------------------
+//  Encode a binary frame as a string; destination string MUST be at least
+//  size * 5 / 4 bytes long plus 1 byte for the null terminator. Returns
+//  dest. Size must be a multiple of 4.
+//  Returns NULL and sets errno = EINVAL for invalid input.
+
+char *zmq_z85_encode (char *dest, uint8_t *data, size_t size)
+{
+    if (size % 4 != 0) {
+        errno = EINVAL;
+        return NULL;
+    }
+    unsigned int char_nbr = 0;
+    unsigned int byte_nbr = 0;
+    uint32_t value = 0;
+    while (byte_nbr < size) {
+        //  Accumulate value in base 256 (binary)
+        value = value * 256 + data [byte_nbr++];
+        if (byte_nbr % 4 == 0) {
+            //  Output value in base 85
+            unsigned int divisor = 85 * 85 * 85 * 85;
+            while (divisor) {
+                dest [char_nbr++] = encoder [value / divisor % 85];
+                divisor /= 85;
+            }
+            value = 0;
+        }
+    }
+    assert (char_nbr == size * 5 / 4);
+    dest [char_nbr] = 0;
+    return dest;
+}
+
+
+//  --------------------------------------------------------------------------
+//  Decode an encoded string into a binary frame; dest must be at least
+//  strlen (string) * 4 / 5 bytes long. Returns dest. strlen (string) 
+//  must be a multiple of 5.
+//  Returns NULL and sets errno = EINVAL for invalid input.
+
+uint8_t *zmq_z85_decode (uint8_t *dest, char *string)
+{
+    
+    if (strlen (string) % 5 != 0) {
+        errno = EINVAL;
+        return NULL;
+    }
+    unsigned int byte_nbr = 0;
+    unsigned int char_nbr = 0;
+    uint32_t value = 0;
+    while (char_nbr < strlen (string)) {
+        //  Accumulate value in base 85
+        value = value * 85 + decoder [(uint8_t) string [char_nbr++] - 32];
+        if (char_nbr % 5 == 0) {
+            //  Output value in base 256
+            unsigned int divisor = 256 * 256 * 256;
+            while (divisor) {
+                dest [byte_nbr++] = value / divisor % 256;
+                divisor /= 256;
+            }
+            value = 0;
+        }
+    }
+    assert (byte_nbr == strlen (string) * 4 / 5);
+    return dest;
+}
+
+//  --------------------------------------------------------------------------
+//  Generate a public/private keypair with libsodium.
+//  Generated keys will be 40 byte z85-encoded strings.
+//  Returns 0 on success, -1 on failure, setting errno.
+//  Sets errno = ENOTSUP in the absence of libsodium.
+
+int zmq_curve_keypair (char* z85_public_key, char *z85_secret_key)
+{
+#ifdef HAVE_LIBSODIUM
+#   if crypto_box_PUBLICKEYBYTES != 32 \
+    || crypto_box_SECRETKEYBYTES != 32
+#       error "libsodium not built correctly"
+#   endif
+
+    uint8_t public_key [32];
+    uint8_t secret_key [32];
+
+    int rc = crypto_box_keypair (public_key, secret_key);
+    // is there a sensible errno to set here?
+    if (rc) return rc;
+    
+    zmq_z85_encode (z85_public_key, public_key, 32);
+    zmq_z85_encode (z85_secret_key, secret_key, 32);
+    
+    return 0;
+#else // requires libsodium
+    errno = ENOTSUP;
+    return -1;
+#endif
+}

data/ext/zeromq/tests/Makefile.am

@@ -3,7 +3,8 @@ INCLUDES = -I$(top_builddir)/include \
 
 LDADD = $(top_builddir)/src/libzmq.la
 
-noinst_PROGRAMS = test_pair_inproc \
+noinst_PROGRAMS = test_system \
+                  test_pair_inproc \
                   test_pair_tcp \
                   test_reqrep_inproc \
                   test_reqrep_tcp \
@@ -13,21 +14,42 @@ noinst_PROGRAMS = test_pair_inproc \
                   test_invalid_rep \
                   test_msg_flags \
                   test_connect_resolve \
-                  test_connect_delay \
+                  test_immediate \
                   test_last_endpoint \
                   test_term_endpoint \
+                  test_linger \
                   test_monitor \
                   test_router_mandatory \
-                  test_disconnect_inproc
-
+                  test_probe_router \
+                  test_stream \
+                  test_disconnect_inproc \
+                  test_ctx_options \
+                  test_ctx_destroy \
+                  test_security_null \
+                  test_security_plain \
+                  test_security_curve \
+                  test_iov \
+                  test_spec_req \
+                  test_spec_rep \
+                  test_spec_dealer \
+                  test_spec_router \
+                  test_spec_pushpull \
+                  test_req_correlate \
+                  test_req_relaxed \
+                  test_conflate \
+                  test_inproc_connect \
+                  test_issue_566 \
+                  test_abstract_ipc
 
 if !ON_MINGW
 noinst_PROGRAMS += test_shutdown_stress \
                    test_pair_ipc \
                    test_reqrep_ipc \
-                   test_timeo
+                   test_timeo \
+                   test_fork
 endif
 
+test_system_SOURCES = test_system.cpp
 test_pair_inproc_SOURCES = test_pair_inproc.cpp testutil.hpp
 test_pair_tcp_SOURCES = test_pair_tcp.cpp testutil.hpp
 test_reqrep_inproc_SOURCES = test_reqrep_inproc.cpp testutil.hpp
@@ -36,20 +58,46 @@ test_hwm_SOURCES = test_hwm.cpp
 test_reqrep_device_SOURCES = test_reqrep_device.cpp
 test_sub_forward_SOURCES = test_sub_forward.cpp
 test_invalid_rep_SOURCES = test_invalid_rep.cpp
+test_linger_SOURCES = test_linger.cpp
 test_msg_flags_SOURCES = test_msg_flags.cpp
 test_connect_resolve_SOURCES = test_connect_resolve.cpp
-test_connect_delay_SOURCES = test_connect_delay.cpp
+test_immediate_SOURCES = test_immediate.cpp
 test_last_endpoint_SOURCES = test_last_endpoint.cpp
 test_term_endpoint_SOURCES = test_term_endpoint.cpp
 test_monitor_SOURCES = test_monitor.cpp
-test_disconnect_inproc_SOURCES = test_disconnect_inproc.cpp
 test_router_mandatory_SOURCES = test_router_mandatory.cpp
-
+test_probe_router_SOURCES = test_probe_router.cpp
+test_stream_SOURCES = test_stream.cpp
+test_disconnect_inproc_SOURCES = test_disconnect_inproc.cpp
+test_ctx_options_SOURCES = test_ctx_options.cpp
+test_iov_SOURCES = test_iov.cpp
+test_ctx_destroy_SOURCES = test_ctx_destroy.cpp
+test_security_null_SOURCES = test_security_null.cpp
+test_security_plain_SOURCES = test_security_plain.cpp
+test_security_curve_SOURCES = test_security_curve.cpp
+test_spec_req_SOURCES = test_spec_req.cpp
+test_spec_rep_SOURCES = test_spec_rep.cpp
+test_spec_dealer_SOURCES = test_spec_dealer.cpp
+test_spec_router_SOURCES = test_spec_router.cpp
+test_spec_pushpull_SOURCES = test_spec_pushpull.cpp
+test_req_correlate_SOURCES = test_req_correlate.cpp
+test_req_relaxed_SOURCES = test_req_relaxed.cpp
+test_conflate_SOURCES = test_conflate.cpp
+test_inproc_connect_SOURCES = test_inproc_connect.cpp
+test_issue_566_SOURCES = test_issue_566.cpp
+test_abstract_ipc_SOURCES = test_abstract_ipc.cpp
 if !ON_MINGW
 test_shutdown_stress_SOURCES = test_shutdown_stress.cpp
 test_pair_ipc_SOURCES = test_pair_ipc.cpp testutil.hpp
 test_reqrep_ipc_SOURCES = test_reqrep_ipc.cpp testutil.hpp
 test_timeo_SOURCES = test_timeo.cpp
+test_fork_SOURCES = test_fork.cpp
 endif
 
+#  Run the test cases
 TESTS = $(noinst_PROGRAMS)
+XFAIL_TESTS = test_linger
+
+if !ON_LINUX
+XFAIL_TESTS += test_abstract_ipc
+endif

data/ext/zeromq/tests/test_abstract_ipc.cpp

@@ -0,0 +1,57 @@
+/*
+    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+
+    This file is part of 0MQ.
+
+    0MQ is free software; you can redistribute it and/or modify it under
+    the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    0MQ is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "testutil.hpp"
+
+int main (void)
+{
+    setup_test_environment();
+    void *ctx = zmq_ctx_new ();
+    assert (ctx);
+
+    void *sb = zmq_socket (ctx, ZMQ_PAIR);
+    assert (sb);
+    int rc = zmq_bind (sb, "ipc://@/tmp/tester");
+    assert (rc == 0);
+
+    char endpoint[200];
+    size_t size = sizeof(endpoint);
+    rc = zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, endpoint, &size);
+    assert (rc == 0);
+    rc = strncmp(endpoint, "ipc://@/tmp/tester", size);
+    assert (rc == 0);
+
+    void *sc = zmq_socket (ctx, ZMQ_PAIR);
+    assert (sc);
+    rc = zmq_connect (sc, "ipc://@/tmp/tester");
+    assert (rc == 0);
+    
+    bounce (sb, sc);
+
+    rc = zmq_close (sc);
+    assert (rc == 0);
+
+    rc = zmq_close (sb);
+    assert (rc == 0);
+
+    rc = zmq_ctx_term (ctx);
+    assert (rc == 0);
+
+    return 0 ;
+}

data/ext/zeromq/tests/test_conflate.cpp

@@ -0,0 +1,75 @@
+/*
+    Copyright (c) 2007-2013 Contributors as noted in the AUTHORS file
+
+    This file is part of 0MQ.
+
+    0MQ is free software; you can redistribute it and/or modify it under
+    the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    0MQ is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "testutil.hpp"
+
+int main (int argc, char *argv [])
+{
+    const char *bind_to = "tcp://127.0.0.1:5555";
+
+    int rc;
+
+    void* ctx = zmq_init (1);
+    assert (ctx);
+
+    void* s_in = zmq_socket (ctx, ZMQ_PULL);
+    assert (s_in);
+
+    int conflate = 1;
+    rc = zmq_setsockopt (s_in, ZMQ_CONFLATE, &conflate, sizeof(conflate));
+    assert (rc == 0);
+
+    rc = zmq_bind (s_in, bind_to);
+    assert (rc == 0);
+
+    void* s_out = zmq_socket (ctx, ZMQ_PUSH);
+    assert (s_out);
+
+    rc = zmq_connect (s_out, bind_to);
+    assert (rc == 0);
+
+    int message_count = 20;
+
+    for (int j = 0; j < message_count; ++j) {
+        rc = zmq_send(s_out, (void*)&j, sizeof(int), 0);
+        if (rc < 0) {
+            printf ("error in zmq_sendmsg: %s\n", zmq_strerror (errno));
+            return -1;
+        }
+    }
+
+    zmq_sleep (1);
+
+    int payload_recved = 0;
+    rc = zmq_recv(s_in, (void*)&payload_recved, sizeof(int), 0);
+    assert (rc > 0);
+    assert (payload_recved == message_count - 1);
+
+
+    rc = zmq_close (s_in);
+    assert (rc == 0);
+
+    rc = zmq_close (s_out);
+    assert (rc == 0);
+
+    rc = zmq_term (ctx);
+    assert (rc == 0);
+
+    return 0;
+}

data/ext/zeromq/tests/test_connect_resolve.cpp

@@ -1,6 +1,5 @@
 /*
-    Copyright (c) 2012 Spotify AB
-    Copyright (c) 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.
 
@@ -18,36 +17,36 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../include/zmq.h"
-#include <stdio.h>
-#include <errno.h>
-
-#undef NDEBUG
-#include <assert.h>
+#include "testutil.hpp"
 
 int main (void)
 {
-    fprintf (stderr, "test_connect_resolve running...\n");
-
-    void *ctx = zmq_init (1);
+    setup_test_environment();
+    void *ctx = zmq_ctx_new ();
     assert (ctx);
 
-    //  Create pair of socket, each with high watermark of 2. Thus the total
-    //  buffer space should be 4 messages.
     void *sock = zmq_socket (ctx, ZMQ_PUB);
     assert (sock);
 
     int rc = zmq_connect (sock, "tcp://localhost:1234");
     assert (rc == 0);
 
-    rc = zmq_connect (sock, "tcp://0mq.is.teh.best:1234");
+    rc = zmq_connect (sock, "tcp://localhost:invalid");
     assert (rc == -1);
     assert (errno == EINVAL);
 
+    rc = zmq_connect (sock, "tcp://in val id:1234");
+    assert (rc == -1);
+    assert (errno == EINVAL);
+
+    rc = zmq_connect (sock, "invalid://localhost:1234");
+    assert (rc == -1);
+    assert (errno == EPROTONOSUPPORT);
+
     rc = zmq_close (sock);
     assert (rc == 0);
 
-    rc = zmq_term (ctx);
+    rc = zmq_ctx_term (ctx);
     assert (rc == 0);
 
     return 0;