Change repo

awg_config.sh

@@ -318,7 +318,7 @@ config_files="network
 firewall
 https-dns-proxy
 dhcp"
-URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/podkop07"
+URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/zapret271225"
 
 checkPackageAndInstall "https-dns-proxy" "0"
 
@@ -575,7 +575,7 @@ fi
 
 path_podkop_config="/etc/config/podkop"
 path_podkop_config_backup="/root/podkop"
-URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/podkop07"
+URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/zapret271225"
 
 if [ -f "/etc/init.d/podkop" ]; then
 	printf "Podkop installed. Reconfigured on AWG WARP and Opera Proxy? (y/n): \n"

config_files/doh-proxy

@@ -10,16 +10,16 @@ config main 'config'
 	option procd_trigger_wan6 '0'
 
 config doh-proxy
-	option bootstrap_dns '94.140.14.14,94.140.15.15'
-	option resolver_url 'https://dns.adguard-dns.com/dns-query'
+	option resolver_url 'https://dns.google/dns-query'
+	option bootstrap_dns '8.8.8.8,8.8.4.4'
 	option listen_addr '127.0.0.1'
 	option listen_port '5053'
 	option user 'nobody'
 	option group 'nogroup'
 
 config doh-proxy
-	option resolver_url 'https://dns.google/dns-query'
-	option bootstrap_dns '8.8.8.8,8.8.4.4'
+	option bootstrap_dns '94.140.14.14,94.140.15.15'
+	option resolver_url 'https://dns.adguard-dns.com/dns-query'
 	option listen_addr '127.0.0.1'
 	option listen_port '5054'
 	option user 'nobody'

config_files/podkopNew

@@ -1,7 +1,7 @@
 
 config settings 'settings'
 	option dns_type 'doh'
-	option dns_server 'dns.adguard-dns.com'
+	option dns_server '8.8.8.8'
 	option bootstrap_dns_server '8.8.8.8'
 	option dns_rewrite_ttl '60'
 	option enable_output_network_interface '0'
@@ -50,6 +50,6 @@ config section 'Youtube_Discord'
 	option mixed_proxy_enabled '0'
 	list community_lists 'youtube'
 	list community_lists 'discord'
-	option user_domains_text '2ip.ru'
-	option user_domains_text 'amazonws.com'
+	option user_domains_text '2ip.ru amazonaws.com whatsapp.com whatsapp.net whatsapp.biz wa.me'
+	list remote_subnet_lists 'https://raw.githubusercontent.com/HybridNetworks/whatsapp-cidr/main/WhatsApp/whatsapp_cidr_ipv4.txt'
 

config_files/podkopNewNoYoutube

@@ -1,7 +1,7 @@
 
 config settings 'settings'
 	option dns_type 'doh'
-	option dns_server 'dns.adguard-dns.com'
+	option dns_server '8.8.8.8'
 	option bootstrap_dns_server '8.8.8.8'
 	option dns_rewrite_ttl '60'
 	option enable_output_network_interface '0'
@@ -49,5 +49,5 @@ config section 'Discord'
 	option user_subnet_list_type 'disabled'
 	option mixed_proxy_enabled '0'
 	list community_lists 'discord'
-	option user_domains_text '2ip.ru'
-	option user_domains_text 'amazonws.com'
+	option user_domains_text '2ip.ru amazonaws.com whatsapp.com whatsapp.net whatsapp.biz wa.me'
+	list remote_subnet_lists 'https://raw.githubusercontent.com/HybridNetworks/whatsapp-cidr/main/WhatsApp/whatsapp_cidr_ipv4.txt'

config_files/podkopNewSecond

@@ -1,7 +1,7 @@
 
 config settings 'settings'
 	option dns_type 'doh'
-	option dns_server 'dns.adguard-dns.com'
+	option dns_server '8.8.8.8'
 	option bootstrap_dns_server '8.8.8.8'
 	option dns_rewrite_ttl '60'
 	option enable_output_network_interface '0'
@@ -40,5 +40,5 @@ config section 'main'
 	list community_lists 'tiktok'
 	list community_lists 'google_ai'
 	list community_lists 'discord'
