X-Git-Url: https://git.ralfj.de/dyn-nsupdate.git/blobdiff_plain/2ded2634bd090dacf54effe51566cd3ab8c3aeaa..32be553e5075e9744e0f0793e8a09a205b2dc1c0:/client-scripts/dyn-ns-client

diff --git a/client-scripts/dyn-ns-client b/client-scripts/dyn-ns-client
index 0e96bed..93b977f 100755
--- a/client-scripts/dyn-ns-client
+++ b/client-scripts/dyn-ns-client
@@ -61,6 +61,8 @@ def getMyIP(family, config, methods = {}, verbose = 0):
     method = config[family]['method']
     if method == 'none':
         return None
+    elif method == 'remove':
+        return ""
     elif method == 'web':
         server = config[family].get('server', config['DEFAULT']['server'])
         url = 'https://'+server+'/checkip'
@@ -83,7 +85,8 @@ def getMyIPv4(config, verbose = 0):
 def getMyIPv6(config, verbose = 0):
     '''Returns our current IPv6 address, detected as given by the configuration'''
     def local():
-        out = subprocess.check_output(["ip", "addr"])
+        device = config["IPv6"].get("device")
+        out = subprocess.check_output(["ip", "addr", "show"] + ([] if device is None else ["dev", device]))
         for line in out.decode('utf-8').split('\n'):
             m = re.search('inet6 ([a-fA-F0-9:]+)/64 ([a-zA-Z0-9 ]*)', line)
             if m is not None:
@@ -151,6 +154,8 @@ def updateDomain(server, domain, ipv4, ipv6, password, config, verbose):
                     msg += " IPv4={} (unchanged)".format(curIPv4)
                 else:
                     msg += " IPv4={} -> {}".format(curIPv4, ipv4)
+            if ipv4 is not None and ipv6 is not None:
+                msg += ","
             if ipv6 is not None:
                 if curIPv6 == ipv6:
                     msg += " IPv6={} (unchanged)".format(curIPv6)