Module Name: src
Committed By: ozaki-r
Date: Mon Jun 26 06:59:57 UTC 2017
Modified Files:
src/sys/net: rtsock.c
src/tests/net/arp: t_arp.sh
src/tests/net/ndp: t_ndp.sh
Log Message:
Drop RTF_UP from a routing message of a deleted ARP/NDP entry
To generate a diff of this commit:
cvs rdiff -u -r1.222 -r1.223 src/sys/net/rtsock.c
cvs rdiff -u -r1.29 -r1.30 src/tests/net/arp/t_arp.sh
cvs rdiff -u -r1.26 -r1.27 src/tests/net/ndp/t_ndp.sh
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/rtsock.c
diff -u src/sys/net/rtsock.c:1.222 src/sys/net/rtsock.c:1.223
--- src/sys/net/rtsock.c:1.222 Mon Jun 26 06:58:42 2017
+++ src/sys/net/rtsock.c Mon Jun 26 06:59:56 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock.c,v 1.222 2017/06/26 06:58:42 ozaki-r Exp $ */
+/* $NetBSD: rtsock.c,v 1.223 2017/06/26 06:59:56 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.222 2017/06/26 06:58:42 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.223 2017/06/26 06:59:56 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -860,6 +860,7 @@ COMPATNAME(route_output)(struct mbuf *m,
satocsdl(info.rti_info[RTAX_GATEWAY]);
error = lla_rt_output(rtm->rtm_type, rtm->rtm_flags,
rtm->rtm_rmx.rmx_expire, &info, sdlp->sdl_index);
+ rtm->rtm_flags &= ~RTF_UP;
break;
}
#endif
Index: src/tests/net/arp/t_arp.sh
diff -u src/tests/net/arp/t_arp.sh:1.29 src/tests/net/arp/t_arp.sh:1.30
--- src/tests/net/arp/t_arp.sh:1.29 Mon Jun 26 03:16:28 2017
+++ src/tests/net/arp/t_arp.sh Mon Jun 26 06:59:57 2017
@@ -1,4 +1,4 @@
-# $NetBSD: t_arp.sh,v 1.29 2017/06/26 03:16:28 ozaki-r Exp $
+# $NetBSD: t_arp.sh,v 1.30 2017/06/26 06:59:57 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -651,7 +651,7 @@ arp_rtm_body()
atf_check -s exit:0 -o match:"$str" grep -A 3 RTM_GET $file
str="$IP4DST $macaddr_dst"
atf_check -s exit:0 -o match:"$str" grep -A 3 RTM_GET $file
- str="RTM_DELETE.+<UP,DONE,LLINFO>"
+ str="RTM_DELETE.+<DONE,LLINFO>"
atf_check -s exit:0 -o match:"$str" grep -A 3 RTM_DELETE $file
str="<DST,GATEWAY>"
atf_check -s exit:0 -o match:"$str" grep -A 3 RTM_DELETE $file
Index: src/tests/net/ndp/t_ndp.sh
diff -u src/tests/net/ndp/t_ndp.sh:1.26 src/tests/net/ndp/t_ndp.sh:1.27
--- src/tests/net/ndp/t_ndp.sh:1.26 Mon Jun 26 03:16:28 2017
+++ src/tests/net/ndp/t_ndp.sh Mon Jun 26 06:59:57 2017
@@ -1,4 +1,4 @@
-# $NetBSD: t_ndp.sh,v 1.26 2017/06/26 03:16:28 ozaki-r Exp $
+# $NetBSD: t_ndp.sh,v 1.27 2017/06/26 06:59:57 ozaki-r Exp $
#
# Copyright (c) 2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -450,7 +450,7 @@ ndp_rtm_body()
atf_check -s exit:0 -o match:"$str" grep -A 3 RTM_GET $file
str="$IP6DST $macaddr_dst"
atf_check -s exit:0 -o match:"$str" grep -A 3 RTM_GET $file
- str="RTM_DELETE.+<UP,DONE,LLINFO>"
+ str="RTM_DELETE.+<DONE,LLINFO>"
atf_check -s exit:0 -o match:"$str" grep -A 3 RTM_DELETE $file
str="<DST,GATEWAY>"
atf_check -s exit:0 -o match:"$str" grep -A 3 RTM_DELETE $file
