mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-11-13 22:58:42 +00:00
Code Releases Activity

Export table: Fixed segfault on withdraw.

Browse Source 
This happens only if the channel really uses the old route.
This commit is contained in:
Maria Matejka 2021-03-20 21:16:12 +01:00
parent f604915200
commit 1cddde9fa6
2 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nest/route.h
View File

@ -346,7 +346,7 @@ void rt_feed_channel_abort(struct channel *c);
int rt_reload_channel(struct channel *c); int rt_reload_channel(struct channel *c);
void rt_reload_channel_abort(struct channel *c); void rt_reload_channel_abort(struct channel *c);
void rt_prune_sync(rtable *t, int all); void rt_prune_sync(rtable *t, int all);
int rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old0, int refeed); int rte_update_out(struct channel *c, const net_addr *n, struct rte_src *src, rte *new, rte **old_exported, int refeed);
struct rtable_config *rt_new_table(struct symbol *s, uint addr_type); struct rtable_config *rt_new_table(struct symbol *s, uint addr_type);

62
nest/rt-table.c
View File

@ -336,6 +336,27 @@ rte_cow_rta(rte *r, linpool *lp)
return r; return r;
} }
/**
* rte_free - delete a &rte
* @e: &rte to be deleted
*
* rte_free() deletes the given &rte from the routing table it's linked to.
*/
void
rte_free(rte *e)
{
if (rta_is_cached(e->attrs))
rta_free(e->attrs);
sl_free(rte_slab, e);
}
static inline void
rte_free_quick(rte *e)
{
rta_free(e->attrs);
sl_free(rte_slab, e);
}
static int /* Actually better or at least as good as */ static int /* Actually better or at least as good as */
rte_better(rte *new, rte *old) rte_better(rte *new, rte *old)
{ {
@ -491,9 +512,17 @@ do_rt_notify(struct channel *c, net *net, rte *new, rte *old, int refeed)
} }
} }
struct rte_src *src = old ? old->attrs->src : new->attrs->src;
/* Apply export table */ /* Apply export table */
if (c->out_table && !rte_update_out(c, net->n.addr, new, old, refeed)) struct rte *old_exported = NULL;
if (c->out_table)
{
if (!rte_update_out(c, net->n.addr, src, new, &old_exported, refeed))
return; return;
}
else if (c->out_filter == FILTER_ACCEPT)
old_exported = old;
if (new) if (new)
stats->exp_updates_accepted++; stats->exp_updates_accepted++;
@ -523,6 +552,9 @@ do_rt_notify(struct channel *c, net *net, rte *new, rte *old, int refeed)
} }
p->rt_notify(p, c, net, new, old); p->rt_notify(p, c, net, new, old);
if (c->out_table && old_exported)
rte_free_quick(old_exported);
} }
static void static void
@ -875,27 +907,6 @@ rte_validate(rte *e)
return 1; return 1;
} }
/**
* rte_free - delete a &rte
* @e: &rte to be deleted
*
* rte_free() deletes the given &rte from the routing table it's linked to.
*/
void
rte_free(rte *e)
{
if (rta_is_cached(e->attrs))
rta_free(e->attrs);
sl_free(rte_slab, e);
}
static inline void
rte_free_quick(rte *e)
{
rta_free(e->attrs);
sl_free(rte_slab, e);
}
static int static int
rte_same(rte *x, rte *y) rte_same(rte *x, rte *y)
{ {
@ -2465,17 +2476,15 @@ rt_prune_sync(rtable *t, int all)
*/ */
int int
rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old0, int refeed) rte_update_out(struct channel *c, const net_addr *n, struct rte_src *src, rte *new, rte **old_exported, int refeed)
{ {
struct rtable *tab = c->out_table; struct rtable *tab = c->out_table;
struct rte_src *src;
rte *old, **pos; rte *old, **pos;
net *net; net *net;
if (new) if (new)
{ {
net = net_get(tab, n); net = net_get(tab, n);
src = new->attrs->src;
if (!rta_is_cached(new->attrs)) if (!rta_is_cached(new->attrs))
new->attrs = rta_lookup(new->attrs); new->attrs = rta_lookup(new->attrs);
@ -2483,7 +2492,6 @@ rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old0, int re
else else
{ {
net = net_find(tab, n); net = net_find(tab, n);
src = old0->attrs->src;
if (!net) if (!net)
goto drop_withdraw; goto drop_withdraw;
@ -2509,7 +2517,7 @@ rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old0, int re
/* Remove the old rte */ /* Remove the old rte */
*pos = old->next; *pos = old->next;
rte_free_quick(old); *old_exported = old;
tab->rt_count--; tab->rt_count--;
break; break;