From c95dd067701c25abdbe5852c82363a4e02aafbb6 Mon Sep 17 00:00:00 2001 From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Fri, 15 May 2026 12:30:03 +0300 Subject: [PATCH] Autocommit in repo: ros.vados.ru, generated by owner: root, in 12:30:02 15.05.2026. --- html/AM-GlobalFunc.rsc | 4 ++-- html/AM-RKN-dnsLookup.rsc | 12 +++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index a3b35662d..45fbd6a55 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/649/998f9ca0"; +:global CommitId "main/650/31d05905"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 12:10:03 15.05.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 12:30:02 15.05.2026."; # The variables are received right here. :global GlobalConfVersion 140; diff --git a/html/AM-RKN-dnsLookup.rsc b/html/AM-RKN-dnsLookup.rsc index 1996e1db3..e8d4d0bc5 100644 --- a/html/AM-RKN-dnsLookup.rsc +++ b/html/AM-RKN-dnsLookup.rsc @@ -23,7 +23,6 @@ while (!$dnsLookupReady) do={ :nothing; } "telegra.ph" "grani.ru" "xhamster.com" - "kasparov.ru" "lostfilm.tv" "rutracker.org" "lurkmore.to" @@ -34,16 +33,13 @@ while (!$dnsLookupReady) do={ :nothing; } "telegram.org" "api.telegram.org" "telegram.me" - "fbcd.net" "facebook.com" "instagram.com" - "twimg.com" "x.com" "twitter.com" "youtube.com" "googleapis.com" "youtu.be" - "ytimg.com" "googlevideo.com" "gstatic.com" "googleusercontent.com" @@ -67,12 +63,13 @@ while (!$dnsLookupReady) do={ :nothing; } :do { /ip firewall address-list add list=$ListRKN address=$newAddress comment=$aItem; } on-error={ - :log error "error when adding ip to list: $ListRKN address: $newAddress domain: $aItem"; + :log error "error when adding ip to list A record: $aRecord, address: $newAddress domain: $aItem"; } } :if ([/ip dns cache all get $dnsRecord type]="CNAME") do={ :local cname; :local nextCname; + :local cnameAddress; :set cname [/ip dns cache all find where (name=$aItem && type="CNAME")]; :set nextCname [/ip dns cache all find where (name=[/ip dns cache all get $cname data] && type="CNAME")]; :while ($nextCname != "") do={ @@ -81,10 +78,11 @@ while (!$dnsLookupReady) do={ :nothing; } } :foreach aRecord in=[/ip dns cache all find where (name=[/ip dns cache all get $cname data] && type="A")] do={ :do { - /ip firewall address-list add list=$ListRKN address=[/ip dns cache all get $aRecord data] comment=$aItem; + :set cnameAddress [/ip dns cache all get $aRecord data]; + /ip firewall address-list add list=$ListRKN address=$cnameAddress comment=$aItem; # /ip firewall raw add action=add-dst-to-address-list address-list=$ListRKN address-list-timeout=none-dynamic chain=prerouting comment=$aItem content=$aItem; } on-error={ - :log error "error when adding ip to list:$ListRKN address: $newAddress domain: $aItem record: $aRecord"; + :log error "error when adding ip to list CNAME record: $cname, A record: $aRecord, address: $newAddress, from domain: $aItem."; } } } -- 2.52.0