d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

For consistency with prison_{local,remote,check}_ipN rename

Browse Source 
prison_getipN to prison_get_ipN.

Submitted by:	jamie (as part of a larger patch)
MFC after:	1 week
This commit is contained in:
Bjoern A. Zeeb 2009-01-25 10:11:58 +00:00
parent 8d456252aa
commit 1cecba0fcd
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/kern/kern_jail.c
View File

@ -812,7 +812,7 @@ prison_proc_free(struct prison *pr)
* Returns 0 on success, 1 on error. Address returned in NBO. * Returns 0 on success, 1 on error. Address returned in NBO.
*/ */
int 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__)); KASSERT(cred != NULL, ("%s: cred is NULL", __func__));
@ -958,7 +958,7 @@ prison_check_ip4(struct ucred *cred, struct in_addr *ia)
* Returns 0 on success, 1 on error. * Returns 0 on success, 1 on error.
*/ */
int 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__)); KASSERT(cred != NULL, ("%s: cred is NULL", __func__));

4
sys/net/rtsock.c
View File

@ -376,7 +376,7 @@ rtm_get_jailed(struct rt_addrinfo *info, struct ifnet *ifp,
* 3. As a last resort return the 'default' * 3. As a last resort return the 'default'
* jail address. * jail address.
*/ */
if (prison_getip4(cred, &ia) != 0) if (prison_get_ip4(cred, &ia) != 0)
return (ESRCH); return (ESRCH);
} }
bzero(&saun->sin, sizeof(struct sockaddr_in)); bzero(&saun->sin, sizeof(struct sockaddr_in));
@ -428,7 +428,7 @@ rtm_get_jailed(struct rt_addrinfo *info, struct ifnet *ifp,
* 3. As a last resort return the 'default' * 3. As a last resort return the 'default'
* jail address. * jail address.
*/ */
if (prison_getip6(cred, &ia6) != 0) if (prison_get_ip6(cred, &ia6) != 0)
return (ESRCH); return (ESRCH);
} }
bzero(&saun->sin6, sizeof(struct sockaddr_in6)); bzero(&saun->sin6, sizeof(struct sockaddr_in6));

8
sys/netinet/in_pcb.c
View File

@ -625,7 +625,7 @@ in_pcbladdr(struct inpcb *inp, struct in_addr *faddr, struct in_addr *laddr,
} }
/* 3. As a last resort return the 'default' jail address. */ /* 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; error = EADDRNOTAVAIL;
goto done; goto done;
} }
@ -678,7 +678,7 @@ in_pcbladdr(struct inpcb *inp, struct in_addr *faddr, struct in_addr *laddr,
} }
/* 3. As a last resort return the 'default' jail address. */ /* 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; error = EADDRNOTAVAIL;
goto done; goto done;
} }
@ -741,7 +741,7 @@ in_pcbladdr(struct inpcb *inp, struct in_addr *faddr, struct in_addr *laddr,
} }
/* 3. As a last resort return the 'default' jail address. */ /* 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; error = EADDRNOTAVAIL;
goto done; goto done;
} }
@ -810,7 +810,7 @@ in_pcbconnect_setup(struct inpcb *inp, struct sockaddr *nam,
*/ */
if (faddr.s_addr == INADDR_ANY) { if (faddr.s_addr == INADDR_ANY) {
if (cred != NULL && jailed(cred)) { if (cred != NULL && jailed(cred)) {
if (prison_getip4(cred, &jailia) != 0) if (prison_get_ip4(cred, &jailia) != 0)
return (EADDRNOTAVAIL); return (EADDRNOTAVAIL);
faddr.s_addr = jailia.s_addr; faddr.s_addr = jailia.s_addr;
} else { } else {

2
sys/netinet/raw_ip.c
View File

@ -371,7 +371,7 @@ rip_output(struct mbuf *m, struct socket *so, u_long dst)
ip->ip_p = inp->inp_ip_p; ip->ip_p = inp->inp_ip_p;
ip->ip_len = m->m_pkthdr.len; ip->ip_len = m->m_pkthdr.len;
if (jailed(inp->inp_cred)) { 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); INP_RUNLOCK(inp);
m_freem(m); m_freem(m);
return (EPERM); return (EPERM);

2
sys/netinet6/raw_ip6.c
View File

@ -412,7 +412,7 @@ rip6_output(m, va_alist)
goto bad; goto bad;
} }
if (jailed(in6p->inp_cred)) if (jailed(in6p->inp_cred))
if (prison_getip6(in6p->inp_cred, in6a) != 0) { if (prison_get_ip6(in6p->inp_cred, in6a) != 0) {
error = EPERM; error = EPERM;
goto bad; goto bad;
} }

4
sys/sys/jail.h
View File

@ -181,12 +181,12 @@ void prison_hold(struct prison *pr);
void prison_hold_locked(struct prison *pr); void prison_hold_locked(struct prison *pr);
void prison_proc_hold(struct prison *); void prison_proc_hold(struct prison *);
void prison_proc_free(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_local_ip4(struct ucred *cred, struct in_addr *ia);
int prison_remote_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); int prison_check_ip4(struct ucred *cred, struct in_addr *ia);
#ifdef INET6 #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_local_ip6(struct ucred *, struct in6_addr *, int);
int prison_remote_ip6(struct ucred *, struct in6_addr *); int prison_remote_ip6(struct ucred *, struct in6_addr *);
int prison_check_ip6(struct ucred *, struct in6_addr *); int prison_check_ip6(struct ucred *, struct in6_addr *);