diff options
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/in.c | 4 | ||||
| -rw-r--r-- | sys/netinet/ip_output.c | 20 | ||||
| -rw-r--r-- | sys/netinet/tcp_output.c | 6 |
3 files changed, 15 insertions, 15 deletions
diff --git a/sys/netinet/in.c b/sys/netinet/in.c index 3a364a604e0..0991e7a9461 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in.c,v 1.22 2001/07/27 02:17:54 itojun Exp $ */ +/* $OpenBSD: in.c,v 1.23 2001/11/24 19:29:06 deraadt Exp $ */ /* $NetBSD: in.c,v 1.26 1996/02/13 23:41:39 christos Exp $ */ /* @@ -246,7 +246,7 @@ in_control(so, cmd, data, ifp) case SIOCDIFADDR: if (ifra->ifra_addr.sin_family == AF_INET) for (; ia != 0; ia = ia->ia_list.tqe_next) { - if (ia->ia_ifp == ifp && + if (ia->ia_ifp == ifp && ia->ia_addr.sin_addr.s_addr == ifra->ifra_addr.sin_addr.s_addr) break; diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 0ffeaab75e2..6a659520fc7 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_output.c,v 1.138 2001/11/02 21:42:19 deraadt Exp $ */ +/* $OpenBSD: ip_output.c,v 1.139 2001/11/24 19:29:06 deraadt Exp $ */ /* $NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $ */ /* @@ -697,9 +697,9 @@ sendit: * them, there is no way for one to update all its * routes when the MTU is changed. */ - if ((ro->ro_rt->rt_flags & (RTF_UP | RTF_HOST)) - && !(ro->ro_rt->rt_rmx.rmx_locks & RTV_MTU) - && (ro->ro_rt->rt_rmx.rmx_mtu > ifp->if_mtu)) { + if ((ro->ro_rt->rt_flags & (RTF_UP | RTF_HOST)) && + !(ro->ro_rt->rt_rmx.rmx_locks & RTV_MTU) && + (ro->ro_rt->rt_rmx.rmx_mtu > ifp->if_mtu)) { ro->ro_rt->rt_rmx.rmx_mtu = ifp->if_mtu; } ipstat.ips_cantfrag++; @@ -1175,9 +1175,9 @@ ip_ctloutput(op, so, level, optname, mp) switch (optname) { case IP_IPSEC_LOCAL_ID: /* Check valid types and NUL-termination */ - if (ipr->ref_type < IPSP_IDENTITY_PREFIX - || ipr->ref_type > IPSP_IDENTITY_CONNECTION - || ((char *)(ipr + 1))[ipr->ref_len - 1]) { + if (ipr->ref_type < IPSP_IDENTITY_PREFIX || + ipr->ref_type > IPSP_IDENTITY_CONNECTION || + ((char *)(ipr + 1))[ipr->ref_len - 1]) { FREE(ipr, M_CREDENTIALS); error = EINVAL; } else { @@ -1188,9 +1188,9 @@ ip_ctloutput(op, so, level, optname, mp) break; case IP_IPSEC_REMOTE_ID: /* Check valid types and NUL-termination */ - if (ipr->ref_type < IPSP_IDENTITY_PREFIX - || ipr->ref_type > IPSP_IDENTITY_CONNECTION - || ((char *)(ipr + 1))[ipr->ref_len - 1]) { + if (ipr->ref_type < IPSP_IDENTITY_PREFIX || + ipr->ref_type > IPSP_IDENTITY_CONNECTION || + ((char *)(ipr + 1))[ipr->ref_len - 1]) { FREE(ipr, M_CREDENTIALS); error = EINVAL; } else { diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index d7587bc52e6..261fe6efc4e 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_output.c,v 1.43 2001/06/25 01:59:29 angelos Exp $ */ +/* $OpenBSD: tcp_output.c,v 1.44 2001/11/24 19:29:07 deraadt Exp $ */ /* $NetBSD: tcp_output.c,v 1.16 1997/06/03 16:17:09 kml Exp $ */ /* @@ -1102,8 +1102,8 @@ out: tcp_mtudisc(tp->t_inpcb, 0); return (0); } - if ((error == EHOSTUNREACH || error == ENETDOWN) - && TCPS_HAVERCVDSYN(tp->t_state)) { + if ((error == EHOSTUNREACH || error == ENETDOWN) && + TCPS_HAVERCVDSYN(tp->t_state)) { tp->t_softerror = error; return (0); } |