more error information

[dyn-nsupdate.git] / client-scripts / dyn-ns-client

diff --git a/client-scripts/dyn-ns-client b/client-scripts/dyn-ns-client
index f482c194f6fe17ed5a621f04f956f79785b41364..774c5103950bd89114a3978eaafafd1de9f1b232 100755 (executable)
--- a/client-scripts/dyn-ns-client
+++ b/client-scripts/dyn-ns-client
@@ -85,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:
@@ -153,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)
@@ -164,7 +167,7 @@ def updateDomain(server, domain, ipv4, ipv6, password, config, verbose):
     else:
         # Something went wrong
         print("Unexpected answer from server",server,"while updating",domain)
-        print(result)
+        print("Got '{}', expected '{}'".format(result, expected))
         return False
 
 if __name__ == "__main__":