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

holy shit, more restructuring

Browse Source
This commit is contained in:
brent s
2020-05-15 18:01:03 -04:00
parent 429cf7b155
commit 363cdc712e
7 changed files with 226 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
utils/he_ipv6/tunnel.py
View File

@@ -4,7 +4,7 @@ import netaddr
from pyroute2 import IPRoute
##
from . import utils
from . import radvd
from . import ra
class IP(object):
@@ -51,10 +51,10 @@ class IP6(IP):
class Assignment(object):
def __init__(self, assign_xml, radvd = False, dns = False):
def __init__(self, assign_xml, ra = False, dns = False, ra_provider = 'dnsmasq'):
self.xml = assign_xml
self.do_radvd = radvd
self.radvd_dns = dns
self.ra = ra
self.dns = dns
self.iface = None
self.iface_idx = None
self.iface_addrs = []
@@ -114,9 +114,10 @@ class Tunnel(object):
self.client = None
self.server = None
self.endpoint = None
self.radvd = None
self.enable_radvd = None
self.radvd_dns = None
self.ra = False
self.ra_provider = None
self.ra_dns = False
self.ra_dhcp = False
self.allocations = {} # This is a dict of {}[alloc.id] = Allocation obj
self.assignments = [] # This is a list of Assignment objs
self.parse()
@@ -127,10 +128,11 @@ class Tunnel(object):
def _assignments(self):
_assigns_xml = self.xml.find('assignments')
self.enable_radvd = utils.xml2bool(_assigns_xml.attrib.get('radvd', 'false'))
self.radvd_dns = utils.xml2bool(_assigns_xml.attrib.get('radvdDns', 'false'))
self.enable_ra = utils.xml2bool(_assigns_xml.attrib.get('radvd', 'false'))
self.ra_dns = utils.xml2bool(_assigns_xml.attrib.get('radvdDns', 'false'))
for _assign_xml in _assigns_xml.findall('assign'):
assign = Assignment(_assign_xml, radvd = self.enable_radvd, dns = self.radvd_dns)
assign = Assignment(_assign_xml, ra = self.enable_ra, dns = self.ra_dns)
assign.alloc = self.allocations[assign.alloc_id]
assign.parse_alloc()
self.assignments.append(assign)
@@ -153,7 +155,7 @@ class Tunnel(object):
return(None)
def _radvd(self):
self.radvd = radvd.RADVD()
self.radvd.conf.generate(self.assignments)
return(None)