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

Revert "Export table: Delay freeing of old stored route."

Browse source 
This reverts commit cee0cd148c.
This change is not needed in version 2 and the surrounding code has
disappeared mostly in version 3.
This commit is contained in:
Maria Matejka 2022-07-22 15:37:21 +02:00
parent b5c8fce284
commit 4d48ede51d
2 changed files with 28 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nest/route.h
View file

@ -339,7 +339,7 @@ int rte_update_in(struct channel *c, const net_addr *n, rte *new, struct rte_src
int rt_reload_channel(struct channel *c);
void rt_reload_channel_abort(struct channel *c);
void rt_prune_sync(rtable *t, int all);
int rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old, rte **old_exported, int refeed);
int rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old0, int refeed);
struct rtable_config *rt_new_table(struct symbol *s, uint addr_type);
static inline int rt_is_ip(rtable *tab)

63
nest/rt-table.c
View file

@ -620,29 +620,6 @@ rte_cow_rta(rte *r, linpool *lp)
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)
{
rt_unlock_source(e->src);
if (rta_is_cached(e->attrs))
rta_free(e->attrs);
sl_free(e);
}
static inline void
rte_free_quick(rte *e)
{
rt_unlock_source(e->src);
rta_free(e->attrs);
sl_free(e);
}
static int /* Actually better or at least as good as */
rte_better(rte *new, rte *old)
{
@ -799,14 +776,8 @@ do_rt_notify(struct channel *c, net *net, rte *new, rte *old, int refeed)
}
/* Apply export table */
struct rte *old_exported = NULL;
if (c->out_table)
{
if (!rte_update_out(c, net->n.addr, new, old, &old_exported, refeed))
return;
}
else if (c->out_filter == FILTER_ACCEPT)
old_exported = old;
if (c->out_table && !rte_update_out(c, net->n.addr, new, old, refeed))
return;
if (new)
stats->exp_updates_accepted++;
@ -836,9 +807,6 @@ do_rt_notify(struct channel *c, net *net, rte *new, rte *old, int refeed)
}
p->rt_notify(p, c, net, new, old);
if (c->out_table && old_exported)
rte_free_quick(old_exported);
}
static void
@ -1198,6 +1166,29 @@ rte_validate(rte *e)
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)
{
rt_unlock_source(e->src);
if (rta_is_cached(e->attrs))
rta_free(e->attrs);
sl_free(e);
}
static inline void
rte_free_quick(rte *e)
{
rt_unlock_source(e->src);
rta_free(e->attrs);
sl_free(e);
}
static int
rte_same(rte *x, rte *y)
{
@ -3258,7 +3249,7 @@ again:
*/
int
rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old0, rte **old_exported, int refeed)
rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old0, int refeed)
{
struct rtable *tab = c->out_table;
struct rte_src *src;
@ -3302,7 +3293,7 @@ rte_update_out(struct channel *c, const net_addr *n, rte *new, rte *old0, rte **
/* Remove the old rte */
*pos = old->next;
*old_exported = old;
rte_free_quick(old);
tab->rt_count--;
break;