From owner-svn-src-user@FreeBSD.ORG Wed Dec 18 14:46:14 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C263D118; Wed, 18 Dec 2013 14:46:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A2A2A1449; Wed, 18 Dec 2013 14:46:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBIEkEJT034321; Wed, 18 Dec 2013 14:46:14 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBIEkEiW034317; Wed, 18 Dec 2013 14:46:14 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201312181446.rBIEkEiW034317@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Wed, 18 Dec 2013 14:46:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r259554 - user/ae/inet6/sys/netinet X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Dec 2013 14:46:14 -0000 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;