- Bird-users - Mailing Lists

[PATCH] Allow to match on the kernel route protocol in filters
by Jérémie Dimino 13 Mar '12

13 Mar '12

This patch add the two following attributes: - krt_source: an enum which export the value of u.krt.src - krt_proto: an integer which export the value of u.krt.proto --- doc/bird.sgml | 9 +++++++++ filter/config.Y | 10 +++++++++- filter/filter.c | 8 ++++++++ filter/filter.h | 1 + sysdep/unix/config.Y | 2 ++ sysdep/unix/main.c | 2 +- 6 files changed, 30 insertions(+), 2 deletions(-) diff --git a/doc/bird.sgml b/doc/bird.sgml index b8dabf4..d74483d 100644 --- a/doc/bird.sgml +++ b/doc/bird.sgml @@ -991,6 +991,9 @@ undefined value is regarded as empty clist for most purposes. <tag><m/enum/ dest</tag> Type of destination the packets should be sent to (<cf/RTD_ROUTER/ for forwarding to a neighboring router, <cf/RTD_DEVICE/ for routing to a directly-connected network, <cf/RTD_BLACKHOLE/ for packets to be silently discarded, <cf/RTD_UNREACHABLE/, <cf/RTD_PROHIBIT/ for packets that should be returned with ICMP host unreachable / ICMP administratively prohibited messages). Read-only. + <tag><m/enum/ krt_source</tag> + the source of kernel routes. Possible values: <cf/KRT_SRC_BIRD/, <cf/KRT_SRC_REDIRECT/, <cf/KRT_SRC_ALIEN/, <cf/KRT_SRC_KERNEL/. + <tag><m/int/ igp_metric</tag> The optional attribute that can be used to specify a distance to the network for routes that do not have a native protocol @@ -1603,6 +1606,12 @@ We support these attributes: <tag>int <cf/krt_realm/</tag> (Linux) The realm of the route. Can be used for traffic classification. + + <tag>enum krt_source <cf/krt_source/</tag> The source of the route. + + <tag>int <cf/krt_proto/</tag> The OS-dependent source of the route. + It is more precice than <cf/krt_source/ but is not available on all systems. + Currently its value is only meaningful under Linux. </descrip> <sect1>Example diff --git a/filter/config.Y b/filter/config.Y index 0166d27..65a2ee2 100644 --- a/filter/config.Y +++ b/filter/config.Y @@ -255,6 +255,7 @@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, UNSET, RETURN, IF, THEN, ELSE, CASE, TRUE, FALSE, RT, RO, UNKNOWN, GENERIC, FROM, GW, NET, MASK, PROTO, SOURCE, SCOPE, CAST, DEST, PREFERENCE, + KRT_PROTO, KRT_SOURCE, LEN, DEFINED, ADD, DELETE, CONTAINS, RESET, @@ -265,7 +266,7 @@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, UNSET, RETURN, %nonassoc THEN %nonassoc ELSE -%type <x> term block cmds cmds_int cmd function_body constant constructor print_one print_list var_list var_listn dynamic_attr static_attr function_call symbol bgp_path_expr +%type <x> term block cmds cmds_int cmd function_body constant constructor print_one print_list var_list var_listn dynamic_attr static_attr krt_attr function_call symbol bgp_path_expr %type <f> filter filter_body where_filter %type <i> type break_command pair_expr ec_kind %type <i32> pair_atom ec_expr @@ -705,6 +706,11 @@ static_attr: | DEST { $$ = f_new_inst(); $$->aux = T_ENUM_RTD; $$->a2.i = OFFSETOF(struct rta, dest); } ; +krt_attr: + KRT_SOURCE { $$ = f_new_inst(); $$->aux = T_ENUM_KRT_SOURCE; $$->a2.i = OFFSETOF(struct rte, u.krt.src); } + | KRT_PROTO { $$ = f_new_inst(); $$->aux = T_INT; $$->a2.i = OFFSETOF(struct rte, u.krt.proto); } + ; + term: '(' term ')' { $$ = $2; } | term '+' term { $$ = f_new_inst(); $$->code = '+'; $$->a1.p = $1; $$->a2.p = $3; } @@ -733,6 +739,8 @@ term: | rtadot dynamic_attr { $$ = $2; $$->code = P('e','a'); } + | rtadot krt_attr { $$ = $2; $$->code = 'k'; } + | term '.' IP { $$ = f_new_inst(); $$->code = P('c','p'); $$->a1.p = $1; $$->aux = T_IP; } | term '.' LEN { $$ = f_new_inst(); $$->code = 'L'; $$->a1.p = $1; } | term '.' MASK '(' term ')' { $$ = f_new_inst(); $$->code = P('i','M'); $$->a1.p = $1; $$->a2.p = $5; } diff --git a/filter/filter.c b/filter/filter.c index d6d338b..8cea76b 100644 --- a/filter/filter.c +++ b/filter/filter.c @@ -833,6 +833,14 @@ interpret(struct f_inst *what) } } break; + case 'k': /* u.krt access */ + { + res.type = what->aux; + if ((*f_rte)->attrs->source == RTS_INHERIT) + res.val.i = * ((char *) (*f_rte) + what->a2.i); + else + res.val.i = -1; + } case P('a','S'): ONEARG; if (what->aux != v1.type) diff --git a/filter/filter.h b/filter/filter.h index 2cf4652..51f5b7e 100644 --- a/filter/filter.h +++ b/filter/filter.h @@ -141,6 +141,7 @@ int tree_compare(const void *p1, const void *p2); #define T_ENUM_SCOPE 0x32 #define T_ENUM_RTC 0x33 #define T_ENUM_RTD 0x34 +#define T_ENUM_KRT_SOURCE 0x35 /* new enums go here */ #define T_ENUM_EMPTY 0x3f /* Special hack for atomic_aggr */ diff --git a/sysdep/unix/config.Y b/sysdep/unix/config.Y index 844f53d..e6d60b0 100644 --- a/sysdep/unix/config.Y +++ b/sysdep/unix/config.Y @@ -16,6 +16,8 @@ CF_DECLS CF_KEYWORDS(LOG, SYSLOG, ALL, DEBUG, TRACE, INFO, REMOTE, WARNING, ERROR, AUTH, FATAL, BUG, STDERR, SOFT) CF_KEYWORDS(TIMEFORMAT, ISO, SHORT, LONG, BASE, NAME) +CF_ENUM(T_ENUM_KRT_SOURCE, KRT_SRC_, BIRD, REDIRECT, ALIEN, KERNEL) + %type <i> log_mask log_mask_list log_cat %type <g> log_file %type <t> cfg_name diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c index d617684..b022be9 100644 --- a/sysdep/unix/main.c +++ b/sysdep/unix/main.c @@ -188,7 +188,7 @@ sysdep_preconfig(struct config *c) init_list(&c->logfiles); #ifdef PATH_IPROUTE_DIR - // read_iproute_table(PATH_IPROUTE_DIR "/rt_protos", "ipp_", 256); + read_iproute_table(PATH_IPROUTE_DIR "/rt_protos", "ipp_", 256); read_iproute_table(PATH_IPROUTE_DIR "/rt_realms", "ipr_", 256); read_iproute_table(PATH_IPROUTE_DIR "/rt_scopes", "ips_", 256); read_iproute_table(PATH_IPROUTE_DIR "/rt_tables", "ipt_", 256); -- 1.7.9.1 --MP_/H2IZm=0dknKvFOfee5JxakH--

