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

Export table: Delay freeing of old stored route.

Browse source 
This is needed to provide the protocols the full old route after filters
when export table is enabled.
This commit is contained in:
Maria Matejka 2021-03-20 21:16:12 +01:00
parent 8216ec3027
commit cee0cd148c
2 changed files with 34 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nest/route.h
View file

@ -353,7 +353,7 @@ int rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src
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, rte *new, rte *old, 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);

56
nest/rt-table.c
View file

@ -333,6 +333,26 @@ 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);
}
/** /**
* rte_init_tmp_attrs - initialize temporary ea_list for route * rte_init_tmp_attrs - initialize temporary ea_list for route
@ -661,8 +681,14 @@ do_rt_notify(struct channel *c, net *net, rte *new, rte *old, int refeed)
} }
/* 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, new, old, &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++;
@ -692,6 +718,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
@ -1044,27 +1073,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)
{ {
@ -2762,7 +2770,7 @@ again:
*/ */
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, rte *new, rte *old0, rte **old_exported, int refeed)
{ {
struct rtable *tab = c->out_table; struct rtable *tab = c->out_table;
struct rte_src *src; struct rte_src *src;
@ -2808,7 +2816,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;