fixes #986 ws_read_finish_str free invalid pointer

Also, this has refactored the websocket stream test to the new
acutest.h, and includes a much deeper test of fragmentation and
reassembly of websocket streams.

4 files changed, 16 insertions, 206 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index bab00692..c4856aed 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -161,9 +161,8 @@ add_nng_test(tcp6 60)
 add_nng_test(transport 5)
 add_nng_test(udp 5)
 add_nng_test(url 5)
-add_nng_test1(ws 30 NNG_TRANSPORT_WS)
+add_nng_test(ws 30)
 add_nng_test1(wss 30 NNG_TRANSPORT_WSS)
-add_nng_test1(wsstream 10 NNG_TRANSPORT_WS)
 add_nng_test1(zt 60 NNG_TRANSPORT_ZEROTIER)
 
 add_nng_test(bus 5)
diff --git a/tests/testutil.c b/tests/testutil.c
index ef748b99..1c65c996 100644
--- a/tests/testutil.c
+++ b/tests/testutil.c
@@ -123,6 +123,18 @@ testutil_htons(uint16_t in)
 	return (in);
 }
 
+uint32_t
+testutil_htonl(uint32_t in)
+{
+#ifdef NNG_LITTLE_ENDIAN
+	in = ((in >> 24u) & 0xffu) |
+	    ((in >> 8u) & 0xff00u) |
+	    ((in << 8u) & 0xff0000u) |
+	    ((in << 24u) & 0xff000000u);
+#endif
+	return (in);
+}
+
 // testutil_next_port returns a "next" allocation port.
 // Ports are chosen by starting from a random point within a
 // range (normally 38000-40000, but other good places to choose
diff --git a/tests/testutil.h b/tests/testutil.h
index ab792557..b9acfedf 100644
--- a/tests/testutil.h
+++ b/tests/testutil.h
@@ -31,6 +31,9 @@ extern bool testutil_pollfd(int);
 // testutil_htons is just htons portably.
 extern uint16_t testutil_htons(uint16_t);
 
+// testutil_htonl is just htonl portably.
+extern uint32_t testutil_htonl(uint32_t);
+
 // testutil_sleep sleeps the specified number of msec
 extern void testutil_sleep(int);
 
diff --git a/tests/wsstream.c b/tests/wsstream.c
deleted file mode 100644
index c51e2630..00000000
--- a/tests/wsstream.c
+++ /dev/null
@@ -1,204 +0,0 @@
-//
-// Copyright 2019 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("Websocket STREAM", {
-	atexit(nng_fini);
-	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;
-			size_t       sz;
-			uint8_t      ip[4];
-
-			So(nng_stream_listener_alloc(
-			       &l, "ws://127.0.0.1:0/test") == 0);
-			So(nng_stream_listener_listen(l) == 0);
-
-			sz    = sizeof(sa);
-			ip[0] = 127;
-			ip[1] = 0;
-			ip[2] = 0;
-			ip[3] = 1;
-			So(nng_stream_listener_get(
-			       l, NNG_OPT_LOCADDR, &sa, &sz) == 0);
-			So(sz == sizeof(sa));
-			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),
-				    "ws://127.0.0.1:%d/test",
-				    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;
-					size_t       sz;
-
-					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 = true;
-					So(nng_stream_set(c1,
-					       NNG_OPT_TCP_NODELAY, &on,
-					       sizeof(on)) == 0);
-					So(nng_stream_set(c2,
-					       NNG_OPT_TCP_NODELAY, &on,
-					       sizeof(on)) == 0);
-
-					So(nng_stream_set(c1,
-					       NNG_OPT_TCP_KEEPALIVE, &on,
-					       sizeof(on)) == 0);
-
-					on = false;
-					sz = sizeof(on);
-					So(nng_stream_get(c1,
-					       NNG_OPT_TCP_NODELAY, &on,
-					       &sz) == 0);
-					So(sz == sizeof(on));
-					So(on == true);
-
-					on = false;
-					sz = sizeof(on);
-					So(nng_stream_get(c1,
-					       NNG_OPT_TCP_KEEPALIVE, &on,
-					       &sz) == 0);
-					So(sz == sizeof(on));
-					So(on == true);
-
-					// 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", {
-						sz = sizeof(sa2);
-						So(nng_stream_get(c2,
-						       NNG_OPT_LOCADDR, &sa2,
-						       &sz) == 0);
-						So(sz == sizeof(sa2));
-						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", {
-						sz = sizeof(sa2);
-						So(nng_stream_get(c1,
-						       NNG_OPT_REMADDR, &sa2,
-						       &sz) == 0);
-						So(sz == sizeof(sa2));
-						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);
-					});
-				});
-			});
-		});
-	});
-})