Gdamore/more tests

.github/workflows/coverage.yml

@@ -27,7 +27,7 @@ jobs:
         uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          yml: ./.codecov.yml
+          codecov_yml_path: ./.codecov.yml
 
   darwin-coverage:
     name: darwin

src/core/errors_test.c

@@ -1,5 +1,5 @@
 //
-// Copyright 2020 Staysail Systems, Inc. <[email protected]>
+// Copyright 2024 Staysail Systems, Inc. <[email protected]>
 //
 // This software is supplied under the terms of the MIT License, a
 // copy of which should be located in the distribution where this
@@ -15,6 +15,7 @@
 static void
 test_known_errors(void)
 {
+	NUTS_MATCH(nng_strerror(0), "Hunky dory");
 	NUTS_MATCH(nng_strerror(NNG_ECLOSED), "Object closed");
 	NUTS_MATCH(nng_strerror(NNG_ETIMEDOUT), "Timed out");
 }

src/core/panic.c

@@ -69,6 +69,5 @@
 void
 nni_println(const char *msg)
 {
-	// TODO: support redirection of this later.
-	nni_plat_println(msg);
+	nni_plat_printf("%s\n", msg);
 }

src/platform/posix/posix_debug.c

@@ -32,13 +32,6 @@ nni_plat_printf(const char *fmt, ...)
 	va_end(ap);
 }
 
