diff --git a/utils/he_ipv6/tpl/dnsmasq.include.j2 b/utils/he_ipv6/tpl/dnsmasq.include.j2 index dd97b95..a3f16dd 100644 --- a/utils/he_ipv6/tpl/dnsmasq.include.j2 +++ b/utils/he_ipv6/tpl/dnsmasq.include.j2 @@ -26,7 +26,7 @@ enable-ra # {{ assignment.iface }} assignment # Assignment blocks: {%- for b in assignment.iface_blocks %} -# * {{ b|string }} ({{ assignment.dhcp6_ranges[assign_loop.index0] }}) +# * {{ b|string }} {{ assignment.dhcp6_ranges[assign_loop.index0] }} {%- endfor %} {%- if do_listen %} listen-address = {{ assignment.iface_ll }} diff --git a/utils/he_ipv6/tunnel.py b/utils/he_ipv6/tunnel.py index b12a720..43a0828 100644 --- a/utils/he_ipv6/tunnel.py +++ b/utils/he_ipv6/tunnel.py @@ -132,6 +132,7 @@ class Assignment(object): for i in self.iface_blocks: # DHCPv6 range. _base = str(i.ip).rstrip(':') + logger.debug('Base prefix for {0}: {1}'.format(str(i), _base)) start = '{0}:dead:beef:cafe:0'.format(_base) stop = '{0}:dead:beef:cafe:ffff'.format(_base) self.dhcp6_ranges.append((start, stop))