summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-11-14 07:09:35 +0100
committerGitHub <noreply@github.com>2020-11-14 07:09:35 +0100
commit0d921d0494edc40dd82cf4073300bfe466cc0fdc (patch)
tree857b55ec8d9e6b2820635c34664e73a27cbf8154
parent858c912ed6c47a4dc1ef90d1430368e59a03a65f (diff)
parentba70767ead5e5e602d2b9dcfcc6691f619f6920b (diff)
downloadvyos-1x-0d921d0494edc40dd82cf4073300bfe466cc0fdc.tar.gz
vyos-1x-0d921d0494edc40dd82cf4073300bfe466cc0fdc.zip
Merge pull request #610 from vyos/revert-607-T2802
Revert "T2802: Tunnel interface does not apply EUI-64 IPv6 Address"
-rw-r--r--python/vyos/ifconfig/wireguard.py22
1 files changed, 1 insertions, 21 deletions
diff --git a/python/vyos/ifconfig/wireguard.py b/python/vyos/ifconfig/wireguard.py
index 5e9173349..da3bd4e89 100644
--- a/python/vyos/ifconfig/wireguard.py
+++ b/python/vyos/ifconfig/wireguard.py
@@ -26,10 +26,6 @@ from vyos.ifconfig import Interface
from vyos.ifconfig import Operational
from vyos.template import is_ipv6
-import random
-from random import seed, getrandbits
-from ipaddress import IPv6Network, IPv6Address
-
class WireGuardOperational(Operational):
def _dump(self):
"""Dump wireguard data in a python friendly way."""
@@ -172,23 +168,7 @@ class WireGuardIf(Interface):
options = Interface.options + \
['port', 'private_key', 'pubkey', 'psk',
'allowed_ips', 'fwmark', 'endpoint', 'keepalive']
-
-
- def generate_link_local():
- # Linux Kernel does not generate IPv6 Link Local address do to missing MAC
- # We have to generate address manually and assign to interface
- net = IPv6Network("FE80::/16")
- rand_net = IPv6Network((net.network_address + (random.getrandbits(64 - net.prefixlen) << 64 ),64))
- network = IPv6Network(rand_net)
- address = str(IPv6Address(network.network_address + getrandbits(network.max_prefixlen - network.prefixlen)))+'/'+str(network.prefixlen)
-
- return address
-
- def _create(self):
- super()._create(self)
- # Assign generated IPv6 Link Local address to the interface
- self.add_addr(self.generate_link_local())
-
+
def update(self, config):
""" General helper function which works on a dictionary retrived by
get_config_dict(). It's main intention is to consolidate the scattered