From fffb1e892a9eaca08072f64c41af1b7ff3557627 Mon Sep 17 00:00:00 2001 From: Pim van Pelt Date: Fri, 24 Dec 2021 20:05:08 +0000 Subject: [PATCH] After fixing the feflags/frpflags bug, install specials again --- .lcpng_nl_sync.c.swp | Bin 0 -> 45056 bytes lcpng_nl_sync.c | 14 ++------------ 2 files changed, 2 insertions(+), 12 deletions(-) create mode 100644 .lcpng_nl_sync.c.swp diff --git a/.lcpng_nl_sync.c.swp b/.lcpng_nl_sync.c.swp new file mode 100644 index 0000000000000000000000000000000000000000..062f771120fb5b3fca32d8655f573926b92fb2c7 GIT binary patch literal 45056 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 AssI20 literal 0 HcmV?d00001 diff --git a/lcpng_nl_sync.c b/lcpng_nl_sync.c index 13cfe34..3f83194 100644 --- a/lcpng_nl_sync.c +++ b/lcpng_nl_sync.c @@ -490,11 +490,7 @@ lcp_nl_route_add (struct rtnl_route *rr) }; rtnl_route_foreach_nexthop (rr, lcp_nl_route_path_parse, &np); - // TODO(pim) - figure out why we have spurious crashes when - // adding a route w/ nexthops {} or nexthops { idx 1 } on an - // empty FIB. - // - // lcp_nl_route_path_add_special (rr, &np); + lcp_nl_route_path_add_special (rr, &np); if (0 != vec_len (np.paths)) { @@ -535,13 +531,7 @@ lcp_nl_route_add (struct rtnl_route *rr) } } else - // TODO(pim) - while the above add_special() is commented out, any - // route inserted tiwh unreach/prohibit/blackhole, for example when VPP - // is restarted, Bird will flip all routes in the RIB to 'unreach', and - // when it rediscovers devices and their connecteds, it will send a whole - // bunch of them back. Ignore for now. When add_special() is fixed, this - // should become a WARN again. - NL_INFO ("route_add: no paths table %d prefix %U flags %U netlink %U", + NL_WARN ("route_add: no paths table %d prefix %U flags %U netlink %U", rtnl_route_get_table (rr), format_fib_prefix, &pfx, format_fib_entry_flags, entry_flags, format_nl_object, rr);