From b5da8e67844f8547c5c8cfdf1945bc496c82d208 Mon Sep 17 00:00:00 2001
From: Matt Parnell <mparnell@gmail.com>
Date: Wed, 21 Sep 2022 10:22:28 -0500
Subject: [PATCH 1/4] Add icanhazip.com as a checkip provider. Fast, only
 returns IP so less processing time.

---
 .../src/opnsense/mvc/app/models/OPNsense/DynDNS/DynDNS.xml       | 1 +
 dns/ddclient/src/opnsense/scripts/ddclient/checkip               | 1 +
 2 files changed, 2 insertions(+)

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 8b8439da3..336143e1a 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
@@ -111,6 +111,7 @@
                         <web_freedns>freedns</web_freedns>
                         <web_googledomains>googledomains</web_googledomains>
                         <web_he>he</web_he>
+                        <web_icanhazip value="icanhazip">icanhazip</web_icanhazip>
                         <web_ip4only_me value="web_ip4only.me">ip4only.me</web_ip4only_me>
                         <web_ip6only_me value="web_ip6only.me">ip6only.me</web_ip6only_me>
                         <web_ipify_ipv4 value="web_ipify-ipv4">ipify-ipv4</web_ipify_ipv4>
diff --git a/dns/ddclient/src/opnsense/scripts/ddclient/checkip b/dns/ddclient/src/opnsense/scripts/ddclient/checkip
index f68ec76b8..19d665835 100755
--- a/dns/ddclient/src/opnsense/scripts/ddclient/checkip
+++ b/dns/ddclient/src/opnsense/scripts/ddclient/checkip
@@ -35,6 +35,7 @@ service_list = {
   'freedns': '%s://freedns.afraid.org/dynamic/check.php',
   'googledomains': '%s://domains.google.com/checkip',
   'he': '%s://checkip.dns.he.net/',
+  'icanhazip': '%s://icanhazip.com/',
   'ip4only.me': '%s://ip4only.me/api/',
   'ip6only.me': '%s://ip6only.me/api/',
   'ipify-ipv4': '%s://api.ipify.org/',

From a425c1f8423902215fe02edf4fc0164ef0a6e496 Mon Sep 17 00:00:00 2001
From: Matt Parnell <mparnell@gmail.com>
Date: Wed, 21 Sep 2022 10:30:17 -0500
Subject: [PATCH 2/4] Appears I missed this one. I don't think ddclient.conf
 needs edited - correct me if I am wrong, as it doesn't provide dynamic DNS
 services itself.

---
 .../src/opnsense/mvc/app/models/OPNsense/DynDNS/DynDNS.xml       | 1 +
 1 file changed, 1 insertion(+)

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 336143e1a..3c40ca312 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
@@ -50,6 +50,7 @@
                         <gandi>Gandi.net</gandi>
                         <he-net>HE.net</he-net>
                         <he-net-tunnel>HE.net TunnelBroker</he-net-tunnel>
+                        <icanhazip>icanhazip</icanhazip>
                         <inwx>INWX</inwx>
                         <loopia>Loopia</loopia>
                         <namecheap>NameCheap</namecheap>

From ef4486f6a57848c41964352ca76c1dfc2b767bf0 Mon Sep 17 00:00:00 2001
From: Matt Parnell <mparnell@gmail.com>
Date: Wed, 21 Sep 2022 10:37:24 -0500
Subject: [PATCH 3/4] Actually, I was wrong. Just as an IP fetcher, we only
 need the web_ entry I believe.

---
 .../src/opnsense/mvc/app/models/OPNsense/DynDNS/DynDNS.xml       | 1 -
 1 file changed, 1 deletion(-)

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 3c40ca312..336143e1a 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
@@ -50,7 +50,6 @@
                         <gandi>Gandi.net</gandi>
                         <he-net>HE.net</he-net>
                         <he-net-tunnel>HE.net TunnelBroker</he-net-tunnel>
-                        <icanhazip>icanhazip</icanhazip>
                         <inwx>INWX</inwx>
                         <loopia>Loopia</loopia>
                         <namecheap>NameCheap</namecheap>

From 01b56a35c60df9180ab32e6b5eeb4cc0c1e7f20b Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Wed, 21 Sep 2022 21:08:14 +0200
Subject: [PATCH 4/4] dns/ddclient - Add icanhazip.com as a checkip provider
 (bugfix https://github.com/opnsense/plugins/pull/3134)

---
 dns/ddclient/Makefile                                           | 2 +-
 dns/ddclient/pkg-descr                                          | 1 +
 .../src/opnsense/mvc/app/models/OPNsense/DynDNS/DynDNS.xml      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dns/ddclient/Makefile b/dns/ddclient/Makefile
index cc295655f..235e0b751 100644
--- a/dns/ddclient/Makefile
+++ b/dns/ddclient/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		ddclient
 PLUGIN_VERSION=		1.8
-PLUGIN_REVISION=	2
+PLUGIN_REVISION=	3
 PLUGIN_DEPENDS=		ddclient
 PLUGIN_COMMENT=		Dynamic DNS client
 PLUGIN_MAINTAINER=	ad@opnsense.org
diff --git a/dns/ddclient/pkg-descr b/dns/ddclient/pkg-descr
index f7f9129fc..677610b20 100644
--- a/dns/ddclient/pkg-descr
+++ b/dns/ddclient/pkg-descr
@@ -13,6 +13,7 @@ Plugin Changelog
 * Make service status and stop more reliable
 * Time out checkip script after 10 seconds
 * allow % characters in usernames (rev 2)
+* add icanhazip.com as a checkip provider (rev 3)
 
 1.7
 
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 336143e1a..a010321c8 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
@@ -111,7 +111,7 @@
                         <web_freedns>freedns</web_freedns>
                         <web_googledomains>googledomains</web_googledomains>
                         <web_he>he</web_he>
-                        <web_icanhazip value="icanhazip">icanhazip</web_icanhazip>
+                        <web_icanhazip>icanhazip</web_icanhazip>
                         <web_ip4only_me value="web_ip4only.me">ip4only.me</web_ip4only_me>
                         <web_ip6only_me value="web_ip6only.me">ip6only.me</web_ip6only_me>
                         <web_ipify_ipv4 value="web_ipify-ipv4">ipify-ipv4</web_ipify_ipv4>