fixes #289 nng_sockaddr could just be a union

fixes #290 sockaddr improvements

5 files changed, 44 insertions, 45 deletions

diff --git a/src/transport/inproc/inproc.c b/src/transport/inproc/inproc.c
index f9f438ab..375d8bdd 100644
--- a/src/transport/inproc/inproc.c
+++ b/src/transport/inproc/inproc.c
@@ -183,9 +183,8 @@ nni_inproc_pipe_get_addr(void *arg, void *buf, size_t *szp)
 	nni_sockaddr     sa;
 
 	memset(&sa, 0, sizeof(sa));
-	sa.s_un.s_inproc.sa_family = NNG_AF_INPROC;
-	nni_strlcpy(sa.s_un.s_inproc.sa_path, p->addr,
-	    sizeof(sa.s_un.s_inproc.sa_path));
+	sa.s_inproc.sa_family = NNG_AF_INPROC;
+	nni_strlcpy(sa.s_inproc.sa_name, p->addr, sizeof(sa.s_inproc.sa_name));
 	return (nni_getopt_sockaddr(&sa, buf, szp));
 }
 
diff --git a/src/transport/ipc/ipc.c b/src/transport/ipc/ipc.c
index 41498ca3..fa59f0fe 100644
--- a/src/transport/ipc/ipc.c
+++ b/src/transport/ipc/ipc.c
@@ -120,11 +120,11 @@ nni_ipc_pipe_init(nni_ipc_pipe **pipep, nni_ipc_ep *ep, void *ipp)
 		return (rv);
 	}
 
-	p->proto                    = ep->proto;
-	p->rcvmax                   = ep->rcvmax;
-	p->ipp                      = ipp;
-	p->sa.s_un.s_path.sa_family = NNG_AF_IPC;
-	p->sa                       = ep->sa;
+	p->proto              = ep->proto;
+	p->rcvmax             = ep->rcvmax;
+	p->ipp                = ipp;
+	p->sa.s_ipc.sa_family = NNG_AF_IPC;
+	p->sa                 = ep->sa;
 
 	*pipep = p;
 	return (0);
@@ -524,10 +524,10 @@ nni_ipc_ep_init(void **epp, nni_url *url, nni_sock *sock, int mode)
 	}
 	nni_mtx_init(&ep->mtx);
 
-	sz                           = sizeof(ep->sa.s_un.s_path.sa_path);
-	ep->sa.s_un.s_path.sa_family = NNG_AF_IPC;
+	sz                     = sizeof(ep->sa.s_ipc.sa_path);
+	ep->sa.s_ipc.sa_family = NNG_AF_IPC;
 
-	if (nni_strlcpy(ep->sa.s_un.s_path.sa_path, url->u_path, sz) >= sz) {
+	if (nni_strlcpy(ep->sa.s_ipc.sa_path, url->u_path, sz) >= sz) {
 		nni_ipc_ep_fini(ep);
 		return (NNG_EADDRINVAL);
 	}
diff --git a/src/transport/tcp/tcp.c b/src/transport/tcp/tcp.c
index 2a23b88b..1b4e6dc2 100644
--- a/src/transport/tcp/tcp.c
+++ b/src/transport/tcp/tcp.c
@@ -555,16 +555,16 @@ nni_tcp_ep_init(void **epp, nni_url *url, nni_sock *sock, int mode)
 	// XXX: arguably we could defer this part to the point we do a bind
 	// or connect!
 	if (mode == NNI_EP_MODE_DIAL) {
-		passive           = 0;
-		lsa.s_un.s_family = NNG_AF_UNSPEC;
+		passive      = 0;
+		lsa.s_family = NNG_AF_UNSPEC;
 		nni_aio_set_input(aio, 0, &rsa);
 		if ((host == NULL) || (serv == NULL)) {
 			nni_aio_fini(aio);
 			return (NNG_EADDRINVAL);
 		}
 	} else {
-		passive           = 1;
-		rsa.s_un.s_family = NNG_AF_UNSPEC;
+		passive      = 1;
+		rsa.s_family = NNG_AF_UNSPEC;
 		nni_aio_set_input(aio, 0, &lsa);
 	}
 
diff --git a/src/transport/tls/tls.c b/src/transport/tls/tls.c
index cf849373..534b955d 100644
--- a/src/transport/tls/tls.c
+++ b/src/transport/tls/tls.c
@@ -568,20 +568,20 @@ nni_tls_ep_init(void **epp, nni_url *url, nni_sock *sock, int mode)
 	}
 
 	if (mode == NNI_EP_MODE_DIAL) {
-		passive           = 0;
-		tlsmode           = NNG_TLS_MODE_CLIENT;
-		authmode          = NNG_TLS_AUTH_MODE_REQUIRED;
-		lsa.s_un.s_family = NNG_AF_UNSPEC;
+		passive      = 0;
+		tlsmode      = NNG_TLS_MODE_CLIENT;
+		authmode     = NNG_TLS_AUTH_MODE_REQUIRED;
+		lsa.s_family = NNG_AF_UNSPEC;
 		nni_aio_set_input(aio, 0, &rsa);
 		if ((host == NULL) || (serv == NULL)) {
 			nni_aio_fini(aio);
 			return (NNG_EADDRINVAL);
 		}
 	} else {
-		passive           = 1;
-		tlsmode           = NNG_TLS_MODE_SERVER;
-		authmode          = NNG_TLS_AUTH_MODE_NONE;
-		rsa.s_un.s_family = NNG_AF_UNSPEC;
+		passive      = 1;
+		tlsmode      = NNG_TLS_MODE_SERVER;
+		authmode     = NNG_TLS_AUTH_MODE_NONE;
+		rsa.s_family = NNG_AF_UNSPEC;
 		nni_aio_set_input(aio, 0, &lsa);
 	}
 
