X-Git-Url: https://git.ralfj.de/dyn-nsupdate.git/blobdiff_plain/32be553e5075e9744e0f0793e8a09a205b2dc1c0..556b6fb987e04d7898c5520298c4e1f07b234434:/client-scripts/dyn-ns-client?ds=sidebyside diff --git a/client-scripts/dyn-ns-client b/client-scripts/dyn-ns-client index 93b977f..e5eb56e 100755 --- a/client-scripts/dyn-ns-client +++ b/client-scripts/dyn-ns-client @@ -51,9 +51,9 @@ def getConfigDir(): def urlopen(url, config): if sys.version_info >= (3, 4, 3): - return urllib.request.urlopen(url, context=sslContext(config)).read().decode('utf-8').strip() + return urllib.request.urlopen(url, context=sslContext(config)).read().decode('utf-8').strip('\n') else: - return urllib.request.urlopen(url).read().decode('utf-8').strip() + return urllib.request.urlopen(url).read().decode('utf-8').strip('\n') def getMyIP(family, config, methods = {}, verbose = 0): '''Returns our current IP address ( can be "IPv4" or "IPv6"), detected as given by the configuration. @@ -143,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? @@ -167,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__":