Module Name: src
Committed By: roy
Date: Fri Sep 11 10:33:32 UTC 2015
Modified Files:
src/sys/netinet: if_arp.c
src/sys/netinet6: nd6.c
Log Message:
If, for whatever reason, a local interface route is removed and then
re-added, mark it as a local route.
While here, if changing the route to go via the loopback interface
remove any inherited MTU value.
To generate a diff of this commit:
cvs rdiff -u -r1.180 -r1.181 src/sys/netinet/if_arp.c
cvs rdiff -u -r1.176 -r1.177 src/sys/netinet6/nd6.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/netinet/if_arp.c
diff -u src/sys/netinet/if_arp.c:1.180 src/sys/netinet/if_arp.c:1.181
--- src/sys/netinet/if_arp.c:1.180 Wed Sep 9 01:24:01 2015
+++ src/sys/netinet/if_arp.c Fri Sep 11 10:33:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arp.c,v 1.180 2015/09/09 01:24:01 ozaki-r Exp $ */
+/* $NetBSD: if_arp.c,v 1.181 2015/09/11 10:33:32 roy Exp $ */
/*-
* Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.180 2015/09/09 01:24:01 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.181 2015/09/11 10:33:32 roy Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -641,8 +641,11 @@ arp_rtrequest(int req, struct rtentry *r
panic("%s(%s): sockaddr_dl_init cannot fail",
__func__, ifp->if_xname);
}
- if (useloopback)
+ if (useloopback) {
ifp = rt->rt_ifp = lo0ifp;
+ rt->rt_rmx.rmx_mtu = 0;
+ }
+ rt->rt_flags |= RTF_LOCAL;
/*
* make sure to set rt->rt_ifa to the interface
* address we are using, otherwise we will have trouble
Index: src/sys/netinet6/nd6.c
diff -u src/sys/netinet6/nd6.c:1.176 src/sys/netinet6/nd6.c:1.177
--- src/sys/netinet6/nd6.c:1.176 Fri Sep 4 05:33:23 2015
+++ src/sys/netinet6/nd6.c Fri Sep 11 10:33:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6.c,v 1.176 2015/09/04 05:33:23 ozaki-r Exp $ */
+/* $NetBSD: nd6.c,v 1.177 2015/09/11 10:33:32 roy Exp $ */
/* $KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.176 2015/09/04 05:33:23 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.177 2015/09/11 10:33:32 roy Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -1478,8 +1478,10 @@ nd6_rtrequest(int req, struct rtentry *r
*/
if (ifa != rt->rt_ifa)
rt_replace_ifa(rt, ifa);
+ rt->rt_rmx.rmx_mtu = 0;
rt->rt_flags &= ~RTF_CLONED;
}
+ rt->rt_flags |= RTF_LOCAL;
} else if (rt->rt_flags & RTF_ANNOUNCE) {
nd6_llinfo_settimer(ln, -1);
ln->ln_state = ND6_LLINFO_REACHABLE;
