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

First and last accessors to as_paths.

Browse source
This commit is contained in:
Ondrej Zajicek 2009-10-08 15:23:24 +01:00
parent 43c7a1ffa0
commit 7ea5b00f42
2 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
filter/config.Y
View file

@ -36,7 +36,7 @@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, UNSET, RETURN,
LEN, LEN,
DEFINED, DEFINED,
ADD, DELETE, CONTAINS, RESET, ADD, DELETE, CONTAINS, RESET,
PREPEND, MATCH, PREPEND, FIRST, LAST, MATCH,
EMPTY, EMPTY,
FILTER, WHERE, EVAL) FILTER, WHERE, EVAL)
@ -448,6 +448,8 @@ term:
| term '.' IP { $$ = f_new_inst(); $$->code = P('c','p'); $$->a1.p = $1; $$->aux = T_IP; } | term '.' IP { $$ = f_new_inst(); $$->code = P('c','p'); $$->a1.p = $1; $$->aux = T_IP; }
| term '.' LEN { $$ = f_new_inst(); $$->code = 'L'; $$->a1.p = $1; } | term '.' LEN { $$ = f_new_inst(); $$->code = 'L'; $$->a1.p = $1; }
| term '.' MASK '(' term ')' { $$ = f_new_inst(); $$->code = P('i','M'); $$->a1.p = $1; $$->a2.p = $5; } | term '.' MASK '(' term ')' { $$ = f_new_inst(); $$->code = P('i','M'); $$->a1.p = $1; $$->a2.p = $5; }
| term '.' FIRST { $$ = f_new_inst(); $$->code = P('a','f'); $$->a1.p = $1; }
| term '.' LAST { $$ = f_new_inst(); $$->code = P('a','l'); $$->a1.p = $1; }
/* Communities */ /* Communities */
/* This causes one shift/reduce conflict /* This causes one shift/reduce conflict

21
filter/filter.c
View file

@ -353,6 +353,7 @@ interpret(struct f_inst *what)
struct f_val v1, v2, res; struct f_val v1, v2, res;
unsigned u1, u2; unsigned u1, u2;
int i; int i;
u32 as;
res.type = T_VOID; res.type = T_VOID;
if (!what) if (!what)
@ -727,6 +728,26 @@ interpret(struct f_inst *what)
default: bug( "Unknown prefix to conversion" ); default: bug( "Unknown prefix to conversion" );
} }
break; break;
case P('a','f'): /* Get first ASN from AS PATH */
ONEARG;
if (v1.type != T_PATH)
runtime( "AS Path expected" );
as = 0;
as_path_get_last(v1.val.ad, &as); /* really last */
res.type = T_INT;
res.val.i = as;
break;
case P('a','l'): /* Get last ASN from AS PATH */
ONEARG;
if (v1.type != T_PATH)
runtime( "AS path expected" );
as = 0;
as_path_get_first(v1.val.ad, &as); /* really first */
res.type = T_INT;
res.val.i = as;
break;
case 'r': case 'r':
ONEARG; ONEARG;
res = v1; res = v1;