From 0f8af08cd75bf7cc369b7c4ba87a7d4311f16add Mon Sep 17 00:00:00 2001 From: Niklas Yann Wettengel Date: Sat, 12 Aug 2017 23:48:02 +0200 Subject: fixed backbone routing --- roles/configure_static_routes/files/ffmyk-iproute.sh | 11 +++++++++-- roles/configure_static_routes/templates/ffmyk-iproute-down.j2 | 2 -- roles/configure_static_routes/templates/ffmyk-iproute-up.j2 | 2 -- 3 files changed, 9 insertions(+), 6 deletions(-) (limited to 'roles/configure_static_routes') diff --git a/roles/configure_static_routes/files/ffmyk-iproute.sh b/roles/configure_static_routes/files/ffmyk-iproute.sh index bb8c528..eb2f2fc 100755 --- a/roles/configure_static_routes/files/ffmyk-iproute.sh +++ b/roles/configure_static_routes/files/ffmyk-iproute.sh @@ -4,5 +4,12 @@ ip -4 rule add from all fwmark 0x1 table ffmyk priority 10 ip -6 rule add from all fwmark 0x1 table ffmyk priority 10 #Alles mit Freifunk-IP - woher auch immer - gehört zu Tabelle ffmyk -#ip -4 rule add from 10.222.0.0/16 table ffmyk -ip -6 rule add to 2001:470:cd45:FF00::/56 table ffmyk priority 190 +ip -4 rule add to 10.222.1.0/24 table ffmyk priority 10 +ip -4 rule add to 10.222.2.0/23 table ffmyk priority 10 +ip -4 rule add to 10.222.4.0/22 table ffmyk priority 10 +ip -4 rule add to 10.222.8.0/21 table ffmyk priority 10 +ip -4 rule add to 10.222.16.0/20 table ffmyk priority 10 +ip -4 rule add to 10.222.32.0/19 table ffmyk priority 10 +ip -4 rule add to 10.222.64.0/18 table ffmyk priority 10 +ip -4 rule add to 10.222.128.0/17 table ffmyk priority 10 +ip -6 rule add to 2001:470:cd45:FF00::/56 table ffmyk priority 10 diff --git a/roles/configure_static_routes/templates/ffmyk-iproute-down.j2 b/roles/configure_static_routes/templates/ffmyk-iproute-down.j2 index 51a0a17..ae50297 100644 --- a/roles/configure_static_routes/templates/ffmyk-iproute-down.j2 +++ b/roles/configure_static_routes/templates/ffmyk-iproute-down.j2 @@ -7,5 +7,3 @@ ip -4 rule del iif bat{{ item.name }} table ffmyk ip -6 rule del iif bat{{ item.name }} table ffmyk ip -4 rule del from {{ item.net4 }} table ffmyk ip -6 rule del from {{ item.net6 }} table ffmyk -ip -4 rule del to {{ item.net4 }} table ffmyk -ip -6 rule del to {{ item.net6 }} table ffmyk diff --git a/roles/configure_static_routes/templates/ffmyk-iproute-up.j2 b/roles/configure_static_routes/templates/ffmyk-iproute-up.j2 index e97f8bc..47af244 100644 --- a/roles/configure_static_routes/templates/ffmyk-iproute-up.j2 +++ b/roles/configure_static_routes/templates/ffmyk-iproute-up.j2 @@ -4,8 +4,6 @@ ip -4 rule add iif bat{{ item.name }} table ffmyk priority 10 ip -6 rule add iif bat{{ item.name }} table ffmyk priority 10 ip -4 rule add from {{ item.net4 }} table ffmyk priority 10 ip -6 rule add from {{ item.net6 }} table ffmyk priority 10 -ip -4 rule add to {{ item.net4 }} table ffmyk priority 10 -ip -6 rule add to {{ item.net6 }} table ffmyk priority 10 ip -4 rule add from all iif bat{{ item.name }} type unreachable priority 200 ip -6 rule add from all iif bat{{ item.name }} type unreachable priority 200 -- cgit v1.2.3-54-g00ecf