projects
/
dyn-nsupdate.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prettier printing
[dyn-nsupdate.git]
/
client-scripts
/
dyn-ns-client
diff --git
a/client-scripts/dyn-ns-client
b/client-scripts/dyn-ns-client
index 175d88024259ac9702b27a473f05900de0ca0ed3..11e45127d2430a8ab7da2fd6d930bb70b940fa07 100755
(executable)
--- a/
client-scripts/dyn-ns-client
+++ b/
client-scripts/dyn-ns-client
@@
-61,9
+61,15
@@
def getMyIP(family, config, methods = {}, verbose = 0):
method = config[family]['method']
if method == 'none':
return None
method = config[family]['method']
if method == 'none':
return None
+ elif method == 'remove':
+ return ""
elif method == 'web':
server = config[family].get('server', config['DEFAULT']['server'])
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
if verbose >= VERBOSE_FULL:
print("Server",server,"says my",family,"is",ip)
return ip
@@
-147,6
+153,8
@@
def updateDomain(server, domain, ipv4, ipv6, password, config, verbose):
msg += " IPv4={} (unchanged)".format(curIPv4)
else:
msg += " IPv4={} -> {}".format(curIPv4, ipv4)
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)
if ipv6 is not None:
if curIPv6 == ipv6:
msg += " IPv6={} (unchanged)".format(curIPv6)