Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Filter: Handle undefined BGP paths as empty

Browse source 
The same is already done for clists. Also fixes defined() to work
properly for paths and clists.
This commit is contained in:
Ondrej Zajicek (work) 2018-01-03 15:44:05 +01:00
parent 9bd8cb7c3c
commit 8f8671bcde
2 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/bird.sgml
View file

@ -1498,8 +1498,8 @@ if 1234 = i then printn "."; else {
like it accesses variables. Attempts to access undefined attribute result in a like it accesses variables. Attempts to access undefined attribute result in a
runtime error; you can check if an attribute is defined by using the runtime error; you can check if an attribute is defined by using the
<cf>defined( <m>attribute</m> )</cf> operator. One notable exception to this <cf>defined( <m>attribute</m> )</cf> operator. One notable exception to this
rule are attributes of clist type, where undefined value is regarded as empty rule are attributes of bgppath and *clist types, where undefined value is
clist for most purposes. regarded as empty bgppath/*clist for most purposes.
<descrip> <descrip>
<tag><label id="rta-net"><m/prefix/ net</tag> <tag><label id="rta-net"><m/prefix/ net</tag>

28
filter/filter.c
View file

@ -54,6 +54,17 @@
void (*bt_assert_hook)(int result, struct f_inst *assert); void (*bt_assert_hook)(int result, struct f_inst *assert);
static struct adata undef_adata; /* adata of length 0 used for undefined */
/* Special undef value for paths and clists */
static inline int
undef_value(struct f_val v)
{
return ((v.type == T_PATH) || (v.type == T_CLIST) ||
(v.type == T_ECLIST) || (v.type == T_LCLIST)) &&
(v.val.ad == &undef_adata);
}
static struct adata * static struct adata *
adata_empty(struct linpool *pool, int l) adata_empty(struct linpool *pool, int l)
{ {
@ -815,7 +826,7 @@ interpret(struct f_inst *what)
case P('d','e'): case P('d','e'):
ONEARG; ONEARG;
res.type = T_BOOL; res.type = T_BOOL;
res.val.i = (v1.type != T_VOID); res.val.i = (v1.type != T_VOID) && !undef_value(v1);
break; break;
case 'T': case 'T':
ONEARG; ONEARG;
@ -1001,24 +1012,31 @@ interpret(struct f_inst *what)
e = ea_find((*f_rte)->attrs->eattrs, code); e = ea_find((*f_rte)->attrs->eattrs, code);
if (!e) { if (!e) {
/* A special case: undefined int_set looks like empty int_set */ /* A special case: undefined as_path looks like empty as_path */
if ((what->aux & EAF_TYPE_MASK) == EAF_TYPE_AS_PATH) {
res.type = T_PATH;
res.val.ad = &undef_adata;
break;
}
/* The same special case for int_set */
if ((what->aux & EAF_TYPE_MASK) == EAF_TYPE_INT_SET) { if ((what->aux & EAF_TYPE_MASK) == EAF_TYPE_INT_SET) {
res.type = T_CLIST; res.type = T_CLIST;
res.val.ad = adata_empty(f_pool, 0); res.val.ad = &undef_adata;
break; break;
} }
/* The same special case for ec_set */ /* The same special case for ec_set */
if ((what->aux & EAF_TYPE_MASK) == EAF_TYPE_EC_SET) { if ((what->aux & EAF_TYPE_MASK) == EAF_TYPE_EC_SET) {
res.type = T_ECLIST; res.type = T_ECLIST;
res.val.ad = adata_empty(f_pool, 0); res.val.ad = &undef_adata;
break; break;
} }
/* The same special case for lc_set */ /* The same special case for lc_set */
if ((what->aux & EAF_TYPE_MASK) == EAF_TYPE_LC_SET) { if ((what->aux & EAF_TYPE_MASK) == EAF_TYPE_LC_SET) {
res.type = T_LCLIST; res.type = T_LCLIST;
res.val.ad = adata_empty(f_pool, 0); res.val.ad = &undef_adata;
break; break;
} }