Fixes for BUS protocol in compat, test suite, and timing in compat tests.

5 files changed, 138 insertions, 2 deletions

diff --git a/src/nng_compat.c b/src/nng_compat.c
index 3192a5f7..24085f30 100644
--- a/src/nng_compat.c
+++ b/src/nng_compat.c
@@ -734,7 +734,7 @@ nn_cmsg_next(struct nn_msghdr *mh, struct nn_cmsghdr *first)
 void
 nn_sleep(uint64_t msec)
 {
-	nng_usleep(msec / 1000);
+	nng_usleep(msec * 1000);
 }
 
 
diff --git a/src/nng_compat.h b/src/nng_compat.h
index aa0f5a2c..edf4bd6a 100644
--- a/src/nng_compat.h
+++ b/src/nng_compat.h
@@ -74,7 +74,7 @@ extern "C" {
 #define NN_PULL			(NN_PROTO_PIPELINE * 16 + 1)
 #define NN_SURVEYOR		(NN_PROTO_SURVEY * 16 + 2)
 #define NN_RESPONDENT		(NN_PROTO_SURVEY * 16 + 3)
-#define NN_BUS			(NN_PROTO_BUS * 16 + 1)
+#define NN_BUS			(NN_PROTO_BUS * 16 + 0)
 
 #define NN_SOCKADDR_MAX		128
 #define NN_SOL_SOCKET		0
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9545f661..10e7dcca 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -87,5 +87,7 @@ add_nng_test(tcp 5)
 
 # compatbility tests
 add_nng_compat_test(compat_block 5)
+add_nng_compat_test(compat_bug777 5)
+add_nng_compat_test(compat_bus 5)
 add_nng_compat_test(compat_cmsg 5)
 add_nng_compat_test(compat_reqrep 5)
diff --git a/tests/compat_bug777.c b/tests/compat_bug777.c
new file mode 100644
index 00000000..5d19745f
--- /dev/null
+++ b/tests/compat_bug777.c
@@ -0,0 +1,47 @@
+/*
+    Copyright 2016 Garrett D'Amore <garrett@damore.org>
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom
+    the Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+    IN THE SOFTWARE.
+*/
+
+#include "nng_compat.h"
+#include "compat_testutil.h"
+
+int main (int argc, const char *argv[])
+{
+    int sb;
+    int sc1;
+    int sc2;
+    char socket_address[128];
+
+    sb = test_socket (AF_SP, NN_PAIR);
+    test_bind (sb, "inproc://pair");
+    sc1 = test_socket (AF_SP, NN_PAIR);
+    test_connect (sc1, "inproc://pair");
+    sc2 = test_socket (AF_SP, NN_PAIR);
+    test_connect (sc2, "inproc://pair");
+
+    test_send (sb, "HELLO");
+    test_recv (sc1, "HELLO");
+
+    test_send (sc1, "THERE");
+    test_recv (sb, "THERE");
+    return 0;
+}
+
diff --git a/tests/compat_bus.c b/tests/compat_bus.c
new file mode 100644
index 00000000..ac4cc030
--- /dev/null
+++ b/tests/compat_bus.c
@@ -0,0 +1,87 @@
+/*
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom
+    the Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+    IN THE SOFTWARE.
+*/
+
+#include "nng_compat.h"
+#include "compat_testutil.h"
+
+#define SOCKET_ADDRESS_A "inproc://a"
+#define SOCKET_ADDRESS_B "inproc://b"
+
+int main ()
+{
+    int rc;
+    int bus1;
+    int bus2;
+    int bus3;
+    char buf [3];
+
+    /*  Create a simple bus topology consisting of 3 nodes. */
+    bus1 = test_socket (AF_SP, NN_BUS);
+    test_bind (bus1, SOCKET_ADDRESS_A);
+    bus2 = test_socket (AF_SP, NN_BUS);
+    test_bind (bus2, SOCKET_ADDRESS_B);
+
+    nn_sleep(100);
+
+    test_connect (bus2, SOCKET_ADDRESS_A);
+    bus3 = test_socket (AF_SP, NN_BUS);
+    test_connect (bus3, SOCKET_ADDRESS_A);
+    test_connect (bus3, SOCKET_ADDRESS_B);
+
+    /* Wait for connections to establish asynchronously. */
+    nn_sleep(100);
+
+    /*  Send a message from each node. */
+    test_send (bus1, "A");
+    test_send (bus2, "AB");
+    test_send (bus3, "ABC");
+
+    /*  Check that two messages arrived at each node. */
+    rc = nn_recv (bus1, buf, 3, 0);
+    errno_assert (rc >= 0);
+    nn_assert (rc == 2 || rc == 3);
+    rc = nn_recv (bus1, buf, 3, 0);
+    errno_assert (rc >= 0);
+    nn_assert (rc == 2 || rc == 3);
+    rc = nn_recv (bus2, buf, 3, 0);
+    errno_assert (rc >= 0);
+    nn_assert (rc == 1 || rc == 3);
+    rc = nn_recv (bus2, buf, 3, 0);
+    errno_assert (rc >= 0);
+    nn_assert (rc == 1 || rc == 3);
+    rc = nn_recv (bus3, buf, 3, 0);
+    errno_assert (rc >= 0);
+    nn_assert (rc == 1 || rc == 2);
+    rc = nn_recv (bus3, buf, 3, 0);
+    errno_assert (rc >= 0);
+    nn_assert (rc == 1 || rc == 2);
+
+    /*  Wait till both connections are established. */
+    nn_sleep (10);
+
+    test_close (bus3);
+    test_close (bus2);
+    test_close (bus1);
+
+    return 0;
+}
+