December 2019 - Bird-users

bird 2.0.7 crashes with OSPF
by Nico Schottelius 14 Jan '20

14 Jan '20

Hello, continuing my travel now with OSPF, we have found two cases to crash bird via birdc: bird> show ospf topology all ospf_v4 Connection closed by server [00:50] replacement-router1.place5:~# ps aux | grep bird 14220 root 0:00 grep bird bird> show ospf state ospf_v4 Connection closed by server [23:44] router1.place6:~# birdc Unable to connect to server control socket (/var/run/bird.ctl): Connection refused The config leading to this is attached below. Best regards, Nico p.s.: In the documentation for the "instance id" it says "Default value is 0 unless OSPFv3-AF extended address families are used, see RFC 5838 for that case." And further above it says that RFC5838 is enabled by default. However shouldn't it be 64 in case of an ipv4 channel in ospf according to rfc5838? protocol ospf v3 ospf_v6 { instance id 0; ipv6 { import all; export all; }; area 0 { interface "bond0.8" { cost 5; hello 5; retransmit 2; wait 10; dead 20; }; }; } protocol ospf v3 ospf_v4 { instance id 64; ipv4 { import all; export all; }; area 0 { interface "bond0.8" { cost 5; hello 5; retransmit 2; wait 10; dead 20; }; }; } -- Modern, affordable, Swiss Virtual Machines. Visit www.datacenterlight.ch

4 5

[RFC PATCH 00/20] Context typed filters
by Asbjørn Sloth Tønnesen 08 Jan '20

08 Jan '20

This RFC patch series is a first stab, at adding some syntactic sugar making it more plessant to implement non-trivial dual-stack configurations, like https://bgpfilterguide.nlnog.net/ I'm not completely happy with the naming at this stage, but I want to get this series out before 36C3 ends. Looking forward to your feedback. Asbjørn Sloth Tønnesen (20): add NET_ANY make symbol types maskable add new symbol flags for typed symbols add support for defining typed symbols show symbols: don't show typed symbols add initial FI_TYPED_CONSTANT instruction add generic pseudo filter check function add f_has_typed_symbols helper function use net_type when looking up symbols in SYM_FLAG_SAME check show symbol flags in dump filter all check if functions need to be adapted force consistent number of function arguments use FI_TYPED_CONSTANT for typed constants adapt infrastructure adapt protocol filters adapt sh route filters adapt mrt filters allow typed definitions add typed test config add typed documentation conf/cf-lex.l | 75 ++++++++++++++++++++---- conf/conf.h | 58 +++++++++++++----- conf/confbase.Y | 6 +- doc/bird.sgml | 10 ++++ filter/Makefile | 2 +- filter/adapt.c | 150 +++++++++++++++++++++++++++++++++++++++++++++++ filter/config.Y | 28 +++++++-- filter/decl.m4 | 77 +++++++++++++++++++++--- filter/f-inst.c | 42 ++++++++++++- filter/filter.c | 29 +++++---- filter/filter.h | 16 +++++ filter/test.conf | 41 +++++++++++++ lib/net.c | 1 + lib/net.h | 1 + nest/cmds.c | 3 + nest/config.Y | 8 ++- nest/route.h | 1 + nest/rt-show.c | 9 ++- proto/mrt/mrt.c | 17 +++++- proto/mrt/mrt.h | 2 + 20 files changed, 519 insertions(+), 57 deletions(-) create mode 100644 filter/adapt.c -- 2.24.0

2 3

Follow up question on "next hop self"
by Nico Schottelius 07 Jan '20

07 Jan '20

Hello, I was wondering about how bird solves the following problem with next hop self enabled: R1 <--------> R2 \ / \ / upstream 1 So both routers receive the same routes from upstream and insert them with the same local_pref. With "next hop self" on, both routers will think that the path is not the same and potentially either of the two routers could start routing via the other router instead of via upstream directly. What is the typical approach to solve this situation correctly? Does making setting the local_pref lower if received from an iBGP router make sense in that case? Best regards, Nico -- Modern, affordable, Swiss Virtual Machines. Visit www.datacenterlight.ch

