system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-22 18:56:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

route: fix netlink route operations with link-local gw / dst.

Browse source 
Extract ifindex from either gw or dst sockaddr and add it as a
 dedicated RTA_OIF attribute.
This commit is contained in:
Alexander V. Chernikov 2023-04-08 11:38:05 +00:00
parent a02c285690
commit ee8f5c2a31
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sbin/route/route_netlink.c
View file

@ -220,20 +220,37 @@ rtmsg_nl_int(struct nl_helper *h, int cmd, int rtm_flags, int fib, int rtm_addrs
snl_add_msg_attr_ip(&nw, RTA_DST, dst);
snl_add_msg_attr_u32(&nw, RTA_TABLE, fib);
uint32_t rta_oif = 0;
if (gw != NULL) {
if (rtm_flags & RTF_GATEWAY) {
if (gw->sa_family == dst->sa_family)
snl_add_msg_attr_ip(&nw, RTA_GATEWAY, gw);
else
snl_add_msg_attr_ipvia(&nw, RTA_VIA, gw);
if (gw->sa_family == AF_INET6) {
struct sockaddr_in6 *gw6 = (struct sockaddr_in6 *)gw;
if (IN6_IS_ADDR_LINKLOCAL(&gw6->sin6_addr))
rta_oif = gw6->sin6_scope_id;
}
} else {
/* Should be AF_LINK */
struct sockaddr_dl *sdl = (struct sockaddr_dl *)gw;
if (sdl->sdl_index != 0)
snl_add_msg_attr_u32(&nw, RTA_OIF, sdl->sdl_index);
rta_oif = sdl->sdl_index;
}
}
if (dst->sa_family == AF_INET6 && rta_oif == 0) {
struct sockaddr_in6 *dst6 = (struct sockaddr_in6 *)dst;
if (IN6_IS_ADDR_LINKLOCAL(&dst6->sin6_addr))
rta_oif = dst6->sin6_scope_id;
}
if (rta_oif != 0)
snl_add_msg_attr_u32(&nw, RTA_OIF, rta_oif);
if (rtm_flags != 0)
snl_add_msg_attr_u32(&nw, NL_RTA_RTFLAGS, rtm_flags);