mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-11-09 20:58:44 +00:00
Code Releases Activity

Merge commit 'a5a6de58' into thread-next

Browse Source 
Conflicts:
      filter/config.Y
      filter/data.h
      filter/data.c
This commit is contained in:
Maria Matejka 2023-10-24 10:39:52 +02:00
commit c4bcded8b9
4 changed files with 23 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
filter/config.Y
View File

@ -207,11 +207,11 @@ f_generate_empty(const struct symbol *sym)
cf_error("Can't empty %s: not an attribute", sym->name); cf_error("Can't empty %s: not an attribute", sym->name);
const struct ea_class *def = sym->attribute; const struct ea_class *def = sym->attribute;
const struct f_val *empty = f_get_empty(def->type); const struct f_val empty = f_get_empty(def->type);
if (!empty) if (empty.type == T_VOID)
cf_error("Can't empty attribute %s", def->name); cf_error("Can't empty attribute %s", def->name);
return f_new_inst(FI_EA_SET, f_new_inst(FI_CONSTANT, *empty), def); return f_new_inst(FI_EA_SET, f_new_inst(FI_CONSTANT, empty), def);
} }
static inline struct f_inst * static inline struct f_inst *
@ -875,10 +875,10 @@ term:
| dynamic_attr '.' RESET{ } | dynamic_attr '.' RESET{ }
*/ */
| '+' EMPTY '+' { $$ = f_new_inst(FI_CONSTANT, f_const_empty_path); } | '+' EMPTY '+' { $$ = f_new_inst(FI_CONSTANT, f_get_empty(T_PATH)); }
| '-' EMPTY '-' { $$ = f_new_inst(FI_CONSTANT, f_const_empty_clist); } | '-' EMPTY '-' { $$ = f_new_inst(FI_CONSTANT, f_get_empty(T_CLIST)); }
| '-' '-' EMPTY '-' '-' { $$ = f_new_inst(FI_CONSTANT, f_const_empty_eclist); } | '-' '-' EMPTY '-' '-' { $$ = f_new_inst(FI_CONSTANT, f_get_empty(T_ECLIST)); }
| '-' '-' '-' EMPTY '-' '-' '-' { $$ = f_new_inst(FI_CONSTANT, f_const_empty_lclist); } | '-' '-' '-' EMPTY '-' '-' '-' { $$ = f_new_inst(FI_CONSTANT, f_get_empty(T_LCLIST)); }
| PREPEND '(' term ',' term ')' { $$ = f_new_inst(FI_PATH_PREPEND, $3, $5); } | PREPEND '(' term ',' term ')' { $$ = f_new_inst(FI_PATH_PREPEND, $3, $5); }
| ADD '(' term ',' term ')' { $$ = f_new_inst(FI_CLIST_ADD, $3, $5); } | ADD '(' term ',' term ')' { $$ = f_new_inst(FI_CLIST_ADD, $3, $5); }
| DELETE '(' term ',' term ')' { $$ = f_new_inst(FI_CLIST_DEL, $3, $5); } | DELETE '(' term ',' term ')' { $$ = f_new_inst(FI_CLIST_DEL, $3, $5); }

15
filter/data.c
View File

@ -81,20 +81,7 @@ f_type_element_type(btype t)
} }
const struct f_trie f_const_empty_trie = { .ipv4 = -1, }; const struct f_trie f_const_empty_trie = { .ipv4 = -1, };
const struct f_val f_const_empty_prefix_set = {
const struct f_val f_const_empty_path = {
.type = T_PATH,
.val.ad = &null_adata,
}, f_const_empty_clist = {
.type = T_CLIST,
.val.ad = &null_adata,
}, f_const_empty_eclist = {
.type = T_ECLIST,
.val.ad = &null_adata,
}, f_const_empty_lclist = {
.type = T_LCLIST,
.val.ad = &null_adata,
}, f_const_empty_prefix_set = {
.type = T_PREFIX_SET, .type = T_PREFIX_SET,
.val.ti = &f_const_empty_trie, .val.ti = &f_const_empty_trie,
}; };

19
filter/data.h
View File

@ -242,15 +242,20 @@ undef_value(struct f_val v)
(v.val.ad == &null_adata); (v.val.ad == &null_adata);
} }
extern const struct f_val f_const_empty_path, f_const_empty_clist, f_const_empty_eclist, f_const_empty_lclist, f_const_empty_prefix_set; extern const struct f_val f_const_empty_prefix_set;
static inline const struct f_val *f_get_empty(btype t) static inline struct f_val f_get_empty(btype t)
{ {
switch (t) { switch (t) {
case T_PATH: return &f_const_empty_path; case T_PATH:
case T_CLIST: return &f_const_empty_clist; case T_CLIST:
case T_ECLIST: return &f_const_empty_eclist; case T_ECLIST:
case T_LCLIST: return &f_const_empty_lclist; case T_LCLIST:
default: return NULL; return (struct f_val) {
.type = t,
.val.ad = &null_adata,
};
default:
return (struct f_val) { .type = T_VOID };
} }
} }

6
filter/f-inst.c
View File

@ -873,7 +873,7 @@
ACCESS_RTE; ACCESS_RTE;
RESULT_TYPE(da->type); RESULT_TYPE(da->type);
{ {
const struct f_val *empty; struct f_val empty;
const eattr *e = ea_find(fs->rte->attrs, da->id); const eattr *e = ea_find(fs->rte->attrs, da->id);
if (e) if (e)
@ -891,8 +891,8 @@
}]]); }]]);
} }
} }
else if (empty = f_get_empty(da->type)) else if ((empty = f_get_empty(da->type)).type != T_VOID)
RESULT_VAL(*empty); RESULT_VAL(empty);
else else
RESULT_VOID; RESULT_VOID;
} }