diff --git a/src/transport/zerotier/zerotier.c b/src/transport/zerotier/zerotier.c
index 01c290db..2a427ca0 100644
--- a/src/transport/zerotier/zerotier.c
+++ b/src/transport/zerotier/zerotier.c
@@ -345,7 +345,7 @@ zt_node_rcv4_cb(void *arg)
 
 	memset(&sa, 0, sizeof(sa));
 	sin                  = (void *) &sa;
-	nsin                 = &ztn->zn_rcv4_addr.s_un.s_in;
+	nsin                 = &ztn->zn_rcv4_addr.s_in;
 	sin->sin_family      = AF_INET;
 	sin->sin_port        = nsin->sa_port;
 	sin->sin_addr.s_addr = nsin->sa_addr;
@@ -397,7 +397,7 @@ zt_node_rcv6_cb(void *arg)
 
 	memset(&sa, 0, sizeof(sa));
 	sin6              = (void *) &sa;
-	nsin6             = &ztn->zn_rcv6_addr.s_un.s_in6;
+	nsin6             = &ztn->zn_rcv6_addr.s_in6;
 	sin6->sin6_family = AF_INET6;
 	sin6->sin6_port   = nsin6->sa_port;
 	memcpy(&sin6->sin6_addr, nsin6->sa_addr, 16);
@@ -1326,18 +1326,18 @@ zt_wire_packet_send(ZT_Node *node, void *userptr, void *thr, int64_t socket,
 	// the platform layer.
 	switch (sin->sin_family) {
 	case AF_INET:
-		addr.s_un.s_in.sa_family = NNG_AF_INET;
-		addr.s_un.s_in.sa_port   = sin->sin_port;
-		addr.s_un.s_in.sa_addr   = sin->sin_addr.s_addr;
-		udp                      = ztn->zn_udp4;
-		port                     = htons(sin->sin_port);
+		addr.s_in.sa_family = NNG_AF_INET;
+		addr.s_in.sa_port   = sin->sin_port;
+		addr.s_in.sa_addr   = sin->sin_addr.s_addr;
+		udp                 = ztn->zn_udp4;
+		port                = htons(sin->sin_port);
 		break;
 	case AF_INET6:
-		addr.s_un.s_in6.sa_family = NNG_AF_INET6;
-		addr.s_un.s_in6.sa_port   = sin6->sin6_port;
-		udp                       = ztn->zn_udp6;
-		port                      = htons(sin6->sin6_port);
-		memcpy(addr.s_un.s_in6.sa_addr, sin6->sin6_addr.s6_addr, 16);
+		addr.s_in6.sa_family = NNG_AF_INET6;
+		addr.s_in6.sa_port   = sin6->sin6_port;
+		udp                  = ztn->zn_udp6;
+		port                 = htons(sin6->sin6_port);
+		memcpy(addr.s_in6.sa_addr, sin6->sin6_addr.s6_addr, 16);
 		break;
 	default:
 		// No way to understand the address.
@@ -1440,9 +1440,9 @@ zt_node_create(zt_node **ztnp, const char *path)
 
 	// We want to bind to any address we can (for now).
 	memset(&sa4, 0, sizeof(sa4));
-	sa4.s_un.s_in.sa_family = NNG_AF_INET;
+	sa4.s_in.sa_family = NNG_AF_INET;
 	memset(&sa6, 0, sizeof(sa6));
-	sa6.s_un.s_in6.sa_family = NNG_AF_INET6;
+	sa6.s_in6.sa_family = NNG_AF_INET6;
 
 	if ((ztn = NNI_ALLOC_STRUCT(ztn)) == NULL) {
 		return (NNG_ENOMEM);
@@ -2747,10 +2747,10 @@ zt_pipe_getopt_locaddr(void *arg, void *data, size_t *szp)
 	nng_sockaddr sa;
 
 	memset(&sa, 0, sizeof(sa));
-	sa.s_un.s_zt.sa_family = NNG_AF_ZT;
-	sa.s_un.s_zt.sa_nwid   = p->zp_nwid;
-	sa.s_un.s_zt.sa_nodeid = p->zp_laddr >> zt_port_shift;
-	sa.s_un.s_zt.sa_port   = p->zp_laddr & zt_port_mask;
+	sa.s_zt.sa_family = NNG_AF_ZT;
+	sa.s_zt.sa_nwid   = p->zp_nwid;
+	sa.s_zt.sa_nodeid = p->zp_laddr >> zt_port_shift;
+	sa.s_zt.sa_port   = p->zp_laddr & zt_port_mask;
 	return (nni_getopt_sockaddr(&sa, data, szp));
 }
 
@@ -2761,10 +2761,10 @@ zt_pipe_getopt_remaddr(void *arg, void *data, size_t *szp)
 	nng_sockaddr sa;
 
 	memset(&sa, 0, sizeof(sa));
-	sa.s_un.s_zt.sa_family = NNG_AF_ZT;
-	sa.s_un.s_zt.sa_nwid   = p->zp_nwid;
-	sa.s_un.s_zt.sa_nodeid = p->zp_raddr >> zt_port_shift;
-	sa.s_un.s_zt.sa_port   = p->zp_raddr & zt_port_mask;
+	sa.s_zt.sa_family = NNG_AF_ZT;
+	sa.s_zt.sa_nwid   = p->zp_nwid;
+	sa.s_zt.sa_nodeid = p->zp_raddr >> zt_port_shift;
+	sa.s_zt.sa_port   = p->zp_raddr & zt_port_mask;
 	return (nni_getopt_sockaddr(&sa, data, szp));
 }