[src/trunk]: src Improve backward compatibility of (fake) routing messages on...

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c67e84bac81f
branches:  trunk
changeset: 825001:c67e84bac81f
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Mon Jun 26 03:16:28 2017 +0000

description:
Improve backward compatibility of (fake) routing messages on adding an ARP/NDP entry

A message originally included only DST and GATEWAY. Restore it.

diffstat:

 sys/net/rtsock.c       |  6 ++----
 tests/net/arp/t_arp.sh |  6 +++---
 tests/net/ndp/t_ndp.sh |  6 +++---
 3 files changed, 8 insertions(+), 10 deletions(-)

diffs (69 lines):

diff -r 9157507e7ac6 -r c67e84bac81f sys/net/rtsock.c
--- a/sys/net/rtsock.c  Mon Jun 26 03:15:16 2017 +0000
+++ b/sys/net/rtsock.c  Mon Jun 26 03:16:28 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtsock.c,v 1.220 2017/06/26 03:13:40 ozaki-r Exp $     */
+/*     $NetBSD: rtsock.c,v 1.221 2017/06/26 03:16:28 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.220 2017/06/26 03:13:40 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.221 2017/06/26 03:16:28 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1670,8 +1670,6 @@
        sockaddr_dl_init(&u.sdl, sizeof(u.ss), ifp->if_index, ifp->if_type,
            NULL, namelen, NULL, addrlen);
        info.rti_info[RTAX_GATEWAY] = &u.sa;
-       info.rti_info[RTAX_IFP] = rt->rt_ifp->if_dl->ifa_addr;
-       info.rti_info[RTAX_IFA] = rt->rt_ifa->ifa_addr;
 
        rt_missmsg(RTM_ADD, &info, flags, 0);
 #undef RTF_LLINFO
diff -r 9157507e7ac6 -r c67e84bac81f tests/net/arp/t_arp.sh
--- a/tests/net/arp/t_arp.sh    Mon Jun 26 03:15:16 2017 +0000
+++ b/tests/net/arp/t_arp.sh    Mon Jun 26 03:16:28 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: t_arp.sh,v 1.28 2017/06/26 03:13:40 ozaki-r Exp $
+#      $NetBSD: t_arp.sh,v 1.29 2017/06/26 03:16:28 ozaki-r Exp $
 #
 # Copyright (c) 2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -632,9 +632,9 @@
 
        str="RTM_ADD.+<UP,HOST,DONE,LLINFO,CLONED>"
        atf_check -s exit:0 -o match:"$str" cat $file
-       str="<DST,GATEWAY,IFP,IFA>"
+       str="<DST,GATEWAY>"
        atf_check -s exit:0 -o match:"$str" cat $file
-       str="$IP4DST link#2 $macaddr_src $IP4SRC"
+       str="$IP4DST link#2"
        atf_check -s exit:0 -o match:"$str" cat $file
 
        # Test arp -d and resulting routing messages (RTM_GET and RTM_DELETE)
diff -r 9157507e7ac6 -r c67e84bac81f tests/net/ndp/t_ndp.sh
--- a/tests/net/ndp/t_ndp.sh    Mon Jun 26 03:15:16 2017 +0000
+++ b/tests/net/ndp/t_ndp.sh    Mon Jun 26 03:16:28 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: t_ndp.sh,v 1.25 2017/06/26 03:13:40 ozaki-r Exp $
+#      $NetBSD: t_ndp.sh,v 1.26 2017/06/26 03:16:28 ozaki-r Exp $
 #
 # Copyright (c) 2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -431,9 +431,9 @@
 
        str="RTM_ADD.+<UP,HOST,DONE,LLINFO,CLONED>"
        atf_check -s exit:0 -o match:"$str" cat $file
-       str="<DST,GATEWAY,IFP,IFA>"
+       str="<DST,GATEWAY>"
        atf_check -s exit:0 -o match:"$str" cat $file
-       str="$IP6DST link#2 $macaddr_src $IP6SRC"
+       str="$IP6DST link#2"
        atf_check -s exit:0 -o match:"$str" cat $file
 
        # Test ndp -d and resulting routing messages (RTM_GET and RTM_DELETE)