-void
-nni_plat_println(const char *message)
-{
-	fputs(message, stderr);
-	fputc('\n', stderr);
-}
-
 const char *
 nni_plat_strerror(int errnum)
 {

src/platform/posix/posix_ipcdial.c

@@ -80,7 +80,7 @@ static void
 ipc_dialer_cancel(nni_aio *aio, void *arg, int rv)
 {
 	nni_ipc_dialer *d = arg;
-	nni_ipc_conn *  c;
+	nni_ipc_conn   *c;
 
 	nni_mtx_lock(&d->mtx);
 	if ((!nni_aio_list_active(aio)) ||
@@ -100,9 +100,9 @@ ipc_dialer_cancel(nni_aio *aio, void *arg, int rv)
 static void
 ipc_dialer_cb(nni_posix_pfd *pfd, unsigned ev, void *arg)
 {
-	nni_ipc_conn *  c = arg;
+	nni_ipc_conn   *c = arg;
 	nni_ipc_dialer *d = c->dialer;
-	nni_aio *       aio;
+	nni_aio        *aio;
 	int             rv;
 
 	nni_mtx_lock(&d->mtx);
@@ -153,9 +153,9 @@ ipc_dialer_cb(nni_posix_pfd *pfd, unsigned ev, void *arg)
 void
 ipc_dialer_dial(void *arg, nni_aio *aio)
 {
-	ipc_dialer *            d = arg;
-	nni_ipc_conn *          c;
-	nni_posix_pfd *         pfd = NULL;
+	ipc_dialer             *d = arg;
+	nni_ipc_conn           *c;
+	nni_posix_pfd          *pfd = NULL;
 	struct sockaddr_storage ss;
 	size_t                  len;
 	int                     fd;
@@ -205,7 +205,7 @@ ipc_dialer_dial(void *arg, nni_aio *aio)
 		goto error;
 	}
 	if (connect(fd, (void *) &ss, len) != 0) {
-		if (errno != EINPROGRESS) {
+		if (errno != EINPROGRESS && errno != EAGAIN) {
 			if (errno == ENOENT) {
 				// No socket present means nobody listening.
 				rv = NNG_ECONNREFUSED;

src/platform/posix/posix_ipclisten.c

@@ -31,12 +31,12 @@
 
 typedef struct {
 	nng_stream_listener sl;
-	nni_posix_pfd *     pfd;
+	nni_posix_pfd      *pfd;
 	nng_sockaddr        sa;
 	nni_list            acceptq;
 	bool                started;
 	bool                closed;
-	char *              path;
+	char               *path;
 	mode_t              perms;
 	nni_mtx             mtx;
 } ipc_listener;
@@ -45,7 +45,7 @@ static void
 ipc_listener_doclose(ipc_listener *l)
 {
 	nni_aio *aio;
-	char *   path;
+	char    *path;
 
 	l->closed = true;
 	while ((aio = nni_list_first(&l->acceptq)) != NULL) {
@@ -82,7 +82,7 @@ ipc_listener_doaccept(ipc_listener *l)
 		int            fd;
 		int            rv;
 		nni_posix_pfd *pfd;
-		nni_ipc_conn * c;
+		nni_ipc_conn  *c;
 
 		fd = nni_posix_pfd_fd(l->pfd);
 
@@ -302,13 +302,13 @@ ipc_listener_chmod(ipc_listener *l, const char *path)
 int
 ipc_listener_listen(void *arg)
 {
-	ipc_listener *          l = arg;
+	ipc_listener           *l = arg;
 	socklen_t               len;
 	struct sockaddr_storage ss;
 	int                     rv;
 	int                     fd;
-	nni_posix_pfd *         pfd;
-	char *                  path;
+	nni_posix_pfd          *pfd;
+	char                   *path;
 
 	if ((len = nni_posix_nn2sockaddr(&ss, &l->sa)) < sizeof(sa_family_t)) {
 		return (NNG_EADDRINVAL);
@@ -358,8 +358,7 @@ ipc_listener_listen(void *arg)
 		}
 	}
 
-	if ((rv != 0) ||
-	    (ipc_listener_chmod(l, path) != 0) ||
+	if ((rv != 0) || (ipc_listener_chmod(l, path) != 0) ||
 	    (listen(fd, 128) != 0)) {
 		rv = nni_plat_errno(errno);
 	}
@@ -407,7 +406,7 @@ ipc_listener_listen(void *arg)
 static void
 ipc_listener_free(void *arg)
 {
-	ipc_listener * l = arg;
+	ipc_listener  *l = arg;
 	nni_posix_pfd *pfd;
 
 	nni_mtx_lock(&l->mtx);

src/platform/windows/win_debug.c

@@ -32,12 +32,6 @@ nni_plat_printf(const char *fmt, ...)
 	va_end(ap);
 }
 
-void
-nni_plat_println(const char *message)
-{
-	(void) fprintf(stderr, "%s\n", message);
-}
-
 const char *
 nni_plat_strerror(int errnum)
 {

src/sp/transport/ipc/ipc_test.c

@@ -229,6 +229,27 @@ test_ipc_connect_blocking_accept(void)
 	nng_stream_listener_free(l);
 }
 
+void
+test_ipc_listen_accept_cancel(void)
+{
+	nng_stream_listener *l;
+	char                *addr;
+	nng_aio             *aio;
+
+	NUTS_ENABLE_LOG(NNG_LOG_INFO);
+	NUTS_ADDR(addr, "ipc");
+	NUTS_PASS(nng_aio_alloc(&aio, NULL, NULL));
+
+	// start a listening stream listener but do not call accept
+	NUTS_PASS(nng_stream_listener_alloc(&l, addr));
+	NUTS_PASS(nng_stream_listener_listen(l));
+	nng_stream_listener_accept(l, aio);
+	nng_msleep(100);
+	nng_aio_free(aio);
+	nng_stream_listener_close(l);
+	nng_stream_listener_free(l);
+}
+
 void
 test_ipc_listener_clean_stale(void)
 {
@@ -539,6 +560,7 @@ TEST_LIST = {
 	{ "ipc connect blocking", test_ipc_connect_blocking },
 	{ "ipc connect blocking accept", test_ipc_connect_blocking_accept },
 	{ "ipc listen cleanup stale", test_ipc_listener_clean_stale },
+	{ "ipc listen accept cancel", test_ipc_listen_accept_cancel },
 	{ "ipc abstract sockets", test_abstract_sockets },
 	{ "ipc abstract auto bind", test_abstract_auto_bind },
 	{ "ipc abstract name too long", test_abstract_too_long },

src/supplemental/websocket/websocket.c

@@ -2126,6 +2126,7 @@ nni_ws_listener_alloc(nng_stream_listener **wslp, const nng_url *url)
 
 	NNI_LIST_INIT(&l->pend, nni_ws, node);
 	NNI_LIST_INIT(&l->reply, nni_ws, node);
+	NNI_LIST_INIT(&l->headers, ws_header, node);
 
 	// make a private copy of the url structure.
 	if ((rv = nng_url_clone(&l->url, url)) != 0) {
@@ -2651,6 +2652,7 @@ nni_ws_dialer_alloc(nng_stream_dialer **dp, const nng_url *url)
 	}
 	NNI_LIST_INIT(&d->headers, ws_header, node);
 	NNI_LIST_INIT(&d->wspend, nni_ws, node);
+	NNI_LIST_INIT(&d->headers, ws_header, node);
 	nni_mtx_init(&d->mtx);
 	nni_cv_init(&d->cv, &d->mtx);
 

src/supplemental/websocket/websocket_test.c

@@ -146,6 +146,12 @@ test_websocket_conn_props(void)
 	NUTS_PASS(nng_stream_listener_listen(l));
 	NUTS_PASS(nng_stream_dialer_alloc(&d, uri));
 
+	NUTS_PASS(nng_stream_dialer_set_string(
+	    d, NNG_OPT_WS_REQUEST_HEADER "NNG-Req", "True"));
+
+	NUTS_PASS(nng_stream_listener_set_string(
+	    l, NNG_OPT_WS_RESPONSE_HEADER "NNG-Rep", "True"));
+
 	nng_stream_dialer_dial(d, daio);
 	nng_stream_listener_accept(l, laio);
 
@@ -180,6 +186,19 @@ test_websocket_conn_props(void)
 	NUTS_FAIL(
 	    nng_stream_get_size(c1, NNG_OPT_TCP_NODELAY, &sz), NNG_EBADTYPE);
 
+	NUTS_FAIL(nng_stream_get_string(
+	              c1, NNG_OPT_WS_REQUEST_HEADER "No-Such-Header", &str),
+	    NNG_ENOENT);
+	NUTS_PASS(nng_stream_get_string(
+	    c1, NNG_OPT_WS_REQUEST_HEADER "NNG-Req", &str));
+	NUTS_MATCH(str, "True");
+	nng_strfree(str);
+
+	NUTS_PASS(nng_stream_get_string(
+	    c2, NNG_OPT_WS_RESPONSE_HEADER "NNG-Rep", &str));
+	NUTS_MATCH(str, "True");
+	nng_strfree(str);
+
 	NUTS_PASS(nng_stream_get_string(
 	    c1, NNG_OPT_WS_REQUEST_HEADER "Sec-WebSocket-Version", &str));
 	NUTS_TRUE(str != NULL);