diff options
Diffstat (limited to 'tnet/templates')
| -rw-r--r-- | tnet/templates/bird-tnet-pre.conf.j2 | 2 | ||||
| -rw-r--r-- | tnet/templates/bird-tnet.conf.j2 | 35 |
2 files changed, 23 insertions, 14 deletions
diff --git a/tnet/templates/bird-tnet-pre.conf.j2 b/tnet/templates/bird-tnet-pre.conf.j2 index ec31fa2..383c050 100644 --- a/tnet/templates/bird-tnet-pre.conf.j2 +++ b/tnet/templates/bird-tnet-pre.conf.j2 @@ -3,7 +3,7 @@ define tnet_router = fdb1:4242:3538:ffff::/64; function is_tnet() # -> bool { - return net ~ tnet && ! (net ~ tnet_router); + return net ~ tnet && (net !~ tnet_router); } roa6 table dn42_roa; diff --git a/tnet/templates/bird-tnet.conf.j2 b/tnet/templates/bird-tnet.conf.j2 index 9797241..49e9410 100644 --- a/tnet/templates/bird-tnet.conf.j2 +++ b/tnet/templates/bird-tnet.conf.j2 @@ -1,3 +1,9 @@ +# Set to true if this peer is directly connected to a dn42 peer +define is_dn42_peer = true; +# If we are connected directly to dn42, we don't want the dn42 routes from others +define import_dn42 = !is_dn42_peer; +define export_dn42 = is_dn42_peer; + template bgp tnet_tpl { local as 4242423538; neighbor internal; @@ -10,19 +16,23 @@ template bgp tnet_tpl { next hop self; import filter { if is_tnet() then { - print proto, ": import accept, net=", net, ", from=", from, ", gw=", gw; - accept; + accept proto, ": (tnet) import accept, net=", net, ", from=", from, ", gw=", gw; + } else if import_dn42 && dn42_is_valid_network() then { + accept proto, ": (dn42) import accept, net=", net, ", from=", from, ", gw=", gw; + } else { + reject proto, ": import reject, reason=not tnet"; } - print proto, ": import reject, reason=not tnet"; reject; }; # newer bird's only # import keep filtered; export filter { if is_tnet() then { - print proto, ": export accept, net=", net, ", from=", from, ", gw=", gw; - accept; + accept proto, ": (tnet) export accept, net=", net, ", from=", from, ", gw=", gw; + } else if export_dn42 && dn42_is_valid_network() then { + accept proto, ": (dn42) import accept, net=", net, ", from=", from, ", gw=", gw; + } else { + reject proto, ": export reject, reason=not tnet"; } - print proto, ": export reject, reason=not tnet"; reject; }; }; } @@ -50,23 +60,22 @@ protocol bgp {{ p }} { ipv6 { import filter { - if dn42_is_valid_network() && !is_tnet() then { + if dn42_is_valid_network() && (net !~ tnet) then { # Check when unknown or invalid according to ROA if (roa_check(dn42_roa, net, bgp_path.last) = ROA_VALID) then { accept; } else { - print "[dn42] ROA check failed for ", net, " ASN ", bgp_path.last; - reject; + reject proto, "[dn42] ROA check failed for ", net, " ASN ", bgp_path.last; } } else { - reject; + reject proto, "[dn42] invalid dn42 network ", net, " ASN ", bgp_path.last; } }; export filter { - if dn42_is_valid_network() && source ~ [RTS_STATIC, RTS_BGP] then { - accept; + if net ~ tnet then { + accept proto, "[dn42] accepting export tnet: ", net; } else { - reject; + reject proto, "[dn42] rejecting export: ", net; } }; }; |