X-Git-Url: https://git.ralfj.de/dyn-nsupdate.git/blobdiff_plain/b6c27c8de6efd9a11739ea184308802ea5cb7d04..2ded2634bd090dacf54effe51566cd3ab8c3aeaa:/client-scripts/dyn-ns-client?ds=inline diff --git a/client-scripts/dyn-ns-client b/client-scripts/dyn-ns-client index 03835d4..0e96bed 100755 --- a/client-scripts/dyn-ns-client +++ b/client-scripts/dyn-ns-client @@ -63,7 +63,11 @@ def getMyIP(family, config, methods = {}, verbose = 0): return None elif method == 'web': server = config[family].get('server', config['DEFAULT']['server']) - ip = urlopen('https://'+server+'/checkip', config) + url = 'https://'+server+'/checkip' + try: + ip = urlopen(url, config) + except urllib.error.URLError: + raise Exception("Error fetching {}, make sure the URL is correct and the internet connection actually works.".format(url)) if verbose >= VERBOSE_FULL: print("Server",server,"says my",family,"is",ip) return ip @@ -143,9 +147,15 @@ def updateDomain(server, domain, ipv4, ipv6, password, config, verbose): if verbose >= VERBOSE_CHANGE: msg = "Successfully updated domain {} on {}:".format(domain, server) if ipv4 is not None: - msg += " IPv4={} -> {}".format(curIPv4, ipv4) + if curIPv4 == ipv4: + msg += " IPv4={} (unchanged)".format(curIPv4) + else: + msg += " IPv4={} -> {}".format(curIPv4, ipv4) if ipv6 is not None: - msg += " IPv6={} -> {}".format(curIPv6, ipv6) + if curIPv6 == ipv6: + msg += " IPv6={} (unchanged)".format(curIPv6) + else: + msg += " IPv6={} -> {}".format(curIPv6, ipv6) print(msg) # all went all right return True @@ -162,7 +172,7 @@ if __name__ == "__main__": dest="config", default=os.path.join(getConfigDir(), "dyn-ns-client.conf"), help="The configuration file") parser.add_argument("-v", "--verbose", - action="count", dest="verbose", + action="count", dest="verbose", default=0, help="Be more verbose") args = parser.parse_args()