From a3575183ddc7b6841b395954963d9911e8f0e99a Mon Sep 17 00:00:00 2001
From: Meliox <5264368+Meliox@users.noreply.github.com>
Date: Wed, 21 May 2025 08:57:53 +0200
Subject: [PATCH] dns/ddclient: empty ip send to dns provider & replace dyndns
 by dynu (#4448)

* check for empty string ip address

* Replace dyndns ipv4 by dynu ipv6 and ipv4

* Add services and cleaner check of no ip

* PR feedback - revert

* Update dns/ddclient/src/opnsense/scripts/ddclient/lib/account/__init__.py

---------

Co-authored-by: Meliox <na>
Co-authored-by: Ad Schellevis <AdSchellevis@users.noreply.github.com>
---
 .../src/opnsense/mvc/app/models/OPNsense/DynDNS/DynDNS.xml     | 3 ++-
 .../src/opnsense/scripts/ddclient/lib/account/__init__.py      | 2 +-
 dns/ddclient/src/opnsense/scripts/ddclient/lib/address.py      | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dns/ddclient/src/opnsense/mvc/app/models/OPNsense/DynDNS/DynDNS.xml b/dns/ddclient/src/opnsense/mvc/app/models/OPNsense/DynDNS/DynDNS.xml
index 4554ff751..609ff3a1b 100644
--- a/dns/ddclient/src/opnsense/mvc/app/models/OPNsense/DynDNS/DynDNS.xml
+++ b/dns/ddclient/src/opnsense/mvc/app/models/OPNsense/DynDNS/DynDNS.xml
@@ -142,7 +142,8 @@
                         <web_cloudflare>cloudflare</web_cloudflare>
                         <web_cloudflare_ipv4 value="cloudflare-ipv4">cloudflare-ipv4</web_cloudflare_ipv4>
                         <web_cloudflare_ipv6 value="cloudflare-ipv6">cloudflare-ipv6</web_cloudflare_ipv6>
-                        <web_dyndns>dyndns</web_dyndns>
+                        <web_dynu_ipv4 value="dynu-ipv4">dynu-ipv4</web_dynu_ipv4>
+                        <web_dynu_ipv6 value="dynu-ipv6">dynu-ipv6</web_dynu_ipv6>
                         <web_freedns>freedns</web_freedns>
                         <web_he>he</web_he>
                         <web_icanhazip>icanhazip</web_icanhazip>
diff --git a/dns/ddclient/src/opnsense/scripts/ddclient/lib/account/__init__.py b/dns/ddclient/src/opnsense/scripts/ddclient/lib/account/__init__.py
index 7b600eb57..811733ace 100755
--- a/dns/ddclient/src/opnsense/scripts/ddclient/lib/account/__init__.py
+++ b/dns/ddclient/src/opnsense/scripts/ddclient/lib/account/__init__.py
@@ -122,7 +122,7 @@ class BaseAccount:
             dynipv6host = self.settings['dynipv6host'] if self.settings.get('dynipv6host' ,'').strip() != '' else None
         )
 
-        if self._current_address == None:
+        if not self._current_address:
             syslog.syslog(
                 syslog.LOG_WARNING,
                 "Account %s no global IP address detected, check config if warning persists" % (self.description)
diff --git a/dns/ddclient/src/opnsense/scripts/ddclient/lib/address.py b/dns/ddclient/src/opnsense/scripts/ddclient/lib/address.py
index e7dd3edef..44ad79299 100755
--- a/dns/ddclient/src/opnsense/scripts/ddclient/lib/address.py
+++ b/dns/ddclient/src/opnsense/scripts/ddclient/lib/address.py
@@ -35,7 +35,8 @@ checkip_service_list = {
   'cloudflare': '%s://one.one.one.one/cdn-cgi/trace',
   'cloudflare-ipv4': '%s://1.1.1.1/cdn-cgi/trace',
   'cloudflare-ipv6': '%s://[2606:4700:4700::1111]/cdn-cgi/trace',
-  'dyndns': '%s://checkip.dyndns.org/',
+  'dynu-ipv4': '%s://ipcheck.dynu.com/',
+  'dynu-ipv6': '%s://ipcheckv6.dynu.com/',
   'freedns': '%s://freedns.afraid.org/dynamic/check.php',
   'he': '%s://checkip.dns.he.net/',
   'icanhazip': '%s://icanhazip.com/',