4 8

Bgu repport OSPF IPv6 Bird with wireguard
by alpha_one_x86 31 Dec '19

31 Dec '19

Hi, OSPF IPv6 of bird is buggy over wireguard. Work over OpenVPN. Work OSPF IPv4. *Only in IPv6, the OSPF interface is not detected.* Cheers, -- alpha_one_x86/BRULE Herman <alpha_one_x86(a)first-world.info> Main developer of Supercopier/Ultracopier/CatchChallenger, Esourcing and server management IT, OS, technologies, research & development, security and business department

2 2

[RFC PATCH 20/20] add typed documentation
by Asbjørn Sloth Tønnesen 30 Dec '19

30 Dec '19

--- doc/bird.sgml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/bird.sgml b/doc/bird.sgml index 8548c9c6..b9e5c45d 100644 --- a/doc/bird.sgml +++ b/doc/bird.sgml @@ -1229,6 +1229,16 @@ bird> show route filter { if 127.0.0.5 &tilde; net then accept; } bird> </code> +<p>Constants, functions and filters can also be declared for a specific table type context. + +<code> +define default_route:ipv4 = 0.0.0.0/0; +define default_route:ipv6 = ::/0; + +function is_default_route() + return net = default_route; +} +</code> <sect>Data types <label id="data-types"> -- 2.24.0

1 0

[RFC PATCH 19/20] add typed test config
by Asbjørn Sloth Tønnesen 30 Dec '19

30 Dec '19

--- filter/test.conf | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/filter/test.conf b/filter/test.conf index d0941e11..cbc4e90d 100644 --- a/filter/test.conf +++ b/filter/test.conf @@ -1403,3 +1403,44 @@ protocol static ipv6 { import where false; }; route fd01::/48 unreachable; } + +define default_route:ipv4 = 0.0.0.0/0; +define default_route:ipv6 = ::/0; + +function typed_function:ipv4() +{ + reject; +} + +function typed_function:ipv6() +{ + if net = default_route then accept; +} + +# this function is implicitly typed since it uses a typed symbol +function is_default_route() +{ + return net = default_route; +} + +filter implicitly_typed +{ + if is_default_route() then + accept; + else + reject; +} + +protocol static +{ + ipv4 { import filter implicitly_typed; }; + route 0.0.0.0/0 unreachable; + route 192.0.2.0/24 unreachable; +} + +protocol static +{ + ipv6 { import filter implicitly_typed; }; + route ::/0 unreachable; + route 2001:db8::/48 unreachable; +} -- 2.24.0

1 0

[RFC PATCH 18/20] allow typed definitions
by Asbjørn Sloth Tønnesen 30 Dec '19

30 Dec '19