1 0

how to define a prefix
by Oleg 11 Mar '12

11 Mar '12

Hello. When I want to define a prefix: define our_net = 192.168.110.0/24; "bird> configure" says me: /etc/bird.conf, line 18: syntax error. bird 1.3.6.

2 2

bgp community loggin/export
by Tapio Haapala 08 Mar '12

08 Mar '12

Hello, What is easiest or efficent way to get bgp commynity info out from bird? Our need is make some iptables forward rules for traffic accounting based by bgp communities. Can we get communities to syslog when advertisement comes or can we read current status of them with birdc? -- F-Solutions Oy Tapio Haapala PL7, 90571 Oulu GSM 0400 998371 Skype burner- IRC Burner@ircnet

5 5

find ASN in bgp_path
by Oleg 07 Mar '12

07 Mar '12

Hello. I do the next command from birdc to get routes with special ASN in bgp_path: bird> show route filter { if ( ASN ~ bgp_path ) then accept; reject; } It show me nothing and in syslog i see:

2 2

[PATCH 1/1] * Implement show ospf lsadb filtering by router id
by Alexander V. Chernikov 06 Mar '12

06 Mar '12

Conflicts: conf/confbase.Y --- conf/confbase.Y | 1 + proto/ospf/config.Y | 15 ++++++++++++--- proto/ospf/ospf.c | 16 +++++++++++++--- proto/ospf/ospf.h | 8 +++++++- 4 files changed, 33 insertions(+), 7 deletions(-) diff --git a/conf/confbase.Y b/conf/confbase.Y index 14893f4..b952f31 100644 --- a/conf/confbase.Y +++ b/conf/confbase.Y @@ -50,6 +50,7 @@ CF_DECLS struct f_path_mask *h; struct password_item *p; struct rt_show_data *ra; + struct lsadb_show_data *ld; struct iface *iface; void *g; bird_clock_t time; diff --git a/proto/ospf/config.Y b/proto/ospf/config.Y index 24e125a..aa1cb10 100644 --- a/proto/ospf/config.Y +++ b/proto/ospf/config.Y @@ -119,9 +119,10 @@ CF_KEYWORDS(NONBROADCAST, NBMA, POINTOPOINT, PTP, POINTOMULTIPOINT, PTMP) CF_KEYWORDS(NONE, SIMPLE, AUTHENTICATION, STRICT, CRYPTOGRAPHIC) CF_KEYWORDS(ELIGIBLE, POLL, NETWORKS, HIDDEN, VIRTUAL, CHECK, LINK) CF_KEYWORDS(RX, BUFFER, LARGE, NORMAL, STUBNET, HIDDEN, SUMMARY, TAG, EXTERNAL) -CF_KEYWORDS(WAIT, DELAY, LSADB, ECMP, LIMIT, WEIGHT, NSSA, TRANSLATOR, STABILITY) +CF_KEYWORDS(WAIT, DELAY, LSADB, ECMP, LIMIT, WEIGHT, NSSA, TRANSLATOR, STABILITY, ADVROUTER) %type <t> opttext +%type <ld> lsadb_args CF_GRAMMAR @@ -411,8 +412,16 @@ CF_CLI(SHOW OSPF STATE, optsym opttext, [<name>], [[Show information about reach CF_CLI(SHOW OSPF STATE ALL, optsym opttext, [<name>], [[Show information about all OSPF network state]]) { ospf_sh_state(proto_get_named($5, &proto_ospf), 1, 0); }; -CF_CLI(SHOW OSPF LSADB, optsym opttext, [<name>], [[Show content of OSPF LSA database]]) -{ ospf_sh_lsadb(proto_get_named($4, &proto_ospf)); }; +CF_CLI(SHOW OSPF LSADB, lsadb_args, [advrouter|<protocol name>], [[Show content of OSPF LSA database]]) +{ ospf_sh_lsadb($4); }; + +lsadb_args: + /* empty */ { + $$ = cfg_allocz(sizeof(struct lsadb_show_data)); + } + | lsadb_args ADVROUTER idval { $$->advrouter = $3; } + | lsadb_args SYM { $$->p = proto_get_named($2, &proto_ospf); } + ; CF_CODE diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c index 73c06c2..5e72b09 100644 --- a/proto/ospf/ospf.c +++ b/proto/ospf/ospf.c @@ -1471,14 +1471,22 @@ lsa_compare_for_lsadb(const void *p1, const void *p2) } void -ospf_sh_lsadb(struct proto *p) +ospf_sh_lsadb(struct lsadb_show_data *ld) { - struct proto_ospf *po = (struct proto_ospf *) p; - int num = po->gr->hash_entries; + struct proto_ospf *po; + struct proto *p; + int num; unsigned int i, j; int last_dscope = -1; u32 last_domain = 0; + if (!ld->p) + ld->p = proto_get_named(NULL, &proto_ospf); + + p = ld->p; + po = (struct proto_ospf *) p; + num = po->gr->hash_entries; + if (p->proto_state != PS_UP) { cli_msg(-1017, "%s: is not up", p->name); @@ -1530,6 +1538,8 @@ ospf_sh_lsadb(struct proto *p) last_domain = hea[i]->domain; } + if ((ld->advrouter) && (ld->advrouter != lsa->rt)) + continue; cli_msg(-1017," %04x %-15R %-15R %5u %08x %04x", lsa->type, lsa->id, lsa->rt, lsa->age, lsa->sn, lsa->checksum); diff --git a/proto/ospf/ospf.h b/proto/ospf/ospf.h index d696151..3dec090 100644 --- a/proto/ospf/ospf.h +++ b/proto/ospf/ospf.h @@ -846,7 +846,13 @@ void ospf_sh_neigh(struct proto *p, char *iff); void ospf_sh(struct proto *p); void ospf_sh_iface(struct proto *p, char *iff); void ospf_sh_state(struct proto *p, int verbose, int reachable); -void ospf_sh_lsadb(struct proto *p); + +struct lsadb_show_data { + struct proto *p; /* Protocol to request data from */ + u32 advrouter; /* Advertising router */ +}; + +void ospf_sh_lsadb(struct lsadb_show_data *ld); #define EA_OSPF_METRIC1 EA_CODE(EAP_OSPF, 0) -- 1.7.3.2 --------------040304020808000900050901--

1 0

Mismatch between code and documentation for default pipe mode
by Benjamin Cama 05 Mar '12

05 Mar '12

Hi, I had a headache trying to understand why my pipe “preference” option was ignored, and then found out about pipe “mode”. The documentation says that the default mode is “opaque” (see http://bird.network.cz/?get_doc&f=bird-6.html#ss6.6 ) But the code doesn't say so, see https://git.nic.cz/redmine/projects/bird/repository/revisions/master/entry/… : PIPE_CFG->mode = PIPE_TRANSPARENT; What is the intended default? Regards, Benjamin

2 1

Community operations got broken after upgrade to 1.3.6 from 1.2.4
by Alexander Shikoff 04 Mar '12

04 Mar '12

Hello! After upgrade my Route Servers from 1.2.4 to 1.3.6 community processing got broken. Simple function function check_community () pair set wrong; { # # Delete disallowed communities # wrong = [ # 0:XXXXX - Do not announce to peer (0,0)..(0,99), (0,101)..(0,65535) ]; bgp_community.delete(wrong); } deletes ALL communities (0,*) including (0,100). -- MINO-RIPE

2 2

Some small OSPF changes
by Alexander V. Chernikov 29 Feb '12

29 Feb '12

Hello list! There are several improvements that can be applied to OSPF: 1) At the moment TTL is not explicitly set in per-interface sockets, so multicast messages are sent with default OS ttl (which is 255 on *BSD). This is clearly wrong: RFC 2328 states in A.1: To ensure that these packets will not travel multiple hops, their IP TTL must be set to 1. The same(but less strict) for RFC 5340 (A.1): As such, the multicast addresses have been chosen with link-local scope and packets sent to these addresses should have their IPv6 Hop Limit set to 1. There is also RFC 3171 which states that 3. Local Network Control Block (224.0.0/24) Addresses in the Local Network Control block are used for protocol control traffic that is not forwarded off link. so another possiblility is to implement such behavior in sk_setup_multicast() 2) At the moment bird totally ignores neighbor MTU. We should at least print warning (or error) if neighbor MTU differs. This greatly simplifies debugging procedures.

2 3

bird reflector: release 20120229
by Alexander V. Chernikov 29 Feb '12

29 Feb '12

Hello list! Changes: * Sync code with 1.3.6 * Add 6PE (RFC 4798) support. Link: http://bird.mpls.in/distfiles/bird/bird-20120229.tar.gz Documentation: http://bird.mpls.in/projects/mpls-bird/wiki/Bird_rr Git: http://bird.mpls.in/projects/mpls-bird/repository/show?rev=l3vpn Setup: Do configure with --enable-mpls switch (FreeBSD example) ./configure --prefix=/usr/local --mandir=/usr/local/man --infodir=/usr/local/info/ --build=amd64-portbld-freebsd8.2 --enable-mpls FreeBSD users can edit net/bird-devel port, change its version to 20120229 and call 'make makesum' Release is considered as BETA. Feel free to send questions/suggestions/patches.

1 0

New release 1.3.6!
by Ondrej Filip 28 Feb '12

28 Feb '12

Hi! A new version is ready! Changes: Version 1.3.6 o Important bugfix in BGP.

5 5