2 files changed, 73 insertions, 11 deletions
diff --git a/tnet/templates/bird-tnet-pre.conf.j2 b/tnet/templates/bird-tnet-pre.conf.j2
index 7994dfe..e762cd5 100644
--- a/tnet/templates/bird-tnet-pre.conf.j2
+++ b/tnet/templates/bird-tnet-pre.conf.j2
@@ -1,7 +1,20 @@
-define tnet = fdb1:4242:3538::/48;
-define tnet_router = fdb1:4242:3538:ffff::/64;
+define tnet = {{ ipam6.networks.tnet_dn42.range }};
 
-function is_tnet() # -> bool
+function is_tnet(){{ " -> bool" if birdv >= 2015 }}
 {
-  return net ~ tnet && ! (net ~ tnet_router);
+  return net ~ tnet;
+}
+
+roa6 table dn42_roa;
+
+protocol static {
+    roa6 { table dn42_roa; };
+    include "/etc/bird/dn42_roa_bird2_6.conf";
+};
+
+function dn42_is_valid_network(){{ " -> bool" if birdv >= 2015 }}
+{
+  return net ~ [
+    fd00::/8{44,64} # ULA address space as per RFC 4193
+  ];
 }
diff --git a/tnet/templates/bird-tnet.conf.j2 b/tnet/templates/bird-tnet.conf.j2
index 57e557a..2ba456b 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,30 +16,73 @@ 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;
     };
   };
 }
 {% for p in tnet_bird_peers|default([])|sort %}
+{% set peer = tnet_bird_peers[p] %}
+{% set policy = peer.policy | default("tnet") %}
 
+{% if policy == "tnet" %}
 protocol bgp tnet_{{ p }} from tnet_tpl {
   neighbor {{ hostvars[p].tnet_wg[inventory_hostname].address }};
+{% if peer.interface is defined %}
+  interface "{{ peer.interface }}";
+{% else %}
   interface "tnet-{{ p }}";
-{% if tnet_bird_peers[p].rr_client|default(False) %}
+{% endif %}
+{% if peer.rr_client|default(False) %}
 
   rr client;
 {% endif %}
 }
+{% elif policy == "dn42" %}
+protocol bgp {{ p }} {
+  local    as 4242423538;
+  neighbor {{ peer.address }};
+  neighbor as {{ peer.as }};
+{% if peer.interface is defined %}
+  interface "{{ peer.interface }}";
+{% endif %}
+
+  ipv6 {
+    import filter {
+      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 {
+          reject proto, "[dn42] ROA check failed for ", net, " ASN ", bgp_path.last;
+        }
+      } else {
+        reject proto, "[dn42] invalid dn42 network ", net, " ASN ", bgp_path.last;
+      }
+    };
+    export filter {
+      if net ~ tnet then {
+        accept proto, "[dn42] accepting export tnet: ", net;
+      } else {
+        reject proto, "[dn42] rejecting export: ", net;
+      }
+    };
+  };
+}
+{% endif %}
 {% endfor %}