From 2a71d77ab68996a43dc06f735d509b9d6c3b78c6 Mon Sep 17 00:00:00 2001 From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Mon, 4 May 2026 14:10:03 +0300 Subject: [PATCH] Autocommit in repo: ros.vados.ru, generated by owner: root, in 14:10:03 04.05.2026. --- html/AM-FwAddrLists.rsc | 10 +++++++--- html/AM-GlobalFunc.rsc | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/html/AM-FwAddrLists.rsc b/html/AM-FwAddrLists.rsc index 3291c9ebf..d2656b9bd 100644 --- a/html/AM-FwAddrLists.rsc +++ b/html/AM-FwAddrLists.rsc @@ -28,7 +28,9 @@ :global HumanReadableNum; :global IfThenElse; :global LogPrint; - + :global Grep; + :local ValidChars "0123456789.:/ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-"; + :global NetMask4; :global NetMask6; :global ScriptLock; @@ -36,7 +38,6 @@ :local FindDelim; :set FindDelim do={ :local Length [ :tostr $1 ]; - :local ValidChars "0123456789.:/ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-"; :for I from=0 to=([ :len $Length ] - 1) do={ :if ([ :typeof [ :find $ValidChars [ :pick $Length $I ] ] ] != "num") do={ :return $I; @@ -79,9 +80,12 @@ :foreach FwListFile in=[ :deserialize $tmpIndex delimiter="\n" from=dsv options=dsv.plain ] do={ :local FwListName ($FwListFile->0); + :local currentListName [ $Grep $FwListName $ValidChars ]; + :log warning ($ScriptName . " Parsing address-list index entry: " . $currentListName); + :local Delim [ $FindDelim $FwListName ]; :if ($Delim = 0) do={ :set FwListName ""; }; - :if ([ :len $FwListName ] = 0) do={1 + :if ([ :len $FwListName ] = 0) do={ :log error ($ScriptName . " Failed parsing address-list index entry: " . $FwListFile->0); :error true; } diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index 42ab3df0d..331033aa2 100644 --- a/html/AM-GlobalFunc.rsc +++ b/html/AM-GlobalFunc.rsc @@ -17,9 +17,9 @@ :global GlobalFuncReady false; # Git commit id & info, expected configuration version -:global CommitId "main/562/cda75821"; +:global CommitId "main/563/53a25a33"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 14:00:03 04.05.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 14:10:03 04.05.2026."; # The variables are received right here. :global GlobalConfVersion 140; -- 2.52.0