From ea08c856ac013c0c28ab024f6c00e5aa56991b66 Mon Sep 17 00:00:00 2001
From: Tobias Hachmer <tobias@hachmer.de>
Date: Fri, 6 Oct 2017 00:15:31 +0200
Subject: [PATCH] Update some ipaddr filters

---
 roles/network-ffrl/templates/ffrl.j2                | 4 ++--
 roles/network-ffrl/templates/ffrl_nat.j2            | 2 +-
 roles/network-meshbridge/templates/bridge.j2        | 4 ++--
 roles/service-bird-ffrl/templates/ffrl_ipv4.conf.j2 | 2 +-
 roles/service-rclocal/templates/rc.local.j2         | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/roles/network-ffrl/templates/ffrl.j2 b/roles/network-ffrl/templates/ffrl.j2
index bf107db..f8323c3 100644
--- a/roles/network-ffrl/templates/ffrl.j2
+++ b/roles/network-ffrl/templates/ffrl.j2
@@ -11,5 +11,5 @@ iface {{ item.key }} inet tunnel
     mtu 1400
     tunnel-physdev {{ ansible_default_ipv4.interface }}
 
-    address {{ item.value.tunnel_ipv4_network | ipaddr('net') | ipaddr('1') | ipaddr('address') }}/{{ item.value.tunnel_ipv4_network | ipaddr('net') | ipaddr('prefix') }}
-    address {{ item.value.tunnel_ipv6_network | ipaddr('net') | ipaddr('2') | ipaddr('address')  }}/{{ item.value.tunnel_ipv6_network | ipaddr('net') | ipaddr('prefix') }}
+    address {{ item.value.tunnel_ipv4_network | ipaddr('net') | ipaddr('1') | ipaddr('ip/prefix') }}
+    address {{ item.value.tunnel_ipv6_network | ipaddr('net') | ipaddr('2') | ipaddr('ip/prefix') }}
diff --git a/roles/network-ffrl/templates/ffrl_nat.j2 b/roles/network-ffrl/templates/ffrl_nat.j2
index 8e0ff23..39523e9 100644
--- a/roles/network-ffrl/templates/ffrl_nat.j2
+++ b/roles/network-ffrl/templates/ffrl_nat.j2
@@ -4,4 +4,4 @@
 auto ffrl-nat
 iface ffrl-nat
     link-type dummy
-    address {{ ffrl_public_ipv4_nat | ipaddr('address') }}/{{ ffrl_public_ipv4_nat | ipaddr('prefix') }}
+    address {{ ffrl_public_ipv4_nat | ipaddr('host') }}
diff --git a/roles/network-meshbridge/templates/bridge.j2 b/roles/network-meshbridge/templates/bridge.j2
index b3f47ec..c13057b 100644
--- a/roles/network-meshbridge/templates/bridge.j2
+++ b/roles/network-meshbridge/templates/bridge.j2
@@ -6,10 +6,10 @@
 auto {{ item.key }}BR
 iface {{ item.key }}BR
     hwaddress {{ mac | hwaddr('linux') }}
-    address {{ item.value.ipv4_network | ipaddr('net') | ipaddr(magic) | ipaddr('address') }}/{{ item.value.ipv4_network | ipaddr('net') | ipaddr('prefix') }}
+    address {{ item.value.ipv4_network | ipaddr('net') | ipaddr(magic) | ipaddr('ip/prefix') }}
 {% for ip_type, ip_list in item.value.ipv6.iteritems() %}
 {% for ip in ip_list %}
-    address {{ ip | ipaddr('net') | ipsubnet(64, 0) | ipaddr(magic) | ipaddr('address') }}/{{ ip | ipaddr('net') | ipsubnet(64, 0) | ipaddr('prefix') }}
+    address {{ ip | ipaddr('net') | ipsubnet(64, 0) | ipaddr(magic) | ipaddr('ip/prefix') }}
 {% endfor %}
 {% endfor %}
     bridge-ports {{ item.key }}BAT
diff --git a/roles/service-bird-ffrl/templates/ffrl_ipv4.conf.j2 b/roles/service-bird-ffrl/templates/ffrl_ipv4.conf.j2
index 4a16d6f..c20abc7 100644
--- a/roles/service-bird-ffrl/templates/ffrl_ipv4.conf.j2
+++ b/roles/service-bird-ffrl/templates/ffrl_ipv4.conf.j2
@@ -12,7 +12,7 @@ table ffrl;
 # Functions
 function is_ffrl_nat() {
     return net ~ [
-        {{ ffrl_public_ipv4_nat | ipaddr('address') }}/{{ ffrl_public_ipv4_nat | ipaddr('prefix') }}
+        {{ ffrl_public_ipv4_nat | ipaddr('host') }}
     ];
 }
 
diff --git a/roles/service-rclocal/templates/rc.local.j2 b/roles/service-rclocal/templates/rc.local.j2
index 25772e9..beeae5e 100644
--- a/roles/service-rclocal/templates/rc.local.j2
+++ b/roles/service-rclocal/templates/rc.local.j2
@@ -64,8 +64,8 @@ ip -6 rule add to {{ public }} lookup internet priority 41
 {% endfor %}
 ip -6 rule add from all oif {{ mesh_id }}BR lookup internet priority 41
 {% endfor %}
-ip -4 rule add from {{ ffrl_public_ipv4_nat | ipaddr('address') }}/{{ ffrl_public_ipv4_nat | ipaddr('prefix') }} lookup internet priority 41
-ip -4 rule add to {{ ffrl_public_ipv4_nat | ipaddr('address') }}/{{ ffrl_public_ipv4_nat | ipaddr('prefix') }} lookup internet priority 41
+ip -4 rule add from {{ ffrl_public_ipv4_nat | ipaddr('host') }} lookup internet priority 41
+ip -4 rule add to {{ ffrl_public_ipv4_nat | ipaddr('host') }} lookup internet priority 41
 
 # Priority 61 - at this point this is the end of policy routing for freifunk related routes
 {% for mesh_id, mesh_value in meshes.iteritems() %}