NNG_OPT_BOUND_PORT replaces NNG_OPT_TCP/UDP_BOUND_PORT.

This is easier and agnostic about the underlying L3 protocol.
We plan to remove direct NNG_OPT_LOCADDR support from listeners
(and probably both NNG_OPT_LOCADDR and NNG_OPT_REMADDR have numbered
days left in their lifetime.  They will be replaced with more direct
typed access functions as has been done for pipes already.)

While here fixed some include for IWYU in the POSIX platform.

7 files changed, 12 insertions, 12 deletions

diff --git a/src/sp/transport/dtls/dtls.c b/src/sp/transport/dtls/dtls.c
index ff78709d..5a97af4f 100644
--- a/src/sp/transport/dtls/dtls.c
+++ b/src/sp/transport/dtls/dtls.c
@@ -1726,7 +1726,7 @@ static const nni_option dtls_ep_opts[] = {
 	    .o_get  = dtls_ep_get_remaddr,
 	},
 	{
-	    .o_name = NNG_OPT_TCP_BOUND_PORT,
+	    .o_name = NNG_OPT_BOUND_PORT,
 	    .o_get  = dtls_ep_get_port,
 	},
 	// terminate list
diff --git a/src/sp/transport/tcp/tcp.c b/src/sp/transport/tcp/tcp.c
index 1040e7a9..759bc320 100644
--- a/src/sp/transport/tcp/tcp.c
+++ b/src/sp/transport/tcp/tcp.c
@@ -938,7 +938,7 @@ tcptran_ep_bind(void *arg, nng_url *url)
 	if (rv == NNG_OK) {
 		int port;
 		nng_stream_listener_get_int(
-		    ep->listener, NNG_OPT_TCP_BOUND_PORT, &port);
+		    ep->listener, NNG_OPT_BOUND_PORT, &port);
 		url->u_port = (uint32_t) port;
 	}
 	nni_mtx_unlock(&ep->mtx);
diff --git a/src/sp/transport/tls/tls.c b/src/sp/transport/tls/tls.c
index 4814b29f..5086a942 100644
--- a/src/sp/transport/tls/tls.c
+++ b/src/sp/transport/tls/tls.c
@@ -877,7 +877,7 @@ tlstran_ep_bind(void *arg, nng_url *url)
 	if (rv == NNG_OK) {
 		int port;
 		nng_stream_listener_get_int(
-		    ep->listener, NNG_OPT_TCP_BOUND_PORT, &port);
+		    ep->listener, NNG_OPT_BOUND_PORT, &port);
 		url->u_port = (uint32_t) port;
 	}
 	nni_mtx_unlock(&ep->mtx);
diff --git a/src/sp/transport/udp/udp.c b/src/sp/transport/udp/udp.c
index 7f46a3c9..02eb088a 100644
--- a/src/sp/transport/udp/udp.c
+++ b/src/sp/transport/udp/udp.c
@@ -1740,7 +1740,7 @@ static const nni_option udp_ep_opts[] = {
 	    .o_get  = udp_ep_get_remaddr,
 	},
 	{
-	    .o_name = NNG_OPT_TCP_BOUND_PORT,
+	    .o_name = NNG_OPT_BOUND_PORT,
 	    .o_get  = udp_ep_get_port,
 	},
 	// terminate list
diff --git a/src/sp/transport/udp/udp_tran_test.c b/src/sp/transport/udp/udp_tran_test.c
index 56a25cce..33517246 100644
--- a/src/sp/transport/udp/udp_tran_test.c
+++ b/src/sp/transport/udp/udp_tran_test.c
@@ -86,7 +86,7 @@ test_udp_port_zero_bind(void)
 	NUTS_MATCH(nng_url_hostname(u1), nng_url_hostname(u2));
 	NUTS_MATCH(nng_url_path(u1), nng_url_path(u2));
 	NUTS_TRUE(nng_url_port(u1) == nng_url_port(u2));
-	NUTS_PASS(nng_listener_get_int(l, NNG_OPT_TCP_BOUND_PORT, &port));
+	NUTS_PASS(nng_listener_get_int(l, NNG_OPT_BOUND_PORT, &port));
 	NUTS_TRUE(port == (int) nng_url_port(u1));
 
 	NUTS_CLOSE(s2);
