From: John Kohl <jtk.git@bostonpog.org>
Date: Sun, 5 Jun 2022 01:13:56 +0000 (-0400)
Subject: luci-app-watchcat: add support for IP family selection
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=20fdd8dd9d0c90c9fb157c6314d6ae32e7f4d39c;p=project%2Fluci.git

luci-app-watchcat: add support for IP family selection

Signed-off-by: John Kohl <jtk.git@bostonpog.org>
---

diff --git a/applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js b/applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js
index c3863604f0..670dfcde32 100644
--- a/applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js
+++ b/applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js
@@ -40,12 +40,21 @@ return view.extend({
 				1 hour would be: <b>1h</b></li><li>1 week would be: <b>7d</b></li><ul>"));
 		o.default = '6h';
 
-		o = s.taboption('general', form.Value, 'pinghosts', _('Host To Check'), _(`IPv4 address or hostname to ping.`));
-		o.datatype = 'host(1)';
+		o = s.taboption('general', form.Value, 'pinghosts', _('Host To Check'), _(`IP address or hostname to ping.`));
+		o.datatype = 'host';
 		o.default = '8.8.8.8';
 		o.depends({ mode: "ping_reboot" });
 		o.depends({ mode: "restart_iface" });
 
+		o = s.taboption('general', form.ListValue, 'addressfamily',
+				_('Address family for pinging the host'));
+		o.default = 'any';
+		o.depends({ mode: 'ping_reboot' });
+		o.depends({ mode: 'restart_iface' });
+		o.value('any');
+		o.value('ipv4');
+		o.value('ipv6');
+
 		o = s.taboption('general', form.Value, 'pingperiod', 
 			_('Check Interval'), 
 			_("How often to ping the host specified above. \
diff --git a/applications/luci-app-watchcat/po/templates/watchcat.pot b/applications/luci-app-watchcat/po/templates/watchcat.pot
index 07582a9e7e..0c21da2376 100644
--- a/applications/luci-app-watchcat/po/templates/watchcat.pot
+++ b/applications/luci-app-watchcat/po/templates/watchcat.pot
@@ -1,13 +1,17 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:82
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:91
 msgid ""
 "<i>Applies to Ping Reboot and Restart Interface modes</i> <br /> Specify the "
 "interface to monitor and restart if a ping over it fails."
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:72
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:50
+msgid "Address family for pinging the host"
+msgstr ""
+
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:81
 msgid ""
 "Applies to Ping Reboot and Periodic Reboot modes</i> <br /> When rebooting "
 "the router, the service will trigger a soft reboot. Entering a non-zero "
@@ -16,22 +20,22 @@ msgid ""
 "0 to disable the forced reboot delay."
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:88
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:97
 msgid ""
 "Applies to Ping Reboot and Restart Interface modes</i> <br /> If using "
 "ModemManager, you can have Watchcat restart your ModemManger interface by "
 "specifying its name."
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:63
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:72
 msgid "Big: 248 bytes"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:50
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:59
 msgid "Check Interval"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:71
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:80
 msgid "Force Reboot Delay"
 msgstr ""
 
@@ -54,7 +58,7 @@ msgstr ""
 msgid "Host To Check"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:51
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:60
 msgid ""
 "How often to ping the host specified above. <br /><br />The default unit is "
 "seconds, without a suffix, but you can use the suffix <b>m</b> for minutes, "
@@ -64,15 +68,11 @@ msgid ""
 "li><ul>"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:64
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:73
 msgid "Huge: 1492 bytes"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:43
-msgid "IPv4 address or hostname to ping."
-msgstr ""
-
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:95
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:104
 msgid ""
 "If using ModemManager, then before restarting the interface, set the modem "
 "to be allowed to use any band."
@@ -92,15 +92,15 @@ msgid ""
 "li><ul>"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:80
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:89
 msgid "Interface"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:81
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:90
 msgid "Interface to monitor and/or restart"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:65
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:74
 msgid "Jumbo: 9000 bytes"
 msgstr ""
 
@@ -108,7 +108,7 @@ msgstr ""
 msgid "Mode"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:87
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:96
 msgid "Name of ModemManager Interface"
 msgstr ""
 
@@ -120,7 +120,7 @@ msgstr ""
 msgid "Periodic Reboot"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:59
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:68
 msgid "Ping Packet Size"
 msgstr ""
 
@@ -141,11 +141,11 @@ msgstr ""
 msgid "Restart Interface"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:60
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:69
 msgid "Small: 1 byte"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:62
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:71
 msgid "Standard: 56 bytes"
 msgstr ""
 
@@ -153,7 +153,7 @@ msgstr ""
 msgid "These rules will govern how this device reacts to network events."
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:94
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:103
 msgid "Unlock Modem Bands"
 msgstr ""
 
@@ -163,6 +163,6 @@ msgstr ""
 msgid "Watchcat"
 msgstr ""
 
-#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:61
+#: applications/luci-app-watchcat/htdocs/luci-static/resources/view/watchcat.js:70
 msgid "Windows: 32 bytes"
 msgstr ""