aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/platform/CMakeLists.txt1
-rw-r--r--src/platform/tcp_stream_test.c136
-rw-r--r--tests/CMakeLists.txt1
-rw-r--r--tests/tcpsupp.c177
4 files changed, 137 insertions, 178 deletions
diff --git a/src/platform/CMakeLists.txt b/src/platform/CMakeLists.txt
index 6a49d1fe..ce0cb0b7 100644
--- a/src/platform/CMakeLists.txt
+++ b/src/platform/CMakeLists.txt
@@ -15,4 +15,5 @@ add_subdirectory(windows)
nng_test(platform_test)
nng_test(resolver_test)
+nng_test(tcp_stream_test)
nng_test(udp_test)
diff --git a/src/platform/tcp_stream_test.c b/src/platform/tcp_stream_test.c
new file mode 100644
index 00000000..c1353e8a
--- /dev/null
+++ b/src/platform/tcp_stream_test.c
@@ -0,0 +1,136 @@
+//
+// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2018 Capitar IT Group BV <info@capitar.com>
+//
+// This software is supplied under the terms of the MIT License, a
+// copy of which should be located in the distribution where this
+// file was obtained (LICENSE.txt). A copy of the license may also be
+// found online at https://opensource.org/licenses/MIT.
+//
+
+#include <string.h>
+
+#include <nng/nng.h>
+
+#include <nuts.h>
+
+void
+test_tcp_stream(void)
+{
+ nng_stream_dialer *d = NULL;
+ nng_stream_listener *l = NULL;
+ nng_sockaddr sa;
+ uint8_t ip[4];
+ nng_aio *daio = NULL;
+ nng_aio *laio = NULL;
+ nng_aio *maio = NULL;
+ nng_stream *c1 = NULL;
+ nng_stream *c2 = NULL;
+ nng_aio *aio1;
+ nng_aio *aio2;
+ nng_iov iov;
+ nng_sockaddr sa2;
+ char buf1[5];
+ char buf2[5];
+ bool on;
+
+ NUTS_PASS(nng_aio_alloc(&daio, NULL, NULL));
+ NUTS_PASS(nng_aio_alloc(&laio, NULL, NULL));
+ NUTS_PASS(nng_aio_alloc(&maio, NULL, NULL));
+ NUTS_PASS(nng_aio_alloc(&aio1, NULL, NULL));
+ NUTS_PASS(nng_aio_alloc(&aio2, NULL, NULL));
+
+ NUTS_PASS(nng_stream_listener_alloc(&l, "tcp://127.0.0.1"));
+ NUTS_PASS(nng_stream_listener_listen(l));
+
+ ip[0] = 127;
+ ip[1] = 0;
+ ip[2] = 0;
+ ip[3] = 1;
+ NUTS_PASS(nng_stream_listener_get_addr(l, NNG_OPT_LOCADDR, &sa));
+ NUTS_TRUE(sa.s_in.sa_port != 0);
+ NUTS_TRUE(memcmp(&sa.s_in.sa_addr, ip, 4) == 0);
+
+ char uri[64];
+ snprintf(uri, sizeof(uri), "tcp://127.0.0.1:%d",
+ nuts_be16(sa.s_in.sa_port));
+
+ NUTS_PASS(nng_stream_dialer_alloc(&d, uri));
+ nng_stream_dialer_dial(d, daio);
+ nng_stream_listener_accept(l, laio);
+
+ nng_aio_wait(daio);
+ NUTS_PASS(nng_aio_result(daio));
+ nng_aio_wait(laio);
+ NUTS_PASS(nng_aio_result(laio));
+
+ c1 = nng_aio_get_output(daio, 0);
+ c2 = nng_aio_get_output(laio, 0);
+ NUTS_TRUE(c1 != NULL);
+ NUTS_TRUE(c2 != NULL);
+
+ on = false;
+ NUTS_PASS(nng_stream_get_bool(c1, NNG_OPT_TCP_NODELAY, &on));
+ NUTS_TRUE(on);
+
+ on = false;
+ NUTS_PASS(nng_stream_get_bool(c1, NNG_OPT_TCP_KEEPALIVE, &on));
+
+ // This relies on send completing for
+ // for just 5 bytes, and on recv doing
+ // the same. Technically this isn't
+ // guaranteed, but it would be weird
+ // to split such a small payload.
+ memcpy(buf1, "TEST", 5);
+ memset(buf2, 0, 5);
+ iov.iov_buf = buf1;
+ iov.iov_len = 5;
+
+ nng_aio_set_iov(aio1, 1, &iov);
+
+ iov.iov_buf = buf2;
+ iov.iov_len = 5;
+ nng_aio_set_iov(aio2, 1, &iov);
+ nng_stream_send(c1, aio1);
+ nng_stream_recv(c2, aio2);
+ nng_aio_wait(aio1);
+ nng_aio_wait(aio2);
+
+ NUTS_PASS(nng_aio_result(aio1));
+ NUTS_TRUE(nng_aio_count(aio1) == 5);
+
+ NUTS_PASS(nng_aio_result(aio2));
+ NUTS_TRUE(nng_aio_count(aio2) == 5);
+
+ NUTS_TRUE(memcmp(buf1, buf2, 5) == 0);
+
+ NUTS_PASS(nng_stream_get_addr(c2, NNG_OPT_LOCADDR, &sa2));
+ NUTS_TRUE(sa2.s_in.sa_family == NNG_AF_INET);
+
+ NUTS_TRUE(sa2.s_in.sa_addr == sa.s_in.sa_addr);
+ NUTS_TRUE(sa2.s_in.sa_port == sa.s_in.sa_port);
+
+ NUTS_PASS(nng_stream_get_addr(c1, NNG_OPT_REMADDR, &sa2));
+ NUTS_TRUE(sa2.s_in.sa_family == NNG_AF_INET);
+ NUTS_TRUE(sa2.s_in.sa_addr == sa.s_in.sa_addr);
+ NUTS_TRUE(sa2.s_in.sa_port == sa.s_in.sa_port);
+
+ nng_stream_listener_close(l);
+ nng_stream_listener_free(l);
+ nng_stream_dialer_close(d);
+ nng_stream_dialer_free(d);
+ nng_aio_free(aio1);
+ nng_aio_free(aio2);
+ nng_aio_free(daio);
+ nng_aio_free(laio);
+ nng_aio_free(maio);
+ nng_stream_close(c1);
+ nng_stream_free(c1);
+ nng_stream_close(c2);
+ nng_stream_free(c2);
+}
+
+NUTS_TESTS = {
+ { "tcp stream", test_tcp_stream },
+ { NULL, NULL },
+};
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 966a93cc..6be06a8d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -128,7 +128,6 @@ add_nng_test(files 5)
add_nng_test1(httpclient 60 NNG_SUPP_HTTP)
add_nng_test1(httpserver 30 NNG_SUPP_HTTP)
add_nng_test(ipcsupp 10)
-add_nng_test(tcpsupp 10)
add_nng_test(wss 30)
add_nng_test1(zt 60 NNG_TRANSPORT_ZEROTIER)
diff --git a/tests/tcpsupp.c b/tests/tcpsupp.c
deleted file mode 100644
index d7d5c38d..00000000
--- a/tests/tcpsupp.c
+++ /dev/null
@@ -1,177 +0,0 @@
-//
-// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech>
-// Copyright 2018 Capitar IT Group BV <info@capitar.com>
-//
-// This software is supplied under the terms of the MIT License, a
-// copy of which should be located in the distribution where this
-// file was obtained (LICENSE.txt). A copy of the license may also be
-// found online at https://opensource.org/licenses/MIT.
-//
-
-#include <string.h>
-
-#include <nng/nng.h>
-
-#include "convey.h"
-#include "stubs.h"
-
-TestMain("Supplemental TCP", {
- Convey("We can create a dialer and listener", {
- nng_stream_dialer *d = NULL;
- nng_stream_listener *l = NULL;
- Reset({
- nng_stream_listener_free(l);
- nng_stream_dialer_free(d);
- l = NULL;
- d = NULL;
- });
- Convey("Listener listens (wildcard)", {
- nng_sockaddr sa;
- uint8_t ip[4];
-
- So(nng_stream_listener_alloc(&l, "tcp://127.0.0.1") ==
- 0);
- So(nng_stream_listener_listen(l) == 0);
-
- ip[0] = 127;
- ip[1] = 0;
- ip[2] = 0;
- ip[3] = 1;
- So(nng_stream_listener_get_addr(
- l, NNG_OPT_LOCADDR, &sa) == 0);
- So(sa.s_in.sa_port != 0);
- So(memcmp(&sa.s_in.sa_addr, ip, 4) == 0);
-
- Convey("We can dial it", {
- nng_aio *daio = NULL;
- nng_aio *laio = NULL;
- nng_aio *maio = NULL;
- nng_stream *c1 = NULL;
- nng_stream *c2 = NULL;
-
- char uri[64];
- snprintf(uri, sizeof(uri),
- "tcp://127.0.0.1:%d",
- test_htons(sa.s_in.sa_port));
-
- So(nng_stream_dialer_alloc(&d, uri) == 0);
- So(nng_aio_alloc(&daio, NULL, NULL) == 0);
- So(nng_aio_alloc(&laio, NULL, NULL) == 0);
- So(nng_aio_alloc(&maio, NULL, NULL) == 0);
-
- Reset({
- nng_aio_free(daio);
- nng_aio_free(laio);
- nng_aio_free(maio);
- if (c1 != NULL) {
- nng_stream_close(c1);
- nng_stream_free(c1);
- }
- if (c2 != NULL) {
- nng_stream_close(c2);
- nng_stream_free(c2);
- }
- });
-
- nng_stream_dialer_dial(d, daio);
- nng_stream_listener_accept(l, laio);
-
- nng_aio_wait(daio);
- So(nng_aio_result(daio) == 0);
- nng_aio_wait(laio);
- So(nng_aio_result(laio) == 0);
-
- So(nng_aio_result(daio) == 0);
- So(nng_aio_result(laio) == 0);
-
- c1 = nng_aio_get_output(daio, 0);
- c2 = nng_aio_get_output(laio, 0);
- So(c1 != NULL);
- So(c2 != NULL);
-
- Convey("They exchange messages", {
- nng_aio *aio1;
- nng_aio *aio2;
- nng_iov iov;
- nng_sockaddr sa2;
- char buf1[5];
- char buf2[5];
- bool on;
-
- So(nng_aio_alloc(&aio1, NULL, NULL) ==
- 0);
- So(nng_aio_alloc(&aio2, NULL, NULL) ==
- 0);
-
- Reset({
- nng_aio_free(aio1);
- nng_aio_free(aio2);
- });
-
- on = false;
- So(nng_stream_get_bool(c1,
- NNG_OPT_TCP_NODELAY, &on) == 0);
- So(on == true);
-
- on = false;
- So(nng_stream_get_bool(c1,
- NNG_OPT_TCP_KEEPALIVE,
- &on) == 0);
-
- // This relies on send completing for
- // for just 5 bytes, and on recv doing
- // the same. Technically this isn't
- // guaranteed, but it would be weird
- // to split such a small payload.
- memcpy(buf1, "TEST", 5);
- memset(buf2, 0, 5);
- iov.iov_buf = buf1;
- iov.iov_len = 5;
-
- nng_aio_set_iov(aio1, 1, &iov);
-
- iov.iov_buf = buf2;
- iov.iov_len = 5;
- nng_aio_set_iov(aio2, 1, &iov);
- nng_stream_send(c1, aio1);
- nng_stream_recv(c2, aio2);
- nng_aio_wait(aio1);
- nng_aio_wait(aio2);
-
- So(nng_aio_result(aio1) == 0);
- So(nng_aio_count(aio1) == 5);
-
- So(nng_aio_result(aio2) == 0);
- So(nng_aio_count(aio2) == 5);
-
- So(memcmp(buf1, buf2, 5) == 0);
-
- Convey("Socket name matches", {
- So(nng_stream_get_addr(c2,
- NNG_OPT_LOCADDR,
- &sa2) == 0);
- So(sa2.s_in.sa_family ==
- NNG_AF_INET);
-
- So(sa2.s_in.sa_addr ==
- sa.s_in.sa_addr);
- So(sa2.s_in.sa_port ==
- sa.s_in.sa_port);
- });
-
- Convey("Peer name matches", {
- So(nng_stream_get_addr(c1,
- NNG_OPT_REMADDR,
- &sa2) == 0);
- So(sa2.s_in.sa_family ==
- NNG_AF_INET);
- So(sa2.s_in.sa_addr ==
- sa.s_in.sa_addr);
- So(sa2.s_in.sa_port ==
- sa.s_in.sa_port);
- });
- });
- });
- });
- });
-})
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2026-01-18 13:17:18 +0000