From 732aef301bd4c2a4bc3d2e501a8a47acd3fee093 Mon Sep 17 00:00:00 2001 From: Maria Matejka Date: Thu, 27 Jun 2024 13:49:37 +0200 Subject: [PATCH] Export: Throw a warning instead of crashing on export_accepted_map inconsistency --- nest/rt-table.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nest/rt-table.c b/nest/rt-table.c index a401035f..eaabb939 100644 --- a/nest/rt-table.c +++ b/nest/rt-table.c @@ -1051,8 +1051,11 @@ rt_notify_basic(struct channel *c, const rte *new, const rte *old) /* If this is a refeed, we may need to copy the new route to the old one */ if (!old && bmap_test(&c->export_accepted_map, new->id)) { - ASSERT_DIE(rt_export_get_state(&c->out_req) == TES_PARTIAL); - old = new; + if (rt_export_get_state(&c->out_req) == TES_PARTIAL) + old = new; + else + log(L_WARN "%s.%s: Got new route for %N (id %u) which is already marked accepted, weird", + c->proto->name, c->name, new->net, new->id); } /* Run the filters, actually */