libc rcmd update for IPv6.

A new function bindresvport2(), AF independent version of bindresvport()
is also added.

Reviewed by: sumikawa
Obtained from: KAME project

3 files changed, 63 insertions, 18 deletions

diff --git a/lib/libc/rpc/Makefile.inc b/lib/libc/rpc/Makefile.inc
index 79103b3..472cea7 100644
--- a/lib/libc/rpc/Makefile.inc
+++ b/lib/libc/rpc/Makefile.inc
@@ -44,7 +44,8 @@ crypt.h: ${RPCDIR}/crypt.x
 #
 
 # MAN1+=	rstat.1
-MAN3+=	bindresvport.3 des_crypt.3 getrpcent.3 getrpcport.3 publickey.3 rpc.3 \
+MAN3+=	bindresvport.3 bindresvport2.3 des_crypt.3 getrpcent.3 getrpcport.3 \
+	publickey.3 rpc.3 \
 	rpc_secure.3 rtime.3
 MAN5+=	publickey.5 rpc.5
 # MAN8+=	rstat_svc.8
diff --git a/lib/libc/rpc/bindresvport.3 b/lib/libc/rpc/bindresvport.3
index 9abdcb9..8d1f975 100644
--- a/lib/libc/rpc/bindresvport.3
+++ b/lib/libc/rpc/bindresvport.3
@@ -30,3 +30,5 @@ If the value of sin->sin_port is non-zero
 .Fn bindresvport
 will attempt to use that specific port.  If it fails, it chooses another
 privileged port automatically.
+.Sh "SEE ALSO"
+.Xr bindresvport2 3
\ No newline at end of file
diff --git a/lib/libc/rpc/bindresvport.c b/lib/libc/rpc/bindresvport.c
index 1a62efa..e8e8c15 100644
--- a/lib/libc/rpc/bindresvport.c
+++ b/lib/libc/rpc/bindresvport.c
@@ -55,7 +55,6 @@ bindresvport(sd, sin)
 	int sd;
 	struct sockaddr_in *sin;
 {
-	int on, old, error;
 	struct sockaddr_in myaddr;
 	int sinlen = sizeof(struct sockaddr_in);
 
@@ -69,39 +68,82 @@ bindresvport(sd, sin)
 		return (-1);
 	}
 
-	if (sin->sin_port == 0) {
+	return (bindresvport2(sd, sin, sinlen));
+}
+
+int
+bindresvport2(sd, sa, addrlen)
+	int sd;
+	struct sockaddr *sa;
+	socklen_t addrlen;
+{
+	int on, old, error, level, optname;
+	u_short port;
+
+	if (sa == NULL) {
+		errno = EINVAL;
+		return (-1);
+	}
+	switch (sa->sa_family) {
+	case AF_INET:
+		port = ntohs(((struct sockaddr_in *)sa)->sin_port);
+		level = IPPROTO_IP;
+		optname = IP_PORTRANGE;
+		on = IP_PORTRANGE_LOW;
+		break;
+#ifdef INET6
+	case AF_INET6:
+		port = ntohs(((struct sockaddr_in6 *)sa)->sin6_port);
+		level = IPPROTO_IPV6;
+		optname = IPV6_PORTRANGE;
+		on = IPV6_PORTRANGE_LOW;
+		break;
+#endif
+	default:
+		errno = EAFNOSUPPORT;
+		return (-1);
+	}
+
+	if (port == 0) {
 		int oldlen = sizeof(old);
-		error = getsockopt(sd, IPPROTO_IP, IP_PORTRANGE,
-				   &old, &oldlen);
+		error = getsockopt(sd, level, optname, &old, &oldlen);
 		if (error < 0)
 			return(error);
 
-		on = IP_PORTRANGE_LOW;
-		error = setsockopt(sd, IPPROTO_IP, IP_PORTRANGE,
-		           	   &on, sizeof(on));
+		error = setsockopt(sd, level, optname, &on, sizeof(on));
 		if (error < 0)
 			return(error);
 	}
 
-	error = bind(sd, (struct sockaddr *)sin, sinlen);
+	error = bind(sd, sa, addrlen);
 
-	if (sin->sin_port == 0) {
+	switch (sa->sa_family) {
+	case AF_INET:
+		port = ntohs(((struct sockaddr_in *)sa)->sin_port);
+		break;
+#ifdef INET6
+	case AF_INET6:
+		port = ntohs(((struct sockaddr_in6 *)sa)->sin6_port);
+		break;
+#endif
+	default: /* shoud not match here */
+		errno = EAFNOSUPPORT;
+		return (-1);
+	}
+	if (port == 0) {
 		int saved_errno = errno;
 
 		if (error) {
-			if (setsockopt(sd, IPPROTO_IP, IP_PORTRANGE,
+			if (setsockopt(sd, level, optname,
 			    &old, sizeof(old)) < 0)
 				errno = saved_errno;
 			return (error);
 		}
 
-		if (sin != &myaddr) {
-			/* Hmm, what did the kernel assign... */
-			if (getsockname(sd, (struct sockaddr *)sin,
-			    &sinlen) < 0)
-				errno = saved_errno;
-			return (error);
-		}
+		/* Hmm, what did the kernel assign... */
+		if (getsockname(sd, (struct sockaddr *)sa, &addrlen) < 0)
+			errno = saved_errno;
+		return (error);
 	}
 	return (error);
 }