Merge pull request #55 from gmacon/issue-54-ip-interfaces

handle IPv6Interface objects consistently and gracefully (fix for #54)
dlenski · Jun 11, 2020 · 6c173e1 · 6c173e1
2 parents 7ea4c5e + e03de6a
commit 6c173e1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/setup.py b/setup.py
@@ -20,7 +20,7 @@
 
 ########################################
 
-setup(name="vpn_slice",
+setup(name="vpn-slice",
       version=version_pep,
       description=("vpnc-script replacement for easy split-tunnel VPN setup"),
       long_description=open('description.rst').read(),

diff --git a/vpn_slice/dnspython.py b/vpn_slice/dnspython.py
@@ -1,5 +1,5 @@
 from sys import stderr
-from ipaddress import ip_address
+from ipaddress import ip_address, ip_interface
 from dns.resolver import Resolver, NXDOMAIN, NoAnswer, Timeout
 from dns.name import root, from_text
 

diff --git a/vpn_slice/mac.py b/vpn_slice/mac.py
@@ -1,7 +1,7 @@
 import os
 import re
 import subprocess
-from ipaddress import ip_network
+from ipaddress import ip_network, ip_interface
 
 from .posix import PosixProcessProvider
 from .provider import RouteProvider
@@ -102,8 +102,8 @@ def set_link_info(self, device, state, mtu=None):
         self._ifconfig(*args)
 
     def add_address(self, device, address):
+        address = ip_interface(address)
         if address.version == 6:
-            family = 'inet6'
+            self._ifconfig(device, 'inet6', address)
         else:
-            family = 'inet'
-        self._ifconfig(device, family, ip_network(address), address)
+            self._ifconfig(device, 'inet', address.ip, address.ip, 'netmask', '255.255.255.255')
diff --git a/vpn_slice/provider.py b/vpn_slice/provider.py
@@ -1,4 +1,5 @@
 from abc import ABCMeta, abstractmethod
+from ipaddress import ip_interface
 
 
 class ProcessProvider(metaclass=ABCMeta):
@@ -102,7 +103,7 @@ class DNSProvider(metaclass=ABCMeta):
     def configure(self, dns_servers, *, bind_addresses=None, search_domains=()):
         """Configure provider to use the specified DNS servers, bind addresses, and search domains."""
         self.dns_servers = dns_servers
-        self.bind_addresses = bind_addresses
+        self.bind_addresses = [ip_interface(a).ip for a in bind_addresses]
         self.search_domains = search_domains
 
     @abstractmethod