summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhrs <hrs@FreeBSD.org>2014-10-09 23:30:51 +0000
committerhrs <hrs@FreeBSD.org>2014-10-09 23:30:51 +0000
commitd08a17cdad32279fdeb1e2373e50fe9a5f19bf7f (patch)
treef583bfedac266550b2b28213f2a4750d03bc94d4
parentfee8b9f9924d7ba5fcdfc364af079bc02ded5b20 (diff)
downloadFreeBSD-src-d08a17cdad32279fdeb1e2373e50fe9a5f19bf7f.zip
FreeBSD-src-d08a17cdad32279fdeb1e2373e50fe9a5f19bf7f.tar.gz
MFC r270234:
Recover sin6_scope_id of gateway addresses in riprecv() by using the if_index where a RIP packet was received. This fixes a bug which prevented gateway addresses in fe80::/64 from being added.
-rw-r--r--usr.sbin/route6d/route6d.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c
index 2a7dbe6..f20dcc4 100644
--- a/usr.sbin/route6d/route6d.c
+++ b/usr.sbin/route6d/route6d.c
@@ -2838,6 +2838,8 @@ addroute(struct riprt *rrt,
sin6->sin6_len = sizeof(struct sockaddr_in6);
sin6->sin6_family = AF_INET6;
sin6->sin6_addr = *gw;
+ if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr))
+ sin6->sin6_scope_id = ifcp->ifc_index;
sin6 = (struct sockaddr_in6 *)((char *)sin6 + ROUNDUP(sin6->sin6_len));
/* Netmask */
sin6->sin6_len = sizeof(struct sockaddr_in6);
OpenPOWER on IntegriCloud