From 8cd4d16895a4d81d6aa7a947342534bd7b49e9f6 Mon Sep 17 00:00:00 2001 From: hrs Date: Thu, 9 Oct 2014 23:30:51 +0000 Subject: [PATCH] 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. git-svn-id: svn://svn.freebsd.org/base/stable/10@272860 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- usr.sbin/route6d/route6d.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c index 2a7dbe6de..f20dcc4b4 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); -- 2.45.0