unfinished

ansible/bird.conf.j2

@@ -26,37 +26,25 @@ protocol kernel {
 	ipv6 { export all; };
 }
 
-ipv4 table a;
+{% for connection in connections %}
+{% if connection.type != "null" and connection.remoteLocalAddress != address %}
+ipv4 table {{connection.name}};
 protocol static {
         ipv4 {
-            table a;
+            table {{connection.name}};
         };
         igp table master4;
-        route 0.0.0.0/0 recursive 10.199.0.12;
+        route 0.0.0.0/0 recursive {{connection.remoteLocalAddress}};
 }
 protocol kernel {
     ipv4 {
-          table a;
+          table {{connection.name}};
           export all;
     };
-    kernel table 301;
-}
-
-ipv4 table b;
-protocol static {
-        ipv4 {
-            table b;
-        };
-        igp table master4;
-        route 0.0.0.0/0 recursive 10.199.0.10;
-}
-protocol kernel {
-    ipv4 {
-        table b;
-        export all;
-    };
-    kernel table 302;
+    kernel table {{connection.remoteGatewayMark}};
 }
+{% endif %}
+{% endfor %}
 
 protocol ospf v2 {
   	ipv4 {
@@ -73,6 +61,7 @@ protocol ospf v2 {
 #			hello 5;		# Default hello perid 10 is too long
 #		};
 {% for connection in connections %}
+{% if connection.type != "null" and connection.remoteLocalAddress != address %}
 		interface "{{connection.name}}" {
 			type ptp;
 {% if connection.outbound %}
@@ -82,6 +71,7 @@ protocol ospf v2 {
 {% endif %}
 			hello 5;
 		};
+{% endif %}
 {% endfor %}
 		interface "dummy0" {
 			stub;			# Stub interface, just propagate it

ansible/scripts/postup.sh

@@ -4,7 +4,7 @@
 ip addr add "$localPeerAddress" peer "$remotePeerAddress" dev "$dev" scope link
 
 if [ "$outbound" == True ] ; then
-  ip route add default dev "$dev" table "$remoteMark"
+  #ip route add default dev "$dev" table "$remoteMark"
   ip rule add fwmark "$remoteMark" table "$remoteMark" pref 300
 fi
 

src/inventory.ts

@@ -80,8 +80,10 @@ class InventoryBuilder {
     const localGatewayMark = localGatewayName ? localGateway.mark : undefined;
     const remoteGatewayName = (cis ? params.rif : params.lif) || params.if;
     const remoteGateway = remoteGatewayName ? this.gateways[remote.name][remoteGatewayName] : _.find(this.gateways[remote.name]);
+    const remoteGatewayMark = remoteGatewayMark ? remoteGateway.mark : undefined;
     //console.log(remoteGateway.name);
     const remoteAddress = remoteGateway.address;
+    const remoteLocalAddress = remote.address;
     const remoteMark = remote.mark;
     const localPort = primary ? remote.port : remote.port2;
     const remotePort = primary ? local.port : local.port2;
@@ -98,8 +100,10 @@ class InventoryBuilder {
       protocol,
       params,
       localGatewayMark,
+      remoteGatewayMark,
       remoteMark,
       remoteAddress,
+      remoteLocalAddress,
       localPort,
       remotePort,
       wgPublicKey,