From d292a6c7955956bd97da3cae8807e892dfb8c7c4 Mon Sep 17 00:00:00 2001 From: Hiroki Sato Date: Wed, 20 Aug 2014 17:27:15 +0000 Subject: [PATCH] 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. --- 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 fc4561595572..258219bafa02 100644 --- a/usr.sbin/route6d/route6d.c +++ b/usr.sbin/route6d/route6d.c @@ -2835,6 +2835,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);