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

BFD: Better handling of BFD options in BGP configs

Browse source 
Merge multiple BFD option blocks in BGP configs instead of using the last
one. That is necessary for proper handling of templates when BFD options
are used both in a BGP template and in a BGP protocol derived from that
template.
This commit is contained in:
Ondrej Zajicek (work) 2020-11-12 04:02:38 +01:00
parent 99ad208dd7
commit 3b56bf8849
4 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
conf/confbase.Y
View file

@ -79,7 +79,6 @@ CF_DECLS
struct f_trie *trie; struct f_trie *trie;
struct f_val v; struct f_val v;
struct password_item *p; struct password_item *p;
struct bfd_options *bo;
struct rt_show_data *ra; struct rt_show_data *ra;
struct sym_show_data *sd; struct sym_show_data *sd;
struct lsadb_show_data *ld; struct lsadb_show_data *ld;

25
nest/config.Y
View file

@ -52,6 +52,28 @@ get_passwords(void)
return rv; return rv;
} }
static inline void
init_bfd_opts(struct bfd_options **opts)
{
cf_check_bfd(1);
if (! *opts)
*opts = bfd_new_options();
}
static inline void
open_bfd_opts(struct bfd_options **opts)
{
init_bfd_opts(opts);
this_bfd_opts = *opts;
}
static inline void
close_bfd_opts(void)
{
this_bfd_opts = NULL;
}
static void static void
proto_postconfig(void) proto_postconfig(void)
{ {
@ -99,7 +121,6 @@ CF_ENUM_PX(T_ENUM_AF, AF_, AFI_, IPV4, IPV6)
%type <ps> proto_patt proto_patt2 %type <ps> proto_patt proto_patt2
%type <cc> channel_start proto_channel %type <cc> channel_start proto_channel
%type <cl> limit_spec %type <cl> limit_spec
%type <bo> bfd_opts
%type <net> r_args_for_val %type <net> r_args_for_val
%type <net_ptr> r_args_for %type <net_ptr> r_args_for
%type <t> r_args_channel %type <t> r_args_channel
@ -519,7 +540,7 @@ bfd_items:
; ;
bfd_opts: bfd_opts:
'{' { this_bfd_opts = bfd_new_options(); } bfd_items '}' { $$ = this_bfd_opts; this_bfd_opts = NULL; } '{' bfd_items '}'
; ;
/* Core commands */ /* Core commands */

2
proto/bgp/bgp.h
View file

@ -130,7 +130,7 @@ struct bgp_config {
const char *dynamic_name; /* Name pattern for dynamic BGP */ const char *dynamic_name; /* Name pattern for dynamic BGP */
int dynamic_name_digits; /* Minimum number of digits for dynamic names */ int dynamic_name_digits; /* Minimum number of digits for dynamic names */
int check_link; /* Use iface link state for liveness detection */ int check_link; /* Use iface link state for liveness detection */
const struct bfd_options *bfd; /* Use BFD for liveness detection */ struct bfd_options *bfd; /* Use BFD for liveness detection */
}; };
struct bgp_channel_config { struct bgp_channel_config {

6
proto/bgp/config.Y
View file

@ -190,9 +190,9 @@ bgp_proto:
| bgp_proto LONG LIVED STALE TIME expr ';' { BGP_CFG->llgr_time = $6; } | bgp_proto LONG LIVED STALE TIME expr ';' { BGP_CFG->llgr_time = $6; }
| bgp_proto TTL SECURITY bool ';' { BGP_CFG->ttl_security = $4; } | bgp_proto TTL SECURITY bool ';' { BGP_CFG->ttl_security = $4; }
| bgp_proto CHECK LINK bool ';' { BGP_CFG->check_link = $4; } | bgp_proto CHECK LINK bool ';' { BGP_CFG->check_link = $4; }
| bgp_proto BFD bool ';' { cf_check_bfd($3); BGP_CFG->bfd = $3 ? bfd_new_options() : NULL; } | bgp_proto BFD bool ';' { if ($3) init_bfd_opts(&BGP_CFG->bfd); else BGP_CFG->bfd = NULL; }
| bgp_proto BFD GRACEFUL ';' { cf_check_bfd(1); struct bfd_options *opts = bfd_new_options(); opts->mode = BGP_BFD_GRACEFUL; BGP_CFG->bfd = opts; } | bgp_proto BFD GRACEFUL ';' { init_bfd_opts(&BGP_CFG->bfd); BGP_CFG->bfd->mode = BGP_BFD_GRACEFUL; }
| bgp_proto BFD bfd_opts ';' { BGP_CFG->bfd = $3; cf_check_bfd(1); } | bgp_proto BFD { open_bfd_opts(&BGP_CFG->bfd); } bfd_opts { close_bfd_opts(); } ';'
| bgp_proto ENFORCE FIRST AS bool ';' { BGP_CFG->enforce_first_as = $5; } | bgp_proto ENFORCE FIRST AS bool ';' { BGP_CFG->enforce_first_as = $5; }
; ;