svn commit: r259554 - user/ae/inet6/sys/netinet

[Andrey V. Elsukov]

Author: ae
Date: Wed Dec 18 14:46:13 2013
New Revision: 259554
URL: http://svnweb.freebsd.org/changeset/base/259554

Log:
  Update code in sys/netinet to use sockaddr_in6 with jail's functions.

Modified:
  user/ae/inet6/sys/netinet/sctp_pcb.c
  user/ae/inet6/sys/netinet/sctp_usrreq.c
  user/ae/inet6/sys/netinet/tcp_usrreq.c

Modified: user/ae/inet6/sys/netinet/sctp_pcb.c
==============================================================================
--- user/ae/inet6/sys/netinet/sctp_pcb.c	Wed Dec 18 14:45:03 2013	(r259553)
+++ user/ae/inet6/sys/netinet/sctp_pcb.c	Wed Dec 18 14:46:13 2013	(r259554)
@@ -2803,7 +2803,7 @@ sctp_inpcb_bind(struct socket *so, struc
 				 * will transmute the ipv6 address to the
 				 * proper value.
 				 */
-				if (p && (error = prison_local_ip6(p->td_ucred, &sin6->sin6_addr,
+				if (p && (error = prison_local_ip6(p->td_ucred, sin6,
 				    (SCTP_IPV6_V6ONLY(inp) != 0))) != 0) {
 					SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_PCB, error);
 					return (error);

Modified: user/ae/inet6/sys/netinet/sctp_usrreq.c
==============================================================================
--- user/ae/inet6/sys/netinet/sctp_usrreq.c	Wed Dec 18 14:45:03 2013	(r259553)
+++ user/ae/inet6/sys/netinet/sctp_usrreq.c	Wed Dec 18 14:46:13 2013	(r259554)
@@ -5304,7 +5304,7 @@ sctp_setopt(struct socket *so, int optna
 					error = EINVAL;
 					break;
 				}
-				if (td != NULL && (error = prison_local_ip6(td->td_ucred, &(((struct sockaddr_in6 *)(addrs->addr))->sin6_addr),
+				if (td != NULL && (error = prison_local_ip6(td->td_ucred, (struct sockaddr_in6 *)(addrs->addr),
 				    (SCTP_IPV6_V6ONLY(inp) != 0))) != 0) {
 					SCTP_LTRACE_ERR_RET(inp, stcb, NULL, SCTP_FROM_SCTP_USRREQ, error);
 					break;
@@ -5350,7 +5350,7 @@ sctp_setopt(struct socket *so, int optna
 				}
 				if (td != NULL &&
 				    (error = prison_local_ip6(td->td_ucred,
-				    &(((struct sockaddr_in6 *)(addrs->addr))->sin6_addr),
+				    (struct sockaddr_in6 *)(addrs->addr),
 				    (SCTP_IPV6_V6ONLY(inp) != 0))) != 0) {
 					SCTP_LTRACE_ERR_RET(inp, stcb, NULL, SCTP_FROM_SCTP_USRREQ, error);
 					break;
@@ -5928,7 +5928,7 @@ sctp_connect(struct socket *so, struct s
 				return (EINVAL);
 			}
 			sin6p = (struct sockaddr_in6 *)addr;
-			if (p != NULL && (error = prison_remote_ip6(p->td_ucred, &sin6p->sin6_addr)) != 0) {
+			if (p != NULL && (error = prison_remote_ip6(p->td_ucred, sin6p)) != 0) {
 				SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, error);
 				return (error);
 			}

Modified: user/ae/inet6/sys/netinet/tcp_usrreq.c
==============================================================================
--- user/ae/inet6/sys/netinet/tcp_usrreq.c	Wed Dec 18 14:45:03 2013	(r259553)
+++ user/ae/inet6/sys/netinet/tcp_usrreq.c	Wed Dec 18 14:46:13 2013	(r259554)
@@ -549,7 +549,7 @@ tcp6_usr_connect(struct socket *so, stru
 	inp->inp_vflag &= ~INP_IPV4;
 	inp->inp_vflag |= INP_IPV6;
 	inp->inp_inc.inc_flags |= INC_ISIPV6;
-	if ((error = prison_remote_ip6(td->td_ucred, &sin6p->sin6_addr)) != 0)
+	if ((error = prison_remote_ip6(td->td_ucred, sin6p)) != 0)
 		goto out;
 	if ((error = tcp6_connect(tp, nam, td)) != 0)
 		goto out;