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

Allows importing 'onlink' routes.

Browse source
This commit is contained in:
Ondrej Zajicek 2009-10-20 19:04:28 +02:00
parent 4cdd078453
commit bff74c7aa3
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
sysdep/linux/netlink/netlink.c
View file

@ -682,13 +682,29 @@ nl_parse_route(struct nlmsghdr *h, int scan)
ra.dest = RTD_ROUTER; ra.dest = RTD_ROUTER;
memcpy(&ra.gw, RTA_DATA(a[RTA_GATEWAY]), sizeof(ra.gw)); memcpy(&ra.gw, RTA_DATA(a[RTA_GATEWAY]), sizeof(ra.gw));
ipa_ntoh(ra.gw); ipa_ntoh(ra.gw);
ng = neigh_find(&p->p, &ra.gw, 0);
if (ng && ng->scope) if (i->rtm_flags & RTNH_F_ONLINK)
ra.iface = ng->iface; {
/* route with 'onlink' attribute */
ra.iface = if_find_by_index(oif);
if (ra.iface == NULL)
{
log(L_WARN "Kernel told us to use unknown interface %u for %I/%d",
oif, net->n.prefix, net->n.pxlen);
return;
}
}
else else
{ {
log(L_WARN "Kernel told us to use non-neighbor %I for %I/%d", ra.gw, net->n.prefix, net->n.pxlen); /* standard route */
return; ng = neigh_find(&p->p, &ra.gw, 0);
if (ng && ng->scope)
ra.iface = ng->iface;
else
{
log(L_WARN "Kernel told us to use non-neighbor %I for %I/%d", ra.gw, net->n.prefix, net->n.pxlen);
return;
}
} }
} }
else else