summaryrefslogtreecommitdiffstats
path: root/filter
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2000-04-17 13:34:38 +0200
committerPavel Machek <pavel@ucw.cz>2000-04-17 13:34:38 +0200
commit9c400ec9dd0ee74f1f350ead87dcd7366dbab7b1 (patch)
tree8a610e3d07c2004248bd0b247c7a7b2d9af1585d /filter
parente3558ab14ee60c8c9792bc3ed54d9f0c3eaa8ea8 (diff)
downloadbird-9c400ec9dd0ee74f1f350ead87dcd7366dbab7b1.tar
bird-9c400ec9dd0ee74f1f350ead87dcd7366dbab7b1.zip
Int sets moved to core. It is now possible to have variable of type clist.
Diffstat (limited to 'filter')
-rw-r--r--filter/config.Y5
-rw-r--r--filter/filter.c16
-rw-r--r--filter/test.conf5
3 files changed, 26 insertions, 0 deletions
diff --git a/filter/config.Y b/filter/config.Y
index 6ce89e7..9cdc815 100644
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -390,6 +390,7 @@ term:
case SYM_VARIABLE | T_IP:
case SYM_VARIABLE | T_PATH_MASK:
case SYM_VARIABLE | T_PATH:
+ case SYM_VARIABLE | T_CLIST:
$$->code = 'C';
$$->a1.p = $1->aux2;
break;
@@ -423,7 +424,11 @@ term:
| term '.' RESET { }
| '+' EMPTY '+' { $$ = f_new_inst(); $$->code = 'E'; $$->aux = T_PATH; }
+ | '-' EMPTY '-' { $$ = f_new_inst(); $$->code = 'E'; $$->aux = T_CLIST; }
| PREPEND '(' term ',' term ')' { $$ = f_new_inst(); $$->code = P('A','p'); $$->a1.p = $3; $$->a2.p = $5; }
+/* | ADD '(' term, ',' term ')' { $$ = f_new_inst(); $$->code = P('C','a'); $$->a1.p = $3; $$->a2.p = $5; $$->aux = 'a'; }
+ | DELETE '(' term, ',' term ')' { $$ = f_new_inst(); $$->code = P('C','a'); $$->a1.p = $3; $$->a2.p = $5; $$->aux = 'd'; } */
+
/* | term '.' LEN { $$->code = P('P','l'); } */
diff --git a/filter/filter.c b/filter/filter.c
index 267fa16..d9ef65a 100644
--- a/filter/filter.c
+++ b/filter/filter.c
@@ -483,6 +483,21 @@ interpret(struct f_inst *what)
res.val.ad = as_path_prepend(f_pool, v1.val.ad, v2.val.i);
break;
+ case P('C','a'): /* Community list add or delete */
+ TWOARGS;
+ if (v1.type != T_CLIST)
+ runtime("Can't add/delete to non-clist");
+ if (v2.type != T_PAIR)
+ runtime("Can't add/delete non-pair");
+
+ res.type = T_CLIST;
+ switch (what->aux) {
+ case 'a': res.val.ad = int_set_add(f_pool, v1.val.ad, v2.val.i); break;
+ case 'd': res.val.ad = int_set_del(f_pool, v1.val.ad, v2.val.i); break;
+ default: bug("unknown Ca operation");
+ }
+ break;
+
default:
bug( "Unknown instruction %d (%c)", what->code, what->code & 0xff);
}
@@ -566,6 +581,7 @@ i_same(struct f_inst *f1, struct f_inst *f2)
case P('S','W'): ONEARG; if (!same_tree(f1->a2.p, f2->a2.p)) return 0; break;
case P('i','M'): TWOARGS; break;
case P('A','p'): TWOARGS; break;
+ case P('C','a'): TWOARGS; break;
default:
bug( "Unknown instruction %d in same (%c)", f1->code, f1->code & 0xff);
}
diff --git a/filter/test.conf b/filter/test.conf
index a39e6a3..abe9d3f 100644
--- a/filter/test.conf
+++ b/filter/test.conf
@@ -32,6 +32,7 @@ function fifteen()
function paths()
bgpmask p;
bgppath p2;
+clist l;
{
p = / 4 3 2 1 /;
print "Testing path masks: ", p;
@@ -46,6 +47,10 @@ bgppath p2;
print "Should be false: ", p2 ~ p;
print "Should be true: ", p2 ~ / * 4 3 2 1 /, p2, / * 4 3 2 1 /;
print "5 = ", p2.len;
+
+ l = - empty -;
+ l = add( l, (1,2) );
+ print "Community list ", l;
}
function startup()