svn commit: r188286 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb kern net netinet netinet6 sys

[Bjoern A. Zeeb]

Author: bz
Date: Sat Feb  7 13:55:12 2009
New Revision: 188286
URL: http://svn.freebsd.org/changeset/base/188286

Log:
  MFC: r187684
  
    For consistency with prison_{local,remote,check}_ipN rename
    prison_getipN to prison_get_ipN.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/kern/kern_jail.c
  stable/7/sys/net/rtsock.c
  stable/7/sys/netinet/in_pcb.c
  stable/7/sys/netinet/raw_ip.c
  stable/7/sys/netinet6/raw_ip6.c
  stable/7/sys/sys/jail.h

Modified: stable/7/sys/kern/kern_jail.c
==============================================================================
--- stable/7/sys/kern/kern_jail.c	Sat Feb  7 13:51:15 2009	(r188285)
+++ stable/7/sys/kern/kern_jail.c	Sat Feb  7 13:55:12 2009	(r188286)
@@ -846,7 +846,7 @@ prison_proc_free(struct prison *pr)
  * Returns 0 on success, 1 on error.  Address returned in NBO.
  */
 int
-prison_getip4(struct ucred *cred, struct in_addr *ia)
+prison_get_ip4(struct ucred *cred, struct in_addr *ia)
 {
 
 	KASSERT(cred != NULL, ("%s: cred is NULL", __func__));
@@ -992,7 +992,7 @@ prison_check_ip4(struct ucred *cred, str
  * Returns 0 on success, 1 on error.
  */
 int
-prison_getip6(struct ucred *cred, struct in6_addr *ia6)
+prison_get_ip6(struct ucred *cred, struct in6_addr *ia6)
 {
 
 	KASSERT(cred != NULL, ("%s: cred is NULL", __func__));

Modified: stable/7/sys/net/rtsock.c
==============================================================================
--- stable/7/sys/net/rtsock.c	Sat Feb  7 13:51:15 2009	(r188285)
+++ stable/7/sys/net/rtsock.c	Sat Feb  7 13:55:12 2009	(r188286)
@@ -368,7 +368,7 @@ rtm_get_jailed(struct rt_addrinfo *info,
 				 * 3. As a last resort return the 'default'
 				 * jail address.
 				 */
-				if (prison_getip4(cred, &ia) != 0)
+				if (prison_get_ip4(cred, &ia) != 0)
 					return (ESRCH);
 			}
 			bzero(&saun->sin, sizeof(struct sockaddr_in));
@@ -420,7 +420,7 @@ rtm_get_jailed(struct rt_addrinfo *info,
 				 * 3. As a last resort return the 'default'
 				 * jail address.
 				 */
-				if (prison_getip6(cred, &ia6) != 0)
+				if (prison_get_ip6(cred, &ia6) != 0)
 					return (ESRCH);
 			}
 			bzero(&saun->sin6, sizeof(struct sockaddr_in6));

Modified: stable/7/sys/netinet/in_pcb.c
==============================================================================
--- stable/7/sys/netinet/in_pcb.c	Sat Feb  7 13:51:15 2009	(r188285)
+++ stable/7/sys/netinet/in_pcb.c	Sat Feb  7 13:55:12 2009	(r188286)
@@ -617,7 +617,7 @@ in_pcbladdr(struct inpcb *inp, struct in
 		}
 
 		/* 3. As a last resort return the 'default' jail address. */
-		if (prison_getip4(cred, laddr) != 0)
+		if (prison_get_ip4(cred, laddr) != 0)
 			error = EADDRNOTAVAIL;
 		goto done;
 	}
@@ -670,7 +670,7 @@ in_pcbladdr(struct inpcb *inp, struct in
 		}
 
 		/* 3. As a last resort return the 'default' jail address. */
-		if (prison_getip4(cred, laddr) != 0)
+		if (prison_get_ip4(cred, laddr) != 0)
 			error = EADDRNOTAVAIL;
 		goto done;
 	}
@@ -733,7 +733,7 @@ in_pcbladdr(struct inpcb *inp, struct in
 		}
 
 		/* 3. As a last resort return the 'default' jail address. */
-		if (prison_getip4(cred, laddr) != 0)
+		if (prison_get_ip4(cred, laddr) != 0)
 			error = EADDRNOTAVAIL;
 		goto done;
 	}
@@ -801,7 +801,7 @@ in_pcbconnect_setup(struct inpcb *inp, s
 		 */
 		if (faddr.s_addr == INADDR_ANY) {
 			if (cred != NULL && jailed(cred)) {
-				if (prison_getip4(cred, &jailia) != 0)
+				if (prison_get_ip4(cred, &jailia) != 0)
 					return (EADDRNOTAVAIL);
 				faddr.s_addr = jailia.s_addr;
 			} else {

Modified: stable/7/sys/netinet/raw_ip.c
==============================================================================
--- stable/7/sys/netinet/raw_ip.c	Sat Feb  7 13:51:15 2009	(r188285)
+++ stable/7/sys/netinet/raw_ip.c	Sat Feb  7 13:55:12 2009	(r188286)
@@ -359,7 +359,7 @@ rip_output(struct mbuf *m, struct socket
 		ip->ip_p = inp->inp_ip_p;
 		ip->ip_len = m->m_pkthdr.len;
 		if (jailed(inp->inp_cred)) {
-			if (prison_getip4(inp->inp_cred, &ip->ip_src)) {
+			if (prison_get_ip4(inp->inp_cred, &ip->ip_src) != 0) {
 				INP_RUNLOCK(inp);
 				m_freem(m);
 				return (EPERM);

Modified: stable/7/sys/netinet6/raw_ip6.c
==============================================================================
--- stable/7/sys/netinet6/raw_ip6.c	Sat Feb  7 13:51:15 2009	(r188285)
+++ stable/7/sys/netinet6/raw_ip6.c	Sat Feb  7 13:55:12 2009	(r188286)
@@ -398,7 +398,7 @@ rip6_output(m, va_alist)
 		goto bad;
 	}
 	if (jailed(in6p->inp_cred))
-		if (prison_getip6(in6p->inp_cred, in6a) != 0) {
+		if (prison_get_ip6(in6p->inp_cred, in6a) != 0) {
 			error = EPERM;
 			goto bad;
 		}

Modified: stable/7/sys/sys/jail.h
==============================================================================
--- stable/7/sys/sys/jail.h	Sat Feb  7 13:51:15 2009	(r188285)
+++ stable/7/sys/sys/jail.h	Sat Feb  7 13:55:12 2009	(r188286)
@@ -178,12 +178,12 @@ void prison_hold(struct prison *pr);
 void prison_hold_locked(struct prison *pr);
 void prison_proc_hold(struct prison *);
 void prison_proc_free(struct prison *);
-int prison_getip4(struct ucred *cred, struct in_addr *ia);
+int prison_get_ip4(struct ucred *cred, struct in_addr *ia);
 int prison_local_ip4(struct ucred *cred, struct in_addr *ia);
 int prison_remote_ip4(struct ucred *cred, struct in_addr *ia);
 int prison_check_ip4(struct ucred *cred, struct in_addr *ia);
 #ifdef INET6
-int prison_getip6(struct ucred *, struct in6_addr *);
+int prison_get_ip6(struct ucred *, struct in6_addr *);
 int prison_local_ip6(struct ucred *, struct in6_addr *, int);
 int prison_remote_ip6(struct ucred *, struct in6_addr *);
 int prison_check_ip6(struct ucred *, struct in6_addr *);