summaryrefslogtreecommitdiffstats
path: root/filter
diff options
context:
space:
mode:
authorMartin Mares <mj@ucw.cz>2000-05-17 00:37:53 +0200
committerMartin Mares <mj@ucw.cz>2000-05-17 00:37:53 +0200
commitb1c9d871614874092e397ae505799be82284713d (patch)
treecca7d987f0b35fe0ce15a6383dfb7175b5c9931b /filter
parent508c36ab7981a8e50d1235c2c443491e4b04aa01 (diff)
downloadbird-b1c9d871614874092e397ae505799be82284713d.tar
bird-b1c9d871614874092e397ae505799be82284713d.zip
Fixed the horrible mess Pavel has created with his last commit.
Diffstat (limited to 'filter')
-rw-r--r--filter/filter.c30
-rw-r--r--filter/filter.h6
2 files changed, 16 insertions, 20 deletions
diff --git a/filter/filter.c b/filter/filter.c
index a805363..3a1ee07 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
@@ -665,24 +663,22 @@ f_run(struct filter *filter, struct rte **rte, struct ea_list **tmp_attrs, struc
return res.val.i;
}
-void
-filters_postconfig(void)
+int
+f_eval_int(struct f_inst *expr)
{
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" );
- }
-}
+ f_flags = 0;
+ f_tmp_attrs = NULL;
+ f_rte = NULL;
+ f_rte_old = NULL;
+ f_rta_copy = NULL;
+ f_pool = cfg_mem;
+ res = interpret(expr);
+ if (res.type != T_INT)
+ cf_error("Integer expression expected");
+ return res.val.i;
+}
/**
* filter_same - compare two filters
diff --git a/filter/filter.h b/filter/filter.h
index f17f076..02b22ff 100644
--- a/filter/filter.h
+++ b/filter/filter.h
@@ -31,7 +31,7 @@ struct f_inst { /* Instruction */
#define arg1 a1.p
#define arg2 a2.p
-struct prefix {
+struct f_prefix {
ip_addr ip;
int len;
#define LEN_MASK 0xff
@@ -46,7 +46,7 @@ struct f_val {
union {
int i;
/* ip_addr ip; Folded into prefix */
- struct prefix px;
+ struct f_prefix px;
char *s;
struct f_tree *t;
struct adata *ad;
@@ -59,7 +59,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);
@@ -72,6 +71,7 @@ struct ea_list;
struct rte;
int f_run(struct filter *filter, struct rte **rte, struct ea_list **tmp_attrs, struct linpool *tmp_pool, int flags);
+int f_eval_int(struct f_inst *expr);
char *filter_name(struct filter *filter);
int filter_same(struct filter *new, struct filter *old);