r00t2/routerbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

D'OH. dumb mistake

Browse Source
This commit is contained in:
brent s. 2020-05-18 06:21:48 -04:00
parent 3ec21c4fa9
commit d1a9972786
Signed by: bts
GPG Key ID: 8C004C2F93481F6B
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
utils/he_ipv6/tpl/dnsmasq.include.j2
View File

@ -28,7 +28,7 @@ enable-ra
{%- do ra_opts.append('ra-names') -%} {%- do ra_opts.append('ra-names') -%}
# {{ assignment.iface }} assignment # {{ assignment.iface }} assignment
{%- if do_listen %} {%- if do_listen %}
listen = {{ assignment.iface_ll }} listen-address = {{ assignment.iface_ll }}
{%- endif %} {%- endif %}
ra-param = {{ assignment.iface }}, mtu:{{ common_opts.mtu }}, high, {{ common_opts.min_delay }}, {{ common_opts.lifetime }} ra-param = {{ assignment.iface }}, mtu:{{ common_opts.mtu }}, high, {{ common_opts.min_delay }}, {{ common_opts.lifetime }}
{%- if assignment.ra_dhcp %} {%- if assignment.ra_dhcp %}

21
utils/he_ipv6/tunnel.py
View File

@ -169,15 +169,18 @@ class Tunnel(object):
domains = [] domains = []
do_dhcp = False do_dhcp = False
ra_other = False ra_other = False
tag = _assign_xml.attrib.get('tag', None) tag = None
dns = _assign_xml.find('dns') _ra_xml = _assign_xml.find('ra')
if dns and self.ra_provider: if _ra_xml is not None and self.ra_provider:
do_dns = utils.xml2bool(dns.text.strip()) tag = _ra_xml.attrib.get('tag', None)
domains = [i.strip() for i in dns.attrib.get('domains', '').split() if i.strip() != ''] _dns_xml = _assign_xml.find('dns')
dhcp = _assign_xml.find('dhcpv6') _dhcp_xml = _assign_xml.find('dhcpv6')
if dhcp and self.ra_provider: if _dns_xml is not None:
do_dhcp = utils.xml2bool(dhcp.text.strip()) do_dns = utils.xml2bool(_dns_xml.text.strip())
ra_other = utils.xml2bool(dhcp.attrib.get('advOther', 'false').strip()) domains = [i.strip() for i in _dns_xml.attrib.get('domains', '').split() if i.strip() != '']
if _dhcp_xml is not None:
do_dhcp = utils.xml2bool(_dhcp_xml.text.strip())
ra_other = utils.xml2bool(_dhcp_xml.attrib.get('advOther', 'false').strip())
assign = Assignment(_assign_xml, assign = Assignment(_assign_xml,
ra_dns = do_dns, ra_dns = do_dns,
ra_dhcp = do_dhcp, ra_dhcp = do_dhcp,