fixes #375 integer types are error prone

This change converts the various integer types like nng_socket
in the public API to opaque structures that are passed by value.
Basically we just wrap the integer ID.  This "hack" give us strong
type checks by the compiler (yay!), at the expense of not being able
to directly use these as numbers (so comparisions for example don't
work, and neither does initialization to zero using the normal
method.

Comparison of disassembly output shows that at least with the optimizer
enabled there is no difference in the compiler output between using
a structure or an integral value.

16 files changed, 120 insertions, 97 deletions

diff --git a/tests/bufsz.c b/tests/bufsz.c
index 4686a4e5..b7128ed4 100644
--- a/tests/bufsz.c
+++ b/tests/bufsz.c
@@ -61,7 +61,7 @@ TestMain("Buffer Options", {
 		// MUST NOT assume this.  We only do so for testing.
 		Convey("Legacy Recv Buf Option", {
 			int    cnt;
-			int    os = (int) s1;
+			int    os = (int) s1.id;
 			size_t sz = sizeof(cnt);
 			So(nng_setopt_int(s1, NNG_OPT_RECVBUF, 10) == 0);
 			So(nn_getsockopt(
@@ -82,7 +82,7 @@ TestMain("Buffer Options", {
 		});
 		Convey("Legacy Send Buf Option", {
 			int    cnt;
-			int    os = (int) s1;
+			int    os = (int) s1.id;
 			size_t sz = sizeof(cnt);
 			So(nng_setopt_int(s1, NNG_OPT_SENDBUF, 10) == 0);
 			So(nn_getsockopt(
diff --git a/tests/message.c b/tests/message.c
index 2dfa67fb..bf212b48 100644
--- a/tests/message.c
+++ b/tests/message.c
@@ -1,6 +1,6 @@
 //
-// Copyright 2017 Garrett D'Amore <garrett@damore.org>
-// Copyright 2017 Capitar IT Group BV <info@capitar.com>
+// Copyright 2018 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
@@ -113,9 +113,13 @@ TestMain("Message Tests", {
 		});
 
 		Convey("Pipe retrievals work", {
-			So(nng_msg_get_pipe(msg) == 0);
-			nng_msg_set_pipe(msg, (nng_pipe) 45);
-			So(nng_msg_get_pipe(msg) == (nng_pipe) 45);
+			nng_pipe p;
+			p = nng_msg_get_pipe(msg);
+			So(p.id == 0);
+			p.id = 45;
+			nng_msg_set_pipe(msg, p);
+			p = nng_msg_get_pipe(msg);
+			So(p.id == 45);
 		});
 
 		Convey("Message realloc works", {
diff --git a/tests/multistress.c b/tests/multistress.c
index 0a98d5fc..1ae6f323 100644
--- a/tests/multistress.c
+++ b/tests/multistress.c
@@ -150,7 +150,7 @@ req_client(void *arg)
 		nng_msg *  msg;
 		char       buf[32];
 
-		(void) snprintf(buf, sizeof(buf), "%d-%d", req, num++);
+		(void) snprintf(buf, sizeof(buf), "%u-%d", req.id, num++);
 
 		nng_msleep(rand() % 10);
 
@@ -212,8 +212,8 @@ reqrep_test(int ntests)
 
 		cli->name = "req";
 		getaddr(addr);
-		dprintf("DOING reqrep0 (req %d rep %d) address: %s\n",
-		    cli->socket, srv->socket, addr);
+		dprintf("DOING reqrep0 (req %u rep %u) address: %s\n",
+		    cli->socket.id, srv->socket.id, addr);
 
 		if ((rv = nng_listen(srv->socket, addr, NULL, 0)) != 0) {
 			fatal("nng_listen", rv);
@@ -296,8 +296,8 @@ pair0_test(void)
 	}
 
 	getaddr(addr);
-	dprintf("DOING pair0 (%d, %d) address: %s\n", cli->socket, srv->socket,
-	    addr);
+	dprintf("DOING pair0 (%u, %u) address: %s\n", cli->socket.id,
+	    srv->socket.id, addr);
 
 	if ((rv = nng_listen(srv->socket, addr, NULL, 0)) != 0) {
 		fatal("nng_listen", rv);
@@ -375,8 +375,8 @@ bus_test(void)
 	}
 
 	getaddr(addr);
-	dprintf("DOING bus0 (%d, %d) address: %s\n", cli->socket, srv->socket,
-	    addr);
+	dprintf("DOING bus0 (%u, %u) address: %s\n", cli->socket.id,
+	    srv->socket.id, addr);
 
 	if ((rv = nng_listen(srv->socket, addr, NULL, 0)) != 0) {
 		fatal("nng_listen", rv);
@@ -468,8 +468,8 @@ pubsub_test(int ntests)
 
 		cli->name = "sub";
 		getaddr(addr);
-		dprintf("DOING pubsub0 (pub %d sub %d) address: %s\n",
-		    cli->socket, srv->socket, addr);
+		dprintf("DOING pubsub0 (pub %u sub %u) address: %s\n",
+		    cli->socket.id, srv->socket.id, addr);
 
 		if ((rv = nng_listen(srv->socket, addr, NULL, 0)) != 0) {
 			fatal("nng_listen", rv);
@@ -563,8 +563,8 @@ pipeline0_test(int ntests)
 
 		cli->name = "pull";
 		getaddr(addr);
-		dprintf("DOING pipeline0 (pull %d push %d) address: %s\n",
-		    cli->socket, srv->socket, addr);
+		dprintf("DOING pipeline0 (pull %u push %u) address: %s\n",
+		    cli->socket.id, srv->socket.id, addr);
 
 		if ((rv = nng_listen(srv->socket, addr, NULL, 0)) != 0) {
 			fatal("nng_listen", rv);
@@ -637,10 +637,10 @@ Main({
 				if (cases[i].thr != NULL) {
 					nng_thread_destroy(cases[i].thr);
 					dprintf(
-					    "RESULT socket %d (%s) sent %d "
+					    "RESULT socket %u (%s) sent %d "
 					    "recd "
 					    "%d fail %d\n",
-					    cases[i].socket, cases[i].name,
+					    cases[i].socket.id, cases[i].name,
 					    cases[i].nsend, cases[i].nrecv,
 					    cases[i].nfail);
 					So(cases[i].nfail == 0);
diff --git a/tests/pair1.c b/tests/pair1.c
index ef3fe263..8a27bc6e 100644
--- a/tests/pair1.c
+++ b/tests/pair1.c
@@ -28,13 +28,14 @@
 TestMain("PAIRv1 protocol", {
 	const char * templ = "inproc://pairv1/%u";
 	char         addr[NNG_MAXADDRLEN + 1];
-	nng_socket   s1 = 0;
-	nng_socket   c1 = 0;
-	nng_socket   c2 = 0;
+	nng_socket   s1;
+	nng_socket   c1;
+	nng_socket   c2;
 	nng_duration tmo;
 	uint32_t     v;
 	size_t       sz;
 
+	s1.id = c1.id = c2.id = 0;
 	atexit(nng_fini);
 
 	Convey("Given a few sockets", {
@@ -210,7 +211,7 @@ TestMain("PAIRv1 protocol", {
 			So(nng_recvmsg(s1, &msg, 0) == 0);
 			CHECKSTR(msg, "ONE");
 			p1 = nng_msg_get_pipe(msg);
-			So(p1 != 0);
+			So(p1.id != 0);
 			nng_msg_free(msg);
 
 			So(nng_msg_alloc(&msg, 0) == 0);
@@ -219,10 +220,10 @@ TestMain("PAIRv1 protocol", {
 			So(nng_recvmsg(s1, &msg, 0) == 0);
 			CHECKSTR(msg, "TWO");
 			p2 = nng_msg_get_pipe(msg);
-			So(p2 != 0);
+			So(p2.id != 0);
 			nng_msg_free(msg);
 
-			So(p1 != p2);
+			So(p1.id != p2.id);
 
 			So(nng_msg_alloc(&msg, 0) == 0);
 
@@ -307,13 +308,15 @@ TestMain("PAIRv1 protocol", {
 		nng_msleep(20);
 
 		Convey("Send/recv work", {
+			nng_pipe p;
 			So(nng_msg_alloc(&msg, 0) == 0);
 			APPENDSTR(msg, "GAMMA");
 			So(nng_msg_header_append_u32(msg, 1) == 0);
 			So(nng_msg_header_len(msg) == sizeof(uint32_t));
 			So(nng_sendmsg(c1, msg, 0) == 0);
 			So(nng_recvmsg(s1, &msg, 0) == 0);
-			So(nng_msg_get_pipe(msg) != 0);
+			p = nng_msg_get_pipe(msg);
+			So(p.id != 0);
 			CHECKSTR(msg, "GAMMA");
 			So(nng_msg_header_len(msg) == sizeof(uint32_t));
 			So(nng_msg_header_trim_u32(msg, &hops) == 0);
@@ -328,7 +331,8 @@ TestMain("PAIRv1 protocol", {
 			CHECKSTR(msg, "EPSILON");
 			So(nng_msg_header_len(msg) == sizeof(uint32_t));
 			So(nng_msg_header_trim_u32(msg, &hops) == 0);
-			So(nng_msg_get_pipe(msg) != 0);
+			p = nng_msg_get_pipe(msg);
+			So(p.id != 0);
 			So(hops == 2);
 			nng_msg_free(msg);
 		});
@@ -470,7 +474,7 @@ TestMain("PAIRv1 protocol", {
 			So(nng_recvmsg(s1, &msg, 0) == 0);
 			CHECKSTR(msg, "ONE");
 			p1 = nng_msg_get_pipe(msg);
-			So(p1 != 0);
+			So(p1.id != 0);
 			So(nng_msg_header_trim_u32(msg, &hops) == 0);
 			So(hops == 1);
 			nng_msg_free(msg);
@@ -481,12 +485,12 @@ TestMain("PAIRv1 protocol", {
 			So(nng_recvmsg(s1, &msg, 0) == 0);
 			CHECKSTR(msg, "TWO");
 			p2 = nng_msg_get_pipe(msg);
-			So(p2 != 0);
+			So(p2.id != 0);
 			So(nng_msg_header_trim_u32(msg, &hops) == 0);
 			So(hops == 1);
 			nng_msg_free(msg);
 
-			So(p1 != p2);
+			So(p1.id != p2.id);
 
 			So(nng_msg_alloc(&msg, 0) == 0);
 			nng_msg_set_pipe(msg, p1);
@@ -514,7 +518,7 @@ TestMain("PAIRv1 protocol", {
 			So(nng_recvmsg(s1, &msg, 0) == 0);
 			CHECKSTR(msg, "ONE");
 			p1 = nng_msg_get_pipe(msg);
-			So(p1 != 0);
+			So(p1.id != 0);
 			nng_msg_free(msg);
 
 			nng_close(c1);
diff --git a/tests/reconnect.c b/tests/reconnect.c
index 6e7ab79f..4cd6cb3a 100644
--- a/tests/reconnect.c
+++ b/tests/reconnect.c
@@ -96,7 +96,7 @@ TestMain("Reconnect works", {
 					CHECKSTR(msg, "again");
 					p2 = nng_msg_get_pipe(msg);
 					nng_msg_free(msg);
-					So(p2 != p1);
+					So(p2.id != p1.id);
 				});
 			});
 		});
diff --git a/tests/reqstress.c b/tests/reqstress.c
index 04cf73ab..3f1e7396 100644
--- a/tests/reqstress.c
+++ b/tests/reqstress.c
@@ -146,7 +146,7 @@ req_client(void *arg)
 		nng_msg *  msg;
 		char       buf[32];
 
-		(void) snprintf(buf, sizeof(buf), "%d-%d", req, num++);
+		(void) snprintf(buf, sizeof(buf), "%u-%d", req.id, num++);
 
 		nng_msleep(rand() % 10);
 
@@ -208,8 +208,8 @@ reqrep_test(int ntests)
 
 		cli->name = "req";
 		getaddr(addr);
-		dprintf("DOING reqrep0 (req %d rep %d) address: %s\n",
-		    cli->socket, srv->socket, addr);
+		dprintf("DOING reqrep0 (req %u rep %u) address: %s\n",
+		    cli->socket.id, srv->socket.id, addr);
 
 		if ((rv = nng_listen(srv->socket, addr, NULL, 0)) != 0) {
 			fatal("nng_listen", rv);
@@ -261,10 +261,10 @@ Main({
 				if (cases[i].thr != NULL) {
 					nng_thread_destroy(cases[i].thr);
 					dprintf(
-					    "RESULT socket %d (%s) sent %d "
+					    "RESULT socket %u (%s) sent %d "
 					    "recd "
 					    "%d fail %d\n",
-					    cases[i].socket, cases[i].name,
+					    cases[i].socket.id, cases[i].name,
 					    cases[i].nsend, cases[i].nrecv,
 					    cases[i].nfail);
 					So(cases[i].nfail == 0);
diff --git a/tests/sock.c b/tests/sock.c
index 17ea055d..d6e36235 100644
--- a/tests/sock.c
+++ b/tests/sock.c
@@ -99,7 +99,7 @@ TestMain("Socket Operations", {
 				       s1, NNG_OPT_SOCKNAME, name, &sz) == 0);
 				So(sz > 0 && sz < 64);
 				So(sz == nni_strnlen(name, 64) + 1);
-				So(atoi(name) == (int) s1);
+				So(atoi(name) == (int) s1.id);
 
 				So(nng_setopt(
 				       s1, NNG_OPT_SOCKNAME, "hello", 6) == 0);
@@ -336,7 +336,7 @@ TestMain("Socket Operations", {
 			nng_listener l;
 			rv = nng_listen(s1, a, &l, 0);
 			So(rv == 0);
-			So(l != 0);
+			So(l.id != 0);
 
 			Convey("Second listen fails ADDRINUSE", {
 				rv = nng_listen(s1, a, NULL, 0);
@@ -369,10 +369,12 @@ TestMain("Socket Operations", {
 			});
 
 			Convey("Cannot access as listener", {
-				bool b;
+				bool         b;
+				nng_listener l;
+				l.id = ep.id;
 				So(nng_listener_getopt_bool(
-				       ep, NNG_OPT_RAW, &b) == NNG_ENOENT);
-				So(nng_listener_close(ep) == NNG_ENOENT);
+				       l, NNG_OPT_RAW, &b) == NNG_ENOENT);
+				So(nng_listener_close(l) == NNG_ENOENT);
 			});
 
 			Convey("Socket opts not for dialer", {
@@ -395,8 +397,11 @@ TestMain("Socket Operations", {
 				So(nng_dialer_setopt(ep, NNG_OPT_RECVMAXSZ,
 				       "a", 1) == NNG_EINVAL);
 			});
-			Convey("Cannot listen",
-			    { So(nng_listener_start(ep, 0) == NNG_ENOTSUP); });
+			Convey("Cannot listen", {
+				nng_listener l;
+				l.id = ep.id;
+				So(nng_listener_start(l, 0) == NNG_ENOTSUP);
+			});
 
 		});
 
@@ -413,10 +418,12 @@ TestMain("Socket Operations", {
 				So(sz == 4321);
 			});
 			Convey("Cannot access as dialer", {
-				bool b;
+				bool       b;
+				nng_dialer d;
+				d.id = ep.id;
 				So(nng_dialer_getopt_bool(
-				       ep, NNG_OPT_RAW, &b) == NNG_ENOENT);
-				So(nng_dialer_close(ep) == NNG_ENOENT);
+				       d, NNG_OPT_RAW, &b) == NNG_ENOENT);
+				So(nng_dialer_close(d) == NNG_ENOENT);
 			});
 
 			Convey("Socket opts not for listener", {
@@ -440,8 +447,11 @@ TestMain("Socket Operations", {
 				So(nng_listener_setopt(ep, NNG_OPT_RECVMAXSZ,
 				       "a", 1) == NNG_EINVAL);
 			});
-			Convey("Cannot dial",
-			    { So(nng_dialer_start(ep, 0) == NNG_ENOTSUP); });
+			Convey("Cannot dial", {
+				nng_dialer d;
+				d.id = ep.id;
+				So(nng_dialer_start(d, 0) == NNG_ENOTSUP);
+			});
 		});
 
 		Convey("Cannot access absent ep options", {
@@ -449,32 +459,36 @@ TestMain("Socket Operations", {
 			int          i;
 			nng_duration t;
 			bool         b;
+			nng_dialer   d;
+			nng_listener l;
+			d.id = 1999;
+			l.id = 1999;
 
-			So(nng_dialer_setopt_size(
-			       1999, NNG_OPT_RECVMAXSZ, 10) == NNG_ENOENT);
+			So(nng_dialer_setopt_size(d, NNG_OPT_RECVMAXSZ, 10) ==
+			    NNG_ENOENT);
 			So(nng_listener_setopt_size(
-			       1999, NNG_OPT_RECVMAXSZ, 10) == NNG_ENOENT);
+			       l, NNG_OPT_RECVMAXSZ, 10) == NNG_ENOENT);
 
 			s = 1;
-			So(nng_dialer_getopt_bool(1999, NNG_OPT_RAW, &b) ==
+			So(nng_dialer_getopt_bool(d, NNG_OPT_RAW, &b) ==
 			    NNG_ENOENT);
-			So(nng_listener_getopt_bool(1999, NNG_OPT_RAW, &b) ==
+			So(nng_listener_getopt_bool(l, NNG_OPT_RAW, &b) ==
 			    NNG_ENOENT);
 
-			So(nng_dialer_getopt_size(
-			       1999, NNG_OPT_RECVMAXSZ, &s) == NNG_ENOENT);
+			So(nng_dialer_getopt_size(d, NNG_OPT_RECVMAXSZ, &s) ==
+			    NNG_ENOENT);
 			So(nng_listener_getopt_size(
-			       1999, NNG_OPT_RECVMAXSZ, &s) == NNG_ENOENT);
+			       l, NNG_OPT_RECVMAXSZ, &s) == NNG_ENOENT);
 
-			So(nng_dialer_getopt_int(1999, NNG_OPT_RAW, &i) ==
+			So(nng_dialer_getopt_int(d, NNG_OPT_RAW, &i) ==
 			    NNG_ENOENT);
-			So(nng_listener_getopt_int(1999, NNG_OPT_RAW, &i) ==
+			So(nng_listener_getopt_int(l, NNG_OPT_RAW, &i) ==
 			    NNG_ENOENT);
 
-			So(nng_dialer_getopt_ms(1999, NNG_OPT_RECVTIMEO, &t) ==
+			So(nng_dialer_getopt_ms(d, NNG_OPT_RECVTIMEO, &t) ==
+			    NNG_ENOENT);
+			So(nng_listener_getopt_ms(l, NNG_OPT_SENDTIMEO, &t) ==
 			    NNG_ENOENT);
-			So(nng_listener_getopt_ms(
-			       1999, NNG_OPT_SENDTIMEO, &t) == NNG_ENOENT);
 
 		});
 
diff --git a/tests/surveyctx.c b/tests/surveyctx.c
index 9ab2de40..f4d8e703 100644
--- a/tests/surveyctx.c
+++ b/tests/surveyctx.c
@@ -266,7 +266,7 @@ TestMain("Surveyor concurrent contexts", {
 			nng_ctx_send(ctx, aio);
 			nng_aio_wait(aio);
 			So(nng_aio_result(aio) == 0);
-			nng_recv_aio(ctx, aio);
+			nng_ctx_recv(ctx, aio);
 			nng_ctx_close(ctx);
 			nng_aio_wait(aio);
 			So(nng_aio_result(aio) == NNG_ECLOSED);
diff --git a/tests/tcp.c b/tests/tcp.c
index 2677222d..3d2ecfc8 100644
--- a/tests/tcp.c
+++ b/tests/tcp.c
@@ -30,7 +30,7 @@ check_props_v4(nng_msg *msg)
 	bool         b;
 
 	p = nng_msg_get_pipe(msg);
-	So(p > 0);
+	So(p.id > 0);
 	So(nng_pipe_getopt_sockaddr(p, NNG_OPT_LOCADDR, &la) == 0);
 	So(la.s_family == NNG_AF_INET);
 	So(la.s_in.sa_port == htons(trantest_port - 1));
diff --git a/tests/tcp6.c b/tests/tcp6.c
index 07990a36..80135b33 100644
--- a/tests/tcp6.c
+++ b/tests/tcp6.c
@@ -49,7 +49,7 @@ check_props_v6(nng_msg *msg)
 		nng_sockaddr la;
 		z = sizeof(nng_sockaddr);
 		p = nng_msg_get_pipe(msg);
-		So(p > 0);
+		So(p.id > 0);
 		So(nng_pipe_getopt(p, NNG_OPT_LOCADDR, &la, &z) == 0);
 		So(z == sizeof(la));
 		So(la.s_family == NNG_AF_INET6);
@@ -62,7 +62,7 @@ check_props_v6(nng_msg *msg)
 		nng_sockaddr ra;
 		z = sizeof(nng_sockaddr);
 		p = nng_msg_get_pipe(msg);
-		So(p > 0);
+		So(p.id > 0);
 		So(nng_pipe_getopt(p, NNG_OPT_REMADDR, &ra, &z) == 0);
 		So(z == sizeof(ra));
 		So(ra.s_family == NNG_AF_INET6);
diff --git a/tests/tls.c b/tests/tls.c
index 4ce12ea8..71e28deb 100644
--- a/tests/tls.c
+++ b/tests/tls.c
@@ -114,7 +114,7 @@ check_props_v4(nng_msg *msg)
 	nng_sockaddr ra;
 
 	p = nng_msg_get_pipe(msg);
-	So(p > 0);
+	So(p.id > 0);
 
 	// Typed access
 	So(nng_pipe_getopt_sockaddr(p, NNG_OPT_LOCADDR, &la) == 0);
@@ -426,7 +426,7 @@ TestMain("TLS Transport", {
 		So(nng_msg_len(msg) == 6);
 		So(strcmp(nng_msg_body(msg), "hello") == 0);
 		p = nng_msg_get_pipe(msg);
-		So(p > 0);
+		So(p.id > 0);
 		So(nng_pipe_getopt_bool(p, NNG_OPT_TLS_VERIFIED, &b) == 0);
 		So(b == false);
 		nng_msg_free(msg);
@@ -468,7 +468,7 @@ TestMain("TLS Transport", {
 		So(nng_msg_len(msg) == 6);
 		So(strcmp(nng_msg_body(msg), "hello") == 0);
 		p = nng_msg_get_pipe(msg);
-		So(p > 0);
+		So(p.id > 0);
 		So(nng_pipe_getopt_bool(p, NNG_OPT_TLS_VERIFIED, &b) == 0);
 		So(b == true);
 		int i;
diff --git a/tests/trantest.h b/tests/trantest.h
index cbed58f3..ed1eccb7 100644
--- a/tests/trantest.h
+++ b/tests/trantest.h
@@ -172,7 +172,7 @@ trantest_dial(trantest *tt, nng_dialer *dp)
 {
 	nng_dialer d;
 	int        rv;
-	*dp = 0;
+	d.id = 0;
 
 	rv = nng_dialer_create(&d, tt->reqsock, tt->addr);
 	if (rv != 0) {
@@ -197,7 +197,7 @@ trantest_listen(trantest *tt, nng_listener *lp)
 {
 	int          rv;
 	nng_listener l;
-	*lp = 0;
+	l.id = 0;
 
 	rv = nng_listener_create(&l, tt->repsock, tt->addr);
 	if (rv != 0) {
@@ -231,12 +231,13 @@ void
 trantest_conn_refused(trantest *tt)
 {
 	Convey("Connection refused works", {
-		nng_dialer d = 0;
+		nng_dialer d;
+		d.id = 0;
 
 		So(trantest_dial(tt, &d) == NNG_ECONNREFUSED);
-		So(d == 0);
+		So(d.id == 0);
 		So(trantest_dial(tt, &d) == NNG_ECONNREFUSED);
-		So(d == 0);
+		So(d.id == 0);
 	});
 }
 
@@ -248,10 +249,10 @@ trantest_duplicate_listen(trantest *tt)
 		int          rv;
 		rv = trantest_listen(tt, &l);
 		So(rv == 0);
-		So(l != 0);
-		l = 0;
+		So(l.id != 0);
+		l.id = 0;
 		So(trantest_listen(tt, &l) == NNG_EADDRINUSE);
-		So(l == 0);
+		So(l.id == 0);
 	});
 }
 
@@ -262,12 +263,12 @@ trantest_listen_accept(trantest *tt)
 		nng_listener l;
 		nng_dialer   d;
 		So(trantest_listen(tt, &l) == 0);
-		So(l != 0);
+		So(l.id != 0);
 
 		nng_msleep(200);
-		d = 0;
+		d.id = 0;
 		So(trantest_dial(tt, &d) == 0);
-		So(d != 0);
+		So(d.id != 0);
 	});
 }
 
@@ -284,9 +285,9 @@ trantest_send_recv(trantest *tt)
 		char *       url;
 
 		So(trantest_listen(tt, &l) == 0);
-		So(l != 0);
+		So(l.id != 0);
 		So(trantest_dial(tt, &d) == 0);
-		So(d != 0);
+		So(d.id != 0);
 
 		nng_msleep(200); // listener may be behind slightly
 
@@ -312,7 +313,7 @@ trantest_send_recv(trantest *tt)
 		So(nng_msg_len(recv) == strlen("acknowledge"));
 		So(strcmp(nng_msg_body(recv), "acknowledge") == 0);
 		p = nng_msg_get_pipe(recv);
-		So(p != 0);
+		So(p.id != 0);
 		So(nng_pipe_getopt_string(p, NNG_OPT_URL, &url) == 0);
 		So(strcmp(url, tt->addr) == 0);
 		nng_strfree(url);
@@ -334,9 +335,9 @@ trantest_send_recv_multi(trantest *tt)
 		char         msgbuf[16];
 
 		So(trantest_listen(tt, &l) == 0);
-		So(l != 0);
+		So(l.id != 0);
 		So(trantest_dial(tt, &d) == 0);
-		So(d != 0);
+		So(d.id != 0);
 
 		nng_msleep(200); // listener may be behind slightly
 
@@ -366,7 +367,7 @@ trantest_send_recv_multi(trantest *tt)
 			So(nng_msg_len(recv) == strlen(msgbuf) + 1);
 			So(strcmp(nng_msg_body(recv), msgbuf) == 0);
 			p = nng_msg_get_pipe(recv);
-			So(p != 0);
+			So(p.id != 0);
 			So(nng_pipe_getopt_string(p, NNG_OPT_URL, &url) == 0);
 			So(strcmp(url, tt->addr) == 0);
 			nng_strfree(url);
@@ -386,9 +387,9 @@ trantest_check_properties(trantest *tt, trantest_proptest_t f)
 		int          rv;
 
 		So(trantest_listen(tt, &l) == 0);
-		So(l != 0);
+		So(l.id != 0);
 		So(trantest_dial(tt, &d) == 0);
-		So(d != 0);
+		So(d.id != 0);
 
 		nng_msleep(200); // listener may be behind slightly
 
@@ -429,9 +430,9 @@ trantest_send_recv_large(trantest *tt)
 		}
 
 		So(trantest_listen(tt, &l) == 0);
-		So(l != 0);
+		So(l.id != 0);
 		So(trantest_dial(tt, &d) == 0);
-		So(d != 0);
+		So(d.id != 0);
 
 		nng_msleep(200); // listener may be behind slightly
 
diff --git a/tests/ws.c b/tests/ws.c
index 6db790f2..b58ac40f 100644
--- a/tests/ws.c
+++ b/tests/ws.c
@@ -32,7 +32,7 @@ check_props_v4(nng_msg *msg)
 	size_t       len;
 
 	p = nng_msg_get_pipe(msg);
-	So(p > 0);
+	So(p.id > 0);
 
 	So(nng_pipe_getopt_sockaddr(p, NNG_OPT_LOCADDR, &la) == 0);
 	So(la.s_family == NNG_AF_INET);
diff --git a/tests/wss.c b/tests/wss.c
index 89a26623..333af56c 100644
--- a/tests/wss.c
+++ b/tests/wss.c
@@ -141,7 +141,7 @@ check_props(nng_msg *msg)
 	size_t       len;
 
 	p = nng_msg_get_pipe(msg);
-	So(p > 0);
+	So(p.id > 0);
 
 	z = sizeof(nng_sockaddr);
 	So(nng_pipe_getopt(p, NNG_OPT_LOCADDR, &la, &z) == 0);
diff --git a/tests/wssfile.c b/tests/wssfile.c
index 41fb8f9f..6b1d1a7b 100644
--- a/tests/wssfile.c
+++ b/tests/wssfile.c
@@ -142,7 +142,7 @@ check_props(nng_msg *msg)
 	size_t       len;
 
 	p = nng_msg_get_pipe(msg);
-	So(p > 0);
+	So(p.id > 0);
 
 	// Typed
 	z = sizeof(nng_sockaddr);
@@ -349,7 +349,7 @@ TestMain("WebSocket Secure (TLS) Transport (file based)", {
 		So(nng_msg_len(msg) == 6);
 		So(strcmp(nng_msg_body(msg), "hello") == 0);
 		p = nng_msg_get_pipe(msg);
-		So(p > 0);
+		So(p.id > 0);
 		So(nng_pipe_getopt_bool(p, NNG_OPT_TLS_VERIFIED, &b) == 0);
 		So(b == false);
 		nng_msg_free(msg);
@@ -391,7 +391,7 @@ TestMain("WebSocket Secure (TLS) Transport (file based)", {
 		So(nng_msg_len(msg) == 6);
 		So(strcmp(nng_msg_body(msg), "hello") == 0);
 		p = nng_msg_get_pipe(msg);
-		So(p > 0);
+		So(p.id > 0);
 		So(nng_pipe_getopt_bool(p, NNG_OPT_TLS_VERIFIED, &b) == 0);
 		So(b == true);
 		nng_msg_free(msg);
diff --git a/tests/zt.c b/tests/zt.c
index bb16b714..d178f334 100644
--- a/tests/zt.c
+++ b/tests/zt.c
@@ -44,7 +44,7 @@ check_props(nng_msg *msg)
 {
 	nng_pipe p;
 	p = nng_msg_get_pipe(msg);
-	So(p > 0);
+	So(p.id > 0);
 
 	// Check local address.
 	Convey("Local address property works", {