2 files changed, 8 insertions, 5 deletions
diff --git a/tnet/templates/bird-tnet-pre.conf.j2 b/tnet/templates/bird-tnet-pre.conf.j2
index 383c050..e762cd5 100644
--- a/tnet/templates/bird-tnet-pre.conf.j2
+++ b/tnet/templates/bird-tnet-pre.conf.j2
@@ -1,9 +1,8 @@
-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;
@@ -13,7 +12,7 @@ protocol static {
     include "/etc/bird/dn42_roa_bird2_6.conf";
 };
 
-function dn42_is_valid_network() # -> bool
+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 49e9410..2ba456b 100644
--- a/tnet/templates/bird-tnet.conf.j2
+++ b/tnet/templates/bird-tnet.conf.j2
@@ -43,7 +43,11 @@ template bgp tnet_tpl {
 {% 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 }}";
+{% endif %}
 {% if peer.rr_client|default(False) %}
 
   rr client;