tnet: Updating changes from knot.

2 files changed, 31 insertions, 7 deletions

diff --git a/tnet/files/akili/bird-tnet-pre.conf b/tnet/files/akili/bird-tnet-pre.conf
index 7994dfe..383c050 100644
--- a/tnet/files/akili/bird-tnet-pre.conf
+++ b/tnet/files/akili/bird-tnet-pre.conf
@@ -3,5 +3,19 @@ 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;
+
+protocol static {
+    roa6 { table dn42_roa; };
+    include "/etc/bird/dn42_roa_bird2_6.conf";
+};
+
+function dn42_is_valid_network() # -> bool
+{
+  return net ~ [
+    fd00::/8{44,64} # ULA address space as per RFC 4193
+  ];
 }
diff --git a/tnet/files/akili/bird-tnet.conf b/tnet/files/akili/bird-tnet.conf
index f9b9d08..24c9b8e 100644
--- a/tnet/files/akili/bird-tnet.conf
+++ b/tnet/files/akili/bird-tnet.conf
@@ -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;
     };
   };
 }