Version bump

.github/workflows/release.yml

@@ -25,15 +25,20 @@ jobs:
             exit 1
           fi
 
-      - name: Install RAR
-        run: sudo apt-get install -y rar
+      - name: Install tools
+        run: sudo apt-get install -y rar p7zip-full
 
       - name: Create archives
         run: |
           NAME="zapret-discord-youtube-${{ github.event.inputs.tag }}"
-          zip -r "${NAME}.zip" bin/ lists/ utils/ *.bat
+          7z a "${NAME}.zip" bin/ lists/ utils/ *.bat
           rar a "${NAME}.rar" bin/ lists/ utils/ *.bat
 
+      - name: Print SHA256 checksums
+        run: |
+          NAME="zapret-discord-youtube-${{ github.event.inputs.tag }}"
+          sha256sum "${NAME}.zip" "${NAME}.rar"
+
       - name: Create GitHub Release
         uses: softprops/action-gh-release@v2
         with:

.gitignore

@@ -2,4 +2,7 @@
 /utils/game_filter.enabled
 /lists/ipset-exclude-user.txt
 /lists/list-general-user.txt
-/lists/list-exclude-user.txt
+/lists/list-exclude-user.txt
+
+.vscode/
+/build/

.service/hosts

@@ -1,3 +1,13 @@
+149.154.167.220 my.telegram.org
+149.154.167.220 oauth.telegram.org
+149.154.167.220 cdn.telesco.pe
+149.154.167.220 cdn1.telesco.pe
+149.154.167.220 cdn2.telesco.pe
+149.154.167.220 cdn3.telesco.pe
+149.154.167.220 cdn4.telesco.pe
+149.154.167.220 cdn5.telesco.pe
+149.154.167.220 api.telegram.org
+149.154.167.220 core.telegram.org
 149.154.167.220 zws4.web.telegram.org
 149.154.167.220 vesta.web.telegram.org
 149.154.167.220 vesta-1.web.telegram.org
@@ -21,6 +31,10 @@
 149.154.167.220 zws2.web.telegram.org
 149.154.167.220 zws4-1.web.telegram.org
 
+185.199.109.133 raw.githubusercontent.com
+185.199.109.133 release-assets.githubusercontent.com
+185.199.108.133 private-user-images.githubusercontent.com
+
 104.25.158.178 finland10000.discord.media
 104.25.158.178 finland10001.discord.media
 104.25.158.178 finland10002.discord.media

.service/version.txt

@@ -1 +1 @@
-1.9.8b
+1.9.8c

lists/list-exclude.txt

@@ -15,9 +15,6 @@ ya.ru
 dns-shop.ru
 habr.com
 3dnews.ru
-sberbank.ru
-ozon.ru
-wildberries.ru
 microsoft.com
 microsoftonline.com
 live.com
@@ -54,14 +51,11 @@ ok.ru
 mycdn.me
 okcdn.ru
 odkl.ru
-wbbasket.ru
 wb.ru
-ozone.ru
 geobasket.ru
 paywb.com
 rwb.ru
 wb-basket.ru
-wb.ru
 wbbasket.ru
 wbpay.ru
 wibes.ru

service.bat

@@ -1,5 +1,5 @@
 @echo off
-set "LOCAL_VERSION=1.9.8b"
+set "LOCAL_VERSION=1.9.8c"
 
 :: External commands
 if "%~1"=="status_zapret" (
@@ -58,11 +58,13 @@ cls
 call :ipset_switch_status
 call :game_switch_status
 call :check_updates_switch_status
+call :get_strategy_name
 
 set "menu_choice=null"
 
 echo.
 echo   ZAPRET SERVICE MANAGER v!LOCAL_VERSION!
+echo.  !CurrentStrategy!
 echo   ----------------------------------------
 echo.
 echo   :: SERVICE
@@ -124,6 +126,7 @@ exit /b
 
 :: TCP ENABLE ==========================
 :tcp_enable
+chcp 437 > nul
 netsh interface tcp show global | findstr /i "timestamps" | findstr /i "enabled" > nul || netsh interface tcp set global timestamps=enabled > nul 2>&1
 exit /b
 
@@ -994,6 +997,13 @@ pause
 goto menu
 
 
+:: Get strategy name
+:get_strategy_name
+set "CurrentStrategy="
+for /f "tokens=2*" %%A in ('reg query "HKLM\System\CurrentControlSet\Services\zapret" /v zapret-discord-youtube 2^>nul') do set "CurrentStrategy=Strategy: %%B"
+exit /b
+
+
 :: Utility functions
 
 :PrintGreen

utils/test zapret.ps1

@@ -894,13 +894,20 @@ try {
             foreach ($targetRes in $results) {
                 $id = $targetRes.TargetId
                 $provider = $targetRes.Provider
-                Add-Content $resultFile "  Target: $id ($provider)"
+                $country = $targetRes.Country
+                if ($country) {
+                    Add-Content $resultFile "  Target: [$country] $id ($provider)"
+                } else {
+                    Add-Content $resultFile "  Target: $id ($provider)"
+                }
                 foreach ($line in $targetRes.Lines) {
                     $test = $line.TestLabel
                     $code = $line.Code
-                    $size = $line.SizeKB
+                    $up = $line.UpKB
+                    $down = $line.DownKB
+                    $time = $line.Time
                     $status = $line.Status
-                    Add-Content $resultFile "    ${test}: code=${code} size=${size} KB status=${status}"
+                    Add-Content $resultFile "    ${test}: code=${code}  up=${up} KB  down=${down} KB  time=${time}s  status=${status}"
                 }
             }
         }