Basic support for IPv6 sockets

In enough of the APIs to support unfs3.

Author: CendioOssman

librpc/svc_tcp.c

@@ -194,8 +194,8 @@ svc_vc_create(sock, sendsize, recvsize)
 {
 	register SVCXPRT *xprt;
 	register struct tcp_rendezvous *r;
-	struct sockaddr_in addr;
-	int len = sizeof(struct sockaddr_in);
+	struct sockaddr_storage addr;
+	int len = sizeof(struct sockaddr_storage);
 
 	if ((getsockname(sock, (struct sockaddr *)&addr, &len) != 0)  ||
 	    (listen(sock, 2) != 0)) {
@@ -226,7 +226,12 @@ svc_vc_create(sock, sendsize, recvsize)
 	xprt->xp_p1 = (caddr_t)r;
 	xprt->xp_verf = _null_auth;
 	xprt->xp_ops = &svctcp_rendezvous_op;
-	xprt->xp_port = ntohs(addr.sin_port);
+	if (addr.ss_family == AF_INET)
+		xprt->xp_port = ntohs(((struct sockaddr_in *)&addr)->sin_port);
+	else if (addr.ss_family == AF_INET6)
+		xprt->xp_port = ntohs(((struct sockaddr_in6 *)&addr)->sin6_port);
+	else
+		xprt->xp_port = 0;
 	xprt->xp_fd = sock;
 	xprt_register(xprt);
 	return (xprt);
@@ -298,12 +303,12 @@ rendezvous_request(xprt)
 {
 	int sock;
 	struct tcp_rendezvous *r;
-	struct sockaddr_in addr;
+	struct sockaddr_storage addr;
 	int len;
 
 	r = (struct tcp_rendezvous *)xprt->xp_p1;
     again:
-	len = sizeof(struct sockaddr_in);
+	len = sizeof(struct sockaddr_storage);
 	if ((sock = accept(xprt->xp_fd, (struct sockaddr *)&addr,
 	    &len)) < 0) {
 #ifdef WIN32

librpc/svc_udp.c

@@ -165,8 +165,8 @@ svc_dg_create(sock, sendsz, recvsz)
 {
 	register SVCXPRT *xprt;
 	register struct svcudp_data *su;
-	struct sockaddr_in addr;
-	int len = sizeof(struct sockaddr_in);
+	struct sockaddr_storage addr;
+	int len = sizeof(struct sockaddr_storage);
 
 	if (getsockname(sock, (struct sockaddr *)&addr, &len) != 0) {
 		perror("svcudp_create - cannot getsockname");
@@ -211,7 +211,12 @@ svc_dg_create(sock, sendsz, recvsz)
 	xprt->xp_ltaddr.buf = mem_alloc(xprt->xp_ltaddr.maxlen);
 	getsockname(xprt->xp_fd, xprt->xp_ltaddr.buf, &xprt->xp_ltaddr.len);
 	xprt->xp_ops = &svcudp_op;
-	xprt->xp_port = ntohs(addr.sin_port);
+	if (addr.ss_family == AF_INET)
+		xprt->xp_port = ntohs(((struct sockaddr_in *)&addr)->sin_port);
+	else if (addr.ss_family == AF_INET6)
+		xprt->xp_port = ntohs(((struct sockaddr_in6 *)&addr)->sin6_port);
+	else
+		xprt->xp_port = 0;
 	xprt->xp_fd = sock;
 	xprt_register(xprt);
 	return (xprt);
@@ -237,7 +242,7 @@ svcudp_recv(xprt, msg)
 	u_long replylen;
 
     again:
-	xprt->xp_addrlen = sizeof(struct sockaddr_in);
+	xprt->xp_addrlen = sizeof(struct sockaddr_storage);
 	rlen = recvfrom(xprt->xp_fd, rpc_buffer(xprt), (int) su->su_iosz,
 	    0, (struct sockaddr *)&(xprt->xp_raddr), &(xprt->xp_addrlen));
 #ifdef WIN32
@@ -378,7 +383,7 @@ struct cache_node {
 	u_long cache_proc;
 	u_long cache_vers;
 	u_long cache_prog;
-	struct sockaddr_in cache_addr;
+	struct sockaddr_storage cache_addr;
 	/*
 	 * The cached reply and length
 	 */
@@ -403,7 +408,7 @@ struct udp_cache {
 	u_long uc_prog;		/* saved program number */
 	u_long uc_vers;		/* saved version number */
 	u_long uc_proc;		/* saved procedure number */
-	struct sockaddr_in uc_addr; /* saved caller's address */
+	struct sockaddr_storage uc_addr; /* saved caller's address */
 };
 
 

rpc/rpc.h

@@ -51,6 +51,7 @@
 #ifdef WIN32
 #include <stdlib.h>
 #include <winsock2.h>
+#include <ws2tcpip.h>
 #include <rpc/types.h>		/* some typedefs */
 #include <process.h>
 

rpc/svc.h

@@ -100,7 +100,7 @@ typedef struct {
 	    void	(*xp_destroy)(DOTS); /* destroy this struct */
 	} *xp_ops;
 	int		xp_addrlen;	 /* length of remote address */
-	struct sockaddr_in xp_raddr;	 /* remote address */
+	struct sockaddr_storage xp_raddr;	 /* remote address */
 	struct netbuf	xp_ltaddr;	 /* local transport address */
 	struct netbuf	xp_rtaddr;	 /* remote transport address */
 	struct opaque_auth xp_verf;	 /* raw response verifier */