diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2012-07-18 19:29:33 +0200 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2012-07-18 19:29:33 +0200 |
| commit | 4be266a9831799dcc2e67e83fc83d9db43828a64 (patch) | |
| tree | 13e880c5b078b851ba51688ed416c6dab3754545 /filter | |
| parent | abced4a91495e27fe86b142bc1967cec53bab3dc (diff) | |
Implements wildcard matching in config file include.
Also fixes some minor bugs in include.
Thanks Kelly Cochran for suggestion and draft patch.
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/f-util.c | 4 | ||||
| -rw-r--r-- | filter/test.conf.inc | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/filter/f-util.c b/filter/f-util.c index 5908ac64..def2b248 100644 --- a/filter/f-util.c +++ b/filter/f-util.c @@ -19,7 +19,7 @@ f_new_inst(void) ret = cfg_alloc(sizeof(struct f_inst)); ret->code = ret->aux = 0; ret->arg1 = ret->arg2 = ret->next = NULL; - ret->lineno = ifs->conf_lino; + ret->lineno = ifs->lino; return ret; } @@ -60,7 +60,7 @@ f_generate_roa_check(struct symbol *sym, struct f_inst *prefix, struct f_inst *a { struct f_inst_roa_check *ret = cfg_allocz(sizeof(struct f_inst_roa_check)); ret->i.code = P('R','C'); - ret->i.lineno = ifs->conf_lino; + ret->i.lineno = ifs->lino; ret->i.arg1 = prefix; ret->i.arg2 = asn; /* prefix == NULL <-> asn == NULL */ diff --git a/filter/test.conf.inc b/filter/test.conf.inc index 10fc7014..109a49c5 100644 --- a/filter/test.conf.inc +++ b/filter/test.conf.inc @@ -3,4 +3,3 @@ print "Entering include"; print "Should be 2: ", 1+1; print "Leaving include"; - |