diff options
author | Maria Matejka <mq@ucw.cz> | 2022-05-30 16:41:15 +0200 |
---|---|---|
committer | Maria Matejka <mq@ucw.cz> | 2022-05-30 16:41:15 +0200 |
commit | e16e1e4138cf10fd8f2508fa0e41e5ec98de6d53 (patch) | |
tree | 9c09bc2b7ebe25e072d47ec58d5841b25e4960b7 /proto/static/static.c | |
parent | 0097f24e2e8b3feb56d4ae5c5b56a8defd9f7d2e (diff) | |
parent | f2f3163f6c3fba7f9ef03640d7b2f6323873d2cc (diff) |
Merge commit 'f2f3163f6c3fba7f9ef03640d7b2f6323873d2cc' into haugesund
Diffstat (limited to 'proto/static/static.c')
-rw-r--r-- | proto/static/static.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/proto/static/static.c b/proto/static/static.c index fe0c77bc..87d795ee 100644 --- a/proto/static/static.c +++ b/proto/static/static.c @@ -47,8 +47,6 @@ #include "static.h" -static linpool *static_lp; - static inline struct rte_src * static_get_source(struct static_proto *p, uint i) { return i ? rt_get_source(&p->p, i) : p->p.main_source; } @@ -107,14 +105,10 @@ static_announce_rte(struct static_proto *p, struct static_route *r) /* Evaluate the filter */ if (r->cmds) - f_eval_rte(r->cmds, e, static_lp); + f_eval_rte(r->cmds, e); rte_update(p->p.main_channel, r->net, e, src); r->state = SRS_CLEAN; - - if (r->cmds) - lp_flush(static_lp); - return; withdraw: @@ -474,9 +468,6 @@ static_start(struct proto *P) struct static_config *cf = (void *) P->cf; struct static_route *r; - if (!static_lp) - static_lp = lp_new(&root_pool); - if (p->igp_table_ip4) rt_lock_table(p->igp_table_ip4); |