Module Name: src Committed By: ozaki-r Date: Wed Nov 13 02:51:23 UTC 2019
Modified Files: src/sys/net: if.c route.c src/sys/netinet: ip_input.c sctp_output.c src/sys/netinet6: frag6.c in6_src.c ip6_output.c nd6_nbr.c Log Message: Get rid of unnecessary NULL checks for rt_ifa and ifa_ifp They are always non-NULL nowadays. To generate a diff of this commit: cvs rdiff -u -r1.463 -r1.464 src/sys/net/if.c cvs rdiff -u -r1.225 -r1.226 src/sys/net/route.c cvs rdiff -u -r1.392 -r1.393 src/sys/netinet/ip_input.c cvs rdiff -u -r1.18 -r1.19 src/sys/netinet/sctp_output.c cvs rdiff -u -r1.74 -r1.75 src/sys/netinet6/frag6.c cvs rdiff -u -r1.85 -r1.86 src/sys/netinet6/in6_src.c cvs rdiff -u -r1.221 -r1.222 src/sys/netinet6/ip6_output.c cvs rdiff -u -r1.174 -r1.175 src/sys/netinet6/nd6_nbr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/net/if.c diff -u src/sys/net/if.c:1.463 src/sys/net/if.c:1.464 --- src/sys/net/if.c:1.463 Sun Oct 6 15:11:17 2019 +++ src/sys/net/if.c Wed Nov 13 02:51:22 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if.c,v 1.463 2019/10/06 15:11:17 uwe Exp $ */ +/* $NetBSD: if.c,v 1.464 2019/11/13 02:51:22 ozaki-r Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc. @@ -90,7 +90,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.463 2019/10/06 15:11:17 uwe Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.464 2019/11/13 02:51:22 ozaki-r Exp $"); #if defined(_KERNEL_OPT) #include "opt_inet.h" @@ -2197,10 +2197,10 @@ link_rtrequest(int cmd, struct rtentry * struct ifnet *ifp; struct psref psref; - if (cmd != RTM_ADD || (ifa = rt->rt_ifa) == NULL || - (ifp = ifa->ifa_ifp) == NULL || (dst = rt_getkey(rt)) == NULL || - ISSET(info->rti_flags, RTF_DONTCHANGEIFA)) + if (cmd != RTM_ADD || ISSET(info->rti_flags, RTF_DONTCHANGEIFA)) return; + ifp = rt->rt_ifa->ifa_ifp; + dst = rt_getkey(rt); if ((ifa = ifaof_ifpforaddr_psref(dst, ifp, &psref)) != NULL) { rt_replace_ifa(rt, ifa); if (ifa->ifa_rtrequest && ifa->ifa_rtrequest != link_rtrequest) Index: src/sys/net/route.c diff -u src/sys/net/route.c:1.225 src/sys/net/route.c:1.226 --- src/sys/net/route.c:1.225 Thu Oct 3 03:10:02 2019 +++ src/sys/net/route.c Wed Nov 13 02:51:22 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: route.c,v 1.225 2019/10/03 03:10:02 knakahara Exp $ */ +/* $NetBSD: route.c,v 1.226 2019/11/13 02:51:22 ozaki-r Exp $ */ /*- * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc. @@ -97,7 +97,7 @@ #endif #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.225 2019/10/03 03:10:02 knakahara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.226 2019/11/13 02:51:22 ozaki-r Exp $"); #include <sys/param.h> #ifdef RTFLUSH_DEBUG @@ -355,9 +355,8 @@ rt_get_ifa(struct rtentry *rt) { struct ifaddr *ifa; - if ((ifa = rt->rt_ifa) == NULL) - return ifa; - else if (ifa->ifa_getifa == NULL) + ifa = rt->rt_ifa; + if (ifa->ifa_getifa == NULL) return ifa; #if 0 else if (ifa->ifa_seqno != NULL && *ifa->ifa_seqno == rt->rt_ifa_seqno) @@ -412,8 +411,7 @@ rt_replace_ifa(struct rtentry *rt, struc if (rt->rt_ifa == ifa) return; - if (rt->rt_ifa && - rt->rt_ifa != ifa && + if (rt->rt_ifa != ifa && rt->rt_ifa->ifa_flags & IFA_ROUTE && rt_ifa_connected(rt, rt->rt_ifa)) { @@ -1194,18 +1192,17 @@ rtrequest1(int req, struct rt_addrinfo * if ((rt = rt_deladdr(rtbl, dst, netmask)) == NULL) senderr(ESRCH); rt->rt_flags &= ~RTF_UP; - if ((ifa = rt->rt_ifa)) { - if (ifa->ifa_flags & IFA_ROUTE && - rt_ifa_connected(rt, ifa)) { - RT_DPRINTF("rt->_rt_key = %p, ifa = %p, " - "deleted IFA_ROUTE\n", - (void *)rt->_rt_key, (void *)ifa); - ifa->ifa_flags &= ~IFA_ROUTE; - } - if (ifa->ifa_rtrequest) - ifa->ifa_rtrequest(RTM_DELETE, rt, info); - ifa = NULL; + ifa = rt->rt_ifa; + if (ifa->ifa_flags & IFA_ROUTE && + rt_ifa_connected(rt, ifa)) { + RT_DPRINTF("rt->_rt_key = %p, ifa = %p, " + "deleted IFA_ROUTE\n", + (void *)rt->_rt_key, (void *)ifa); + ifa->ifa_flags &= ~IFA_ROUTE; } + if (ifa->ifa_rtrequest) + ifa->ifa_rtrequest(RTM_DELETE, rt, info); + ifa = NULL; rttrash++; if (ret_nrt) { *ret_nrt = rt; @@ -1519,7 +1516,7 @@ rt_update(struct rtentry *rt, struct rt_ rt->rt_flags = (info->rti_flags & ~PRESERVED_RTF) | (rt->rt_flags & PRESERVED_RTF); } - if (rt->rt_ifa && rt->rt_ifa->ifa_rtrequest) + if (rt->rt_ifa->ifa_rtrequest) rt->rt_ifa->ifa_rtrequest(RTM_ADD, rt, info); #if defined(INET) || defined(INET6) if (ifp_changed && rt_mask(rt) != NULL) Index: src/sys/netinet/ip_input.c diff -u src/sys/netinet/ip_input.c:1.392 src/sys/netinet/ip_input.c:1.393 --- src/sys/netinet/ip_input.c:1.392 Thu Sep 19 05:31:50 2019 +++ src/sys/netinet/ip_input.c Wed Nov 13 02:51:22 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_input.c,v 1.392 2019/09/19 05:31:50 ozaki-r Exp $ */ +/* $NetBSD: ip_input.c,v 1.393 2019/11/13 02:51:22 ozaki-r Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -91,7 +91,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.392 2019/09/19 05:31:50 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.393 2019/11/13 02:51:22 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -1400,8 +1400,7 @@ ip_forward(struct mbuf *m, int srcrt, st (rt->rt_flags & (RTF_DYNAMIC|RTF_MODIFIED)) == 0 && !in_nullhost(satocsin(rt_getkey(rt))->sin_addr) && ipsendredirects && !srcrt) { - if (rt->rt_ifa && - (ip->ip_src.s_addr & ifatoia(rt->rt_ifa)->ia_subnetmask) == + if ((ip->ip_src.s_addr & ifatoia(rt->rt_ifa)->ia_subnetmask) == ifatoia(rt->rt_ifa)->ia_subnet) { if (rt->rt_flags & RTF_GATEWAY) dest = satosin(rt->rt_gateway)->sin_addr.s_addr; Index: src/sys/netinet/sctp_output.c diff -u src/sys/netinet/sctp_output.c:1.18 src/sys/netinet/sctp_output.c:1.19 --- src/sys/netinet/sctp_output.c:1.18 Sat Dec 22 14:28:57 2018 +++ src/sys/netinet/sctp_output.c Wed Nov 13 02:51:22 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sctp_output.c,v 1.18 2018/12/22 14:28:57 maxv Exp $ */ +/* $NetBSD: sctp_output.c,v 1.19 2019/11/13 02:51:22 ozaki-r Exp $ */ /* $KAME: sctp_output.c,v 1.48 2005/06/16 18:29:24 jinmei Exp $ */ /* @@ -30,7 +30,7 @@ * SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sctp_output.c,v 1.18 2018/12/22 14:28:57 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sctp_output.c,v 1.19 2019/11/13 02:51:22 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_ipsec.h" @@ -2507,9 +2507,7 @@ int sctp_is_address_in_scope(struct ifad int local_scope, int site_scope) { - if ((loopback_scope == 0) && - (ifa->ifa_ifp) && - (ifa->ifa_ifp->if_type == IFT_LOOP)) { + if ((loopback_scope == 0) && (ifa->ifa_ifp->if_type == IFT_LOOP)) { /* skip loopback if not in scope * */ return (0); Index: src/sys/netinet6/frag6.c diff -u src/sys/netinet6/frag6.c:1.74 src/sys/netinet6/frag6.c:1.75 --- src/sys/netinet6/frag6.c:1.74 Tue May 15 19:16:38 2018 +++ src/sys/netinet6/frag6.c Wed Nov 13 02:51:22 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: frag6.c,v 1.74 2018/05/15 19:16:38 maxv Exp $ */ +/* $NetBSD: frag6.c,v 1.75 2019/11/13 02:51:22 ozaki-r Exp $ */ /* $KAME: frag6.c,v 1.40 2002/05/27 21:40:31 itojun Exp $ */ /* @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.74 2018/05/15 19:16:38 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: frag6.c,v 1.75 2019/11/13 02:51:22 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_net_mpsafe.h" @@ -181,7 +181,7 @@ frag6_input(struct mbuf **mp, int *offp, dstifp = NULL; /* find the destination interface of the packet. */ sockaddr_in6_init(&u.dst6, &ip6->ip6_dst, 0, 0, 0); - if ((rt = rtcache_lookup(&ro, &u.dst)) != NULL && rt->rt_ifa != NULL) + if ((rt = rtcache_lookup(&ro, &u.dst)) != NULL) dstifp = ((struct in6_ifaddr *)rt->rt_ifa)->ia_ifp; /* jumbo payload can't contain a fragment header */ Index: src/sys/netinet6/in6_src.c diff -u src/sys/netinet6/in6_src.c:1.85 src/sys/netinet6/in6_src.c:1.86 --- src/sys/netinet6/in6_src.c:1.85 Tue May 1 07:21:39 2018 +++ src/sys/netinet6/in6_src.c Wed Nov 13 02:51:22 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: in6_src.c,v 1.85 2018/05/01 07:21:39 maxv Exp $ */ +/* $NetBSD: in6_src.c,v 1.86 2019/11/13 02:51:22 ozaki-r Exp $ */ /* $KAME: in6_src.c,v 1.159 2005/10/19 01:40:32 t-momose Exp $ */ /* @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: in6_src.c,v 1.85 2018/05/01 07:21:39 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: in6_src.c,v 1.86 2019/11/13 02:51:22 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -780,8 +780,7 @@ getroute: * destination address (which should probably be one of our own * addresses.) */ - if (rt->rt_ifa && rt->rt_ifa->ifa_ifp && - rt->rt_ifa->ifa_ifp != *retifp && + if (rt->rt_ifa->ifa_ifp != *retifp && !if_is_deactivated(rt->rt_ifa->ifa_ifp)) { if_put(*retifp, psref); *retifp = rt->rt_ifa->ifa_ifp; Index: src/sys/netinet6/ip6_output.c diff -u src/sys/netinet6/ip6_output.c:1.221 src/sys/netinet6/ip6_output.c:1.222 --- src/sys/netinet6/ip6_output.c:1.221 Fri Nov 1 04:23:21 2019 +++ src/sys/netinet6/ip6_output.c Wed Nov 13 02:51:22 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ip6_output.c,v 1.221 2019/11/01 04:23:21 knakahara Exp $ */ +/* $NetBSD: ip6_output.c,v 1.222 2019/11/13 02:51:22 ozaki-r Exp $ */ /* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */ /* @@ -62,7 +62,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.221 2019/11/01 04:23:21 knakahara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.222 2019/11/13 02:51:22 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -550,7 +550,7 @@ ip6_output( * destination addresses. We should use ia_ifp to support the * case of sending packets to an address of our own. */ - if (ia != NULL && ia->ia_ifp) { + if (ia != NULL) { origifp = ia->ia_ifp; if (if_is_deactivated(origifp)) goto bad; Index: src/sys/netinet6/nd6_nbr.c diff -u src/sys/netinet6/nd6_nbr.c:1.174 src/sys/netinet6/nd6_nbr.c:1.175 --- src/sys/netinet6/nd6_nbr.c:1.174 Wed Sep 25 09:52:32 2019 +++ src/sys/netinet6/nd6_nbr.c Wed Nov 13 02:51:22 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: nd6_nbr.c,v 1.174 2019/09/25 09:52:32 ozaki-r Exp $ */ +/* $NetBSD: nd6_nbr.c,v 1.175 2019/11/13 02:51:22 ozaki-r Exp $ */ /* $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $ */ /* @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.174 2019/09/25 09:52:32 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.175 2019/11/13 02:51:22 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -1179,8 +1179,7 @@ nd6_dad_find(struct ifaddr *ifa, struct *found_nonce = true; log(LOG_DEBUG, "%s: detected a looped back NS message for %s\n", - ifa->ifa_ifp ? if_name(ifa->ifa_ifp) : "???", - IN6_PRINT(ip6buf, myaddr6)); + if_name(ifa->ifa_ifp), IN6_PRINT(ip6buf, myaddr6)); dp->dad_ns_lcount++; continue; } @@ -1256,7 +1255,7 @@ nd6_dad_start(struct ifaddr *ifa, int xt "nd6_dad_start: called with non-tentative address " "%s(%s)\n", IN6_PRINT(ip6buf, &ia->ia_addr.sin6_addr), - ifa->ifa_ifp ? if_name(ifa->ifa_ifp) : "???"); + if_name(ifa->ifa_ifp)); return; } if (ia->ia6_flags & IN6_IFF_ANYCAST || !ip6_dad_enabled()) { @@ -1264,7 +1263,6 @@ nd6_dad_start(struct ifaddr *ifa, int xt rt_addrmsg(RTM_NEWADDR, ifa); return; } - KASSERT(ifa->ifa_ifp != NULL); if (!(ifa->ifa_ifp->if_flags & IFF_UP)) return; @@ -1284,7 +1282,7 @@ nd6_dad_start(struct ifaddr *ifa, int xt log(LOG_ERR, "nd6_dad_start: memory allocation failed for " "%s(%s)\n", IN6_PRINT(ip6buf, &ia->ia_addr.sin6_addr), - ifa->ifa_ifp ? if_name(ifa->ifa_ifp) : "???"); + if_name(ifa->ifa_ifp)); return; } @@ -1361,14 +1359,14 @@ nd6_dad_timer(struct dadq *dp) log(LOG_ERR, "nd6_dad_timer: called with duplicate address " "%s(%s)\n", IN6_PRINT(ip6buf, &ia->ia_addr.sin6_addr), - ifa->ifa_ifp ? if_name(ifa->ifa_ifp) : "???"); + if_name(ifa->ifa_ifp)); goto done; } if ((ia->ia6_flags & IN6_IFF_TENTATIVE) == 0) { log(LOG_ERR, "nd6_dad_timer: called with non-tentative address " "%s(%s)\n", IN6_PRINT(ip6buf, &ia->ia_addr.sin6_addr), - ifa->ifa_ifp ? if_name(ifa->ifa_ifp) : "???"); + if_name(ifa->ifa_ifp)); goto done; }