-	option user_domains_text 'myip.com'
-	option user_domains_text 'amazonws.com'
+	option user_domains_text 'myip.com amazonaws.com whatsapp.com whatsapp.net whatsapp.biz wa.me'
+	list remote_subnet_lists 'https://raw.githubusercontent.com/HybridNetworks/whatsapp-cidr/main/WhatsApp/whatsapp_cidr_ipv4.txt'

config_files/podkopNewSecondYoutube

@@ -1,7 +1,7 @@
 
 config settings 'settings'
 	option dns_type 'doh'
-	option dns_server 'dns.adguard-dns.com'
+	option dns_server '8.8.8.8'
 	option bootstrap_dns_server '8.8.8.8'
 	option dns_rewrite_ttl '60'
 	option enable_output_network_interface '0'
@@ -41,5 +41,5 @@ config section 'main'
 	list community_lists 'google_ai'
 	list community_lists 'youtube'
 	list community_lists 'discord'
-	option user_domains_text 'myip.com'
-	option user_domains_text 'amazonws.com'
+	option user_domains_text 'myip.com amazonaws.com whatsapp.com whatsapp.net whatsapp.biz wa.me'
+	list remote_subnet_lists 'https://raw.githubusercontent.com/HybridNetworks/whatsapp-cidr/main/WhatsApp/whatsapp_cidr_ipv4.txt'

config_files/podkopNewWARP

@@ -1,7 +1,7 @@
 
 config settings 'settings'
 	option dns_type 'doh'
-	option dns_server 'dns.adguard-dns.com'
+	option dns_server '8.8.8.8'
 	option bootstrap_dns_server '8.8.8.8'
 	option dns_rewrite_ttl '60'
 	option enable_output_network_interface '0'
@@ -34,5 +34,5 @@ config section 'main'
 	list community_lists 'google_ai'
 	list community_lists 'discord'
 	list community_lists 'yotube'
-	option user_domains_text 'myip.com'
-	option user_domains_text 'amazonws.com'
+	option user_domains_text 'myip.com amazonaws.com whatsapp.com whatsapp.net whatsapp.biz wa.me'
+	list remote_subnet_lists 'https://raw.githubusercontent.com/HybridNetworks/whatsapp-cidr/main/WhatsApp/whatsapp_cidr_ipv4.txt'

config_files/podkopNewWARPNoYoutube

@@ -1,7 +1,7 @@
 
 config settings 'settings'
 	option dns_type 'doh'
-	option dns_server 'dns.adguard-dns.com'
+	option dns_server '8.8.8.8'
 	option bootstrap_dns_server '8.8.8.8'
 	option dns_rewrite_ttl '60'
 	option enable_output_network_interface '0'
@@ -33,5 +33,5 @@ config section 'main'
 	list community_lists 'tiktok'
 	list community_lists 'google_ai'
 	list community_lists 'discord'
-	option user_domains_text 'myip.com'
-	option user_domains_text 'amazonws.com'
+	option user_domains_text 'myip.com amazonaws.com whatsapp.com whatsapp.net whatsapp.biz wa.me'
+	list remote_subnet_lists 'https://raw.githubusercontent.com/HybridNetworks/whatsapp-cidr/main/WhatsApp/whatsapp_cidr_ipv4.txt'

config_files/stubby

@@ -20,6 +20,10 @@ config stubby 'global'
 	list trigger 'wwan0'
 	option log_level '0'
 
+config resolver
+	option address '8.8.8.8'
+	option tls_auth_name 'dns.google'
+
 config resolver
 	option address '94.140.14.14'
 	option tls_auth_name 'dns.adguard.com'
@@ -36,10 +40,6 @@ config resolver
 	option address '2a10:50c0::ad2:ff'
 	option tls_auth_name 'dns.adguard.com'
 
-config resolver
-	option address '8.8.8.8'
-	option tls_auth_name 'dns.google'
-
 config resolver
 	option address '1.1.1.1'
 	option tls_auth_name 'cloudflare-dns.com'

config_files/wdoc-wg

@@ -0,0 +1,13 @@
+
+config wdoc-wg 'main'
+	option enabled '0'
+	option timeout '900'
+	option log '0'
+	option dns1 '77.88.8.8'
+	option dns2 '8.8.8.8'
+
+config interface
+	option iface 'awg10'
+	option ip '172.16.0.1'
+	option check_inet '1'
+

