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

f_new_dynamic_attr gets third argument, type as filters know it.

Browse source
This commit is contained in:
Pavel Machek 2000-04-12 14:02:04 +00:00
parent 12d5677aa3
commit ac7a2145cc
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
filter/f-util.c
View file

@ -21,10 +21,10 @@ f_new_inst(void)
} }
struct f_inst * struct f_inst *
f_new_dynamic_attr(int type, int code) f_new_dynamic_attr(int type, int f_type, int code)
{ {
struct f_inst *f = f_new_inst(); struct f_inst *f = f_new_inst();
f->aux = T_PATH; /* type; HACK!!! */ f->aux = f_type;
f->a2.i = code; f->a2.i = code;
return f; return f;
} }

2
filter/filter.h
View file

@ -64,7 +64,7 @@ struct filter {
void filters_postconfig(void); void filters_postconfig(void);
struct f_inst *f_new_inst(void); struct f_inst *f_new_inst(void);
struct f_inst *f_new_dynamic_attr(int type, int code); struct f_inst *f_new_dynamic_attr(int type, int f_type, int code); /* Type as core knows it, type as filters know it, and code */
struct f_tree *f_new_tree(void); struct f_tree *f_new_tree(void);
struct f_tree *build_tree(struct f_tree *); struct f_tree *build_tree(struct f_tree *);

2
proto/bgp/config.Y
View file

@ -50,7 +50,7 @@ bgp_proto:
| bgp_proto NEXT HOP SELF ';' { BGP_CFG->next_hop_self = 1; } | bgp_proto NEXT HOP SELF ';' { BGP_CFG->next_hop_self = 1; }
; ;
CF_ADDTO(dynamic_attr, BGP_PATH { $$ = f_new_dynamic_attr(EAF_TYPE_AS_PATH, EA_CODE(EAP_BGP, BA_AS_PATH)); }) CF_ADDTO(dynamic_attr, BGP_PATH { $$ = f_new_dynamic_attr(EAF_TYPE_AS_PATH, T_PATH, EA_CODE(EAP_BGP, BA_AS_PATH)); })
CF_CODE CF_CODE

4
proto/rip/config.Y
View file

@ -98,8 +98,8 @@ rip_iface_list:
| rip_iface_list ',' rip_iface | rip_iface_list ',' rip_iface
; ;
CF_ADDTO(dynamic_attr, RIP_METRIC { $$ = f_new_dynamic_attr(EAF_TYPE_INT | EAF_TEMP, EA_RIP_METRIC); }) CF_ADDTO(dynamic_attr, RIP_METRIC { $$ = f_new_dynamic_attr(EAF_TYPE_INT | EAF_TEMP, T_INT, EA_RIP_METRIC); })
CF_ADDTO(dynamic_attr, RIP_TAG { $$ = f_new_dynamic_attr(EAF_TYPE_INT | EAF_TEMP, EA_RIP_TAG); }) CF_ADDTO(dynamic_attr, RIP_TAG { $$ = f_new_dynamic_attr(EAF_TYPE_INT | EAF_TEMP, T_INT, EA_RIP_TAG); })
CF_CODE CF_CODE