 @@ -1,14 +1,14 @@
-/*	$NetBSD: in.c,v 1.184 2016/09/29 15:04:17 roy Exp $	*/
+/*	$NetBSD: in.c,v 1.185 2016/09/29 15:18:18 roy Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -81,27 +81,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)in.c	8.4 (Berkeley) 1/9/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.184 2016/09/29 15:04:17 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.185 2016/09/29 15:18:18 roy Exp $");
 #include "arp.h"
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_inet_conf.h"
 #include "opt_mrouting.h"
 #endif
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
 @@ -598,56 +598,49 @@ in_control0(struct socket *so, u_long cm
 			mutex_enter(&in_ifaddr_lock);
 			LIST_REMOVE(ia, ia_hash);
 			IN_ADDRHASH_WRITER_REMOVE(ia);
 			mutex_exit(&in_ifaddr_lock);
 			need_reinsert = true;
+		}
 		error = in_ifinit(ifp, ia, satocsin(ifreq_getaddr(cmd, ifr)),
 		    NULL, 1);
 		run_hook = true;
 		break;
 	case SIOCSIFNETMASK:
-		in_ifscrub(ifp, ia);
+		in_scrubprefix(ia);
 		ia->ia_sockmask = *satocsin(ifreq_getaddr(cmd, ifr));
 		ia->ia_subnetmask = ia->ia_sockmask.sin_addr.s_addr;
 		if (!newifaddr) {
 			mutex_enter(&in_ifaddr_lock);
 			LIST_REMOVE(ia, ia_hash);
 			IN_ADDRHASH_WRITER_REMOVE(ia);
 			mutex_exit(&in_ifaddr_lock);
 			need_reinsert = true;
+		}
 		error = in_ifinit(ifp, ia, NULL, NULL, 0);
 		break;
 	case SIOCAIFADDR:
 		maskIsNew = 0;
 		if (ifra->ifra_mask.sin_len) {
-			/* Only scrub if we control the prefix route,
+			in_scrubprefix(ia);
 			 * otherwise userland gets a bogus message */
 			if ((ia->ia_flags & IFA_ROUTE))
 				in_ifscrub(ifp, ia);
 			ia->ia_sockmask = ifra->ifra_mask;
 			ia->ia_subnetmask = ia->ia_sockmask.sin_addr.s_addr;
 			maskIsNew = 1;
+		}
 		if ((ifp->if_flags & IFF_POINTOPOINT) &&
 		    (ifra->ifra_dstaddr.sin_family == AF_INET)) {
 			/* Only scrub if we control the prefix route,
 			 * otherwise userland gets a bogus message */
 			if ((ia->ia_flags & IFA_ROUTE))
 				in_ifscrub(ifp, ia);
 			new_dstaddr = &ifra->ifra_dstaddr;
 			maskIsNew  = 1; /* We lie; but the effect's the same */
 		} else
 			new_dstaddr = NULL;
 		if (ifra->ifra_addr.sin_family == AF_INET &&
 		    (hostIsNew || maskIsNew)) {
 			if (!newifaddr) {
 				mutex_enter(&in_ifaddr_lock);
 				LIST_REMOVE(ia, ia_hash);
 				IN_ADDRHASH_WRITER_REMOVE(ia);
 				mutex_exit(&in_ifaddr_lock);
 				need_reinsert = true;
+			}
 @@ -801,28 +794,29 @@ in_ifremlocal(struct ifaddr *ifa)
 		ifa_release(alt_ifa, &psref);
 out:
 	curlwp_bindx(bound);
+}
 static void
 in_scrubaddr(struct in_ifaddr *ia)