diff --git a/src/sp/transport/ws/websocket.c b/src/sp/transport/ws/websocket.c
index dec0ea8e..4033553b 100644
--- a/src/sp/transport/ws/websocket.c
+++ b/src/sp/transport/ws/websocket.c
@@ -234,7 +234,7 @@ wstran_listener_bind(void *arg, nng_url *url)
 	if ((rv = nng_stream_listener_listen(l->listener)) == NNG_OK) {
 		int port;
 		nng_stream_listener_get_int(
-		    l->listener, NNG_OPT_TCP_BOUND_PORT, &port);
+		    l->listener, NNG_OPT_BOUND_PORT, &port);
 		url->u_port = (uint32_t) port;
 	}
 	return (rv);
diff --git a/src/sp/transport/ws/ws_test.c b/src/sp/transport/ws/ws_test.c
index 4f41b150..6f41fe99 100644
--- a/src/sp/transport/ws/ws_test.c
+++ b/src/sp/transport/ws/ws_test.c
@@ -24,7 +24,7 @@ test_ws_url_path_filters(void)
 
 	snprintf(addr, sizeof(addr), "ws://127.0.0.1:0/ws-url-path-filters");
 	NUTS_PASS(nng_listen(s1, addr, &l, 0));
-	NUTS_PASS(nng_listener_get_int(l, NNG_OPT_TCP_BOUND_PORT, &port));
+	NUTS_PASS(nng_listener_get_int(l, NNG_OPT_BOUND_PORT, &port));
 
 	snprintf(
 	    addr, sizeof(addr), "ws://127.0.0.1:%d/some-other-location", port);
@@ -58,16 +58,16 @@ test_wild_card_port(void)
 	NUTS_OPEN(s5);
 	NUTS_OPEN(s6);
 	NUTS_PASS(nng_listen(s1, "ws://127.0.0.1:0/one", &l1, 0));
-	NUTS_PASS(nng_listener_get_int(l1, NNG_OPT_TCP_BOUND_PORT, &port1));
+	NUTS_PASS(nng_listener_get_int(l1, NNG_OPT_BOUND_PORT, &port1));
 	NUTS_TRUE(port1 != 0);
 	snprintf(ws_url, sizeof(ws_url), "ws4://127.0.0.1:%d/two", port1);
 	NUTS_PASS(nng_listen(s2, ws_url, &l2, 0));
-	NUTS_PASS(nng_listener_get_int(l2, NNG_OPT_TCP_BOUND_PORT, &port2));
+	NUTS_PASS(nng_listener_get_int(l2, NNG_OPT_BOUND_PORT, &port2));
 	NUTS_TRUE(port1 != 0);
 	NUTS_TRUE(port1 == port2);
 	// Now try a different wild card port.
 	NUTS_PASS(nng_listen(s3, "ws4://127.0.0.1:0/three", &l3, 0));
-	NUTS_PASS(nng_listener_get_int(l3, NNG_OPT_TCP_BOUND_PORT, &port3));
+	NUTS_PASS(nng_listener_get_int(l3, NNG_OPT_BOUND_PORT, &port3));
 	NUTS_TRUE(port3 != 0);
 	NUTS_TRUE(port3 != port1);
 
@@ -127,7 +127,7 @@ test_empty_host(void)
 	// we use ws4 to ensure 127.0.0.1 binding
 	snprintf(addr, sizeof(addr), "ws4://:0/test");
 	NUTS_PASS(nng_listen(s1, addr, &l, 0));
-	NUTS_PASS(nng_listener_get_int(l, NNG_OPT_TCP_BOUND_PORT, &port));
+	NUTS_PASS(nng_listener_get_int(l, NNG_OPT_BOUND_PORT, &port));
 	nng_msleep(100);
 
 	snprintf(addr, sizeof(addr), "ws://127.0.0.1:%u/test", port);
@@ -165,7 +165,7 @@ test_ws_recv_max(void)
 	NUTS_PASS(nng_listener_get_size(l, NNG_OPT_RECVMAXSZ, &sz));
 	NUTS_TRUE(sz == 100);
 	NUTS_PASS(nng_listener_start(l, 0));
-	NUTS_PASS(nng_listener_get_int(l, NNG_OPT_TCP_BOUND_PORT, &port));
+	NUTS_PASS(nng_listener_get_int(l, NNG_OPT_BOUND_PORT, &port));
 
 	NUTS_OPEN(s1);
 	snprintf(url, sizeof(url), addr, port);