From 68092a514af78da738f9b6ee9e72dc97ce314b7d Mon Sep 17 00:00:00 2001 From: brent s Date: Sun, 10 May 2020 05:17:53 -0400 Subject: [PATCH] LOL. i am a silly ninny. https://github.com/svinota/pyroute2/issues/703 --- utils/he_ipv6.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/utils/he_ipv6.py b/utils/he_ipv6.py index 797f6e7..4d9b339 100755 --- a/utils/he_ipv6.py +++ b/utils/he_ipv6.py @@ -8,7 +8,6 @@ import socket ## import requests import requests.auth -from pyroute2 import IPDB from pyroute2 import IPRoute @@ -72,12 +71,12 @@ class TunnelBroker(object): if not self.ipr: self.ipr = IPRoute() self.ipr.link('add', - ifname = 'sit_he-{0}'.format(self.tun_id), + ifname = 'he-{0}'.format(self.tun_id), kind = 'sit', - ipip_local = self.my_ip, - ipip_remote = self.server, - ipip_ttl = 255) - self.iface_idx = self.ipr.link_lookup(ifname = 'sit_he-{0}'.format(self.tun_id))[0] + sit_local = self.my_ip, + sit_remote = self.server, + sit_ttl = 255) + self.iface_idx = self.ipr.link_lookup(ifname = 'he-{0}'.format(self.tun_id))[0] self.ipr.link('set', index = self.iface_idx, state = 'up', mtu = 1480) for a in self.addrs: self.ipr.addr('add', @@ -92,7 +91,7 @@ class TunnelBroker(object): def stop(self): if not self.ipr: self.ipr = IPRoute() - self.iface_idx = self.ipr.link_lookup(ifname = 'sit_he-{0}'.format(self.tun_id))[0] + self.iface_idx = self.ipr.link_lookup(ifname = 'he-{0}'.format(self.tun_id))[0] self.ipr.link('set', index = self.iface_idx, state = 'down') self.ipr.route('del', dst = '::', mask = 0, oif = self.iface_idx, family = socket.AF_INET6) self.ipr.link('set', index = self.iface_idx, state = 'down') @@ -143,15 +142,14 @@ def parseArgs(): args.add_argument('oper', metavar = 'OPERATION', choices = ('update', 'start', 'stop'), - help = ('The operation to perform. "update" is performed automatically by "start", ' - 'but otherwise will just update the IPv4 address on record at tunnelbroker')) + help = ('The operation to perform ("start", "stop", or "update"). "update" is performed ' + 'automatically by "start", but otherwise will just update the IPv4 address on record ' + 'at tunnelbroker')) return(args) def main(): args = parseArgs().parse_args() - import pprint - pprint.pprint(vars(args)) tb = TunnelBroker(**vars(args)) if args.oper == 'start': tb.start()