diff --git a/filters/ebgp.conf b/filters/ebgp.conf index 1949da3..c2a9095 100644 --- a/filters/ebgp.conf +++ b/filters/ebgp.conf @@ -55,5 +55,8 @@ function ebgp_export_v6() if ! is_mine_ripe() then ok = false; + if net = 2a09:11c0:202::/48 then + ok = false; + return ok; } diff --git a/filters/ibgp.conf b/filters/ibgp.conf index 944bf05..068a0bc 100644 --- a/filters/ibgp.conf +++ b/filters/ibgp.conf @@ -39,8 +39,5 @@ function ibgp_import_v6() if net = ::/0 then ok = false; -# if ! is_mine() then -# ok = false; - return ok; } diff --git a/protocols/bfd.conf b/protocols/bfd.conf index 3afeb2b..9851b6e 100644 --- a/protocols/bfd.conf +++ b/protocols/bfd.conf @@ -1,6 +1,8 @@ protocol bfd bfd1 { interface "wg-*" { - + interval 100ms; + authentication simple; + password pw_bfd; }; } diff --git a/protocols/dn42/grc.conf b/protocols/dn42/grc.conf index ff90590..8a16311 100644 --- a/protocols/dn42/grc.conf +++ b/protocols/dn42/grc.conf @@ -30,6 +30,8 @@ protocol bgp dn42_grc_export { } protocol bgp dn42_grc_import { + disabled yes; + description "dn42: Global Route Collector Import (burble)"; local fd42:4dd0:ff00::1:1 as my_dn42_asn; diff --git a/protocols/ibgp.conf b/protocols/ibgp.conf index 51e0664..7707ed2 100644 --- a/protocols/ibgp.conf +++ b/protocols/ibgp.conf @@ -1,27 +1,3 @@ -template bgp rr_clients { - local as my_ripe_asn; - neighbor as my_ripe_asn; - - rr client; - rr cluster id 172.23.156.3; - - direct; - - ipv4 { - import keep filtered; - import where ibgp_import_v4(); - export where ibgp_export_v4(); - next hop self; - }; - - ipv6 { - import keep filtered; - import where ibgp_import_v6(); - export where ibgp_export_v6(); - next hop self; - }; -} - protocol bgp moon from rr_clients { description "iBGP: moon.0l.de"; diff --git a/protocols/k8s.conf b/protocols/k8s.conf index 4a73d92..cf9fcb4 100644 --- a/protocols/k8s.conf +++ b/protocols/k8s.conf @@ -6,6 +6,8 @@ protocol bgp k8s_0_v4 from rr_clients { ipv4 { export none; + + aigp originate; }; } @@ -17,5 +19,7 @@ protocol bgp k8s_0_v6 from rr_clients { ipv6 { export none; + + aigp originate; }; } diff --git a/templates/ebgp.conf b/templates/ebgp.conf index c0a74df..05fc41e 100644 --- a/templates/ebgp.conf +++ b/templates/ebgp.conf @@ -2,6 +2,7 @@ template bgp ebgp_peer { local as my_ripe_asn; graceful restart on; + allow local as 1; } template bgp ebgp_peer_v6 from ebgp_peer { diff --git a/templates/ibgp.conf b/templates/ibgp.conf new file mode 100644 index 0000000..99acee8 --- /dev/null +++ b/templates/ibgp.conf @@ -0,0 +1,27 @@ +template bgp rr_clients { + local as my_ripe_asn; + neighbor as my_ripe_asn; + + rr client; + rr cluster id 172.23.156.3; + + direct; + + ipv4 { + import keep filtered; + import where ibgp_import_v4(); + export where ibgp_export_v4(); + + next hop self; + aigp originate; + }; + + ipv6 { + import keep filtered; + import where ibgp_import_v6(); + export where ibgp_export_v6(); + + next hop self; + aigp originate; + }; +}