upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-05-28 04:34:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge d9d9dbcc9f into cb9a5d6d69

Browse source
This commit is contained in:
gewuerz-gurke 2026-05-25 09:38:58 +08:00 committed by GitHub
commit c76b47c02b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dns/ddclient/src/opnsense/scripts/ddclient/lib/address.py
View file

@ -127,18 +127,22 @@ def checkip(service, proto='https', timeout='10', interface=None, dynipv6host=No
# invalid address
return ""
elif service in ['if', 'if6'] and interface is not None:
# return first non private IPv[4|6] interface address
# return first non private IPv[4|6] interface address. In case IPv6 address is deprecated return last
address = ''
ifcfg = subprocess.run(['/sbin/ifconfig', interface], capture_output=True, text=True).stdout
for line in ifcfg.split('\n'):
if line.startswith('\tinet'):
parts = line.split()
if (parts[0] == 'inet' and service == 'if') or (parts[0] == 'inet6' and service == 'if6'):
try:
address = transform_ip(parts[1], dynipv6host)
if address.is_global:
return str(address)
currentAddress = transform_ip(parts[1], dynipv6host)
if currentAddress.is_global:
address = currentAddress
if (service == 'if') or (service == 'if6' and 'deprecated' not in line):
break
except ValueError:
continue
return str(address)
elif service.lstrip('dns_') in checkip_dns_list:
svc_info = checkip_dns_list[service.lstrip('dns_')]
resolve_params = svc_info['resolve_params']