1 files changed, 17 insertions, 4 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
+  ];
 }