method = config[family]['method']
if method == 'none':
return None
+ elif method == 'remove':
+ return ""
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
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)