mirror of
https://github.com/remittor/zapret-openwrt.git
synced 2026-01-30 22:30:36 +03:00
Compare commits
9 Commits
v72.202601
...
v72.202601
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c575592f9e | ||
|
|
643eb3c693 | ||
|
|
c0e2747f30 | ||
|
|
8abbd3fb5e | ||
|
|
508e81b66c | ||
|
|
dfb6b0a338 | ||
|
|
c5fa0829e1 | ||
|
|
d401c8c6b5 | ||
|
|
ddbbb81d3c |
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@@ -276,6 +276,8 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
make defconfig
|
make defconfig
|
||||||
sed -i 's/CONFIG_LUCI_JSMIN=y/CONFIG_LUCI_JSMIN=n/g' .config
|
sed -i 's/CONFIG_LUCI_JSMIN=y/CONFIG_LUCI_JSMIN=n/g' .config
|
||||||
|
sed -i 's/CONFIG_LUCI_CSSMIN=y/CONFIG_LUCI_CSSMIN=n/g' .config
|
||||||
|
grep -q '^CONFIG_LUCI_CSSMIN=' .config || echo 'CONFIG_LUCI_CSSMIN=n' >> .config
|
||||||
echo "status=success" >> $GITHUB_OUTPUT
|
echo "status=success" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
- name: Show config
|
- name: Show config
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=luci-app-zapret
|
PKG_NAME:=luci-app-zapret
|
||||||
PKG_VERSION:=72.20260114
|
PKG_VERSION:=72.20260115
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
PKG_LICENSE:=MIT
|
PKG_LICENSE:=MIT
|
||||||
PKG_MAINTAINER:=remittor <https://github.com/remittor>
|
PKG_MAINTAINER:=remittor <https://github.com/remittor>
|
||||||
|
|||||||
@@ -30,6 +30,11 @@ return baseclass.extend({
|
|||||||
this.appendLog('Original sources: https://github.com/hyperion-cs/dpi-checkers');
|
this.appendLog('Original sources: https://github.com/hyperion-cs/dpi-checkers');
|
||||||
this.appendLog('WEB-version: https://hyperion-cs.github.io/dpi-checkers/ru/tcp-16-20/');
|
this.appendLog('WEB-version: https://hyperion-cs.github.io/dpi-checkers/ru/tcp-16-20/');
|
||||||
let cmd = [ fn_dwc_sh ];
|
let cmd = [ fn_dwc_sh ];
|
||||||
|
let resolve_dns = document.getElementById('cfg_resolve_dns');
|
||||||
|
let dns_ip = resolve_dns.options[resolve_dns.selectedIndex].text;
|
||||||
|
if (dns_ip && dns_ip != 'default') {
|
||||||
|
cmd.push(...[ '-d', dns_ip.trim() ]);
|
||||||
|
}
|
||||||
let log = '/tmp/'+tools.appName+'_dwc.log';
|
let log = '/tmp/'+tools.appName+'_dwc.log';
|
||||||
let callback = this.execAndReadCallback;
|
let callback = this.execAndReadCallback;
|
||||||
let wnd = this;
|
let wnd = this;
|
||||||
@@ -60,6 +65,19 @@ return baseclass.extend({
|
|||||||
{
|
{
|
||||||
this.pkg_arch = pkg_arch;
|
this.pkg_arch = pkg_arch;
|
||||||
|
|
||||||
|
let DNS_LIST = [ '8.8.8.8', '1.1.1.1' ];
|
||||||
|
let dns_list = [ ];
|
||||||
|
dns_list.push( E('option', { value: 'dns_default' }, [ 'default' ] ) );
|
||||||
|
for (let id = 0; id < DNS_LIST.length; id++) {
|
||||||
|
let dns_ipaddr = '' + DNS_LIST[id];
|
||||||
|
let val = 'dns_' + dns_ipaddr.replace(/\./g, "_");
|
||||||
|
dns_list.push( E('option', { value: val }, [ dns_ipaddr ] ));
|
||||||
|
}
|
||||||
|
let resolve_dns = E('label', [
|
||||||
|
_('Resolve IP-Addr via') + ': ',
|
||||||
|
E('select', { id: 'cfg_resolve_dns' }, dns_list)
|
||||||
|
]);
|
||||||
|
|
||||||
this.logArea = E('textarea', {
|
this.logArea = E('textarea', {
|
||||||
'id': 'widget.modal_content',
|
'id': 'widget.modal_content',
|
||||||
'readonly': true,
|
'readonly': true,
|
||||||
@@ -84,6 +102,8 @@ return baseclass.extend({
|
|||||||
|
|
||||||
ui.showModal(_('Diagnostics'), [
|
ui.showModal(_('Diagnostics'), [
|
||||||
E('div', { 'class': 'cbi-section' }, [
|
E('div', { 'class': 'cbi-section' }, [
|
||||||
|
resolve_dns,
|
||||||
|
E('br'), E('br'),
|
||||||
this.logArea,
|
this.logArea,
|
||||||
]),
|
]),
|
||||||
E('div', { 'class': 'right' }, [
|
E('div', { 'class': 'right' }, [
|
||||||
|
|||||||
@@ -244,8 +244,18 @@ return view.extend({
|
|||||||
' ', _('Set AutoHostList mode')
|
' ', _('Set AutoHostList mode')
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
let erase_autohostlist = E('label', [
|
||||||
|
E('input', { type: 'checkbox', id: 'cfg_erase_autohostlist' }),
|
||||||
|
' ', _('Erase AutoHostList (ipset)')
|
||||||
|
]);
|
||||||
|
|
||||||
|
let enable_custom_d = E('label', [
|
||||||
|
E('input', { type: 'checkbox', id: 'cfg_enable_custom_d' }),
|
||||||
|
' ', _('Enable use custom.d scripts')
|
||||||
|
]);
|
||||||
|
|
||||||
let strat_list = [ ];
|
let strat_list = [ ];
|
||||||
strat_list.push( E('option', { value: 'strat__skip__' }, [ '-' ] ) );
|
strat_list.push( E('option', { value: 'strat__skip__' }, [ 'not change' ] ) );
|
||||||
for (let id = 0; id < this.nfqws_strat_list.length; id++) {
|
for (let id = 0; id < this.nfqws_strat_list.length; id++) {
|
||||||
let strat = '' + this.nfqws_strat_list[id];
|
let strat = '' + this.nfqws_strat_list[id];
|
||||||
strat_list.push( E('option', { value: 'strat_' + id }, [ strat ] ) );
|
strat_list.push( E('option', { value: 'strat_' + id }, [ strat ] ) );
|
||||||
@@ -276,10 +286,19 @@ return view.extend({
|
|||||||
if (document.getElementById('cfg_autohostlist').checked) {
|
if (document.getElementById('cfg_autohostlist').checked) {
|
||||||
opt_flags += '(set_mode_autohostlist)';
|
opt_flags += '(set_mode_autohostlist)';
|
||||||
};
|
};
|
||||||
|
if (document.getElementById('cfg_erase_autohostlist').checked) {
|
||||||
|
opt_flags += '(erase_autohostlist)';
|
||||||
|
};
|
||||||
|
if (document.getElementById('enable_custom_d').checked) {
|
||||||
|
opt_flags += '(enable_custom_d)';
|
||||||
|
};
|
||||||
//console.log('RESET: opt_flags = ' + opt_flags);
|
//console.log('RESET: opt_flags = ' + opt_flags);
|
||||||
let sel_strat = document.getElementById('cfg_nfqws_strat');
|
let sel_strat = document.getElementById('cfg_nfqws_strat');
|
||||||
let opt_strat = sel_strat.options[sel_strat.selectedIndex].text;
|
let opt_strat = sel_strat.options[sel_strat.selectedIndex].text;
|
||||||
//console.log('RESET: strat = ' + opt_strat);
|
//console.log('RESET: strat = ' + opt_strat);
|
||||||
|
if (opt_strat == 'not change') {
|
||||||
|
opt_strat = '-';
|
||||||
|
}
|
||||||
opt_flags += '(sync)';
|
opt_flags += '(sync)';
|
||||||
let args = [ opt_flags, opt_strat ];
|
let args = [ opt_flags, opt_strat ];
|
||||||
return this.serviceActionEx('reset', resetcfg_btn, args, true);
|
return this.serviceActionEx('reset', resetcfg_btn, args, true);
|
||||||
@@ -293,6 +312,10 @@ return view.extend({
|
|||||||
E('br'), E('br'),
|
E('br'), E('br'),
|
||||||
set_autohostlist,
|
set_autohostlist,
|
||||||
E('br'), E('br'),
|
E('br'), E('br'),
|
||||||
|
erase_autohostlist,
|
||||||
|
E('br'), E('br'),
|
||||||
|
enable_custom_d,
|
||||||
|
E('br'), E('br'),
|
||||||
nfqws_strat,
|
nfqws_strat,
|
||||||
E('br'), E('br')
|
E('br'), E('br')
|
||||||
]),
|
]),
|
||||||
|
|||||||
@@ -370,21 +370,40 @@ return baseclass.extend({
|
|||||||
]);
|
]);
|
||||||
},
|
},
|
||||||
|
|
||||||
handleSaveAdv: function(ev) {
|
handleSaveAdv: async function(ev) {
|
||||||
let txt = document.getElementById('widget.modal_content');
|
let txt = document.getElementById('widget.modal_content');
|
||||||
let value = txt.value.trim().replace(/\r\n/g, '\n') + '\n';
|
let value = txt.value.trim().replace(/\r\n/g, '\n');
|
||||||
|
if (value.length > 0) {
|
||||||
return fs.write(this.file, value).then(async rc => {
|
value += '\n';
|
||||||
|
}
|
||||||
|
let data = value.replace(/'/g, `'\"'\"'`);
|
||||||
|
let chunkSize = 8000;
|
||||||
|
try {
|
||||||
|
for (let wsize = -1; wsize < data.length; wsize += chunkSize) {
|
||||||
|
let chunk = '';
|
||||||
|
if (wsize < 0) {
|
||||||
|
wsize = 0;
|
||||||
|
}
|
||||||
|
if (data.length > 0) {
|
||||||
|
chunk = data.slice(wsize, wsize + chunkSize);
|
||||||
|
}
|
||||||
|
let teeArg = (wsize === 0) ? '' : '-a ';
|
||||||
|
let cmd = `printf %s '${chunk}' | tee ${teeArg} '${this.file}'`;
|
||||||
|
let res = await fs.exec('/bin/busybox', [ 'sh', '-c', cmd ]);
|
||||||
|
if (res.code !== 0) {
|
||||||
|
throw new Error('tee failed, rc = ' + res.code);
|
||||||
|
}
|
||||||
|
}
|
||||||
txt.value = value;
|
txt.value = value;
|
||||||
ui.addNotification(null, E('p', _('Contents have been saved.')), 'info');
|
ui.addNotification(null, E('p', _('Contents have been saved.')), 'info');
|
||||||
if (this.callback) {
|
if (this.callback) {
|
||||||
return this.callback(rc);
|
return this.callback(rc);
|
||||||
}
|
}
|
||||||
}).catch(e => {
|
} catch(e) {
|
||||||
ui.addNotification(null, E('p', _('Unable to save the contents') + ': %s'.format(e.message)));
|
ui.addNotification(null, E('p', _('Unable to save the contents') + ': %s'.format(e.message)));
|
||||||
}).finally(() => {
|
} finally {
|
||||||
ui.hideModal();
|
ui.hideModal();
|
||||||
});
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
error: function(e) {
|
error: function(e) {
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=zapret
|
PKG_NAME:=zapret
|
||||||
PKG_VERSION:=72.20260114
|
PKG_VERSION:=72.20260115
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_MAINTAINER:=bol-van
|
PKG_MAINTAINER:=bol-van
|
||||||
@@ -15,7 +15,7 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
|
|||||||
PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
|
PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
|
||||||
PKG_SOURCE_PROTO:=git
|
PKG_SOURCE_PROTO:=git
|
||||||
PKG_SOURCE_VERSION:=76764ad6b0ee7d3991c97e7b8c24d53189d25c28
|
PKG_SOURCE_VERSION:=76764ad6b0ee7d3991c97e7b8c24d53189d25c28
|
||||||
PKG_SOURCE_DATE:=2026-01-14
|
PKG_SOURCE_DATE:=2026-01-15
|
||||||
|
|
||||||
#PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
#PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
#PKG_SOURCE_URL:=https://github.com/bol-van/zapret/archive/refs/tags/v$(PKG_VERSION).tar.gz?
|
#PKG_SOURCE_URL:=https://github.com/bol-van/zapret/archive/refs/tags/v$(PKG_VERSION).tar.gz?
|
||||||
|
|||||||
@@ -292,6 +292,57 @@ function set_cfg_nfqws_strat
|
|||||||
commit $cfgname
|
commit $cfgname
|
||||||
EOF
|
EOF
|
||||||
fi
|
fi
|
||||||
|
if [ "$strat" = "v7_by_StressOzz" ]; then
|
||||||
|
uci batch <<-EOF
|
||||||
|
set $cfgname.config.NFQWS_PORTS_TCP='80,443,2053,2083,2087,2096,8443'
|
||||||
|
set $cfgname.config.NFQWS_PORTS_UDP='443,19294-19344,50000-50100'
|
||||||
|
set $cfgname.config.NFQWS_OPT="
|
||||||
|
# Strategy $strat
|
||||||
|
|
||||||
|
--filter-tcp=443
|
||||||
|
--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
|
||||||
|
--dpi-desync=fake,multisplit
|
||||||
|
--dpi-desync-split-pos=2,sld
|
||||||
|
--dpi-desync-fake-tls=0x0F0F0F0F
|
||||||
|
--dpi-desync-fake-tls=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
|
||||||
|
--dpi-desync-fake-tls-mod=rnd,dupsid,sni=ggpht.com
|
||||||
|
--dpi-desync-split-seqovl=620
|
||||||
|
--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
|
||||||
|
--dpi-desync-fooling=badsum,badseq
|
||||||
|
|
||||||
|
--new
|
||||||
|
--filter-tcp=443 <HOSTLIST>
|
||||||
|
--dpi-desync=fake,multisplit
|
||||||
|
--dpi-desync-split-seqovl=654
|
||||||
|
--dpi-desync-split-pos=1
|
||||||
|
--dpi-desync-fooling=ts
|
||||||
|
--dpi-desync-repeats=8
|
||||||
|
--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/max.bin
|
||||||
|
--dpi-desync-fake-tls=/opt/zapret/files/fake/max.bin
|
||||||
|
|
||||||
|
--new
|
||||||
|
--filter-udp=443 <HOSTLIST_NOAUTO>
|
||||||
|
--dpi-desync=fake
|
||||||
|
--dpi-desync-repeats=6
|
||||||
|
--dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin
|
||||||
|
|
||||||
|
--new
|
||||||
|
--filter-udp=19294-19344,50000-50100
|
||||||
|
--filter-l7=discord,stun
|
||||||
|
--dpi-desync=fake
|
||||||
|
--dpi-desync-repeats=6
|
||||||
|
|
||||||
|
--new
|
||||||
|
--filter-tcp=2053,2083,2087,2096,8443
|
||||||
|
--hostlist-domains=discord.media
|
||||||
|
--dpi-desync=multisplit
|
||||||
|
--dpi-desync-split-seqovl=652
|
||||||
|
--dpi-desync-split-pos=2
|
||||||
|
--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
|
||||||
|
"
|
||||||
|
commit $cfgname
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
if [ "$strat" = "ALT7_by_Flowseal" ]; then
|
if [ "$strat" = "ALT7_by_Flowseal" ]; then
|
||||||
uci batch <<-EOF
|
uci batch <<-EOF
|
||||||
set $cfgname.config.NFQWS_PORTS_TCP='80,443'
|
set $cfgname.config.NFQWS_PORTS_TCP='80,443'
|
||||||
@@ -391,5 +442,17 @@ function set_cfg_default_values
|
|||||||
commit $cfgname
|
commit $cfgname
|
||||||
EOF
|
EOF
|
||||||
fi
|
fi
|
||||||
|
if echo "$opt_flags" | grep -q "(enable_custom_d)"; then
|
||||||
|
uci batch <<-EOF
|
||||||
|
set $cfgname.config.DISABLE_CUSTOM='0'
|
||||||
|
commit $cfgname
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
|
if echo "$opt_flags" | grep -q "(disable_custom_d)"; then
|
||||||
|
uci batch <<-EOF
|
||||||
|
set $cfgname.config.DISABLE_CUSTOM='1'
|
||||||
|
commit $cfgname
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,18 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# Copyright (c) 2026 remittor
|
# Copyright (c) 2026 remittor
|
||||||
|
|
||||||
. /opt/zapret/comfunc.sh
|
|
||||||
|
|
||||||
ZAP_TMP_DIR=/tmp/zapret_dwc
|
ZAP_TMP_DIR=/tmp/zapret_dwc
|
||||||
|
|
||||||
|
opt_dig=
|
||||||
|
opt_test=
|
||||||
|
|
||||||
|
while getopts "d:t" opt; do
|
||||||
|
case $opt in
|
||||||
|
d) opt_dig="$OPTARG";;
|
||||||
|
t) opt_test="true";;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
rm -rf $ZAP_TMP_DIR
|
rm -rf $ZAP_TMP_DIR
|
||||||
|
|
||||||
CURL_TIMEOUT=5
|
CURL_TIMEOUT=5
|
||||||
@@ -27,6 +35,16 @@ if ! echo "$CURL_INFO" | grep -q 'https'; then
|
|||||||
return 11
|
return 11
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ "$opt_dig" != "" ]; then
|
||||||
|
if ! command -v dig >/dev/null 2>&1; then
|
||||||
|
echo "ERROR: package \"bind-dig\" not installed!"
|
||||||
|
return 12
|
||||||
|
fi
|
||||||
|
[ "$opt_dig" = "@" ] && opt_dig='8.8.8.8'
|
||||||
|
[ "$opt_dig" = "8" ] && opt_dig='8.8.8.8'
|
||||||
|
[ "$opt_dig" = "1" ] && opt_dig='1.1.1.1'
|
||||||
|
fi
|
||||||
|
|
||||||
#echo 'Original sources: https://github.com/hyperion-cs/dpi-checkers'
|
#echo 'Original sources: https://github.com/hyperion-cs/dpi-checkers'
|
||||||
#echo 'WEB-version: https://hyperion-cs.github.io/dpi-checkers/ru/tcp-16-20/'
|
#echo 'WEB-version: https://hyperion-cs.github.io/dpi-checkers/ru/tcp-16-20/'
|
||||||
|
|
||||||
@@ -102,21 +120,25 @@ while IFS='|' read -r ID TAG COUNTRY PROVIDER TIMES URL; do
|
|||||||
#echo "TAG=$TAG , COUNTRY=$COUNTRY , PROVIDER=$PROVIDER , DOMAIN=$DOMAIN , URL=$URL"
|
#echo "TAG=$TAG , COUNTRY=$COUNTRY , PROVIDER=$PROVIDER , DOMAIN=$DOMAIN , URL=$URL"
|
||||||
FNAME="$ZAP_TMP_DIR/$ID3=$TAG=$PROVIDER"
|
FNAME="$ZAP_TMP_DIR/$ID3=$TAG=$PROVIDER"
|
||||||
(
|
(
|
||||||
DST_IP="???"
|
DST_IP=
|
||||||
if [ "$DST_IP" = "" ]; then
|
RESOLVE_OPT=
|
||||||
|
if [ "$opt_dig" != "" ]; then
|
||||||
|
DST_IP=$( dig +time=2 +retry=1 @$opt_dig +short "$DOMAIN" 2>/dev/null | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$' | head -n1 )
|
||||||
|
else
|
||||||
CURL_TIMEOUTS="--connect-timeout 5 --max-time 6 --speed-time 5 --speed-limit 1"
|
CURL_TIMEOUTS="--connect-timeout 5 --max-time 6 --speed-time 5 --speed-limit 1"
|
||||||
#DST_IP=$( curl -4 -I -s $CURL_TIMEOUTS -o /dev/null -w '%{remote_ip}\n' "$URL" )
|
DST_IP=$( curl -4 -I -s $CURL_TIMEOUTS -o /dev/null -w '%{remote_ip}\n' "$URL" )
|
||||||
if [ -z "$DST_IP" ]; then
|
if [ -z "$DST_IP" ]; then
|
||||||
DST_IP=$( curl -4 -s $CURL_TIMEOUTS -o /dev/null -r 0-0 -w '%{remote_ip}\n' "$URL" )
|
DST_IP=$( curl -4 -s $CURL_TIMEOUTS -o /dev/null -r 0-0 -w '%{remote_ip}\n' "$URL" )
|
||||||
fi
|
fi
|
||||||
if [ -z "$DST_IP" ]; then
|
|
||||||
DST_IP="$( ping -c1 "$DOMAIN" 2>/dev/null | sed -n '1s/.*(\([0-9.]*\)).*/\1/p')"
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
echo "$URL" > "$FNAME.url"
|
if [ "$DST_IP" = "" ]; then
|
||||||
|
DST_IP=$( ping -c1 "$DOMAIN" 2>/dev/null | sed -n '1s/.*(\([0-9.]*\)).*/\1/p' )
|
||||||
|
fi
|
||||||
|
[ "$DST_IP" != "" ] && RESOLVE_OPT="--resolve $DOMAIN:443:$DST_IP"
|
||||||
echo "$DST_IP" > "$FNAME.ip"
|
echo "$DST_IP" > "$FNAME.ip"
|
||||||
RESOLVE_OPT="--resolve $DOMAIN:443:$DST_IP"
|
echo "$URL" > "$FNAME.url"
|
||||||
curl "$URL" \
|
curl "$URL" \
|
||||||
|
$RESOLVE_OPT \
|
||||||
--connect-timeout $CURL_CON_TIMEOUT \
|
--connect-timeout $CURL_CON_TIMEOUT \
|
||||||
--max-time $CURL_TIMEOUT \
|
--max-time $CURL_TIMEOUT \
|
||||||
--speed-time $CURL_SPEED_TIME \
|
--speed-time $CURL_SPEED_TIME \
|
||||||
@@ -140,12 +162,10 @@ printf '%s\n' "$ZAP_TMP_DIR"/*.txt | sort | while IFS= read -r file; do
|
|||||||
FNAME="$ZAP_TMP_DIR/$FNAME"
|
FNAME="$ZAP_TMP_DIR/$FNAME"
|
||||||
BODY_SIZE=0
|
BODY_SIZE=0
|
||||||
[ -f "$FNAME.body" ] && BODY_SIZE=$( wc -c < "$FNAME.body" )
|
[ -f "$FNAME.body" ] && BODY_SIZE=$( wc -c < "$FNAME.body" )
|
||||||
|
IPADDR="x.x.x.x"
|
||||||
|
[ -s "$FNAME.ip" ] && IPADDR=$( cat "$FNAME.ip" )
|
||||||
status=
|
status=
|
||||||
if [ ! -f "$FNAME.ip" ]; then
|
if [ ! -f "$FNAME.hdr" ]; then
|
||||||
status="ERROR: cannot get IP-Addr"
|
|
||||||
elif [ ! -s "$FNAME.ip" ]; then
|
|
||||||
status="ERROR: cannot get ip-addr"
|
|
||||||
elif [ ! -f "$FNAME.hdr" ]; then
|
|
||||||
status="ERROR: cannot Get Headers"
|
status="ERROR: cannot Get Headers"
|
||||||
elif [ ! -s "$FNAME.hdr" ]; then
|
elif [ ! -s "$FNAME.hdr" ]; then
|
||||||
status="ERROR: cannot get headers"
|
status="ERROR: cannot get headers"
|
||||||
@@ -160,7 +180,7 @@ printf '%s\n' "$ZAP_TMP_DIR"/*.txt | sort | while IFS= read -r file; do
|
|||||||
status="[ OK ]"
|
status="[ OK ]"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
printf '%12s / %-13s: %s \n' "$TAG" "$PROVIDER" "$status"
|
printf '%12s / %-15s / %-13s: %s \n' "$TAG" "$IPADDR" "$PROVIDER" "$status"
|
||||||
echo "$BODY_SIZE" > "$FNAME.size"
|
echo "$BODY_SIZE" > "$FNAME.size"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|||||||
@@ -16,6 +16,8 @@ gov.ru
|
|||||||
sudrf.ru
|
sudrf.ru
|
||||||
ottai.com
|
ottai.com
|
||||||
ipstream.one
|
ipstream.one
|
||||||
|
vkusvill.ru
|
||||||
|
kinopoisk.ru
|
||||||
#################################### Epicgames
|
#################################### Epicgames
|
||||||
easy.ac
|
easy.ac
|
||||||
fab.com
|
fab.com
|
||||||
@@ -37,45 +39,14 @@ cubicmotion.com
|
|||||||
playparagon.com
|
playparagon.com
|
||||||
realityscan.com
|
realityscan.com
|
||||||
epicgamescdn.com
|
epicgamescdn.com
|
||||||
et.epicgames.com
|
|
||||||
ol.epicgames.com
|
|
||||||
radgametools.com
|
radgametools.com
|
||||||
unrealengine.com
|
unrealengine.com
|
||||||
api.epicgames.dev
|
|
||||||
easyanticheat.net
|
easyanticheat.net
|
||||||
shadowcomplex.com
|
shadowcomplex.com
|
||||||
battlebreakers.com
|
battlebreakers.com
|
||||||
store.epicgames.com
|
|
||||||
capturingreality.com
|
capturingreality.com
|
||||||
unrealtournament.com
|
unrealtournament.com
|
||||||
cdn1.unrealengine.com
|
|
||||||
cdn2.unrealengine.com
|
|
||||||
accounts.epicgames.com
|
|
||||||
download.epicgames.com
|
|
||||||
tracking.epicgames.com
|
|
||||||
download2.epicgames.com
|
|
||||||
download3.epicgames.com
|
|
||||||
download4.epicgames.com
|
|
||||||
metrics.ol.epicgames.com
|
|
||||||
datarouter.ol.epicgames.com
|
|
||||||
fastly-download.epicgames.com
|
|
||||||
store-content.ak.epicgames.com
|
|
||||||
static-assets-prod.epicgames.com
|
|
||||||
epicgames-download1.akamaized.net
|
epicgames-download1.akamaized.net
|
||||||
launcher-website-prod07.ol.epicgames.com
|
|
||||||
ut-public-service-prod10.ol.epicgames.com
|
|
||||||
store-site-backend-static.ak.epicgames.com
|
|
||||||
library-service.live.use1a.on.epicgames.com
|
|
||||||
accountportal-website-prod07.ol.epicgames.com
|
|
||||||
account-public-service-prod03.ol.epicgames.com
|
|
||||||
catalog-public-service-prod06.ol.epicgames.com
|
|
||||||
friends-public-service-prod06.ol.epicgames.com
|
|
||||||
launcher-public-service-prod06.ol.epicgames.com
|
|
||||||
entitlement-public-service-prod08.ol.epicgames.com
|
|
||||||
lightswitch-public-service-prod06.ol.epicgames.com
|
|
||||||
orderprocessor-public-service-ecomprod01.ol.epicgames.com
|
|
||||||
launcherwaitingroom-public-service-prod06.ol.epicgames.com
|
|
||||||
datastorage-public-service-liveegs.live.use1a.on.epicgames.com
|
|
||||||
#################################### Steam
|
#################################### Steam
|
||||||
s.team
|
s.team
|
||||||
steam.tv
|
steam.tv
|
||||||
@@ -103,99 +74,49 @@ valvesoftware.net
|
|||||||
steam.cdn.webra.ru
|
steam.cdn.webra.ru
|
||||||
steambroadcast.com
|
steambroadcast.com
|
||||||
steamcommunity.com
|
steamcommunity.com
|
||||||
cdn.steamstatic.com
|
|
||||||
cs.steampowered.com
|
|
||||||
dl.steam.clngaa.com
|
dl.steam.clngaa.com
|
||||||
steam.ru.qtlglb.com
|
steam.ru.qtlglb.com
|
||||||
api.steampowered.com
|
|
||||||
steam.eca.qtlglb.com
|
steam.eca.qtlglb.com
|
||||||
steamusercontent.com
|
steamusercontent.com
|
||||||
help.steampowered.com
|
|
||||||
steam.apac.qtlglb.com
|
steam.apac.qtlglb.com
|
||||||
steam.naeu.qtlglb.com
|
steam.naeu.qtlglb.com
|
||||||
cdn.steamcommunity.com
|
cdn.steamcommunity.com
|
||||||
gstore.val.manlaxy.com
|
gstore.val.manlaxy.com
|
||||||
login.steampowered.com
|
|
||||||
media.steampowered.com
|
|
||||||
partner.steamgames.com
|
partner.steamgames.com
|
||||||
shared.steamstatic.com
|
|
||||||
steam.cdn.orcon.net.nz
|
steam.cdn.orcon.net.nz
|
||||||
store.steampowered.com
|
|
||||||
steamcdn-a.akamaihd.net
|
steamcdn-a.akamaihd.net
|
||||||
steampipe.akamaized.net
|
steampipe.akamaized.net
|
||||||
partner.steampowered.com
|
|
||||||
steamcdn-a.akamaized.net
|
steamcdn-a.akamaized.net
|
||||||
steamdeckusercontent.com
|
steamdeckusercontent.com
|
||||||
support.steampowered.com
|
|
||||||
checkout.steampowered.com
|
|
||||||
community.steamstatic.com
|
|
||||||
steam.cdn.slingshot.co.nz
|
steam.cdn.slingshot.co.nz
|
||||||
steammobile.akamaized.net
|
steammobile.akamaized.net
|
||||||
steamstatic.akamaized.net
|
steamstatic.akamaized.net
|
||||||
steamstore-a.akamaihd.net
|
steamstore-a.akamaihd.net
|
||||||
steamvideo-a.akamaihd.net
|
steamvideo-a.akamaihd.net
|
||||||
workshop.steampowered.com
|
|
||||||
cdn.akamai.steamstatic.com
|
|
||||||
cdn.fastly.steamstatic.com
|
|
||||||
client-update.queniuqe.com
|
client-update.queniuqe.com
|
||||||
community.steampowered.com
|
|
||||||
steamdeckcdn.akamaized.net
|
steamdeckcdn.akamaized.net
|
||||||
steampipe-kr.akamaized.net
|
steampipe-kr.akamaized.net
|
||||||
clan.fastly.steamstatic.com
|
|
||||||
steamcontent-a.akamaihd.net
|
steamcontent-a.akamaihd.net
|
||||||
steambroadcast.akamaized.net
|
steambroadcast.akamaized.net
|
||||||
steamcommunity.akamaized.net
|
steamcommunity.akamaized.net
|
||||||
store.akamai.steamstatic.com
|
|
||||||
store.fastly.steamstatic.com
|
|
||||||
scontent.steamusercontent.com
|
scontent.steamusercontent.com
|
||||||
shared.fastly.steamstatic.com
|
|
||||||
steamcommunity-a.akamaihd.net
|
steamcommunity-a.akamaihd.net
|
||||||
avatars.fastly.steamstatic.com
|
|
||||||
cdn.cloudflare.steamstatic.com
|
|
||||||
edge.steam-dns.top.comcast.net
|
edge.steam-dns.top.comcast.net
|
||||||
steamcommunity-a.akamaized.net
|
steamcommunity-a.akamaized.net
|
||||||
steamuserimages-a.akamaihd.net
|
steamuserimages-a.akamaihd.net
|
||||||
steampipe-partner.akamaized.net
|
steampipe-partner.akamaized.net
|
||||||
steamusercontent-a.akamaihd.net
|
steamusercontent-a.akamaihd.net
|
||||||
client-download.steampowered.com
|
|
||||||
community.fastly.steamstatic.com
|
|
||||||
store.cloudflare.steamstatic.com
|
|
||||||
community.cloudflare.steamstatic.com
|
|
||||||
steamcdn-a.akamaihd.net.edgesuite.net
|
steamcdn-a.akamaihd.net.edgesuite.net
|
||||||
steamcloudsweden.blob.core.windows.net
|
steamcloudsweden.blob.core.windows.net
|
||||||
steamcommunity.cloudflare.steamstatic.com
|
|
||||||
steamcommunity-a.akamaihd.net.edgesuite.net
|
steamcommunity-a.akamaihd.net.edgesuite.net
|
||||||
#################################### OpenWRT
|
#################################### OpenWRT
|
||||||
github.com
|
|
||||||
openwrt.org
|
openwrt.org
|
||||||
gh.openwrt.org
|
|
||||||
cdn.openwrt.org
|
|
||||||
dev.openwrt.org
|
|
||||||
git.openwrt.org
|
|
||||||
lede-project.org
|
lede-project.org
|
||||||
wiki.openwrt.org
|
|
||||||
forum.openwrt.org
|
|
||||||
lists.openwrt.org
|
|
||||||
openwrt.gitlab.io
|
|
||||||
archive.openwrt.org
|
|
||||||
downloads.openwrt.org
|
|
||||||
fwdownloads.openwrt.org
|
|
||||||
mirror-01.infra.openwrt.org
|
|
||||||
mirror-02.infra.openwrt.org
|
|
||||||
mirror-03.infra.openwrt.org
|
|
||||||
mirror-04.infra.openwrt.org
|
|
||||||
#################################### UbisoftConnect
|
#################################### UbisoftConnect
|
||||||
ubi.com
|
ubi.com
|
||||||
ubisoft.com
|
ubisoft.com
|
||||||
store.ubi.com
|
|
||||||
ubisoftconnect.com
|
ubisoftconnect.com
|
||||||
connect.ubisoft.com
|
connect.ubisoft.comubisoft-orbit-savegames.s3.amazonaws.com
|
||||||
drops-register.ubi.com
|
|
||||||
public-ubiservices.ubi.com
|
|
||||||
ubisoftconnect.cdn.ubi.com
|
|
||||||
uplaypc-s-ubisoft.cdn.ubi.com
|
|
||||||
uplaypc-s-ubisoft-ww.cdn.ubi.com
|
|
||||||
ubisoft-orbit-savegames.s3.amazonaws.com
|
|
||||||
ubisoft-uplay-savegames.s3.amazonaws.com
|
ubisoft-uplay-savegames.s3.amazonaws.com
|
||||||
#################################### Aliexpress
|
#################################### Aliexpress
|
||||||
ae.com
|
ae.com
|
||||||
@@ -215,55 +136,33 @@ playstation.net
|
|||||||
playstation.com
|
playstation.com
|
||||||
account.sony.com
|
account.sony.com
|
||||||
psremoteplay.com
|
psremoteplay.com
|
||||||
ps4.playstation.com
|
|
||||||
ps5.playstation.com
|
|
||||||
playstationcloud.com
|
playstationcloud.com
|
||||||
psapi.playstation.net
|
|
||||||
store.playstation.com
|
|
||||||
media.playstation.com
|
|
||||||
auth.np.ac.playstation.net
|
|
||||||
sonyentertainmentnetwork.com
|
sonyentertainmentnetwork.com
|
||||||
np.community.playstation.net
|
|
||||||
id.sonyentertainmentnetwork.com
|
|
||||||
#################################### Twitch
|
#################################### Twitch
|
||||||
twitch.tv
|
twitch.tv
|
||||||
ttvnw.net
|
ttvnw.net
|
||||||
jtvnw.net
|
jtvnw.net
|
||||||
twimg.com
|
|
||||||
m.twitch.tv
|
|
||||||
id.twitch.tv
|
|
||||||
www.twitch.tv
|
|
||||||
twitchcdn.net
|
twitchcdn.net
|
||||||
ext-twitch.tv
|
ext-twitch.tv
|
||||||
twitchsvc.net
|
twitchsvc.net
|
||||||
api.twitch.tv
|
|
||||||
gql.twitch.tv
|
|
||||||
dev.twitch.tv
|
|
||||||
live-video.net
|
live-video.net
|
||||||
twitch.a2z.com
|
twitch.a2z.com
|
||||||
chat.twitch.tv
|
|
||||||
help.twitch.tv
|
|
||||||
assets.twitch.tv
|
|
||||||
twitch-shadow.net
|
twitch-shadow.net
|
||||||
passport.twitch.tv
|
|
||||||
irc.chat.twitch.tv
|
|
||||||
vod-metro.twitch.tv
|
|
||||||
twitchcdn-shadow.net
|
twitchcdn-shadow.net
|
||||||
static.twitchcdn.net
|
|
||||||
vod-secure.twitch.tv
|
|
||||||
irc-ws.chat.twitch.tv
|
|
||||||
pubsub-edge.twitch.tv
|
|
||||||
vod-pop-secure.twitch.tv
|
|
||||||
#################################### Valorant
|
#################################### Valorant
|
||||||
|
qq.com
|
||||||
pvp.net
|
pvp.net
|
||||||
vivox.com
|
vivox.com
|
||||||
sd-rtn.com
|
sd-rtn.com
|
||||||
|
adjust.com
|
||||||
riotcdn.net
|
riotcdn.net
|
||||||
adobess.com
|
adobess.com
|
||||||
valorant.com
|
valorant.com
|
||||||
akamaihd.net
|
akamaihd.net
|
||||||
|
myqcloud.com
|
||||||
riotgames.com
|
riotgames.com
|
||||||
playvalorant.com
|
playvalorant.com
|
||||||
|
wildrift-na.akamaized.net
|
||||||
#################################### TikTok
|
#################################### TikTok
|
||||||
musical.ly
|
musical.ly
|
||||||
tiktok.com
|
tiktok.com
|
||||||
@@ -359,4 +258,30 @@ xiaomifactory.com
|
|||||||
airstarfinance.net
|
airstarfinance.net
|
||||||
dreame-technology.cn
|
dreame-technology.cn
|
||||||
dreame-technology.com
|
dreame-technology.com
|
||||||
|
#################################### Picooc
|
||||||
|
picoocru.com
|
||||||
|
picooc-g.com
|
||||||
|
picooc-int.com
|
||||||
|
#################################### Huawei
|
||||||
|
hc-cdn.cn
|
||||||
|
huawei.ru
|
||||||
|
huawei.com
|
||||||
|
hc-cdn.com
|
||||||
|
huawei.net
|
||||||
|
dbankcdn.ru
|
||||||
|
hicloud.com
|
||||||
|
dbankcdn.com
|
||||||
|
dbankcloud.ru
|
||||||
|
dbankcloud.cn
|
||||||
|
dbankcloud.com
|
||||||
|
huaweicloud.com
|
||||||
|
huaweistatic.com
|
||||||
|
hwclouds-dns.com
|
||||||
|
hwclouds-dns.net
|
||||||
|
myhuaweicloud.cn
|
||||||
|
myhuaweicloud.com
|
||||||
|
huaweicloud-dns.cn
|
||||||
|
huaweicloud-dns.ru
|
||||||
|
huaweicloud-dns.com
|
||||||
|
huaweicloud-dns.org
|
||||||
####################################
|
####################################
|
||||||
|
|||||||
@@ -14,6 +14,11 @@ if echo "$opt_flags" | grep -q "(reset_ipset)"; then
|
|||||||
restore_all_ipset_cfg
|
restore_all_ipset_cfg
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if echo "$opt_flags" | grep -q "(erase_autohostlist)"; then
|
||||||
|
: > $ZAPRET_BASE/ipset/zapret-hosts-auto.txt
|
||||||
|
: > $ZAPRET_BASE/ipset/zapret-hosts-auto-debug.log
|
||||||
|
fi
|
||||||
|
|
||||||
create_default_cfg "$opt_flags" "$opt_strat"
|
create_default_cfg "$opt_flags" "$opt_strat"
|
||||||
|
|
||||||
if [ "$cfg_run_on_boot" = "1" ]; then
|
if [ "$cfg_run_on_boot" = "1" ]; then
|
||||||
|
|||||||
@@ -487,7 +487,7 @@ if [ "$opt_update" != "" ]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if ! command -v unzip >/dev/null 2>&1; then
|
if ! command -v unzip >/dev/null 2>&1; then
|
||||||
echo "ERROR: package \"upzip\" not installed!"
|
echo "ERROR: package \"unzip\" not installed!"
|
||||||
return 218
|
return 218
|
||||||
fi
|
fi
|
||||||
unzip -q "$ZAP_PKG_FN" -d $ZAP_PKG_DIR
|
unzip -q "$ZAP_PKG_FN" -d $ZAP_PKG_DIR
|
||||||
|
|||||||
Reference in New Issue
Block a user