diff options
| -rw-r--r-- | TODO | 5 | ||||
| -rw-r--r-- | conf/conf.c | 1 | ||||
| -rw-r--r-- | filter/config.Y | 7 | ||||
| -rw-r--r-- | filter/filter.c | 21 | ||||
| -rw-r--r-- | filter/filter.h | 1 |
5 files changed, 2 insertions, 33 deletions
@@ -9,6 +9,8 @@ Core - filters: deletion of mandatory attributes? - filters: user defined attributes? +- kernel: persistent mode + - cli: show tables? - client: Ctrl-R eats one more enter @@ -32,9 +34,6 @@ Documentation Globals ~~~~~~~ - right usage of DBG vs. debug -- kill preconfigs? -- check dump functions -- cleanup debugging calls - logging and tracing; use appropriate log levels - check incoming packets and log errors!! - check log calls for trailing newlines and log levels followed by comma diff --git a/conf/conf.c b/conf/conf.c index 323655d3..dd716424 100644 --- a/conf/conf.c +++ b/conf/conf.c @@ -58,7 +58,6 @@ config_parse(struct config *c) protos_preconfig(c); rt_preconfig(c); cf_parse(); - filters_postconfig(); /* FIXME: Do we really need this? */ protos_postconfig(c); #ifdef IPV6 if (!c->router_id) diff --git a/filter/config.Y b/filter/config.Y index 4c4a859a..8988241b 100644 --- a/filter/config.Y +++ b/filter/config.Y @@ -170,14 +170,7 @@ function_body: CF_ADDTO(conf, function_def) function_def: FUNCTION SYM { DBG( "Beginning of function %s\n", $2->name ); cf_push_scope($2); } function_params function_body { - extern struct f_inst *startup_func, *test1_func, *test2_func; cf_define_symbol($2, SYM_FUNCTION, $5); - if (!strcasecmp($2->name, "__startup")) - startup_func = $5; - if (!strcasecmp($2->name, "__test1")) - test1_func = $5; - if (!strcasecmp($2->name, "__test2")) - test2_func = $5; $2->aux = (int) $4; $2->aux2 = $5; DBG("Hmm, we've got one function here - %s\n", $2->name); diff --git a/filter/filter.c b/filter/filter.c index 2510b6a3..c9350c96 100644 --- a/filter/filter.c +++ b/filter/filter.c @@ -43,8 +43,6 @@ #define P(a,b) ((a<<8) | b) -struct f_inst *startup_func = NULL, *test1_func, *test2_func; - #define CMP_ERROR 999 static int @@ -682,25 +680,6 @@ f_eval_int(struct f_inst *expr) return res.val.i; } -void -filters_postconfig(void) -{ - struct f_val res; - -#if 1 - if (!i_same(test1_func, test2_func)) - bug("i_same does not work"); -#endif - if (startup_func) { - debug( "Launching startup function...\n" ); - f_pool = lp_new(&root_pool, 1024); - res = interpret(startup_func); - if (res.type == F_ERROR) - die( "Startup function resulted in error." ); - debug( "done\n" ); - } -} - /** * filter_same - compare two filters * @new: first filter to be compared diff --git a/filter/filter.h b/filter/filter.h index b746063e..3a62cd7e 100644 --- a/filter/filter.h +++ b/filter/filter.h @@ -58,7 +58,6 @@ struct filter { struct f_inst *root; }; -void filters_postconfig(void); 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); |