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
afc54517
Commit
afc54517
authored
Apr 17, 2000
by
Pavel Machek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prepend and creation of empty path should work, but it has strange
syntax for now.
parent
f421cfdd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
1 deletion
+22
-1
filter/config.Y
filter/config.Y
+4
-0
filter/filter.c
filter/filter.c
+18
-1
No files found.
filter/config.Y
View file @
afc54517
...
...
@@ -73,6 +73,7 @@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, UNSET, RETURN,
DEFINED,
ADD, DELETE, CONTAINS, RESET,
APPEND, MATCH,
EMPTY,
FILTER, WHERE)
%nonassoc THEN
...
...
@@ -418,6 +419,9 @@ term:
/* Paths */
| term '.' APPEND '(' term ')' { }
| term '.' RESET { }
| EMPTY { $$ = f_new_inst(); $$->code = 'E'; $$->aux = T_PATH; }
/* | term '.' LEN { $$->code = P('P','l'); } */
/* function_call is inlined here */
...
...
filter/filter.c
View file @
afc54517
...
...
@@ -453,6 +453,22 @@ interpret(struct f_inst *what)
res
.
val
.
px
.
ip
=
ipa_and
(
mask
,
v1
.
val
.
px
.
ip
);
}
break
;
case
'E'
:
/* Create empty attribute */
res
.
type
=
what
->
aux
;
res
.
val
.
ad
=
adata_empty
(
f_pool
);
break
;
case
P
(
'A'
,
'p'
):
/* Path prepend */
TWOARGS
;
if
(
v1
.
type
!=
T_PATH
)
runtime
(
"Can't prepend to non-path"
);
if
(
v2
.
type
!=
T_INT
)
runtime
(
"Can't prepend non-integer"
);
res
.
type
=
T_PATH
;
res
.
val
.
ad
=
as_path_prepend
(
f_pool
,
v1
.
val
.
ad
,
v2
.
val
.
i
);
break
;
default:
bug
(
"Unknown instruction %d (%c)"
,
what
->
code
,
what
->
code
&
0xff
);
}
...
...
@@ -519,7 +535,7 @@ i_same(struct f_inst *f1, struct f_inst *f2)
break
;
case
'p'
:
ONEARG
;
break
;
case
'?'
:
TWOARGS
;
break
;
case
'0'
:
break
;
case
'0'
:
case
'E'
:
break
;
case
P
(
'p'
,
','
):
ONEARG
;
A2_SAME
;
break
;
case
'a'
:
A2_SAME
;
break
;
case
P
(
'e'
,
'a'
):
A2_SAME
;
break
;
...
...
@@ -535,6 +551,7 @@ i_same(struct f_inst *f1, struct f_inst *f2)
break
;
case
P
(
'S'
,
'W'
):
ONEARG
;
if
(
!
same_tree
(
f1
->
a2
.
p
,
f2
->
a2
.
p
))
return
0
;
break
;
case
P
(
'i'
,
'M'
):
TWOARGS
;
break
;
case
P
(
'A'
,
'p'
):
TWOARGS
;
break
;
default:
bug
(
"Unknown instruction %d in same (%c)"
,
f1
->
code
,
f1
->
code
&
0xff
);
}
...
...
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