summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Mares <mj@ucw.cz>2000-04-17 15:41:50 +0200
committerMartin Mares <mj@ucw.cz>2000-04-17 15:41:50 +0200
commit74a7da482b1a537aaa97b4b5d6f6815887150f26 (patch)
treefbd1ae5bd8c9fe59ece776454208a11ce174b737
parent8f10985e1ef77c7d44c8912cf92f99e5c4502cbd (diff)
downloadbird-74a7da482b1a537aaa97b4b5d6f6815887150f26.tar
bird-74a7da482b1a537aaa97b4b5d6f6815887150f26.zip
Adding of dynamic attributes is hopefully correct now.
-rw-r--r--filter/filter.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/filter/filter.c b/filter/filter.c
index 3ebc4f2..fd6ea35 100644
--- a/filter/filter.c
+++ b/filter/filter.c
@@ -153,6 +153,7 @@ static struct rte **f_rte, *f_rte_old;
static struct linpool *f_pool;
static struct ea_list **f_tmp_attrs;
static int f_flags;
+static rta *f_rta_copy;
#define runtime(x) do { \
log( L_ERR x ); \
@@ -404,9 +405,15 @@ interpret(struct f_inst *what)
}
if (!(what->aux & EAF_TEMP) && (!(f_flags & FF_FORCE_TMPATTR))) {
- *f_rte = rte_cow(*f_rte);
- l->next = (*f_rte)->attrs->eattrs;
- (*f_rte)->attrs->eattrs = l;
+ if (!f_rta_copy) {
+ f_rta_copy = lp_alloc(f_pool, sizeof(rta));
+ memcpy(f_rta_copy, (*f_rte)->attrs, sizeof(rta));
+ f_rta_copy->aflags = 0;
+ *f_rte = rte_cow(*f_rte);
+ (*f_rte)->attrs = f_rta_copy;
+ }
+ l->next = f_rta_copy->eattrs;
+ f_rta_copy->eattrs = l;
} else {
l->next = (*f_tmp_attrs);
(*f_tmp_attrs) = l;
@@ -607,6 +614,7 @@ f_run(struct filter *filter, struct rte **rte, struct ea_list **tmp_attrs, struc
f_tmp_attrs = tmp_attrs;
f_rte = rte;
f_rte_old = *rte;
+ f_rta_copy = NULL;
f_pool = tmp_pool;
inst = filter->root;
res = interpret(inst);