mirror of
https://github.com/remittor/zapret-openwrt.git
synced 2026-01-28 05:10:35 +03:00
Compare commits
23 Commits
v72.202601
...
v72.202601
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a18d45190e | ||
|
|
217b105b7b | ||
|
|
0d6ba6e657 | ||
|
|
bc518190d2 | ||
|
|
d02391a0e3 | ||
|
|
3c2f472b78 | ||
|
|
39c4fd6279 | ||
|
|
91ec462bcf | ||
|
|
015bf4befe | ||
|
|
75ccdb6a1b | ||
|
|
98c5d5b0ed | ||
|
|
cf7661f2b9 | ||
|
|
4327f98bb7 | ||
|
|
694716a512 | ||
|
|
be1027dfd7 | ||
|
|
0edcc6c4a0 | ||
|
|
a71965b382 | ||
|
|
d45d07df82 | ||
|
|
f4a68178b7 | ||
|
|
32c6f9cfc3 | ||
|
|
6660ea0a20 | ||
|
|
5f470e8f82 | ||
|
|
d6304e6e24 |
5
.github/workflows/build.yml
vendored
5
.github/workflows/build.yml
vendored
@@ -155,6 +155,7 @@ jobs:
|
||||
- mipsel_24kc_24kf
|
||||
- mipsel_74kc
|
||||
- mipsel_mips32
|
||||
- riscv64_riscv64
|
||||
- riscv64_generic
|
||||
- x86_64
|
||||
isTestOrFake:
|
||||
@@ -164,6 +165,10 @@ jobs:
|
||||
arch: arm_cortex-a9_vfpv3-d16
|
||||
- branch: ${{ needs.var.outputs.APK_BRANCH }}
|
||||
arch: mips_4kec
|
||||
- branch: ${{ needs.var.outputs.APK_BRANCH }}
|
||||
arch: riscv64_riscv64
|
||||
- branch: ${{ needs.var.outputs.IPK_BRANCH }}
|
||||
arch: riscv64_generic
|
||||
- { isTestOrFake: true }
|
||||
include:
|
||||
- branch: ${{ needs.var.outputs.IPK_BRANCH }}
|
||||
|
||||
58
.github/workflows/releases.yml
vendored
58
.github/workflows/releases.yml
vendored
@@ -5,7 +5,7 @@ on:
|
||||
workflows: ["build"]
|
||||
types: [completed]
|
||||
release:
|
||||
types: [published, created, edited]
|
||||
types: [published, unpublished, created, edited, deleted, prereleased]
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
@@ -25,6 +25,62 @@ jobs:
|
||||
ref: gh-pages
|
||||
continue-on-error: true
|
||||
|
||||
- name: Wait for GitHub API consistency (release events)
|
||||
if: github.event_name == 'release'
|
||||
env:
|
||||
REPO: ${{ github.repository }}
|
||||
ACTION: ${{ github.event.action }}
|
||||
TARGET_ID: ${{ github.event.release.id }}
|
||||
TARGET_NAME: ${{ github.event.release.name }}
|
||||
run: |
|
||||
set -e
|
||||
echo "Release action: $ACTION"
|
||||
echo "Target release id: $TARGET_ID"
|
||||
max=10
|
||||
delay=6
|
||||
check() {
|
||||
curl -s https://api.github.com/repos/$REPO/releases
|
||||
}
|
||||
for iter in $(seq 1 $max); do
|
||||
case "$ACTION" in
|
||||
created)
|
||||
echo "Release created (draft). No API wait needed."
|
||||
exit 0
|
||||
;;
|
||||
published|prereleased)
|
||||
if check | jq "any(.[]; .id == $TARGET_ID)"; then
|
||||
echo "Release appeared in API"
|
||||
exit 0
|
||||
fi
|
||||
;;
|
||||
deleted)
|
||||
if ! check | jq "any(.[]; .id == $TARGET_ID)"; then
|
||||
echo "Release disappeared from API"
|
||||
exit 0
|
||||
fi
|
||||
;;
|
||||
unpublished)
|
||||
if check | jq "any(.[]; .id == $TARGET_ID and .draft == true)"; then
|
||||
echo "Release is now draft"
|
||||
exit 0
|
||||
fi
|
||||
;;
|
||||
edited)
|
||||
if check | jq "any(.[]; .id == $TARGET_ID and .name == \"$TARGET_NAME\")"; then
|
||||
echo "Release updated"
|
||||
exit 0
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
echo "No consistency wait needed for action: $ACTION"
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
echo "Retry $iter/$max..."
|
||||
sleep "$delay"
|
||||
done
|
||||
echo "WARNING: API consistency timeout for action $ACTION"
|
||||
|
||||
- name: Save FULL releases.json
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=luci-app-zapret
|
||||
PKG_VERSION:=72.20260108
|
||||
PKG_VERSION:=72.20260114
|
||||
PKG_RELEASE:=1
|
||||
PKG_LICENSE:=MIT
|
||||
PKG_MAINTAINER:=remittor <https://github.com/remittor>
|
||||
|
||||
@@ -0,0 +1,96 @@
|
||||
'use strict';
|
||||
'require baseclass';
|
||||
'require fs';
|
||||
'require poll';
|
||||
'require uci';
|
||||
'require ui';
|
||||
'require view';
|
||||
'require view.zapret.tools as tools';
|
||||
|
||||
const btn_style_neutral = 'btn';
|
||||
const btn_style_action = 'btn cbi-button-action';
|
||||
const btn_style_positive = 'btn cbi-button-save important';
|
||||
const btn_style_negative = 'btn cbi-button-reset important';
|
||||
const btn_style_warning = 'btn cbi-button-negative';
|
||||
const btn_style_success = 'btn cbi-button-success important';
|
||||
|
||||
const fn_dwc_sh = '/opt/'+tools.appName+'/dwc.sh';
|
||||
|
||||
return baseclass.extend({
|
||||
appendLog: function(msg, end = '\n')
|
||||
{
|
||||
this.logArea.value += msg + end;
|
||||
this.logArea.scrollTop = this.logArea.scrollHeight;
|
||||
},
|
||||
|
||||
dpiCheck: async function()
|
||||
{
|
||||
this._action = 'dpiCheck';
|
||||
this.appendLog('DPI check [tcp 16-20]...');
|
||||
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/');
|
||||
let cmd = [ fn_dwc_sh ];
|
||||
let log = '/tmp/'+tools.appName+'_dwc.log';
|
||||
let callback = this.execAndReadCallback;
|
||||
let wnd = this;
|
||||
return tools.execAndRead({ cmd: cmd, log: log, logArea: this.logArea, callback: callback, cbarg: wnd });
|
||||
},
|
||||
|
||||
execAndReadCallback: function(wnd, rc, txt = '')
|
||||
{
|
||||
if (rc == 0 && txt) {
|
||||
if (wnd._action == 'dpiCheck') {
|
||||
wnd.appendLog('=========================================================');
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (rc >= 500) {
|
||||
if (txt) {
|
||||
wnd.appendLog(txt.startsWith('ERROR') ? txt : 'ERROR: ' + txt);
|
||||
} else {
|
||||
wnd.appendLog('ERROR: ' + wnd._action + ': Terminated with error code = ' + rc);
|
||||
}
|
||||
} else {
|
||||
wnd.appendLog('ERROR: Process finished with retcode = ' + rc);
|
||||
}
|
||||
wnd.appendLog('=========================================================');
|
||||
},
|
||||
|
||||
openDiagnostDialog: function(pkg_arch)
|
||||
{
|
||||
this.pkg_arch = pkg_arch;
|
||||
|
||||
this.logArea = E('textarea', {
|
||||
'id': 'widget.modal_content',
|
||||
'readonly': true,
|
||||
'style': 'width:100% !important; font-family: monospace;',
|
||||
'rows': 26,
|
||||
'wrap': 'off',
|
||||
});
|
||||
|
||||
this.btn_cancel = E('button', {
|
||||
'id': 'btn_cancel',
|
||||
'name': 'btn_cancel',
|
||||
'class': btn_style_warning,
|
||||
}, _('Cancel'));
|
||||
this.btn_cancel.onclick = ui.hideModal;
|
||||
|
||||
this.btn_dpicheck = E('button', {
|
||||
'id': 'btn_dpicheck',
|
||||
'name': 'btn_dpicheck',
|
||||
'class': btn_style_action,
|
||||
}, _('DPI check [tcp 16-20]'));
|
||||
this.btn_dpicheck.onclick = ui.createHandlerFn(this, () => { this.dpiCheck() });
|
||||
|
||||
ui.showModal(_('Diagnostics'), [
|
||||
E('div', { 'class': 'cbi-section' }, [
|
||||
this.logArea,
|
||||
]),
|
||||
E('div', { 'class': 'right' }, [
|
||||
this.btn_dpicheck,
|
||||
' ',
|
||||
this.btn_cancel,
|
||||
])
|
||||
]);
|
||||
}
|
||||
});
|
||||
@@ -5,6 +5,7 @@
|
||||
'require ui';
|
||||
'require view';
|
||||
'require view.zapret.tools as tools';
|
||||
'require view.zapret.diagnost as diagnost';
|
||||
'require view.zapret.updater as updater';
|
||||
|
||||
const btn_style_neutral = 'btn';
|
||||
@@ -23,6 +24,7 @@ return view.extend({
|
||||
restart : elems.btn_restart || document.getElementById('btn_restart'),
|
||||
stop : elems.btn_stop || document.getElementById('btn_stop'),
|
||||
reset : elems.btn_reset || document.getElementById('btn_reset'),
|
||||
diag : elems.btn_diag || document.getElementById('btn_diag'),
|
||||
update : elems.btn_update || document.getElementById('btn_update'),
|
||||
};
|
||||
},
|
||||
@@ -382,6 +384,10 @@ return view.extend({
|
||||
btn_reset.onclick = L.bind(this.dialogResetCfg, this);
|
||||
layout_append(_('Reset settings to default'), null, [ btn_reset ] );
|
||||
|
||||
let btn_diag = create_btn('btn_diag', btn_style_action, _('Diagnostics'));
|
||||
btn_diag.onclick = ui.createHandlerFn(this, () => { diagnost.openDiagnostDialog(this.pkg_arch) });
|
||||
layout_append('Diagnostic tools', null, [ btn_diag ] );
|
||||
|
||||
let btn_update = create_btn('btn_update', btn_style_action, _('Update'));
|
||||
btn_update.onclick = ui.createHandlerFn(this, () => { updater.openUpdateDialog(this.pkg_arch) });
|
||||
layout_append(_('Update package'), null, [ btn_update ] );
|
||||
@@ -394,6 +400,7 @@ return view.extend({
|
||||
"btn_restart": btn_restart,
|
||||
"btn_stop": btn_stop,
|
||||
"btn_reset": btn_reset,
|
||||
"btn_diag": btn_diag,
|
||||
"btn_update": btn_update,
|
||||
};
|
||||
this.setAppStatus(status_array, elems);
|
||||
|
||||
@@ -7,6 +7,11 @@
|
||||
'require view';
|
||||
'require view.zapret.tools as tools';
|
||||
|
||||
document.head.appendChild(E('link', {
|
||||
rel: 'stylesheet',
|
||||
href: L.resource('view/zapret/styles.css')
|
||||
}));
|
||||
|
||||
return view.extend({
|
||||
parsers: { },
|
||||
|
||||
@@ -128,8 +133,10 @@ return view.extend({
|
||||
let btn = sec.taboption(tabname, form.Button, '_' + param + '_btn', locname);
|
||||
btn.inputtitle = _('Edit');
|
||||
btn.inputstyle = 'edit btn';
|
||||
let val = sec.taboption(tabname, form.DummyValue, '_' + param);
|
||||
val.rawhtml = multiline ? true : false;
|
||||
let val = sec.taboption(tabname, form.TextValue, '_' + param);
|
||||
val.readonly = true;
|
||||
val.rows = rows + 5;
|
||||
val.wrap = false;
|
||||
val.cfgvalue = function(section_id) {
|
||||
let value = uci.get(tools.appName, section_id, param);
|
||||
if (value == null) {
|
||||
@@ -141,15 +148,10 @@ return view.extend({
|
||||
value = value.replace(/\n --/g, "\n--");
|
||||
value = value.replace(/ --/g, "\n--");
|
||||
}
|
||||
if (val.rawhtml) {
|
||||
value = value.replace(/</g, '˂');
|
||||
value = value.replace(/>/g, '˃');
|
||||
value = value.replace(/\n/g, '<br/>');
|
||||
}
|
||||
return value;
|
||||
};
|
||||
val.validate = function(section_id, value) {
|
||||
return (value) ? value.trim() : "";
|
||||
return true;
|
||||
};
|
||||
let desc = locname;
|
||||
if (multiline == 2) {
|
||||
@@ -279,6 +281,10 @@ return view.extend({
|
||||
o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_RETRANS_MAXSEQ', _('RETRANS_MAXSEQ'));
|
||||
o.rmempty = false;
|
||||
o.datatype = 'uinteger';
|
||||
|
||||
o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_RETRANS_RESET', _('RETRANS_RESET'));
|
||||
o.rmempty = false;
|
||||
o.datatype = 'uinteger';
|
||||
}
|
||||
|
||||
o = s.taboption(tabname, form.Value, 'AUTOHOSTLIST_RETRANS_THRESHOLD', _('RETRANS_THRESHOLD'));
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
textarea, .cbi-value textarea
|
||||
{
|
||||
white-space: pre;
|
||||
overflow-x: auto;
|
||||
font-family: monospace;
|
||||
}
|
||||
@@ -506,24 +506,10 @@ return baseclass.extend({
|
||||
value = value.replace(/˂/g, '<');
|
||||
value = value.replace(/˃/g, '>');
|
||||
try {
|
||||
let elem = document.getElementById("cbi-" + this.appName + "-" + this.cfgsec + "-_" + this.cfgparam);
|
||||
if (elem) {
|
||||
if (elem.querySelector('div')) {
|
||||
elem = elem.querySelector('div');
|
||||
} else {
|
||||
elem = elem.querySelector('output');
|
||||
}
|
||||
}
|
||||
let elem = document.getElementById("widget.cbid." + this.appName + ".config._" + this.cfgparam);
|
||||
if (elem) {
|
||||
let val = value.trim();
|
||||
if (this.multiline) {
|
||||
val = val.replace(/</g, '˂');
|
||||
val = val.replace(/>/g, '˃');
|
||||
val = val.replace(/\n/g, '<br/>');
|
||||
elem.innerHTML = val;
|
||||
} else {
|
||||
elem.textContent = val;
|
||||
}
|
||||
elem.textContent = val;
|
||||
}
|
||||
} catch(e) {
|
||||
console.error('ERROR: cannot found elem for ' + this.cfgsec + '.' + this.cfgparam);
|
||||
|
||||
137
zapret/Makefile
137
zapret/Makefile
@@ -5,7 +5,7 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=zapret
|
||||
PKG_VERSION:=72.20260108
|
||||
PKG_VERSION:=72.20260114
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_MAINTAINER:=bol-van
|
||||
@@ -14,8 +14,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
|
||||
|
||||
PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_VERSION:=16ac0587a4c7d823be4d947d2bbebdbf445d770c
|
||||
PKG_SOURCE_DATE:=2026-01-08
|
||||
PKG_SOURCE_VERSION:=76764ad6b0ee7d3991c97e7b8c24d53189d25c28
|
||||
PKG_SOURCE_DATE:=2026-01-14
|
||||
|
||||
#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?
|
||||
@@ -57,10 +57,17 @@ define Build/Compile
|
||||
endef
|
||||
|
||||
define Package/$(PKG_NAME)/conffiles
|
||||
/etc/config/zapret
|
||||
/opt/zapret/config
|
||||
/opt/zapret/ipset/
|
||||
/opt/zapret/init.d/openwrt/custom.d/
|
||||
/opt/zapret/ipset/zapret-hosts-google.txt
|
||||
/opt/zapret/ipset/zapret-hosts-user.txt
|
||||
/opt/zapret/ipset/zapret-hosts-user-exclude.txt
|
||||
/opt/zapret/ipset/zapret-ip-exclude.txt
|
||||
/opt/zapret/ipset/zapret-hosts-auto.txt
|
||||
/opt/zapret/init.d/openwrt/custom.d/10-script.sh
|
||||
/opt/zapret/init.d/openwrt/custom.d/20-script.sh
|
||||
/opt/zapret/init.d/openwrt/custom.d/50-script.sh
|
||||
/opt/zapret/init.d/openwrt/custom.d/60-script.sh
|
||||
/opt/zapret/init.d/openwrt/custom.d/90-script.sh
|
||||
endef
|
||||
|
||||
define Package/$(PKG_NAME)/install
|
||||
@@ -90,6 +97,7 @@ define Package/$(PKG_NAME)/install
|
||||
$(INSTALL_DIR) $(1)/etc/init.d
|
||||
$(INSTALL_BIN) ./init.d.sh $(1)/etc/init.d/zapret
|
||||
$(INSTALL_DATA) ./config.default $(1)/opt/zapret/config.default
|
||||
$(INSTALL_DATA) ./config.default $(1)/opt/zapret/config
|
||||
$(INSTALL_DATA) ./ipset/zapret-hosts-google.txt $(1)/opt/zapret/ipset/zapret-hosts-google.txt
|
||||
$(INSTALL_DATA) ./ipset/zapret-hosts-user.txt $(1)/opt/zapret/ipset/zapret-hosts-user.txt
|
||||
$(INSTALL_DATA) ./ipset/zapret-hosts-user-exclude.txt $(1)/opt/zapret/ipset/zapret-hosts-user-exclude.txt
|
||||
@@ -105,42 +113,96 @@ define Package/$(PKG_NAME)/install
|
||||
$(CP) ./custom.d/* $(1)/opt/zapret/init.d/openwrt/custom.d/
|
||||
$(INSTALL_DIR) $(1)/etc/uci-defaults
|
||||
$(INSTALL_BIN) ./uci-def-cfg.sh $(1)/etc/uci-defaults/zapret-uci-def-cfg.sh
|
||||
$(INSTALL_BIN) ./uci-def-cfg.sh $(1)/opt/zapret/uci-def-cfg.sh
|
||||
$(INSTALL_BIN) ./comfunc.sh $(1)/opt/zapret/comfunc.sh
|
||||
$(INSTALL_BIN) ./def-cfg.sh $(1)/opt/zapret/def-cfg.sh
|
||||
$(INSTALL_BIN) ./renew-cfg.sh $(1)/opt/zapret/renew-cfg.sh
|
||||
$(INSTALL_BIN) ./restore-def-cfg.sh $(1)/opt/zapret/restore-def-cfg.sh
|
||||
$(INSTALL_BIN) ./sync_config.sh $(1)/opt/zapret/sync_config.sh
|
||||
$(INSTALL_BIN) ./script-exec.sh $(1)/opt/zapret/script-exec.sh
|
||||
$(INSTALL_BIN) ./update-pkg.sh $(1)/opt/zapret/update-pkg.sh
|
||||
# Fix permisions
|
||||
# install all sh-scripts
|
||||
$(CP) ./*.sh $(1)/opt/zapret/
|
||||
rm -f $(1)/opt/zapret/init.d.sh
|
||||
# Create empty conf files
|
||||
$(INSTALL_DATA) /dev/null $(1)/opt/zapret/ipset/zapret-hosts-auto.txt
|
||||
$(INSTALL_DATA) /dev/null $(1)/opt/zapret/ipset/cust1.txt
|
||||
$(INSTALL_DATA) /dev/null $(1)/opt/zapret/ipset/cust2.txt
|
||||
$(INSTALL_DATA) /dev/null $(1)/opt/zapret/ipset/cust3.txt
|
||||
$(INSTALL_DATA) /dev/null $(1)/opt/zapret/ipset/cust4.txt
|
||||
$(INSTALL_DATA) /dev/null $(1)/opt/zapret/init.d/openwrt/custom.d/10-script.sh
|
||||
$(INSTALL_DATA) /dev/null $(1)/opt/zapret/init.d/openwrt/custom.d/20-script.sh
|
||||
$(INSTALL_DATA) /dev/null $(1)/opt/zapret/init.d/openwrt/custom.d/60-script.sh
|
||||
$(INSTALL_DATA) /dev/null $(1)/opt/zapret/init.d/openwrt/custom.d/90-script.sh
|
||||
# Fix permissions
|
||||
chmod 644 $(1)/opt/zapret/ipset/*.txt
|
||||
chmod 644 $(1)/opt/zapret/ipset_def/*.txt
|
||||
chmod 644 $(1)/opt/zapret/init.d/openwrt/custom.d/*.sh
|
||||
chmod 644 $(1)/opt/zapret/config.default
|
||||
chmod 644 $(1)/opt/zapret/config*
|
||||
chmod 755 $(1)/opt/zapret/*.sh
|
||||
chmod 755 $(1)/opt/zapret/$(MAKE_PATH)/*
|
||||
chmod 755 $(1)/opt/zapret/ip2net/*
|
||||
chmod 755 $(1)/opt/zapret/mdig/*
|
||||
# Disable TPWS in blockcheck
|
||||
grep -q '^SKIP_TPWS=' $(1)/opt/zapret/blockcheck.sh || sed -i '/^NFT_TABLE=blockcheck$$$$/a SKIP_TPWS=$$$${SKIP_TPWS:-1}' $(1)/opt/zapret/blockcheck.sh
|
||||
endef
|
||||
|
||||
define Package/$(PKG_NAME)/preinst
|
||||
#!/bin/sh
|
||||
# check if we are on real system
|
||||
if [ -z "$${IPKG_INSTROOT}" ]; then
|
||||
if [ -f "/etc/init.d/zapret" ]; then
|
||||
SCRIPT=$$( readlink /etc/init.d/zapret )
|
||||
ZAPRET_DIR=/opt/zapret
|
||||
ZAPRET_INITD=/etc/init.d/zapret
|
||||
ZAPRET_CFG=/etc/config/zapret
|
||||
if [ -f "$${ZAPRET_INITD}" ]; then
|
||||
SCRIPT=$$( readlink "$${ZAPRET_INITD}" )
|
||||
if [ -n "$${SCRIPT}" ]; then
|
||||
echo "Please uninstall original zapret utility!"
|
||||
echo "Please uninstall incompatible \"zapret\" service!"
|
||||
exit 44
|
||||
fi
|
||||
fi
|
||||
if command -v apk >/dev/null; then
|
||||
PKG_MGR="apk"
|
||||
PKG_CHECK="apk info -e "
|
||||
PKG_REMOVE="apk del --force "
|
||||
else
|
||||
PKG_MGR="opkg"
|
||||
PKG_CHECK="opkg status "
|
||||
PKG_REMOVE="opkg remove --force-remove "
|
||||
fi
|
||||
if [ "$${PKG_UPGRADE}" = "1" ]; then
|
||||
# stop service if PKG_UPGRADE
|
||||
if [ -x "/etc/init.d/zapret" ]; then
|
||||
/etc/init.d/zapret running && /etc/init.d/zapret stop >/dev/null 2>&1
|
||||
if [ -x "$${ZAPRET_INITD}" ]; then
|
||||
$${ZAPRET_INITD} running && $${ZAPRET_INITD} stop >/dev/null 2>&1
|
||||
fi
|
||||
fi
|
||||
if $${PKG_CHECK} zapret >/dev/null 2>&1; then
|
||||
if [ ! -f "/opt/zapret/sync_config.sh" ]; then
|
||||
echo "Please uninstall incompatible \"zapret\" package!"
|
||||
exit 47
|
||||
fi
|
||||
if [ -f "$${ZAPRET_CFG}" ] && ! grep -q "run_on_boot" "$${ZAPRET_CFG}"; then
|
||||
echo "Please uninstall incompatible \"zapret\" package!"
|
||||
exit 48
|
||||
fi
|
||||
fi
|
||||
if $${PKG_CHECK} luci-app-zapret >/dev/null 2>&1; then
|
||||
SVC_FILE=/www/luci-static/resources/view/zapret/service.js
|
||||
if [ ! -f "$${SVC_FILE}" ] || ! grep -Fq "/remittor/zapret-openwrt" "$${SVC_FILE}"; then
|
||||
echo "Please uninstall incompatible \"luci-app-zapret\" package!"
|
||||
exit 55
|
||||
fi
|
||||
fi
|
||||
if [ -f "$${ZAPRET_CFG}" ] && ! grep -q "run_on_boot" "$${ZAPRET_CFG}"; then
|
||||
if [ -x "$${ZAPRET_INITD}" ]; then
|
||||
$${ZAPRET_INITD} running && $${ZAPRET_INITD} stop >/dev/null 2>&1
|
||||
fi
|
||||
rm -f $${ZAPRET_CFG}
|
||||
rm -f $${ZAPRET_INITD}
|
||||
[ -d "$${ZAPRET_DIR}" ] && rm -rf $${ZAPRET_DIR}
|
||||
echo "All files of the previously installed package have been removed!"
|
||||
fi
|
||||
if $${PKG_CHECK} zapret-mdig >/dev/null 2>&1; then
|
||||
$${PKG_REMOVE} zapret-mdig
|
||||
fi
|
||||
if $${PKG_CHECK} zapret-ip2net >/dev/null 2>&1; then
|
||||
$${PKG_REMOVE} zapret-ip2net
|
||||
fi
|
||||
if [ ! -d "$${ZAPRET_DIR}" ]; then
|
||||
mkdir -p $${ZAPRET_DIR}
|
||||
fi
|
||||
if [ ! -f "/opt/zapret/ipset/zapret-hosts-google.txt" ]; then
|
||||
if [ -f "/opt/zapret/ipset/zapret-hosts-user.txt" ]; then
|
||||
CFGLISTHASH=$$( md5sum "/opt/zapret/ipset/zapret-hosts-user.txt" | awk '{print $$1;}' )
|
||||
@@ -157,8 +219,17 @@ define Package/$(PKG_NAME)/postinst
|
||||
#!/bin/sh
|
||||
# check if we are on real system
|
||||
if [ -z "$${IPKG_INSTROOT}" ]; then
|
||||
ZAPRET_DIR=/opt/zapret
|
||||
ZAPRET_INITD=/etc/init.d/zapret
|
||||
ZAPRET_CFG=/etc/config/zapret
|
||||
ZAPRET_CONFIG=/opt/zapret/config
|
||||
ZAPRET_CONFIG_DEF="/opt/zapret/config.default"
|
||||
# Fix permissions
|
||||
chmod 644 $${ZAPRET_CFG} >/dev/null 2>&1
|
||||
chmod 644 $${ZAPRET_DIR}/ipset/*.txt >/dev/null 2>&1
|
||||
chmod 644 $${ZAPRET_DIR}/ipset_def/*.txt >/dev/null 2>&1
|
||||
chmod 644 $${ZAPRET_DIR}/init.d/openwrt/custom.d/*.sh >/dev/null 2>&1
|
||||
chmod 644 $${ZAPRET_DIR}/config* >/dev/null 2>&1
|
||||
# creating main config if its not exists
|
||||
if [ ! -f "$${ZAPRET_CONFIG}" ]; then
|
||||
cp -f "$${ZAPRET_CONFIG_DEF}" "$${ZAPRET_CONFIG}"
|
||||
@@ -171,8 +242,10 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
|
||||
echo "Current file $${ZAPRET_CONFIG} backuped to $${ZAPRET_CONFIG_BACKUP}"
|
||||
cp -f "$${ZAPRET_CONFIG_DEF}" "$${ZAPRET_CONFIG}"
|
||||
fi
|
||||
# remove fake uci-config
|
||||
[ -f "$${ZAPRET_CFG}" ] && [ ! -s "$${ZAPRET_CFG}" ] && rm -f "$${ZAPRET_CFG}"
|
||||
# check existing uci-config
|
||||
[ -f "/etc/config/zapret" ] && ZAPRET_CFG_EXISTS=1 || ZAPRET_CFG_EXISTS=0
|
||||
[ -f "$${ZAPRET_CFG}" ] && ZAPRET_CFG_EXISTS=1 || ZAPRET_CFG_EXISTS=0
|
||||
# create or merge uci-config
|
||||
/opt/zapret/uci-def-cfg.sh
|
||||
[ "$${ZAPRET_CFG_EXISTS}" = "1" ] && echo "Config /etc/config/zapret merged with default uci-config"
|
||||
@@ -184,13 +257,13 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
|
||||
sh -n "$${ZAPRET_CONFIG}" 2>/dev/null || cp -f "$${ZAPRET_CONFIG_DEF}" "$${ZAPRET_CONFIG}"
|
||||
sh -n "$${ZAPRET_CONFIG}" 2>/dev/null || exit 58
|
||||
# enable main service
|
||||
/etc/init.d/zapret enable
|
||||
$${ZAPRET_INITD} enable
|
||||
# stop all
|
||||
/etc/init.d/zapret stop_fw
|
||||
/etc/init.d/zapret stop_daemons
|
||||
$${ZAPRET_INITD} stop_fw >/dev/null 2>&1
|
||||
$${ZAPRET_INITD} stop_daemons >/dev/null 2>&1
|
||||
ps w | grep '/opt/zapret/nfq/nfqws' | grep -v grep | awk '{print $$1}' | xargs -r kill -9
|
||||
# start main service
|
||||
/etc/init.d/zapret start
|
||||
$${ZAPRET_INITD} start
|
||||
# restart firewall
|
||||
[ -x /sbin/fw4 ] && fw4 -q restart || fw3 -q restart
|
||||
fi
|
||||
@@ -201,8 +274,10 @@ define Package/$(PKG_NAME)/prerm
|
||||
#!/bin/sh
|
||||
# check if we are on real system
|
||||
if [ -z "$${IPKG_INSTROOT}" ]; then
|
||||
EXEDIR=/opt/zapret
|
||||
ZAPRET_DIR=/opt/zapret
|
||||
ZAPRET_BASE=/opt/zapret
|
||||
ZAPRET_INITD=/etc/init.d/zapret
|
||||
ZAPRET_CFG=/etc/config/zapret
|
||||
ZAPRET_CONFIG=/opt/zapret/config
|
||||
ZAPRET_CONFIG_DEF="/opt/zapret/config.default"
|
||||
OPENWRT_FW_INCLUDE=/etc/firewall.zapret
|
||||
@@ -217,8 +292,8 @@ if [ -z "$${IPKG_INSTROOT}" ]; then
|
||||
. "$${ZAPRET_BASE}/common/fwtype.sh"
|
||||
. "$${ZAPRET_BASE}/common/nft.sh"
|
||||
. "$${ZAPRET_BASE}/common/installer.sh"
|
||||
/etc/init.d/zapret running && /etc/init.d/zapret stop
|
||||
/etc/init.d/zapret disable
|
||||
$${ZAPRET_INITD} running && $${ZAPRET_INITD} stop >/dev/null 2>&1
|
||||
$${ZAPRET_INITD} disable >/dev/null 2>&1
|
||||
ps w | grep '/opt/zapret/nfq/nfqws' | grep -v grep | awk '{print $$1}' | xargs -r kill -9
|
||||
remove_openwrt_firewall
|
||||
nft_del_table
|
||||
@@ -231,7 +306,9 @@ define Package/$(PKG_NAME)/postrm
|
||||
#!/bin/sh
|
||||
# check if we are on real system
|
||||
if [ -z "$${IPKG_INSTROOT}" ]; then
|
||||
[ -f "/etc/config/zapret-opkg" ] && rm -f "/etc/config/zapret-opkg"
|
||||
rm -f /etc/config/zapret-opkg*
|
||||
rm -f /etc/config/zapret.opkg*
|
||||
rm -f /etc/config/zapret.apk*
|
||||
[ -f "/opt/zapret/config" ] && cp -f /opt/zapret/config "/opt/zapret/config.backup"
|
||||
#rm -rf /opt/zapret
|
||||
#echo "Directory /opt/zapret removed!"
|
||||
|
||||
@@ -130,7 +130,7 @@ function restore_all_ipset_cfg
|
||||
restore_ipset_txt zapret-hosts-google.txt
|
||||
restore_ipset_txt zapret-hosts-user.txt
|
||||
restore_ipset_txt zapret-hosts-user-exclude.txt
|
||||
restore_ipset_txt zapret-ip-exclude.txt.txt
|
||||
restore_ipset_txt zapret-ip-exclude.txt
|
||||
}
|
||||
|
||||
function create_default_cfg
|
||||
@@ -179,7 +179,7 @@ function insert_cron_task_logs
|
||||
{
|
||||
[ ! -f "$CRONTAB_FILE" ] && touch "$CRONTAB_FILE"
|
||||
[ ! -f "$CRONTAB_FILE" ] && return 1
|
||||
if ! grep -q -e "-name '$ZAPRET_CFG_NAME\*\.log' -size \+" "$CRONTAB_FILE"; then
|
||||
if ! grep -q -e "-name '$ZAPRET_CFG_NAME+\*\.log' -size \+" "$CRONTAB_FILE"; then
|
||||
echo "*/2 * * * * /usr/bin/find /tmp -maxdepth 1 -type f -name '$ZAPRET_CFG_NAME+*.log' -size +2600k -exec rm -f {} \;" >> "$CRONTAB_FILE"
|
||||
/etc/init.d/cron restart 2> /dev/null
|
||||
fi
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
function set_cfg_reset_values
|
||||
{
|
||||
local cfgname=${1:-$ZAPRET_CFG_NAME}
|
||||
local TAB="$( echo -n -e '\t' )"
|
||||
local TAB="$( printf '\t' )"
|
||||
uci batch <<-EOF
|
||||
set $cfgname.config.run_on_boot='0'
|
||||
# settings for zapret service
|
||||
@@ -47,7 +47,7 @@ function set_cfg_reset_values
|
||||
function clear_nfqws_strat
|
||||
{
|
||||
local cfgname=${1:-$ZAPRET_CFG_NAME}
|
||||
local TAB="$( echo -n -e '\t' )"
|
||||
local TAB="$( printf '\t' )"
|
||||
uci batch <<-EOF
|
||||
set $cfgname.config.MODE_FILTER='hostlist'
|
||||
set $cfgname.config.NFQWS_PORTS_TCP='80,443'
|
||||
@@ -61,7 +61,7 @@ function set_cfg_nfqws_strat
|
||||
{
|
||||
local strat=${1:--}
|
||||
local cfgname=${2:-$ZAPRET_CFG_NAME}
|
||||
local TAB="$( echo -n -e '\t' )"
|
||||
local TAB="$( printf '\t' )"
|
||||
|
||||
uci batch <<-EOF
|
||||
set $cfgname.config.MODE_FILTER='hostlist'
|
||||
|
||||
169
zapret/dwc.sh
Normal file
169
zapret/dwc.sh
Normal file
@@ -0,0 +1,169 @@
|
||||
#!/bin/sh
|
||||
# Copyright (c) 2026 remittor
|
||||
|
||||
. /opt/zapret/comfunc.sh
|
||||
|
||||
ZAP_TMP_DIR=/tmp/zapret_dwc
|
||||
|
||||
rm -rf $ZAP_TMP_DIR
|
||||
|
||||
CURL_TIMEOUT=5
|
||||
CURL_RANGETO=65535
|
||||
CURL_NOCACHE='cache-control: no-cache'
|
||||
CURL_NOCACHE2='pragma: no-cache'
|
||||
CURL_USERAGENT='Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36'
|
||||
|
||||
if ! command -v curl >/dev/null 2>&1; then
|
||||
echo "ERROR: package \"curl\" not installed!"
|
||||
return 10
|
||||
fi
|
||||
CURL_INFO=$( curl -V )
|
||||
if ! echo "$CURL_INFO" | grep -q 'https'; then
|
||||
echo "------- package curl"
|
||||
echo "$CURL_INFO"
|
||||
echo "-------"
|
||||
echo "ERROR: package \"curl\" not supported HTTPS protocol!"
|
||||
echo "NOTE: Please install package \"curl-ssl\""
|
||||
return 11
|
||||
fi
|
||||
|
||||
#echo 'Original sources: https://github.com/hyperion-cs/dpi-checkers'
|
||||
#echo 'WEB-version: https://hyperion-cs.github.io/dpi-checkers/ru/tcp-16-20/'
|
||||
|
||||
TEST_SUITE='[
|
||||
{ id: "US.CF-01", provider: "🇺🇸 Cloudflare", times: 1, url: "https://img.wzstats.gg/cleaver/gunFullDisplay" },
|
||||
{ id: "US.CF-02", provider: "🇺🇸 Cloudflare", times: 1, url: "https://genshin.jmp.blue/characters/all#" },
|
||||
{ id: "US.CF-03", provider: "🇺🇸 Cloudflare", times: 1, url: "https://api.frankfurter.dev/v1/2000-01-01..2002-12-31" },
|
||||
{ id: "US.CF-04", provider: "🇨🇦 Cloudflare", times: 1, url: "https://www.bigcartel.com/" },
|
||||
{ id: "US.DO-01", provider: "🇺🇸 DigitalOcean", times: 2, url: "https://genderize.io/" },
|
||||
{ id: "DE.HE-01", provider: "🇩🇪 Hetzner", times: 1, url: "https://j.dejure.org/jcg/doctrine/doctrine_banner.webp" },
|
||||
{ id: "DE.HE-02", provider: "🇩🇪 Hetzner", times: 1, url: "https://maps.gnosis.earth/ogcapi/api/swagger-ui/swagger-ui-standalone-preset.js#" },
|
||||
{ id: "FI.HE-01", provider: "🇫🇮 Hetzner", times: 1, url: "https://251b5cd9.nip.io/1MB.bin" },
|
||||
{ id: "FI.HE-02", provider: "🇫🇮 Hetzner", times: 1, url: "https://5fd8c176.nip.io/1MB.bin" },
|
||||
{ id: "FI.HE-03", provider: "🇫🇮 Hetzner", times: 1, url: "https://5fd8bdae.nip.io/1MB.bin" },
|
||||
{ id: "FI.HE-04", provider: "🇫🇮 Hetzner", times: 1, url: "https://5fd8bca5.nip.io/1MB.bin" },
|
||||
{ id: "FR.OVH-01", provider: "🇫🇷 OVH", times: 1, url: "https://eu.api.ovh.com/console/rapidoc-min.js" },
|
||||
{ id: "FR.OVH-02", provider: "🇫🇷 OVH", times: 1, url: "https://ovh.sfx.ovh/10M.bin" },
|
||||
{ id: "SE.OR-01", provider: "🇸🇪 Oracle", times: 1, url: "https://oracle.sfx.ovh/10M.bin" },
|
||||
{ id: "DE.AWS-01", provider: "🇩🇪 AWS", times: 1, url: "https://www.getscope.com/assets/fonts/fa-solid-900.woff2" },
|
||||
{ id: "US.AWS-01", provider: "🇺🇸 AWS", times: 1, url: "https://corp.kaltura.com/wp-content/cache/min/1/wp-content/themes/airfleet/dist/styles/theme.css" },
|
||||
{ id: "US.GC-01", provider: "🇺🇸 Google Cloud", times: 1, url: "https://api.usercentrics.eu/gvl/v3/en.json" },
|
||||
{ id: "US.FST-01", provider: "🇺🇸 Fastly", times: 1, url: "https://www.jetblue.com/footer/footer-element-es2015.js" },
|
||||
{ id: "CA.FST-01", provider: "🇨🇦 Fastly", times: 1, url: "https://www.cnn10.com/" },
|
||||
{ id: "US.AKM-01", provider: "🇺🇸 Akamai", times: 1, url: "https://www.roxio.com/static/roxio/images/products/creator/nxt9/call-action-footer-bg.jpg" },
|
||||
{ id: "PL.AKM-01", provider: "🇵🇱 Akamai", times: 1, url: "https://media-assets.stryker.com/is/image/stryker/gateway_1?$max_width_1410$" },
|
||||
{ id: "US.CDN77-01", provider: "🇺🇸 CDN77", times: 1, url: "https://cdn.eso.org/images/banner1920/eso2520a.jpg" },
|
||||
{ id: "FR.CNTB-01", provider: "🇫🇷 Contabo", times: 1, url: "https://airsea.no/images/main_logo.png" },
|
||||
{ id: "NL.SW-01", provider: "🇳🇱 Scaleway", times: 1, url: "https://www.velivole.fr/img/header.jpg" },
|
||||
{ id: "US.CNST-01", provider: "🇺🇸 Constant", times: 1, url: "https://cdn.xuansiwei.com/common/lib/font-awesome/4.7.0/fontawesome-webfont.woff2?v=4.7.0" }
|
||||
]'
|
||||
|
||||
function trim
|
||||
{
|
||||
echo "$1" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//'
|
||||
}
|
||||
|
||||
mkdir -p "$ZAP_TMP_DIR"
|
||||
|
||||
TARGET_LIST_FILE="$ZAP_TMP_DIR/targets"
|
||||
: > "$TARGET_LIST_FILE"
|
||||
IDX=0
|
||||
while IFS= read -r line; do
|
||||
case "$line" in
|
||||
*id:*provider:*url:*)
|
||||
IDX=$((IDX + 1))
|
||||
TAG=$( printf '%s\n' "$line" | cut -d'"' -f2 )
|
||||
COUNTRY="${TAG%%.*}"
|
||||
PROVIDER_RAW=$( printf '%s\n' "$line" | cut -d'"' -f4 )
|
||||
PROVIDER="${PROVIDER_RAW#* }"
|
||||
TIMES=$( printf '%s\n' "$line" | cut -d':' -f4 | cut -d',' -f1 | tr -d ' ')
|
||||
URL=$( printf '%s\n' "$line" | cut -d'"' -f6 )
|
||||
echo "${IDX}|${TAG}|${COUNTRY}|${PROVIDER}|${TIMES}|${URL}" >> "$TARGET_LIST_FILE"
|
||||
;;
|
||||
esac
|
||||
done <<EOF
|
||||
$TEST_SUITE
|
||||
EOF
|
||||
|
||||
CURL_CON_TIMEOUT=$((CURL_TIMEOUT-2))
|
||||
CURL_SPEED_TIME=$((CURL_TIMEOUT-2))
|
||||
CURL_SPEED_LIMIT=1
|
||||
|
||||
while IFS='|' read -r ID TAG COUNTRY PROVIDER TIMES URL; do
|
||||
[ -z "$TAG" ] && continue
|
||||
ID=$((ID+1))
|
||||
ID3=$( printf '%03d' "$ID" )
|
||||
COUNTRY=$( echo "$TAG" | cut -d. -f1 )
|
||||
CNTFLAG=$( echo "$PROVIDER" | awk '{print $1}' )
|
||||
URL_NO_PROTO="${URL#*://}"
|
||||
DOMAIN="${URL_NO_PROTO%%/*}"
|
||||
URLPATH="/${URL_NO_PROTO#*/}"
|
||||
[ "$URLPATH" = "/$URL_NO_PROTO" ] && URLPATH="/"
|
||||
#echo "TAG=$TAG , COUNTRY=$COUNTRY , PROVIDER=$PROVIDER , DOMAIN=$DOMAIN , URL=$URL"
|
||||
FNAME="$ZAP_TMP_DIR/$ID3=$TAG=$PROVIDER"
|
||||
(
|
||||
DST_IP="???"
|
||||
if [ "$DST_IP" = "" ]; then
|
||||
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" )
|
||||
if [ -z "$DST_IP" ]; then
|
||||
DST_IP=$( curl -4 -s $CURL_TIMEOUTS -o /dev/null -r 0-0 -w '%{remote_ip}\n' "$URL" )
|
||||
fi
|
||||
if [ -z "$DST_IP" ]; then
|
||||
DST_IP="$( ping -c1 "$DOMAIN" 2>/dev/null | sed -n '1s/.*(\([0-9.]*\)).*/\1/p')"
|
||||
fi
|
||||
fi
|
||||
echo "$URL" > "$FNAME.url"
|
||||
echo "$DST_IP" > "$FNAME.ip"
|
||||
RESOLVE_OPT="--resolve $DOMAIN:443:$DST_IP"
|
||||
curl "$URL" \
|
||||
--connect-timeout $CURL_CON_TIMEOUT \
|
||||
--max-time $CURL_TIMEOUT \
|
||||
--speed-time $CURL_SPEED_TIME \
|
||||
--speed-limit $CURL_SPEED_LIMIT \
|
||||
--range 0-$CURL_RANGETO \
|
||||
-A "$CURL_USERAGENT" \
|
||||
-D "$FNAME.hdr" \
|
||||
-o "$FNAME.body"
|
||||
) > "$FNAME.txt" 2>&1 &
|
||||
done < "$TARGET_LIST_FILE"
|
||||
|
||||
wait
|
||||
|
||||
printf '%s\n' "$ZAP_TMP_DIR"/*.txt | sort | while IFS= read -r file; do
|
||||
[ -f "$file" ] || continue
|
||||
FNAME="${file##*/}"
|
||||
FNAME="${FNAME%.txt}"
|
||||
ID=$( echo "$FNAME" | cut -d= -f1)
|
||||
TAG=$( echo "$FNAME" | cut -d= -f2)
|
||||
PROVIDER=$(echo "$FNAME" | cut -d= -f3 )
|
||||
FNAME="$ZAP_TMP_DIR/$FNAME"
|
||||
BODY_SIZE=0
|
||||
[ -f "$FNAME.body" ] && BODY_SIZE=$( wc -c < "$FNAME.body" )
|
||||
status=
|
||||
if [ ! -f "$FNAME.ip" ]; 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"
|
||||
elif [ ! -s "$FNAME.hdr" ]; then
|
||||
status="ERROR: cannot get headers"
|
||||
elif [ ! -f "$FNAME.body" ]; then
|
||||
status="ERROR: cannot get body"
|
||||
elif [ ! -s "$FNAME.body" ]; then
|
||||
status="Possibly detected"
|
||||
else
|
||||
if [ "$BODY_SIZE" -le $CURL_RANGETO ]; then
|
||||
status="Failed to complete detection (recv $BODY_SIZE bytes)"
|
||||
else
|
||||
status="[ OK ]"
|
||||
fi
|
||||
fi
|
||||
printf '%12s / %-13s: %s \n' "$TAG" "$PROVIDER" "$status"
|
||||
echo "$BODY_SIZE" > "$FNAME.size"
|
||||
done
|
||||
|
||||
rm -f "$ZAP_TMP_DIR"/*.body >/dev/null 2>&1
|
||||
|
||||
return 0
|
||||
@@ -14,6 +14,7 @@ gosuslugi.ru
|
||||
mos-gorsud.ru
|
||||
gov.ru
|
||||
sudrf.ru
|
||||
ottai.com
|
||||
ipstream.one
|
||||
#################################### Epicgames
|
||||
easy.ac
|
||||
@@ -253,4 +254,109 @@ vod-secure.twitch.tv
|
||||
irc-ws.chat.twitch.tv
|
||||
pubsub-edge.twitch.tv
|
||||
vod-pop-secure.twitch.tv
|
||||
#################################### Valorant
|
||||
pvp.net
|
||||
vivox.com
|
||||
sd-rtn.com
|
||||
riotcdn.net
|
||||
adobess.com
|
||||
valorant.com
|
||||
akamaihd.net
|
||||
riotgames.com
|
||||
playvalorant.com
|
||||
#################################### TikTok
|
||||
musical.ly
|
||||
tiktok.com
|
||||
tiktokv.eu
|
||||
tiktokv.us
|
||||
tiktokw.eu
|
||||
tiktokw.us
|
||||
muscdn.com
|
||||
tiktokd.net
|
||||
tiktokd.org
|
||||
tiktokv.com
|
||||
tiktokcdn.com
|
||||
ibytedtos.com
|
||||
ttwstatic.com
|
||||
tik-tokapi.com
|
||||
tiktok-row.net
|
||||
tiktokminis.us
|
||||
byteoversea.com
|
||||
tiktok-minis.com
|
||||
tiktokcdn-eu.com
|
||||
tiktokcdn-us.com
|
||||
tiktokeu-cdn.com
|
||||
tiktokrow-cdn.com
|
||||
tiktokglobalshopv.com
|
||||
tiktokcdn.com.akamaized.net
|
||||
tiktokcdn.com.edgesuite.net
|
||||
tiktokcdn-us.com.edgesuite.net
|
||||
#################################### Hoyoverse
|
||||
hoyo.link
|
||||
hoyolab.com
|
||||
yuanshen.com
|
||||
hoyoverse.com
|
||||
genshinimpact.com
|
||||
zenlesszonezero.com
|
||||
#################################### Xiaomi
|
||||
mi.com
|
||||
miui.com
|
||||
wali.com
|
||||
c.mi.com
|
||||
mgslb.com
|
||||
mifile.cn
|
||||
xiaomi.cn
|
||||
mipay.com
|
||||
youpin.cn
|
||||
zmifi.com
|
||||
mi-idc.com
|
||||
mi-img.com
|
||||
mijia.tech
|
||||
mitvos.com
|
||||
miwifi.com
|
||||
xiaomi.com
|
||||
xiaomi.net
|
||||
duokan.com
|
||||
saxyit.com
|
||||
mi-fan.com
|
||||
mihome.com
|
||||
xiaomisa.cn
|
||||
migames.com
|
||||
miaibox.com
|
||||
mi-home.com
|
||||
xiaomicp.com
|
||||
xiaomidns.cn
|
||||
xiaomiev.com
|
||||
xiaomiinc.cn
|
||||
xiaominr.com
|
||||
xiaomisa.com
|
||||
xiaomisa.net
|
||||
xiaomisa.org
|
||||
roborock.com
|
||||
mi-robot.com
|
||||
yeelight.com
|
||||
miot-spec.cn
|
||||
xiaomidns.com
|
||||
xiaomidns.net
|
||||
xiaomiinc.com
|
||||
xiaomiinc.net
|
||||
duokanbox.com
|
||||
youpin.com.cn
|
||||
miot-spec.org
|
||||
miot-spec.com
|
||||
xiaomiwear.com
|
||||
xiaomimimo.com
|
||||
dreamehome.com
|
||||
xiaomiprint.com
|
||||
xiaomidns.com.cn
|
||||
xiaomiinc.com.cn
|
||||
xiaomimobile.com
|
||||
xiaomixiaoai.com
|
||||
xiaomiyoupin.com
|
||||
xiaoaiassist.com
|
||||
xiaomi-mijia.com
|
||||
xiaomifactory.com
|
||||
airstarfinance.net
|
||||
dreame-technology.cn
|
||||
dreame-technology.com
|
||||
####################################
|
||||
|
||||
@@ -46,7 +46,7 @@ function sync_param
|
||||
local value="$( uci -q get $ZAPRET_CFG_SEC.$param )"
|
||||
uncomment_param $param
|
||||
append_param $param
|
||||
local TAB="$( echo -n -e '\t' )"
|
||||
local TAB="$( printf '\t' )"
|
||||
if [ "$value" = "$TAB" ]; then
|
||||
value=""
|
||||
fi
|
||||
@@ -101,6 +101,7 @@ sync_param AUTOHOSTLIST_FAIL_TIME
|
||||
if [ $ZAPRET_CFG_NAME = "zapret2" ]; then
|
||||
sync_param AUTOHOSTLIST_INCOMING_MAXSEQ
|
||||
sync_param AUTOHOSTLIST_RETRANS_MAXSEQ
|
||||
sync_param AUTOHOSTLIST_RETRANS_RESET
|
||||
sync_param AUTOHOSTLIST_UDP_IN
|
||||
sync_param AUTOHOSTLIST_UDP_OUT
|
||||
fi
|
||||
|
||||
@@ -1,11 +1,15 @@
|
||||
#!/bin/sh
|
||||
# Copyright (c) 2024 remittor
|
||||
|
||||
[ ! -f /opt/zapret/comfunc.sh ] && exit 0
|
||||
|
||||
. /opt/zapret/comfunc.sh
|
||||
|
||||
mkdir -p $ZAPRET_BASE/ipset
|
||||
|
||||
# create empty txt files into ipset directory
|
||||
[ ! -f "$ZAPRET_BASE/ipset/zapret-hosts-google.txt" ] && touch "$ZAPRET_BASE/ipset/zapret-hosts-google.txt"
|
||||
#[ ! -f "$ZAPRET_BASE/ipset/zapret-hosts-auto.txt" ] && touch "$ZAPRET_BASE/ipset/zapret-hosts-auto.txt"
|
||||
[ ! -f "$ZAPRET_BASE/ipset/zapret-hosts-auto.txt" ] && touch "$ZAPRET_BASE/ipset/zapret-hosts-auto.txt"
|
||||
[ ! -f "$ZAPRET_BASE/ipset/zapret-hosts-user.txt" ] && touch "$ZAPRET_BASE/ipset/zapret-hosts-user.txt"
|
||||
[ ! -f "$ZAPRET_BASE/ipset/zapret-hosts-user-ipban.txt" ] && touch "$ZAPRET_BASE/ipset/zapret-hosts-user-ipban.txt"
|
||||
#[ ! -f "$ZAPRET_BASE/ipset/zapret-ip.txt" ] && touch "$ZAPRET_BASE/ipset/zapret-ip.txt"
|
||||
@@ -14,5 +18,6 @@
|
||||
[ ! -f "$ZAPRET_BASE/ipset/zapret-ip-user-ipban.txt" ] && touch "$ZAPRET_BASE/ipset/zapret-ip-user-ipban.txt"
|
||||
|
||||
# create or merge uci-config
|
||||
[ ! -f "$ZAPRET_BASE/renew-cfg.sh" ] && exit 0
|
||||
$ZAPRET_BASE/renew-cfg.sh
|
||||
|
||||
Reference in New Issue
Block a user