diff --git a/global-functions.rsc b/global-functions.rsc index c9440ed7..10a9b5ac 100644 --- a/global-functions.rsc +++ b/global-functions.rsc @@ -812,15 +812,10 @@ # check if DNS is resolving :set IsDNSResolving do={ :do { - :local I 1; - :retry { - :set I ($I ^ 1); - :resolve ("low-ttl.eworm." . ({ "de"; "net" }->$I)); - } delay=50ms max=6; + :resolve "low-ttl.eworm.de"; } on-error={ :return false; } - :return true; } diff --git a/netwatch-dns.rsc b/netwatch-dns.rsc index 7c6a7b5b..9531d4ad 100644 --- a/netwatch-dns.rsc +++ b/netwatch-dns.rsc @@ -115,15 +115,13 @@ :local Data false; :onerror Err { - :local I 1; :retry { - :set I ($I ^ 1); :set Data ([ /tool/fetch check-certificate=yes-without-crl output=user \ http-header-field=({ "accept: application/dns-message" }) \ url=(($DohServer->"doh-url") . "?dns=" . [ :convert to=base64 ([ :rndstr length=2 ] . \ - "\01\00" . "\00\01" . "\00\00" . "\00\00" . "\00\00" . "\09doh-check\05eworm" . \ - ({ "\02de"; "\03net" }->$I) . "\00" . "\00\10" . "\00\01") ]) as-value ]->"data"); - } delay=500ms max=6; + "\01\00" . "\00\01" . "\00\00" . "\00\00" . "\00\00" . "\09doh-check\05eworm\02de\00" . \ + "\00\10" . "\00\01") ]) as-value ]->"data"); + } delay=1s max=3; } do={ $LogPrint warning $ScriptName ("Request to DoH server " . ($DohServer->"doh-url") . \ " failed: " . $Err);