diff options
| author | maxim <maxim@FreeBSD.org> | 2004-05-03 17:15:34 +0000 |
|---|---|---|
| committer | maxim <maxim@FreeBSD.org> | 2004-05-03 17:15:34 +0000 |
| commit | 96efdc32508a89617572eb65f9fe09f464e77cf8 (patch) | |
| tree | fa82d5d03c7ab380a1087f85407657b8fa884949 | |
| parent | 79697f7186c61b65c0dc7178ea0f61c818dc70a2 (diff) | |
| download | FreeBSD-src-96efdc32508a89617572eb65f9fe09f464e77cf8.zip FreeBSD-src-96efdc32508a89617572eb65f9fe09f464e77cf8.tar.gz | |
o Fix misindentation in the previous commit.
| -rw-r--r-- | sys/net/rtsock.c | 8 | ||||
| -rw-r--r-- | sys/netinet/raw_ip.c | 15 |
2 files changed, 11 insertions, 12 deletions
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 7094bf7..002432b 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -409,13 +409,13 @@ route_output(struct mbuf *m, struct socket *so) jail.sin_addr.s_addr = htonl(prison_getip(so->so_cred)); info.rti_info[RTAX_IFA] = - (struct sockaddr *)&jail; + (struct sockaddr *)&jail; } else info.rti_info[RTAX_IFA] = - rt->rt_ifa->ifa_addr; + rt->rt_ifa->ifa_addr; if (ifp->if_flags & IFF_POINTOPOINT) - info.rti_info[RTAX_BRD] = - rt->rt_ifa->ifa_dstaddr; + info.rti_info[RTAX_BRD] = + rt->rt_ifa->ifa_dstaddr; rtm->rtm_index = ifp->if_index; } else { info.rti_info[RTAX_IFP] = NULL; diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index f4eb92c..6668059 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -208,8 +208,8 @@ rip_input(struct mbuf *m, int off) inp->inp_faddr.s_addr != ip->ip_src.s_addr) goto docontinue; if (jailed(inp->inp_socket->so_cred)) - if (htonl(prison_getip(inp->inp_socket->so_cred)) - != ip->ip_dst.s_addr) + if (htonl(prison_getip(inp->inp_socket->so_cred)) != + ip->ip_dst.s_addr) goto docontinue; if (last) { struct mbuf *n; @@ -268,7 +268,7 @@ rip_output(struct mbuf *m, struct socket *so, u_long dst) ip->ip_len = m->m_pkthdr.len; if (jailed(inp->inp_socket->so_cred)) ip->ip_src.s_addr = - htonl(prison_getip(inp->inp_socket->so_cred)); + htonl(prison_getip(inp->inp_socket->so_cred)); else ip->ip_src = inp->inp_laddr; ip->ip_dst.s_addr = dst; @@ -281,7 +281,7 @@ rip_output(struct mbuf *m, struct socket *so, u_long dst) ip = mtod(m, struct ip *); if (jailed(inp->inp_socket->so_cred)) { if (ip->ip_src.s_addr != - htonl(prison_getip(inp->inp_socket->so_cred))) { + htonl(prison_getip(inp->inp_socket->so_cred))) { m_freem(m); return (EPERM); } @@ -639,11 +639,10 @@ rip_bind(struct socket *so, struct sockaddr *nam, struct thread *td) return EINVAL; if (jailed(td->td_ucred)) { - if (addr->sin_addr.s_addr == INADDR_ANY) + if (addr->sin_addr.s_addr == INADDR_ANY) addr->sin_addr.s_addr = - htonl(prison_getip(td->td_ucred)); - if (htonl(prison_getip(td->td_ucred)) - != addr->sin_addr.s_addr) + htonl(prison_getip(td->td_ucred)); + if (htonl(prison_getip(td->td_ucred)) != addr->sin_addr.s_addr) return (EADDRNOTAVAIL); } |
