 @@ -1,14 +1,14 @@
-/*	$NetBSD: route.c,v 1.196 2017/06/22 09:56:48 ozaki-r Exp $	*/
+/*	$NetBSD: route.c,v 1.197 2017/06/28 04:10:47 ozaki-r Exp $	*/
 /*-
  * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Kevin M. Lahey of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * 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
 @@ -87,27 +87,27 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)route.c	8.3 (Berkeley) 1/9/95
  */
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_route.h"
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.196 2017/06/22 09:56:48 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.197 2017/06/28 04:10:47 ozaki-r Exp $");
 #include <sys/param.h>
 #ifdef RTFLUSH_DEBUG
 #include <sys/sysctl.h>
 #endif
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/proc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/domain.h>
 #include <sys/kernel.h>
 @@ -1584,28 +1584,26 @@ rt_ifa_addlocal(struct ifaddr *ifa)
 	rt = rtalloc1(ifa->ifa_addr, 0);
 #ifdef RT_DEBUG
 	if (rt != NULL)
 		dump_rt(rt);
 #endif
 	if (rt == NULL || (rt->rt_flags & RTF_HOST) == 0 ||
 	    (rt->rt_ifp->if_flags & IFF_LOOPBACK) == 0)
+	{
 		struct rt_addrinfo info;
 		struct rtentry *nrt;
 		memset(&info, 0, sizeof(info));
 		info.rti_flags = RTF_HOST | RTF_LOCAL;
 		if (!(ifa->ifa_ifp->if_flags & (IFF_LOOPBACK|IFF_POINTOPOINT)))
 			info.rti_flags |= RTF_LLDATA;
 		info.rti_info[RTAX_DST] = ifa->ifa_addr;
 		info.rti_info[RTAX_GATEWAY] =
 		    (const struct sockaddr *)ifa->ifa_ifp->if_sadl;
 		info.rti_ifa = ifa;
 		nrt = NULL;
 		e = rtrequest1(RTM_ADD, &info, &nrt);
 		if (nrt && ifa != nrt->rt_ifa)
 			rt_replace_ifa(nrt, ifa);
 		rt_newaddrmsg(RTM_ADD, ifa, e, nrt);
 		if (nrt != NULL) {
 #ifdef RT_DEBUG
 			dump_rt(nrt);
 #endif

 @@ -1,14 +1,14 @@
-#	$NetBSD: t_arp.sh,v 1.30 2017/06/26 06:59:57 ozaki-r Exp $
+#	$NetBSD: t_arp.sh,v 1.31 2017/06/28 04:10:47 ozaki-r Exp $
+#
 # Copyright (c) 2015 The NetBSD Foundation, Inc.
 # 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.
+#
 @@ -312,30 +312,32 @@ arp_garp_body()
 arp_cache_overwriting_body()
+{
 	local bonus=2
 	rump_server_start $SOCKSRC
 	rump_server_start $SOCKDST
 	setup_dst_server
 	setup_src_server
 	export RUMP_SERVER=$SOCKSRC
 	# Cannot overwrite a permanent cache
-	atf_check -s exit:0 rump.arp -s $IP4SRC b2:a0:20:00:00:ff
+	atf_check -s exit:0 rump.arp -s $IP4DST b2:a0:20:00:00:ff
 	$DEBUG && rump.arp -n -a
 	atf_check -s not-exit:0 -e match:'File exists' \
-	    rump.arp -s $IP4SRC b2:a0:20:00:00:fe
+	    rump.arp -s $IP4DST b2:a0:20:00:00:fe
 	# cleanup
 	atf_check -s exit:0 rump.arp -d $IP4DST
 	atf_check -s exit:0 -o ignore rump.ping -n -w $TIMEOUT -c 1 $IP4DST
 	$DEBUG && rump.arp -n -a
 	# Can overwrite a dynamic cache
 	atf_check -s exit:0 -o ignore rump.arp -s $IP4DST b2:a0:20:00:00:00
 	$DEBUG && rump.arp -n -a
 	atf_check -s exit:0 -o match:'b2:a0:20:00:00:00' rump.arp -n $IP4DST
 	atf_check -s exit:0 -o match:'permanent' rump.arp -n $IP4DST
 	atf_check -s exit:0 -o ignore rump.arp -s 10.0.1.10 b2:a0:20:00:00:10 temp
 	$DEBUG && rump.arp -n -a
 	atf_check -s exit:0 -o match:'b2:a0:20:00:00:10' rump.arp -n 10.0.1.10
 	atf_check -s exit:0 -o not-match:'permanent' rump.arp -n 10.0.1.10
 @@ -373,76 +375,64 @@ test_proxy_arp()
 	rump_server_start $SOCKSRC
 	rump_server_start $SOCKDST tap
 	setup_dst_server
 	setup_src_server
 	export RUMP_SERVER=$SOCKDST
 	atf_check -s exit:0 -o ignore rump.sysctl -w net.inet.ip.forwarding=1
 	macaddr_dst=$(get_macaddr $SOCKDST shmif0)
 	if [ "$type" = "pub" ]; then
 		opts="pub"
 		title="permanent published"
 	else
 		opts="pub proxy"
 		title='permanent published \(proxy only\)'
 	fi
 	# Always proxy only since migrating to lltable/llentry
 	title='permanent published \(proxy only\)'
+	#
 	# Test#1: First setup an endpoint then create proxy arp entry
+	#
 	export RUMP_SERVER=$SOCKDST
 	atf_check -s exit:0 rump.ifconfig tap1 create
 	atf_check -s exit:0 rump.ifconfig tap1 $IP4DST_PROXYARP1/24 up
 	atf_check -s exit:0 rump.ifconfig -w 10
 	# Try to ping (should fail w/o proxy arp)
 	export RUMP_SERVER=$SOCKSRC
 	atf_check -s not-exit:0 -o ignore -e ignore \
 	    rump.ping -n -w 1 -c 1 $IP4DST_PROXYARP1
 	# Flushing
 	extract_new_packets bus1 > ./out
 	# Set up proxy ARP entry
 	export RUMP_SERVER=$SOCKDST
 	atf_check -s exit:0 -o ignore \
 	    rump.arp -s $IP4DST_PROXYARP1 $macaddr_dst $opts
 	atf_check -s exit:0 -o match:"$title" rump.arp -n $IP4DST_PROXYARP1
 	# Try to ping
 	export RUMP_SERVER=$SOCKSRC
-	if [ "$type" = "pub" ]; then
+	atf_check -s exit:0 -o ignore rump.ping -n -w 1 -c 1 $IP4DST_PROXYARP1
 		# XXX fails
 		atf_check -s not-exit:0 -o ignore -e ignore \
 		    rump.ping -n -w 1 -c 1 $IP4DST_PROXYARP1
 	else
 		atf_check -s exit:0 -o ignore \
 		    rump.ping -n -w 1 -c 1 $IP4DST_PROXYARP1
 	fi
 	extract_new_packets bus1 > ./out
 	$DEBUG && cat ./out
 	pkt1=$(make_pkt_str_arprep $IP4DST_PROXYARP1 $macaddr_dst)
 	pkt2=$(make_pkt_str_garp $IP4DST_PROXYARP1 $macaddr_dst)
-	if [ "$type" = "pub" ]; then
+	atf_check -s exit:0 -x "cat ./out |grep -q -e '$pkt1' -e '$pkt2'"
 		atf_check -s not-exit:0 -x \
 		    "cat ./out |grep -q -e '$pkt1' -e '$pkt2'"
 	else
 		atf_check -s exit:0 -x "cat ./out |grep -q -e '$pkt1' -e '$pkt2'"
 	fi
+	#
 	# Test#2: Create proxy arp entry then set up an endpoint
+	#
 	export RUMP_SERVER=$SOCKDST
 	atf_check -s exit:0 -o ignore \
 	    rump.arp -s $IP4DST_PROXYARP2 $macaddr_dst $opts
 	atf_check -s exit:0 -o match:"$title" rump.arp -n $IP4DST_PROXYARP2
 	$DEBUG && rump.netstat -nr -f inet
 	# Try to ping (should fail because no endpoint exists)
 	export RUMP_SERVER=$SOCKSRC
 	atf_check -s not-exit:0 -o ignore -e ignore \

 @@ -1,14 +1,14 @@
-#	$NetBSD: t_route.sh,v 1.12 2017/03/24 03:47:25 ozaki-r Exp $
+#	$NetBSD: t_route.sh,v 1.13 2017/06/28 04:10:47 ozaki-r Exp $
+#
 # Copyright (c) 2016 Internet Initiative Japan Inc.
 # 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.
+#
 @@ -224,27 +224,27 @@ test_route_get()
 	export RUMP_SERVER=$SOCKSRC
 	$DEBUG && rump.netstat -nr -f inet
 	$DEBUG && rump.arp -n -a
 	# Make sure an ARP cache to the gateway doesn't exist
 	rump.arp -d $IP4SRCGW
 	# Local
 	cat >./expect <<-EOF
    route to: 10.0.1.2
 destination: 10.0.1.2
  local addr: 10.0.1.2
   interface: lo0
-      flags: <UP,HOST,DONE,LLINFO,LOCAL>
+      flags: <UP,HOST,DONE,LOCAL>
  recvpipe  sendpipe  ssthresh  rtt,msec    rttvar  hopcount      mtu     expire
 	EOF
 	rump.route -n get $IP4SRC > ./output
 	$DEBUG && cat ./expect ./output
 	# XXX: omit the last line because expire is unstable on rump kernel.
 	sed -i '$d' ./output
 	atf_check -s exit:0 diff ./expect ./output
 	# Neighbor
 	cat >./expect <<-EOF
    route to: 10.0.1.1
 destination: 10.0.1.0
        mask: 255.255.255.0
 @@ -299,27 +299,27 @@ test_route_get6()
 	export RUMP_SERVER=$SOCKSRC
 	$DEBUG && rump.netstat -nr -f inet
 	$DEBUG && rump.ndp -n -a
 	# Make sure an ARP cache to the gateway doesn't exist
 	rump.ndp -d $IP6SRCGW
 	# Local
 	cat >./expect <<-EOF
    route to: fc00:0:0:1::2
 destination: fc00:0:0:1::2
  local addr: fc00:0:0:1::2
   interface: lo0
-      flags: <UP,HOST,DONE,LLINFO,LOCAL>
+      flags: <UP,HOST,DONE,LOCAL>
  recvpipe  sendpipe  ssthresh  rtt,msec    rttvar  hopcount      mtu     expire
 	EOF
 	rump.route -n get -inet6 $IP6SRC > ./output
 	$DEBUG && cat ./expect ./output
 	sed -i '$d' ./output
 	atf_check -s exit:0 diff ./expect ./output
 	# Neighbor
 	cat >./expect <<-EOF
    route to: fc00:0:0:1::1
 destination: fc00:0:0:1::
        mask: ffff:ffff:ffff:ffff::
  local addr: fc00:0:0:1::2