netwatch-notify: do not update with record in cache

Using `:resolve` we have just one address, but chances are several
records do exist. These end up in cache, so we are happy to find them
there - no need to update then.

check-lte-firmware-upgrade.rsc

@@ -29,8 +29,8 @@ $ScriptLock $0;
   :global Identity;
   :global SentLteFirmwareUpgradeNotification;
 
-  :global CharacterReplace;
   :global FormatLine;
+  :global IfThenElse;
   :global LogPrintExit2;
   :global ScriptFromTerminal;
   :global SendNotification2;
@@ -84,7 +84,9 @@ $ScriptLock $0;
     subject=([ $SymbolForNotification "sparkles" ] . "LTE firmware upgrade"); \
     message=("A new firmware version " . ($Firmware->"latest") . " is available for " . \
       "LTE interface " . $IntName . " on " . $Identity . ".\n\n" . \
-      [ $FormatLine "Interface" [ $CharacterReplace ($Info->"manufacturer" . " " . $Info->"model") ("\"") "" ] ] . "\n" . \
+      [ $IfThenElse ([ :len ($Info->"manufacturer") ] > 0) ([ $FormatLine "Manufacturer" ($Info->"manufacturer") ] . "\n") ] . \
+      [ $IfThenElse ([ :len ($Info->"model") ] > 0) ([ $FormatLine "Model" ($Info->"model") ] . "\n") ] . \
+      [ $IfThenElse ([ :len ($Info->"revision") ] > 0) ([ $FormatLine "Revision" ($Info->"revision") ] . "\n") ] . \
       "Firmware version:\n" . \
       [ $FormatLine "    Installed" ($Firmware->"installed") ] . "\n" . \
       [ $FormatLine "    Available" ($Firmware->"latest") ]); silent=true });

doc/unattended-lte-firmware-upgrade.md

@@ -12,6 +12,7 @@ This script upgrades LTE firmware on compatible devices:
 * R11e-LTE-US
 * R11e-4G
 * R11e-LTE6
+* ... and more - probably what ever Mikrotik builds into their devices
 
 A temporary scheduler is created to be independent from terminal. Thus
 starting the upgrade process over the broadband connection is supported.

netwatch-notify.rsc

@@ -79,7 +79,8 @@ $ScriptLock $0;
       :if ([ $IsDNSResolving ] = true) do={
         :do {
           :local Resolve [ :resolve ($HostInfo->"resolve") ];
-          :if ($Resolve != $HostVal->"host") do={
+          :if ($Resolve != $HostVal->"host" and \
+               [ :len [ /ip/dns/cache/find where name=($HostInfo->"resolve") data=[ :tostr ($HostVal->"host") ] ] ] = 0) do={
              $LogPrintExit2 info $0 ("Name '" . $HostInfo->"resolve" . [ $IfThenElse \
                  ($HostInfo->"resolve" != $HostInfo->"name") ("' for " . $Type . " '" . \
                  $HostInfo->"name") "" ] . "' resolves to different address " . $Resolve . \

unattended-lte-firmware-upgrade.rsc

@@ -24,13 +24,17 @@
         :set LTEFirmwareUpgrade;
 
         /system/scheduler/remove ($1 . "-firmware-upgrade");
-        /interface/lte/firmware-upgrade $1 upgrade=yes;
+        :do {
-        :log info ("LTE firmware upgrade on '" . $1 . "' finished, waiting for reset.");
+          /interface/lte/firmware-upgrade $1 upgrade=yes;
-        :delay 240s;
+          :log info ("LTE firmware upgrade on '" . $1 . "' finished, waiting for reset.");
-        :local Firmware [ /interface/lte/firmware-upgrade $1 once as-value ];
+          :delay 240s;
-        :if (($Firmware->"installed") != ($Firmware->"latest")) do={
+          :local Firmware [ /interface/lte/firmware-upgrade $1 once as-value ];
-          :log warning ("LTE firmware versions still differ. Resetting again...");
+          :if (($Firmware->"installed") != ($Firmware->"latest")) do={
-          /interface/lte/at-chat $1 input="AT+RESET";
+            :log warning ("LTE firmware versions still differ. Resetting again...");
+            /interface/lte/at-chat $1 input="AT+RESET";
+          }
+        } on-error={
+          :log error ("LTE firmware upgrade on '" . $1 . "' failed.");
         }
       }