X-Git-Url: https://git.ralfj.de/dyn-nsupdate.git/blobdiff_plain/1a68dfd140219eb54670d5c961d9d684a7c63666..7b0e7e640748b57d853245fe8d2e09235695c177:/client-scripts/dyn-ns-client?ds=inline diff --git a/client-scripts/dyn-ns-client b/client-scripts/dyn-ns-client index 11e4512..85c2910 100755 --- 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: @@ -142,6 +143,8 @@ def updateDomain(server, domain, ipv4, ipv6, password, config, verbose): if ipv6 is not None: url += '&ipv6='+urllib.parse.quote(ipv6) expected += " "+ipv6 + if verbose >= VERBOSE_FULL: + print("Request:",url) result = urlopen(url, config) # did everything go as planned? @@ -166,7 +169,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__":