projects
/
dyn-nsupdate.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more verbose
[dyn-nsupdate.git]
/
client-scripts
/
dyn-ns-client
diff --git
a/client-scripts/dyn-ns-client
b/client-scripts/dyn-ns-client
index 11e45127d2430a8ab7da2fd6d930bb70b940fa07..85c291054ae72f60b6ffa3b435db55ed6dbfcee1 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():
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:
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 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?
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)
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__":
return False
if __name__ == "__main__":