Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
labs
BIRD Internet Routing Daemon
Commits
e399b6f6
Commit
e399b6f6
authored
Apr 17, 2000
by
Pavel Machek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Path and path matching seem to work, now.
parent
1ed2fe96
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
9 deletions
+21
-9
filter/config.Y
filter/config.Y
+5
-3
filter/filter.c
filter/filter.c
+5
-3
filter/test.conf
filter/test.conf
+11
-3
No files found.
filter/config.Y
View file @
e399b6f6
...
...
@@ -72,7 +72,7 @@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, UNSET, RETURN,
LEN,
DEFINED,
ADD, DELETE, CONTAINS, RESET,
A
PPEND, MATCH,
P
RE
PEND, MATCH,
EMPTY,
FILTER, WHERE)
...
...
@@ -388,6 +388,7 @@ term:
case SYM_VARIABLE | T_PREFIX:
case SYM_VARIABLE | T_IP:
case SYM_VARIABLE | T_PATH_MASK:
case SYM_VARIABLE | T_PATH:
$$->code = 'C';
$$->a1.p = $1->aux2;
break;
...
...
@@ -417,10 +418,11 @@ term:
*/
/* Paths */
| term '.'
A
PPEND '(' term ')' { }
| term '.' P
RE
PEND '(' term ')' { }
| term '.' RESET { }
| EMPTY { $$ = f_new_inst(); $$->code = 'E'; $$->aux = T_PATH; }
| '+' EMPTY '+' { $$ = f_new_inst(); $$->code = 'E'; $$->aux = T_PATH; }
| PREPEND '(' term ',' term ')' { $$ = f_new_inst(); $$->code = P('A','p'); $$->a1.p = $3; $$->a2.p = $5; }
/* | term '.' LEN { $$->code = P('P','l'); } */
...
...
filter/filter.c
View file @
e399b6f6
...
...
@@ -253,6 +253,8 @@ interpret(struct f_inst *what)
case
T_IP
:
case
T_PREFIX
:
case
T_PAIR
:
case
T_PATH
:
case
T_CLIST
:
case
T_PATH_MASK
:
if
(
sym
->
class
!=
(
SYM_VARIABLE
|
v2
.
type
))
runtime
(
"Variable of bad type"
);
...
...
@@ -584,6 +586,7 @@ filters_postconfig(void)
struct
f_val
res
;
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."
);
...
...
@@ -674,10 +677,9 @@ path_format(u8 *p, int len)
#define PM_END -1
#define PM_ASTERIX -2
#define MASK_PLUS do { mask = mask->next; if (mask
->val == PM_END
) return next == q; \
#define MASK_PLUS do { mask = mask->next; if (
!
mask) return next == q; \
asterix = (mask->val == PM_ASTERIX); \
printf( "Asterix now %d\n", asterix ); \
if (asterix) { mask = mask->next; if (mask->val == PM_END) { printf( "Quick exit\n" ); return 1; } } \
if (asterix) { mask = mask->next; if (!mask) { return 1; } } \
} while(0)
int
...
...
filter/test.conf
View file @
e399b6f6
...
...
@@ -31,10 +31,18 @@ function fifteen()
function
paths
()
bgpmask
p
;
bgppath
p2
;
{
print
"Testing paths"
;
p
= /
1
2
3
4
/;
print
p
;
p
= /
4
3
2
1
/;
print
"Testing path masks: "
,
p
;
p2
=
prepend
( +
empty
+,
1
);
p2
=
prepend
(
p2
,
2
);
p2
=
prepend
(
p2
,
3
);
p2
=
prepend
(
p2
,
4
);
print
"Testing paths: "
,
p2
;
print
"Should be true: "
,
p2
~
p
;
p2
=
prepend
(
p2
,
5
);
print
"Should be false: "
,
p2
~
p
;
}
function
startup
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment