i...think it's ready to test.

This commit is contained in:
2020-05-14 23:46:03 -04:00
parent efb53be81b
commit 742a0b55d5
4 changed files with 18 additions and 11 deletions

View File

@@ -175,7 +175,10 @@ class Config(BaseConfig):
for tun_xml in tunnels_xml.findall('tunnel'):
tun_id = int(tun_xml.attrib['id'].strip())
tun_creds_id = tun_xml.attrib['creds']
tun = tunnel.Tunnel(tun_xml, self.creds[tun_creds_id])
creds = self.creds[tun_creds_id]
update_key = tun_xml.find('updateKey').text.strip()
he_conf = HETunnelConfig(tun_id, creds, update_key)
tun = tunnel.Tunnel(tun_xml, he_conf, self.creds[tun_creds_id])
self.tunnels[tun_id] = tun
return(None)
@@ -223,7 +226,7 @@ class HEBaseConfig(BaseConfig):
return(raw_xml)
# This isn't really used anymore.
# This isn't really used.
class HEConfig(HEBaseConfig):
default_xsd = 'http://schema.xml.r00t2.io/projects/tunnelbroker.tun.xsd'
nsmap = {None: 'https://tunelbroker.net/tunnelInfo.php?tid',