From a1705da9a0adc18d78900f96acdbac8603e7ec6d Mon Sep 17 00:00:00 2001
From: Tobias Hachmer <tobias@hachmer.de>
Date: Tue, 3 Oct 2017 21:18:39 +0200
Subject: [PATCH] Role service-radvd: optimize ipaddr filters

---
 roles/service-radvd/templates/radvd.conf.j2 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/roles/service-radvd/templates/radvd.conf.j2 b/roles/service-radvd/templates/radvd.conf.j2
index d1b8385..9fe390a 100644
--- a/roles/service-radvd/templates/radvd.conf.j2
+++ b/roles/service-radvd/templates/radvd.conf.j2
@@ -1,3 +1,4 @@
+
 #
 # {{ ansible_managed }}
 #
@@ -12,7 +13,7 @@ interface {{ mesh_id }}BR
 {% for ip_type, ip_list in mesh_value.ipv6.iteritems() %}
 {% for prefix in ip_list %}
 {% if ip_type == "ula" %}
-	RDNSS {{ prefix | ipaddr('net') | ipsubnet(64, 0) | ipaddr(magic) }}
+	RDNSS {{ prefix | ipaddr('net') | ipsubnet(64, 0) | ipaddr(magic) | ipaddr('address') }}
 	{
 		FlushRDNSS off;
 	};
@@ -23,9 +24,9 @@ interface {{ mesh_id }}BR
 {% for ip_type, ip_list in mesh_value.ipv6.iteritems() %}
 {% for prefix in ip_list %}
 {% if ip_type == "public" %}
-	prefix {{ prefix | ipaddr('net') | ipsubnet(64, magic)  }}
+	prefix {{ prefix | ipaddr('net') | ipsubnet(64, magic) | ipaddr('subnet')  }}
 {% else %}
-	prefix {{ prefix | ipaddr('net') | ipsubnet(64, 0) }}
+	prefix {{ prefix | ipaddr('net') | ipsubnet(64, 0) | ipaddr('subnet') }}
 {% endif %}
 	{
 		AdvValidLifetime 864000;