From e709eacbc23b91717464635fede8f0eb0aa04ef9 Mon Sep 17 00:00:00 2001
From: ValdikSS <iam@valdikss.org.ru>
Date: Wed, 2 Mar 2022 10:40:57 +0300
Subject: [PATCH] Manually revert 91b2584845c95626e3595de67a5e45ba0667bf7e

I vaguely remember a website for which I introduced that but can't find it right now.
That was some kind of bulletin board on *.pp.ru or *.msk.ru domain, only one
subdomain of which was blocked, and it broke on full proxifying.

This fixes '*.echo.msk.ru' Registry entry.
---
 generate-pac.sh      | 2 +-
 scripts/getzones.awk | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/generate-pac.sh b/generate-pac.sh
index 75fcb48..4654bef 100755
--- a/generate-pac.sh
+++ b/generate-pac.sh
@@ -68,7 +68,7 @@ echo "  if (domains.length < 10) return \"DIRECT\"; // list is broken
 
   var shost;
   if (/\.(ru|co|cu|com|info|net|org|gov|edu|int|mil|biz|pp|ne|msk|spb|nnov|od|in|ho|cc|dn|i|tut|v|dp|sl|ddns|dyndns|livejournal|herokuapp|azurewebsites|cloudfront|ucoz|3dn|nov|linode|amazonaws|sl-reverse|kiev|beget|kirov|akadns|scaleway|fastly|hldns|appspot|my1|hwcdn|deviantart|wixmp|netdna-ssl|brightcove|berlogovo|edgecastcdn|trafficmanager|iwara|pximg|github|hopto|u-stream)\.[^.]+$/.test(host))
-    shost = host;
+    shost = host.replace(/(.+)\.([^.]+\.[^.]+\.[^.]+$)/, \"\$2\");
   else
     shost = host.replace(/(.+)\.([^.]+\.[^.]+$)/, \"\$2\");
 
diff --git a/scripts/getzones.awk b/scripts/getzones.awk
index b705a27..c0b506d 100644
--- a/scripts/getzones.awk
+++ b/scripts/getzones.awk
@@ -17,7 +17,9 @@
 {sub(/\.$/, "", $1)}
 
 {
- if (!(/\.(ru|co|cu|com|info|net|org|gov|edu|int|mil|biz|pp|ne|msk|spb|nnov|od|in|ho|cc|dn|i|tut|v|dp|sl|ddns|dyndns|livejournal|herokuapp|azurewebsites|cloudfront|ucoz|3dn|nov|linode|amazonaws|sl-reverse|kiev|beget|kirov|akadns|scaleway|fastly|hldns|appspot|my1|hwcdn|deviantart|wixmp|netdna-ssl|brightcove|berlogovo|edgecastcdn|trafficmanager|iwara|pximg|github|hopto|u-stream)\.[^.]+$/))
+ if (/\.(ru|co|cu|com|info|net|org|gov|edu|int|mil|biz|pp|ne|msk|spb|nnov|od|in|ho|cc|dn|i|tut|v|dp|sl|ddns|dyndns|livejournal|herokuapp|azurewebsites|cloudfront|ucoz|3dn|nov|linode|amazonaws|sl-reverse|kiev|beget|kirov|akadns|scaleway|fastly|hldns|appspot|my1|hwcdn|deviantart|wixmp|netdna-ssl|brightcove|berlogovo|edgecastcdn|trafficmanager|iwara|pximg|github|hopto|u-stream)\.[^.]+$/)
+  {$1 = gensub(/(.+)\.([^.]+\.[^.]+\.[^.]+$)/, "\\2", 1)}
+ else
   {$1 = gensub(/(.+)\.([^.]+\.[^.]+$)/, "\\2", 1)}
 }