Merge pull request #59 from Breina/feature/support-ipv6

Add IPv6 support
andreikop · Mar 18, 2024 · c31baa7 · c31baa7
2 parents 0e6634f + aec879c
commit c31baa7
Show file tree

Hide file tree

Showing 4 changed files with 179 additions and 77 deletions.
diff --git a/wsdiscovery/discovery.py b/wsdiscovery/discovery.py
@@ -13,7 +13,7 @@
 
 
 class Discovery:
-    "networking-agnostic generic remote service discovery mixin"
+    """networking-agnostic generic remote service discovery mixin"""
 
     def __init__(self, **kwargs):
         self._remoteServices = {}

diff --git a/wsdiscovery/service.py b/wsdiscovery/service.py
@@ -1,4 +1,5 @@
 """Discoverable WS-Discovery service."""
+import socket
 
 from .util import _getNetworkAddrs
 
@@ -38,10 +39,11 @@ def getXAddrs(self):
         for xAddr in self._xAddrs:
             if '{ip}' in xAddr:
                 if ipAddrs is None:
-                    ipAddrs = _getNetworkAddrs()
+                    ipAddrs = _getNetworkAddrs(socket.AF_INET)
+                    ipAddrs.append(_getNetworkAddrs(socket.AF_INET6))
                 for ipAddr in ipAddrs:
-                    if ipAddr != '127.0.0.1':
-                        ret.append(xAddr.format(ip=ipAddr))
+                    if not ipAddr.is_loopback:
+                        ret.append(xAddr.format(ip=str(ipAddr)))
             else:
                 ret.append(xAddr)
         return ret