From 742a0b55d5330a69a5d041520f46821cb19f900b Mon Sep 17 00:00:00 2001 From: brent s Date: Thu, 14 May 2020 23:46:03 -0400 Subject: [PATCH] i...think it's ready to test. --- utils/he_ipv6/config.py | 7 +++++-- utils/he_ipv6/example.tunnelbroker.xml | 1 + utils/he_ipv6/tunnel.py | 10 +++++----- utils/he_ipv6/tunnelbroker.py | 11 +++++++---- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/utils/he_ipv6/config.py b/utils/he_ipv6/config.py index a781912..bef433e 100644 --- a/utils/he_ipv6/config.py +++ b/utils/he_ipv6/config.py @@ -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', diff --git a/utils/he_ipv6/example.tunnelbroker.xml b/utils/he_ipv6/example.tunnelbroker.xml index 26a7ddd..67cb0db 100644 --- a/utils/he_ipv6/example.tunnelbroker.xml +++ b/utils/he_ipv6/example.tunnelbroker.xml @@ -8,6 +8,7 @@ https://www.tunnelbroker.net/tunnel_detail.php?tid=584532 I highly recommend their (free) certification as well if you're brand-new to IPv6: https://ipv6.he.net/certification/ + **It is VERY highly encouraged to only use one tunnel at a time on a machine.** -->