+{
 	/* stop DAD processing */
 	if (ia->ia_dad_stop != NULL)
 		ia->ia_dad_stop(&ia->ia_ifa);
-	in_ifscrub(ia->ia_ifp, ia);
+	in_scrubprefix(ia);
 	in_ifremlocal(&ia->ia_ifa);
 	if (ia->ia_allhosts != NULL) {
 		in_delmulti(ia->ia_allhosts);
 		ia->ia_allhosts = NULL;
+	}
+}
 /*
  * Depends on it isn't called in concurrent. It should be guaranteed
  * by ifa->ifa_ifp's ioctl lock. The possible callers are in_control
  * and if_purgeaddrs; the former is called iva ifa->ifa_ifp's ioctl
  * and the latter is called via ifa->ifa_ifp's if_detach. The functions
  * never be executed in concurrent.
  */
 @@ -1037,36 +1031,26 @@ in_lifaddr_ioctl(struct socket *so, u_lo
 			memcpy(&ifra.ifra_dstaddr, &ia->ia_sockmask,
 				ia->ia_sockmask.sin_len);
 			pserialize_read_exit(s);
 			return in_control(so, SIOCDIFADDR, &ifra, ifp);
+		}
+	    }
+	}
 	return EOPNOTSUPP;	/*just for safety*/
+}
 /*
  * Delete any existing route for an interface.
  */
 void
 in_ifscrub(struct ifnet *ifp, struct in_ifaddr *ia)
 	in_scrubprefix(ia);
 /*
  * Initialize an interface's internet address
  * and routing table entry.
  */
 int
 in_ifinit(struct ifnet *ifp, struct in_ifaddr *ia,
     const struct sockaddr_in *sin, const struct sockaddr_in *dst, int scrub)
+{
 	u_int32_t i;
 	struct sockaddr_in oldaddr, olddst;
 	int s, oldflags, flags = RTF_UP, error, hostIsNew;
 	if (sin == NULL)
 		sin = &ia->ia_addr;
 @@ -1118,27 +1102,27 @@ in_ifinit(struct ifnet *ifp, struct in_i
 		ia->ia4_flags = oldflags;
 		return error;
+	}
 	if (scrub || hostIsNew) {
 		int newflags = ia->ia4_flags;
 		ia->ia_ifa.ifa_addr = sintosa(&oldaddr);
 		ia->ia_ifa.ifa_dstaddr = sintosa(&olddst);
 		ia->ia4_flags = oldflags;
 		if (hostIsNew)
 			in_scrubaddr(ia);
 		else if (scrub)
-			in_ifscrub(ifp, ia);
+			in_scrubprefix(ia);
 		ia->ia_ifa.ifa_addr = sintosa(&ia->ia_addr);
 		ia->ia_ifa.ifa_dstaddr = sintosa(&ia->ia_dstaddr);
 		ia->ia4_flags = newflags;
+	}
 	/* Add the local route to the address */
 	in_ifaddlocal(&ia->ia_ifa);
 	i = ia->ia_addr.sin_addr.s_addr;
 	if (IN_CLASSA(i))
 		ia->ia_netmask = IN_CLASSA_NET;
 	else if (IN_CLASSB(i))
 		ia->ia_netmask = IN_CLASSB_NET;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: in_var.h,v 1.86 2016/09/29 15:04:17 roy Exp $	*/
+/*	$NetBSD: in_var.h,v 1.87 2016/09/29 15:18:18 roy Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Public Access Networks Corporation ("Panix").  It was developed under
  * contract to Panix by Eric Haszlakiewicz and Thor Lancelot Simon.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -403,27 +403,26 @@ struct in_multi *in_addmulti(struct in_a
 void in_delmulti(struct in_multi *);
 void in_multi_lock(int);
 void in_multi_unlock(void);
 int in_multi_lock_held(void);
 struct ifaddr;
 int	in_ifinit(struct ifnet *, struct in_ifaddr *,
     const struct sockaddr_in *, const struct sockaddr_in *, int);
 void	in_savemkludge(struct in_ifaddr *);
 void	in_restoremkludge(struct in_ifaddr *, struct ifnet *);
 void	in_purgemkludge(struct ifnet *);
 void	in_ifscrub(struct ifnet *, struct in_ifaddr *);
 void	in_setmaxmtu(void);
 const char *in_fmtaddr(struct in_addr);
 int	in_control(struct socket *, u_long, void *, struct ifnet *);
 void	in_purgeaddr(struct ifaddr *);
 void	in_purgeif(struct ifnet *);
 int	ipflow_fastforward(struct mbuf *);
 struct ipid_state;
 typedef struct ipid_state ipid_state_t;
 ipid_state_t *	ip_id_init(void);
 void		ip_id_fini(ipid_state_t *);
 uint16_t	ip_randomid(ipid_state_t *, uint16_t);