config_files/youtubeUnblock

@@ -19,7 +19,7 @@ config section
 	option frag_sni_faked '0'
 	option frag_middle_sni '1'
 	option frag_sni_pos '1'
-	option seg2delay '0'
+	option seg2delay '3'
 	option fk_winsize '0'
 	option synfake '0'
 	option sni_detection 'parse'

config_files/youtubeUnblockSecond

@@ -19,7 +19,7 @@ config section
 	option frag_sni_faked '0'
 	option frag_middle_sni '1'
 	option frag_sni_pos '1'
-	option seg2delay '0'
+	option seg2delay '3'
 	option fk_winsize '0'
 	option synfake '0'
 	option sni_detection 'parse'

config_files/youtubeUnblockSecondDiscord

@@ -19,7 +19,7 @@ config section
 	option frag_sni_faked '0'
 	option frag_middle_sni '1'
 	option frag_sni_pos '1'
-	option seg2delay '0'
+	option seg2delay '3'
 	option fk_winsize '0'
 	option synfake '0'
 	option sni_detection 'parse'

config_files/zapret

@@ -20,6 +20,7 @@ config main 'config'
 	option NFQWS_ENABLE '1'
 	option DESYNC_MARK '0x40000000'
 	option DESYNC_MARK_POSTNAT '0x20000000'
+	option FILTER_MARK '	'
 	option NFQWS_PORTS_TCP '80,443'
 	option NFQWS_PORTS_UDP '443'
 	option NFQWS_TCP_PKT_OUT '9'
@@ -29,27 +30,26 @@ config main 'config'
 	option NFQWS_PORTS_TCP_KEEPALIVE '0'
 	option NFQWS_PORTS_UDP_KEEPALIVE '0'
 	option NFQWS_OPT '
---filter-tcp=80 <HOSTLIST>
---dpi-desync=fake,fakedsplit
---dpi-desync-autottl=2
---dpi-desync-fooling=badsum
---new
 --filter-tcp=443
+--dpi-desync=fake,fakeddisorder
+--dpi-desync-split-pos=10,midsld
+--dpi-desync-fake-tls=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
+--dpi-desync-fake-tls-mod=rnd,dupsid,sni=fonts.google.com
+--dpi-desync-fake-tls=0x0F0F0F0F
+--dpi-desync-fake-tls-mod=none
+--dpi-desync-fakedsplit-pattern=/opt/zapret/files/fake/tls_clienthello_vk_com.bin
+--dpi-desync-split-seqovl=336
+--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_gosuslugi_ru.bin
+--dpi-desync-fooling=badseq,badsum
+--dpi-desync-badseq-increment=0
 --hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
---dpi-desync=multidisorder
---dpi-desync-split-pos=1,midsld
+<HOSTLIST>
 --new
---filter-udp=443 --hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
+--filter-udp=443
 --dpi-desync=fake
---dpi-desync-repeats=11
+--dpi-desync-repeats=4
 --dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin
---new
---filter-udp=443 <HOSTLIST_NOAUTO>
---dpi-desync=fake
---dpi-desync-repeats=11
---new
---filter-tcp=443 <HOSTLIST>
---dpi-desync=multidisorder
---dpi-desync-split-pos=1,sniext+1,host+1,midsld-2,midsld,midsld+2,endhost-1
+--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
+<HOSTLIST>
 '
 

config_files/zapret-hosts-user-exclude.txt

@@ -0,0 +1,18 @@
+127.0.0.0/8
+10.0.0.0/8
+172.16.0.0/12
+192.168.0.0/16
+169.254.0.0/16
+::1
+fc00::/7
+fe80::/10
+play.google.com
+android.com
+google-analytics.com
+gstatic.com
+gvt1.com
+dl.google.com
+dl-ssl.google.com
+android.clients.google.com
+gvt2.com
+gvt3.com

configure_zaprets.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/podkop07"
+URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/zapret271225"
 DIR="/etc/config"
 DIR_BACKUP="/root/backup"
 config_files="dhcp

