diff options
| author | Jan Moskyto Matejka <mq@ucw.cz> | 2015-12-16 15:30:44 +0100 |
|---|---|---|
| committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2015-12-20 13:04:07 +0100 |
| commit | 9656dce72eead158e6da3ad560720bb0addfe7e2 (patch) | |
| tree | 190bdc886af4a3e80cbffee3becc3562412a2ee9 /filter | |
| parent | aedd3a6babbaf35becb7770f73f30b20b464393f (diff) | |
ROA code switchoff
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/config.Y | 3 | ||||
| -rw-r--r-- | filter/f-util.c | 3 | ||||
| -rw-r--r-- | filter/filter.c | 4 | ||||
| -rw-r--r-- | filter/filter.h | 4 |
4 files changed, 10 insertions, 4 deletions
diff --git a/filter/config.Y b/filter/config.Y index 9411b7aa..92ac6fa5 100644 --- a/filter/config.Y +++ b/filter/config.Y @@ -284,7 +284,6 @@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, UNSET, RETURN, DEFINED, ADD, DELETE, CONTAINS, RESET, PREPEND, FIRST, LAST, MATCH, - ROA_CHECK, EMPTY, FILTER, WHERE, EVAL) @@ -761,8 +760,10 @@ term: | DELETE '(' term ',' term ')' { $$ = f_new_inst(); $$->code = P('C','a'); $$->a1.p = $3; $$->a2.p = $5; $$->aux = 'd'; } | FILTER '(' term ',' term ')' { $$ = f_new_inst(); $$->code = P('C','a'); $$->a1.p = $3; $$->a2.p = $5; $$->aux = 'f'; } +/* | ROA_CHECK '(' SYM ')' { $$ = f_generate_roa_check($3, NULL, NULL); } | ROA_CHECK '(' SYM ',' term ',' term ')' { $$ = f_generate_roa_check($3, $5, $7); } +*/ /* | term '.' LEN { $$->code = P('P','l'); } */ diff --git a/filter/f-util.c b/filter/f-util.c index def2b248..7311a56e 100644 --- a/filter/f-util.c +++ b/filter/f-util.c @@ -54,7 +54,7 @@ f_generate_complex(int operation, int operation_aux, struct f_inst *dyn, struct return set_dyn; } - +#if 0 struct f_inst * f_generate_roa_check(struct symbol *sym, struct f_inst *prefix, struct f_inst *asn) { @@ -71,6 +71,7 @@ f_generate_roa_check(struct symbol *sym, struct f_inst *prefix, struct f_inst *a return &ret->i; } +#endif char * filter_name(struct filter *filter) diff --git a/filter/filter.c b/filter/filter.c index 3859a185..d8b828a3 100644 --- a/filter/filter.c +++ b/filter/filter.c @@ -1245,6 +1245,7 @@ interpret(struct f_inst *what) break; +#if 0 case P('R','C'): /* ROA Check */ if (what->arg1) { @@ -1277,6 +1278,7 @@ interpret(struct f_inst *what) res.val.i = ROA_UNKNOWN; // XXXX res.val.i = roa_check_net(rtc->table, &v1.val.net, as); break; +#endif default: bug( "Unknown instruction %d (%c)", what->code, what->code & 0xff); @@ -1404,6 +1406,7 @@ i_same(struct f_inst *f1, struct f_inst *f2) case P('C','a'): TWOARGS; break; case P('a','f'): case P('a','l'): ONEARG; break; +#if 0 case P('R','C'): TWOARGS; /* Does not really make sense - ROA check resuls may change anyway */ @@ -1411,6 +1414,7 @@ i_same(struct f_inst *f1, struct f_inst *f2) ((struct f_inst_roa_check *) f2)->rtc->name)) return 0; break; +#endif default: bug( "Unknown instruction %d in same (%c)", f1->code, f1->code & 0xff); } diff --git a/filter/filter.h b/filter/filter.h index 4e8293c5..fe753630 100644 --- a/filter/filter.h +++ b/filter/filter.h @@ -67,7 +67,7 @@ struct f_inst *f_new_inst(void); struct f_inst *f_new_dynamic_attr(int type, int f_type, int code); /* Type as core knows it, type as filters know it, and code of dynamic attribute */ struct f_tree *f_new_tree(void); struct f_inst *f_generate_complex(int operation, int operation_aux, struct f_inst *dyn, struct f_inst *argument); -struct f_inst *f_generate_roa_check(struct symbol *sym, struct f_inst *prefix, struct f_inst *asn); +// struct f_inst *f_generate_roa_check(struct symbol *sym, struct f_inst *prefix, struct f_inst *asn); struct f_tree *build_tree(struct f_tree *); @@ -133,7 +133,7 @@ void val_format(struct f_val v, buffer *buf); #define T_ENUM_SCOPE 0x32 #define T_ENUM_RTC 0x33 #define T_ENUM_RTD 0x34 -#define T_ENUM_ROA 0x35 +/*#define T_ENUM_ROA 0x35*/ /* new enums go here */ #define T_ENUM_EMPTY 0x3f /* Special hack for atomic_aggr */ |