diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2010-09-11 20:14:53 +0200 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2010-10-04 20:09:55 +0200 |
| commit | 408595259f4eea4e31dd7142100d2f1863574685 (patch) | |
| tree | 682ad8c5421157010b65285319fd39bbffd07b39 | |
| parent | b2c8936720e18d57a7c0c9a26985abccb0c67af9 (diff) | |
Fixes a bug in community set delete.
| -rw-r--r-- | filter/filter.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/filter/filter.c b/filter/filter.c index 5492f80d..2bc54d5c 100644 --- a/filter/filter.c +++ b/filter/filter.c @@ -919,6 +919,9 @@ interpret(struct f_inst *what) runtime("Can't add/delete to non-clist"); struct f_val dummy; + u16 op = what->aux; + i = 0; + if ((v2.type == T_PAIR) || (v2.type == T_QUAD)) i = v2.val.i; #ifndef IPV6 @@ -926,13 +929,13 @@ interpret(struct f_inst *what) else if (v2.type == T_IP) i = ipa_to_u32(v2.val.px.ip); #endif - else if ((v2.type == T_SET) && (what->aux == 'd') && clist_set_type(v2.val.t, &dummy)) - what->aux = 'D'; + else if ((v2.type == T_SET) && (op == 'd') && clist_set_type(v2.val.t, &dummy)) + op = 'D'; else runtime("Can't add/delete non-pair"); res.type = T_CLIST; - switch (what->aux) { + switch (op) { case 'a': res.val.ad = int_set_add(f_pool, v1.val.ad, i); break; case 'd': res.val.ad = int_set_del(f_pool, v1.val.ad, i); break; case 'D': res.val.ad = clist_del_matching(f_pool, v1.val.ad, v2.val.t); break; |