1 files changed, 32 insertions, 15 deletions

diff --git a/tnet/templates/bird-tnet.conf.j2 b/tnet/templates/bird-tnet.conf.j2
index 9797241..1185014 100644
--- a/tnet/templates/bird-tnet.conf.j2
+++ b/tnet/templates/bird-tnet.conf.j2
@@ -1,28 +1,36 @@
+# 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;
 
   direct;
 
-  password "trygvis";
-
   ipv6 {
     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;
     };
   };
 }
@@ -33,7 +41,17 @@ 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 inventory_hostname < p %}
+{% set password_var = inventory_hostname + "-" + p %}
+{% else %}
+{% set password_var = p + "-" + inventory_hostname %}
+{% endif %}
+  password "{{ "{{ bgp_password['" + password_var + "'] }}" }}";
 {% if peer.rr_client|default(False) %}
 
   rr client;
@@ -50,23 +68,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;
       }
     };
   };