off_configure_zaprets.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/podkop07"
+URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/zapret271225"
 DIR="/etc/config"
 DIR_BACKUP="/root/backup"
 config_files="dhcp

run_universal_config.sh

@@ -7,10 +7,10 @@ findVersion="24.10.2"
 
 if echo "$DESCRIPTION" | grep -qi -- "$findKey" && printf '%s\n%s\n' "$findVersion" "$VERSION" | sort -V | tail -n1 | grep -qx -- "$VERSION"; then
 	printf "\033[32;1mThis new firmware. Running new scprit...\033[0m\n"
-	wget --no-check-certificate -O /tmp/universal_config_new_podkop.sh https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/podkop07/universal_config_new_podkop.sh && chmod +x /tmp/universal_config_new_podkop.sh && /tmp/universal_config_new_podkop.sh $1 $2
+	wget --no-check-certificate -O /tmp/universal_config_new_podkop.sh https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/zapret271225/universal_config_new_podkop.sh && chmod +x /tmp/universal_config_new_podkop.sh && /tmp/universal_config_new_podkop.sh $1 $2
 else
 	printf "\033[32;1mThis old firmware.\nRecommendation, upgrade firmware to actual release...\nSleep 5 sec...\033[0m\n"
 	sleep 5
 	printf "\033[32;1mRunning old scprit...\033[0m\n"
-	wget --no-check-certificate -O /tmp/universal_config.sh https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/podkop07/universal_config.sh && chmod +x /tmp/universal_config.sh && /tmp/universal_config.sh $1 $2
+	wget --no-check-certificate -O /tmp/universal_config.sh https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/zapret271225/universal_config.sh && chmod +x /tmp/universal_config.sh && /tmp/universal_config.sh $1 $2
 fi

universal_config.sh

@@ -661,7 +661,7 @@ firewall
 https-dns-proxy
 youtubeUnblock
 dhcp"
-URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/podkop07"
+URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/wdoctrack"
 
 checkPackageAndInstall "https-dns-proxy" "0"
 
@@ -1143,7 +1143,7 @@ service odhcpd restart
 
 path_podkop_config="/etc/config/podkop"
 path_podkop_config_backup="/root/podkop"
-URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/podkop07"
+URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/wdoctrack"
 
 messageComplete=""
 

universal_config_new_podkop.sh

@@ -614,6 +614,9 @@ eval "$(echo "$encoded_code" | base64 --decode)"
 #проверка и установка пакетов AmneziaWG
 #install_awg_packages
 
+#opkg remove zapret luci-app-zapret
+#rm -r /opt/zapret
+
 checkPackageAndInstall "jq" "1"
 checkPackageAndInstall "curl" "1"
 checkPackageAndInstall "unzip" "1"
@@ -650,31 +653,37 @@ else
 	[ -f /etc/config/dhcp-opkg ] && cp /etc/config/dhcp /etc/config/dhcp-old && mv /etc/config/dhcp-opkg /etc/config/dhcp
 fi
 
-#проверяем установлени ли пакет https-dns-proxy
-if opkg list-installed | grep -q https-dns-proxy; then
-	echo "Delete packet https-dns-proxy..."
-	opkg remove --force-removal-of-dependent-packages "https-dns-proxy"
-fi
-
 printf "Setting confdir dnsmasq\n"
 uci set dhcp.@dnsmasq[0].confdir='/tmp/dnsmasq.d'
 uci commit dhcp
 
 DIR="/etc/config"
-DIR_BACKUP="/root/backup5"
+DIR_BACKUP="/root/backup6"
 config_files="network
 firewall
 doh-proxy
 zapret
 dhcp
 dns-failsafe-proxy
-stubby"
-URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/podkop07"
+stubby
+wdoc
+wdoc-singbox
+wdoc-warp
+wdoc-wg"
+URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/zapret271225"
 
 checkPackageAndInstall "luci-app-dns-failsafe-proxy" "1"
 checkPackageAndInstall "luci-i18n-stubby-ru" "1"
+checkPackageAndInstall "luci-i18n-doh-proxy-ru" "1"
 checkPackageAndInstall "luci-i18n-wdoc-singbox-ru" "1"
 checkPackageAndInstall "luci-i18n-wdoc-warp-ru" "1"
