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

Nest: Don't lookup net in table before filters are run.

Browse source 
Using dummy net instead. This should help with performance on rejected
routes.
This commit is contained in:
Maria Matejka 2019-01-31 15:02:15 +01:00
parent 9548888599
commit c65a9a05f9
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
nest/rt-table.c
View file

@ -1346,7 +1346,10 @@ rte_update2(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
rte_update_lock(); rte_update_lock();
if (new) if (new)
{ {
nn = net_get(c->table, n); /* Create a temporary table node */
nn = alloca(sizeof(net) + n->length);
memset(nn, 0, sizeof(net) + n->length);
net_copy(nn->n.addr, n);
new->net = nn; new->net = nn;
new->sender = c; new->sender = c;
@ -1397,6 +1400,10 @@ rte_update2(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
if (!rta_is_cached(new->attrs)) /* Need to copy attributes */ if (!rta_is_cached(new->attrs)) /* Need to copy attributes */
new->attrs = rta_lookup(new->attrs); new->attrs = rta_lookup(new->attrs);
new->flags |= REF_COW; new->flags |= REF_COW;
/* Use the actual struct network, not the dummy one */
nn = net_get(c->table, n);
new->net = nn;
} }
else else
{ {
@ -1411,16 +1418,21 @@ rte_update2(struct channel *c, const net_addr *n, rte *new, struct rte_src *src)
} }
recalc: recalc:
/* And recalculate the best route */
rte_hide_dummy_routes(nn, &dummy); rte_hide_dummy_routes(nn, &dummy);
rte_recalculate(c, nn, new, src); rte_recalculate(c, nn, new, src);
rte_unhide_dummy_routes(nn, &dummy); rte_unhide_dummy_routes(nn, &dummy);
rte_update_unlock(); rte_update_unlock();
return; return;
drop: drop:
rte_free(new); rte_free(new);
new = NULL; new = NULL;
goto recalc; if (nn = net_find(c->table, n))
goto recalc;
rte_update_unlock();
} }
/* Independent call to rte_announce(), used from next hop /* Independent call to rte_announce(), used from next hop