freifunk/ansible-ffibk
9
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix wrong IP subnet calculation in roles service-radvd + service-rclocal

Browse source
This commit is contained in:
Tobias Hachmer 2017-10-06 09:56:14 +02:00
parent ea08c856ac
commit 900eacafb2
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/service-radvd/templates/radvd.conf.j2
View file

@ -24,7 +24,7 @@ interface {{ mesh_id }}BR
{% for ip_type, ip_list in mesh_value.ipv6.iteritems() %} {% for ip_type, ip_list in mesh_value.ipv6.iteritems() %}
{% for prefix in ip_list %} {% for prefix in ip_list %}
{% if ip_type == "public" %} {% if ip_type == "public" %}
prefix {{ prefix | ipaddr('net') | ipsubnet(64, magic) | ipaddr('subnet') }} prefix {{ prefix | ipaddr('net') | ipsubnet(56, magic) | ipsubnet(64, 0) | ipaddr('subnet') }}
{% else %} {% else %}
prefix {{ prefix | ipaddr('net') | ipsubnet(64, 0) | ipaddr('subnet') }} prefix {{ prefix | ipaddr('net') | ipsubnet(64, 0) | ipaddr('subnet') }}
{% endif %} {% endif %}

6
roles/service-rclocal/templates/rc.local.j2
View file

@ -102,11 +102,11 @@ ip -6 rule add from all lookup icvpn priority 107
# static {{ mesh_value.site_name }} routes for rt_table mwu # static {{ mesh_value.site_name }} routes for rt_table mwu
/sbin/ip -4 route add {{ mesh_value.ipv4_network }} proto static dev {{ mesh_id }}BR table mwu /sbin/ip -4 route add {{ mesh_value.ipv4_network }} proto static dev {{ mesh_id }}BR table mwu
{% for ula in mesh_value.ipv6.ula %} {% for ula in mesh_value.ipv6.ula %}
/sbin/ip -6 route add {{ ula | ipaddr('net') | ipsubnet(64, 0) }} proto static dev {{ mesh_id }}BR table mwu /sbin/ip -6 route add {{ ula | ipaddr('net') | ipsubnet(64, 0) | ipaddr('subnet') }} proto static dev {{ mesh_id }}BR table mwu
{% endfor %} {% endfor %}
{% for public in mesh_value.ipv6.public %} {% for public in mesh_value.ipv6.public %}
/sbin/ip -6 route add {{ public | ipaddr('net') | ipsubnet(64, 0) }} proto static dev {{ mesh_id }}BR table mwu /sbin/ip -6 route add {{ public | ipaddr('net') | ipsubnet(64, 0) | ipaddr('subnet') }} proto static dev {{ mesh_id }}BR table mwu
/sbin/ip -6 route add {{ public | ipaddr('net') | ipsubnet(64, magic) }} proto static dev {{ mesh_id }}BR table mwu /sbin/ip -6 route add {{ public | ipaddr('net') | ipsubnet(56, magic) | ipsubnet(64, 0) | ipaddr('subnet') }} proto static dev {{ mesh_id }}BR table mwu
{% endfor %} {% endfor %}
{% if not loop.last %} {% if not loop.last %}