Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

KRT: Fix direct routes for BSD

Browse source 
Old way to set direct routes is to use local IP as gateway, but that does
not work properly on newer FreeBSDs. Now we use sockaddr_dl containing
interface index as gateway.
This commit is contained in:
Ondrej Zajicek (work) 2018-01-14 14:30:38 +01:00
parent 2e507a7457
commit 4d36796131
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
sysdep/bsd/krt-sock.c
View file

@ -186,6 +186,16 @@ struct ks_msg
memcpy(p, body, (l > sizeof(*p) ? sizeof(*p) : l));\ memcpy(p, body, (l > sizeof(*p) ? sizeof(*p) : l));\
body += l;} body += l;}
static inline void
sockaddr_fill_dl(struct sockaddr_dl *sa, struct iface *ifa)
{
uint len = OFFSETOF(struct sockaddr_dl, sdl_data);
memset(sa, 0, len);
sa->sdl_len = len;
sa->sdl_family = AF_LINK;
sa->sdl_index = ifa->index;
}
static int static int
krt_send_route(struct krt_proto *p, int cmd, rte *e) krt_send_route(struct krt_proto *p, int cmd, rte *e)
{ {
@ -291,11 +301,8 @@ krt_send_route(struct krt_proto *p, int cmd, rte *e)
{ {
/* Fallback for all other valid cases */ /* Fallback for all other valid cases */
#ifdef RTF_CLONING #if __OpenBSD__
if (cmd == RTM_ADD && (i->flags & IF_MULTIACCESS) != IF_MULTIACCESS) /* PTP */ /* Keeping temporarily old code for OpenBSD */
msg.rtm.rtm_flags |= RTF_CLONING;
#endif
struct ifa *addr = (net->n.addr->type == NET_IP4) ? i->addr4 : (i->addr6 ?: i->llv6); struct ifa *addr = (net->n.addr->type == NET_IP4) ? i->addr4 : (i->addr6 ?: i->llv6);
if (!addr) if (!addr)
@ -304,7 +311,16 @@ krt_send_route(struct krt_proto *p, int cmd, rte *e)
return -1; return -1;
} }
sockaddr_fill(&gate, af, addr->ip, i, 0); /* Embed interface ID to link-local address */
ip_addr gw = addr->ip;
if (ipa_is_link_local(gw))
_I0(gw) = 0xfe800000 | (i->index & 0x0000ffff);
sockaddr_fill(&gate, af, gw, i, 0);
#else
sockaddr_fill_dl(&gate, i);
#endif
msg.rtm.rtm_addrs |= RTA_GATEWAY; msg.rtm.rtm_addrs |= RTA_GATEWAY;
break; break;
} }