From 935e66dbd8eaf6b3c3b1b3ac145e47af1ef93632 Mon Sep 17 00:00:00 2001
From: Tobias Hachmer <tobias@hachmer.de>
Date: Fri, 9 Nov 2018 21:13:07 +0100
Subject: [PATCH] Role network-meshbridge + service-bird: announce specific
 gate prefix instead of the 'global' one

* configure a local ip address on meshbridge from the 'gate-specific' public IPv6 prefix
* disable announcement for the 'global' public IPv6 prefix
---
 roles/network-meshbridge/templates/bridge.j2 | 1 +
 roles/service-bird/templates/radv.conf.j2    | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/roles/network-meshbridge/templates/bridge.j2 b/roles/network-meshbridge/templates/bridge.j2
index e2703f0..a2da6c3 100644
--- a/roles/network-meshbridge/templates/bridge.j2
+++ b/roles/network-meshbridge/templates/bridge.j2
@@ -9,5 +9,6 @@ iface {{ item.id }}br
 {% endfor %}
 {% for prefix in item.ipv6_public %}
     address {{ prefix | ipaddr('net') | ipsubnet(64, 0) | ipaddr(magic) | ipaddr('ip/prefix') }}
+    address {{ prefix | ipaddr('net') | ipsubnet(56, magic)  | ipsubnet(64, 0) | ipaddr(magic) | ipaddr('ip/prefix') }}
 {% endfor %}
     bridge-ports {{ item.id }}bat
diff --git a/roles/service-bird/templates/radv.conf.j2 b/roles/service-bird/templates/radv.conf.j2
index 153cab4..1cfa1d0 100644
--- a/roles/service-bird/templates/radv.conf.j2
+++ b/roles/service-bird/templates/radv.conf.j2
@@ -15,6 +15,10 @@ protocol radv radv_{{ mesh.id }} {
 			valid lifetime {{ mesh.radvd.advvalidlifetime }};
 			preferred lifetime {{ mesh.radvd.advpreferredlifetime }};
 		};
+
+		prefix {{ prefix | ipaddr('net') | ipsubnet(64, 0) | ipaddr('subnet') }} {
+			skip yes;
+		};
 {% endfor %}
 
 		rdnss {