From 1c6ca643e3a6ea431bfbf103ab1501263767d02c Mon Sep 17 00:00:00 2001 From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Mon, 4 May 2026 21:15:03 +0300 Subject: [PATCH] Autocommit in repo: ros.vados.ru, generated by owner: root, in 21:15:02 04.05.2026. --- html/AM-FwAddrLists.rsc | 12 ------------ html/AM-GlobalFunc.rsc | 4 ++-- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/html/AM-FwAddrLists.rsc b/html/AM-FwAddrLists.rsc index 4780dd004..48972d60f 100644 --- a/html/AM-FwAddrLists.rsc +++ b/html/AM-FwAddrLists.rsc @@ -135,13 +135,6 @@ :foreach Line in=[ :deserialize $Data delimiter="\n" from=dsv options=dsv.plain ] do={ :set Line ($Line->0); - :local Delim [ $FindDelim $Line ]; - :if ($Delim = 0) do={ :set Line ""; }; - :if ([ :len $Line ] = 0) do={ - :do { - :log info ($ScriptName . " address-list entry: " . $Line . " is empty, or commented. Skipped."); - } on-error={ } - } :local Address; :if ([ :pick $Line 0 1 ] = "{" && [ :pick $Line ([ :len $Line ] - 1) ] = "}") do={ :do { @@ -162,8 +155,6 @@ :set Address [ :tostr (([ :toip $Net ] & [ $NetMask4 $CIDR ]) . [ $IfThenElse ($CIDR < 32) ("/" . $CIDR) ]) ]; } :set Branch [ $GetBranch $Address ]; - :if ([ :typeof ($IPv4Addresses->$Branch) ] != "array") do={ - :set ($IPv4Addresses->$Branch) ({}) }; :set ($IPv4Addresses->$Branch->$Address) $TimeOut; } :if ($Address ~ "^[0-9a-zA-Z]*:[0-9a-zA-Z:\\.]+(/[0-9]{1,3})?\$") do={ @@ -176,13 +167,10 @@ } :set Address (([ :toip6 $Net ] & [ $NetMask6 $CIDR ]) . "/" . $CIDR); :set Branch [ $GetBranch $Address ]; - :if ([ :typeof ($IPv6Addresses->$Branch) ] != "array") do={ :set ($IPv6Addresses->$Branch) ({}) }; :set ($IPv6Addresses->$Branch->$Address) $TimeOut; } :if ($Address ~ "^[\\.a-zA-Z0-9-]+\\.[a-zA-Z]{2,}\$") do={ :set Branch [ $GetBranch $Address ]; - :if ([ :typeof ($IPv4Addresses->$Branch) ] != "array") do={ :set ($IPv4Addresses->$Branch) ({}) }; - :if ([ :typeof ($IPv6Addresses->$Branch) ] != "array") do={ :set ($IPv6Addresses->$Branch) ({}) }; :set ($IPv4Addresses->$Branch->$Address) $TimeOut; :set ($IPv6Addresses->$Branch->$Address) $TimeOut; } diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index 93a4cb81e..08582c8da 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/596/174566ea"; +:global CommitId "main/597/e140e1c7"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 21:00:04 04.05.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 21:15:02 04.05.2026."; # The variables are received right here. :global GlobalConfVersion 140; -- 2.52.0