+checkPackageAndInstall "luci-i18n-wdoc-wg-ru" "1"
+
+#проверяем установлени ли пакет https-dns-proxy
+if opkg list-installed | grep -q https-dns-proxy; then
+	echo "Delete packet https-dns-proxy..."
+	opkg remove --force-removal-of-dependent-packages "https-dns-proxy"
+fi
 
 if [ ! -d "$DIR_BACKUP" ]
 then
@@ -771,12 +780,13 @@ opkg upgrade luci-app-zapret
 manage_package "zapret" "enable" "start"
 wget -O "/etc/config/zapret" "$URL/config_files/zapret"
 wget -O "/opt/zapret/ipset/zapret-hosts-user.txt" "$URL/config_files/zapret-hosts-user.txt"
+wget -O "/opt/zapret/ipset/zapret-hosts-user-exclude.txt" "$URL/config_files/zapret-hosts-user-exclude.txt"
 wget -O "/opt/zapret/init.d/openwrt/custom.d/50-stun4all" "$URL/config_files/50-stun4all"
-wget -O "/opt/zapret/init.d/openwrt/custom.d/50-wg4all" "$URL/config_files/50-wg4all"
 chmod +x "/opt/zapret/init.d/openwrt/custom.d/50-stun4all"
-chmod +x "/opt/zapret/init.d/openwrt/custom.d/50-wg4all"
+sh /opt/zapret/sync_config.sh
 
 manage_package "podkop" "enable" "stop"
+manage_package "youtubeUnblock" "disable" "stop"
 service zapret restart
 
 isWorkZapret=0
@@ -826,10 +836,10 @@ printf "\033[32;1mCheck opera proxy...\033[0m\n"
 service sing-box restart
 curl --proxy http://127.0.0.1:18080 ipinfo.io/ip
 if [ $? -eq 0 ]; then
-	printf "\033[32;1mOpera proxy well work...\033[0m\n"
+	printf "\n\033[32;1mOpera proxy well work...\033[0m\n"
 	isWorkOperaProxy=1
 else
-	printf "\033[32;1mOpera proxy not work...\033[0m\n"
+	printf "\n\033[32;1mOpera proxy not work...\033[0m\n"
 	isWorkOperaProxy=0
 fi
 
@@ -1179,7 +1189,7 @@ service odhcpd restart
 
 path_podkop_config="/etc/config/podkop"
 path_podkop_config_backup="/root/podkop"
-URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/podkop07"
+URL="https://raw.githubusercontent.com/routerich/RouterichAX3000_configs/refs/heads/zapret271225"
 
 messageComplete=""
 
@@ -1266,7 +1276,7 @@ case $varByPass in
 esac
 
 PACKAGE="podkop"
-REQUIRED_VERSION="v0.7.7-r1"
+REQUIRED_VERSION="v0.7.10-r1"
 
 INSTALLED_VERSION=$(opkg list-installed | grep "^$PACKAGE" | cut -d ' ' -f 3)
 if [ -n "$INSTALLED_VERSION" ] && [ "$INSTALLED_VERSION" != "$REQUIRED_VERSION" ]; then
@@ -1292,9 +1302,9 @@ else
 	if [ "$is_install_podkop" = "y" ] || [ "$is_install_podkop" = "Y" ]; then
 		DOWNLOAD_DIR="/tmp/podkop"
 		mkdir -p "$DOWNLOAD_DIR"
-		podkop_files="podkop-v0.7.7-r1-all.ipk
-			luci-app-podkop-v0.7.7-r1-all.ipk
-			luci-i18n-podkop-ru-0.7.7.ipk"
+		podkop_files="podkop-v0.7.10-r1-all.ipk
+			luci-app-podkop-v0.7.10-r1-all.ipk
+			luci-i18n-podkop-ru-0.7.10.ipk"
 		for file in $podkop_files
 		do
 			echo "Download $file..."
@@ -1336,6 +1346,7 @@ service stubby restart
 service wdoc restart
 service wdoc-singbox restart
 service wdoc-warp restart
+service wdoc-wg restart
 service dns-failsafe-proxy restart
 
 printf  "\033[32;1mService Podkop and Sing-Box restart...\033[0m\n"