mirror of
https://gitlab.nic.cz/labs/bird.git
synced 2024-12-22 17:51:53 +00:00
Netlink: Do not ignore dead routes from BIRD
Currently, BIRD ignores dead routes to consider them absent. But it also ignores its own routes and thus it can not correctly manage such routes in some cases. This patch makes an exception for routes with proto bird when ignoring dead routes, so they can be properly updated or removed. Thanks to Alexander Zubkov for the original patch.
This commit is contained in:
parent
77d032c71f
commit
f5c8fb5fba
@ -681,7 +681,7 @@ nl_add_multipath(struct nlmsghdr *h, uint bufsize, struct nexthop *nh, int af, e
|
|||||||
}
|
}
|
||||||
|
|
||||||
static struct nexthop *
|
static struct nexthop *
|
||||||
nl_parse_multipath(struct nl_parse_state *s, struct krt_proto *p, const net_addr *n, struct rtattr *ra, int af)
|
nl_parse_multipath(struct nl_parse_state *s, struct krt_proto *p, const net_addr *n, struct rtattr *ra, int af, int krt_src)
|
||||||
{
|
{
|
||||||
struct rtattr *a[BIRD_RTA_MAX];
|
struct rtattr *a[BIRD_RTA_MAX];
|
||||||
struct rtnexthop *nh = RTA_DATA(ra);
|
struct rtnexthop *nh = RTA_DATA(ra);
|
||||||
@ -697,7 +697,7 @@ nl_parse_multipath(struct nl_parse_state *s, struct krt_proto *p, const net_addr
|
|||||||
if ((len < sizeof(*nh)) || (len < nh->rtnh_len))
|
if ((len < sizeof(*nh)) || (len < nh->rtnh_len))
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
if (nh->rtnh_flags & RTNH_F_DEAD)
|
if ((nh->rtnh_flags & RTNH_F_DEAD) && (krt_src != KRT_SRC_BIRD))
|
||||||
goto next;
|
goto next;
|
||||||
|
|
||||||
*last = rv = lp_allocz(s->pool, NEXTHOP_MAX_SIZE);
|
*last = rv = lp_allocz(s->pool, NEXTHOP_MAX_SIZE);
|
||||||
@ -1687,7 +1687,7 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
|
|||||||
|
|
||||||
if (a[RTA_MULTIPATH])
|
if (a[RTA_MULTIPATH])
|
||||||
{
|
{
|
||||||
struct nexthop *nh = nl_parse_multipath(s, p, n, a[RTA_MULTIPATH], i->rtm_family);
|
struct nexthop *nh = nl_parse_multipath(s, p, n, a[RTA_MULTIPATH], i->rtm_family, krt_src);
|
||||||
if (!nh)
|
if (!nh)
|
||||||
SKIP("strange RTA_MULTIPATH\n");
|
SKIP("strange RTA_MULTIPATH\n");
|
||||||
|
|
||||||
@ -1695,7 +1695,7 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (i->rtm_flags & RTNH_F_DEAD)
|
if ((i->rtm_flags & RTNH_F_DEAD) && (krt_src != KRT_SRC_BIRD))
|
||||||
SKIP("ignore RTNH_F_DEAD\n");
|
SKIP("ignore RTNH_F_DEAD\n");
|
||||||
|
|
||||||
ra->nh.iface = if_find_by_index(oif);
|
ra->nh.iface = if_find_by_index(oif);
|
||||||
|
Loading…
Reference in New Issue
Block a user