--- conf/confbase.Y | 5 +++++ filter/config.Y | 18 +++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/conf/confbase.Y b/conf/confbase.Y index eda5b9c1..ca8ec19a 100644 --- a/conf/confbase.Y +++ b/conf/confbase.Y @@ -150,6 +150,11 @@ definition: if (f_eval(f_linearize($4), cfg_mem, val) > F_RETURN) cf_error("Runtime error"); cf_define_symbol($2, SYM_CONSTANT | val->type, val, val); } + | DEFINE symbol ':' net_type '=' term ';' { + struct f_val *val = cfg_alloc(sizeof(struct f_val)); + if (f_eval(f_linearize($6), cfg_mem, val) > F_RETURN) cf_error("Runtime error"); + cf_define_typed_symbol($2, SYM_CONSTANT | val->type, val, val, $4); + } ; expr: diff --git a/filter/config.Y b/filter/config.Y index a7d1dd9b..653d2265 100644 --- a/filter/config.Y +++ b/filter/config.Y @@ -462,12 +462,19 @@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, UNSET, RETURN, %type <v> set_atom switch_atom fipa %type <px> fprefix %type <t> get_cf_position +%type <s> filter_symbol function_symbol CF_GRAMMAR +filter_symbol: + symbol { $$ = cf_define_symbol($1, SYM_FILTER, filter, NULL); } + | symbol ':' net_type { + $$ = cf_define_typed_symbol($1, SYM_FILTER, filter, NULL, $3); + }; + conf: filter_def ; filter_def: - FILTER symbol { $2 = cf_define_symbol($2, SYM_FILTER, filter, NULL); cf_push_scope( $2 ); } + FILTER filter_symbol { cf_push_scope( $2 ); } filter_body { struct filter *f = cfg_alloc(sizeof(struct filter)); *f = (struct filter) { .sym = $2, .root = $4 }; @@ -605,10 +612,15 @@ function_body: } ; +function_symbol: + symbol { $$ = cf_define_symbol($1, SYM_FUNCTION, function, NULL); } + | symbol ':' net_type { + $$ = cf_define_typed_symbol($1, SYM_FUNCTION, function, NULL, $3); + }; + conf: function_def ; function_def: - FUNCTION symbol { DBG( "Beginning of function %s\n", $2->name ); - $2 = cf_define_symbol($2, SYM_FUNCTION, function, NULL); + FUNCTION function_symbol { DBG( "Beginning of function %s\n", $2->name ); cf_push_scope($2); } function_args function_body { DBG("Definition of function %s with %u args and %u local vars.\n", $2->name, $4, $5->vars); -- 2.24.0

1 0

[RFC PATCH 17/20] adapt mrt filters
by Asbjørn Sloth Tønnesen 30 Dec '19

30 Dec '19

--- proto/mrt/mrt.c | 17 +++++++++++++++-- proto/mrt/mrt.h | 2 ++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/proto/mrt/mrt.c b/proto/mrt/mrt.c index 7a396a84..bc20e5c6 100644 --- a/proto/mrt/mrt.c +++ b/proto/mrt/mrt.c @@ -483,6 +483,8 @@ mrt_rib_table_dump(struct mrt_table_dump_state *s, net *n, int add_path) mrt_init_message(&s->buf, MRT_TABLE_DUMP_V2, subtype); mrt_rib_table_header(s, n->n.addr); + const struct filter *f = s->filters[s->table->addr_type]; + rte *rt, *rt0; for (rt0 = n->routes; rt = rt0; rt0 = rt0->next) { @@ -498,7 +500,7 @@ mrt_rib_table_dump(struct mrt_table_dump_state *s, net *n, int add_path) rte_make_tmp_attrs(&rt, s->linpool, NULL); - if (f_run(s->filter, &rt, s->linpool, 0) <= F_ACCEPT) + if (f_run(f, &rt, s->linpool, 0) <= F_ACCEPT) mrt_rib_table_entry(s, rt); if (rt != rt0) @@ -709,8 +711,13 @@ mrt_dump_cmd(struct mrt_dump_data *d) s->filter = d->filter; s->filename = d->filename; - if (s->table_ptr) + u32 net_type_mask = NB_IP; + if (s->table_ptr) { rt_lock_table(s->table_ptr); + net_type_mask = 1 << s->table_ptr->addr_type; + } + + filters_adapt(&s->filters, s->filter, net_type_mask, config); this_cli->cont = mrt_dump_cont; this_cli->cleanup = mrt_dump_cleanup; @@ -818,6 +825,12 @@ mrt_check_config(struct proto_config *CF) if (!cf->period) cf_error("Period not specified"); + + u32 net_type_mask = NB_IP; + if (cf->table_cf) + net_type_mask = cf->table_cf->addr_type; + + filters_adapt(&cf->filters, cf->filter, net_type_mask, new_config); } static struct proto * diff --git a/proto/mrt/mrt.h b/proto/mrt/mrt.h index 4dfb1b19..1d4634e4 100644 --- a/proto/mrt/mrt.h +++ b/proto/mrt/mrt.h @@ -24,6 +24,7 @@ struct mrt_config { struct rtable_config *table_cf; const char *table_expr; const struct filter *filter; + const struct filter *filters[NET_MAX]; const char *filename; uint period; int always_add_path; @@ -62,6 +63,7 @@ struct mrt_table_dump_state { const char *table_expr; /* Wildcard for table name (or NULL) */ struct rtable *table_ptr; /* Explicit table (or NULL) */ const struct filter *filter; /* Optional filter */ + const struct filter *filters[NET_MAX]; const char *filename; /* Filename pattern */ int always_add_path; /* Always use *_ADDPATH message subtypes */ -- 2.24.0

1 0

[RFC PATCH 16/20] adapt sh route filters
by Asbjørn Sloth Tønnesen 30 Dec '19

30 Dec '19

--- nest/route.h | 1 + nest/rt-show.c | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/nest/route.h b/nest/route.h index eaaa5c3f..74cb55f4 100644 --- a/nest/route.h +++ b/nest/route.h @@ -344,6 +344,7 @@ struct rt_show_data { struct fib_iterator fit; /* Iterator over networks in table */ int verbose, tables_defined_by; const struct filter *filter; + const struct filter *filters[NET_MAX]; struct proto *show_protocol; struct proto *export_protocol; struct channel *export_channel; diff --git a/nest/rt-show.c b/nest/rt-show.c index 3431293a..f36bfe6f 100644 --- a/nest/rt-show.c +++ b/nest/rt-show.c @@ -107,6 +107,8 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d) int first = 1; int pass = 0; + const struct filter *f = d->filters[d->tab->table->addr_type]; + bsnprintf(ia, sizeof(ia), "%N", n->n.addr); for (e = n->routes; e; e = e->next) @@ -178,7 +180,7 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d) if (d->show_protocol && (d->show_protocol != e->attrs->src->proto)) goto skip; - if (f_run(d->filter, &e, c->show_pool, 0) > F_ACCEPT) + if (f_run(f, &e, c->show_pool, 0) > F_ACCEPT) goto skip; if (d->stats < 2) @@ -342,6 +344,7 @@ static inline void rt_show_prepare_tables(struct rt_show_data *d) { struct rt_show_data_rtable *tab, *tabx; + u32 net_type_mask = 0; /* Add implicit tables if no table is specified */ if (EMPTY_LIST(d->tables)) @@ -378,8 +381,12 @@ rt_show_prepare_tables(struct rt_show_data *d) rem_node(&(tab->n)); continue; } + + net_type_mask |= 1 << tab->table->addr_type; } + filters_adapt(&d->filters, d->filter, net_type_mask, d->running_on_config); + /* Ensure there is at least one table */ if (EMPTY_LIST(d->tables)) cf_error("No valid tables"); -- 2.24.0

1 0

[RFC PATCH 15/20] adapt protocol filters
by Asbjørn Sloth Tønnesen 30 Dec '19

30 Dec '19

--- nest/config.Y | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nest/config.Y b/nest/config.Y index bd1157c6..04808c00 100644 --- a/nest/config.Y +++ b/nest/config.Y @@ -262,8 +262,12 @@ proto_channel: channel_start channel_opt_list channel_end; rtable: CF_SYM_KNOWN { cf_assert_symbol($1, SYM_TABLE); $$ = $1->table; } ; imexport: - FILTER filter { $$ = $2; } - | where_filter + FILTER filter { + $$ = filter_adapt($2, (struct f_context){ .net_type = this_channel->net_type }); + } + | where_filter { + $$ = filter_adapt($1, (struct f_context){ .net_type = this_channel->net_type }); + } | ALL { $$ = FILTER_ACCEPT; } | NONE { $$ = FILTER_REJECT; } ; -- 2.24.0

1 0