mirror of
https://github.com/remittor/zapret-openwrt.git
synced 2026-01-03 15:18:50 +03:00
Compare commits
28 Commits
v0.8.20251
...
zap1
| Author | SHA1 | Date | |
|---|---|---|---|
|
b714b629b7 | ||
|
|
354a71f6c5 | ||
|
|
f48488b21b | ||
|
|
a3c256c31a | ||
|
|
1d2d3c4b84 | ||
|
|
5b6fd0a1e6 | ||
|
|
791ea2d2b6 | ||
|
|
9d73b59640 | ||
|
|
b58cbafec6 | ||
|
|
a56b1e3f1c | ||
|
|
80f15e3da1 | ||
|
|
89bcec8a60 | ||
|
|
735575c7bc | ||
|
|
5550820fdc | ||
|
|
0e8366f7d1 | ||
|
|
ea3c774537 | ||
|
|
57b7e65532 | ||
|
|
eeacc486f9 | ||
|
|
101382faf7 | ||
|
|
21229ef152 | ||
|
|
9aaf2b29e3 | ||
|
|
246f4a08a0 | ||
|
|
3d3eb82b7b | ||
|
|
8aff441b88 | ||
|
|
1c866d5de1 | ||
|
|
57d5ab5060 | ||
|
|
5a685cfa27 | ||
|
|
21017047a8 |
80
.github/ISSUE_TEMPLATE/bug_report_en.yml
vendored
Normal file
80
.github/ISSUE_TEMPLATE/bug_report_en.yml
vendored
Normal file
@@ -0,0 +1,80 @@
|
||||
---
|
||||
name: 🐛 Bug Report
|
||||
description: Report a reproducible bug
|
||||
title: "[BUG] "
|
||||
labels: ["bug"]
|
||||
assignees: []
|
||||
body:
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
Thanks for reporting a bug! Please fill out the form below.
|
||||
|
||||
Before sending, please:
|
||||
- Check [existing issues](https://github.com/remittor/zapret-openwrt/issues)
|
||||
- Read [documentation](https://github.com/remittor/zapret-openwrt/wiki/)
|
||||
|
||||
- type: textarea
|
||||
id: description
|
||||
attributes:
|
||||
label: 📝 Bug description
|
||||
description: A clear and concise description of what is not working
|
||||
placeholder: A clear and concise description of the bug
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: reproduction
|
||||
attributes:
|
||||
label: Steps to reproduce
|
||||
description: Steps to reproduce the problem. If you're following a manual, please include a link to it.
|
||||
placeholder: |
|
||||
1.
|
||||
2.
|
||||
3.
|
||||
4.
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: expected
|
||||
attributes:
|
||||
label: ✅ Expected behavior
|
||||
description: A clear and concise description of what was to happen
|
||||
placeholder: Describe the expected behavior
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: environment
|
||||
attributes:
|
||||
label: 🖥️ System Information
|
||||
description: |
|
||||
Information about your system (fill in all that used)
|
||||
value: |
|
||||
- **OpenWrt version**:
|
||||
- **Zapret version**:
|
||||
- **Router model**:
|
||||
render: markdown
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: strategy
|
||||
attributes:
|
||||
label: ✅ The NFQWS strategy used
|
||||
description: All parameters of the NFQWS strategy, or its name
|
||||
placeholder: If the problem is caused by the NFQWS strategy
|
||||
|
||||
- type: textarea
|
||||
id: config
|
||||
attributes:
|
||||
label: ⚙️ System Configurations
|
||||
description: |
|
||||
Relevant parts of the configuration (remove sensitive information!)
|
||||
placeholder: |
|
||||
For example:
|
||||
- Contents of /etc/config/zapret
|
||||
- Firewall configuration (Flow offloading, etc.)
|
||||
- Additional configurations required for wireless/network/dhcp, etc.
|
||||
render: shell
|
||||
80
.github/ISSUE_TEMPLATE/bug_report_ru.yml
vendored
Normal file
80
.github/ISSUE_TEMPLATE/bug_report_ru.yml
vendored
Normal file
@@ -0,0 +1,80 @@
|
||||
---
|
||||
name: 🐛 Сообщение об ошибке
|
||||
description: Сообщить об ошибке
|
||||
title: "[BUG] "
|
||||
labels: ["bug"]
|
||||
assignees: []
|
||||
body:
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
Спасибо за создание отчета об ошибке!
|
||||
|
||||
Перед отправкой, пожалуйста:
|
||||
- Проверьте [существующие issues](https://github.com/remittor/zapret-openwrt/issues)
|
||||
- Просмотрите [документацию](https://github.com/remittor/zapret-openwrt/wiki/)
|
||||
|
||||
- type: textarea
|
||||
id: description
|
||||
attributes:
|
||||
label: 📝 Описание проблемы
|
||||
description: Четкое и краткое описание того, что не работает
|
||||
placeholder: Опишите проблему
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: reproduction
|
||||
attributes:
|
||||
label: Шаги для воспроизведения
|
||||
description: Шаги для воспроизведения проблемы. Если вы настраваете что-то по какому либо мануалу, приложите ссылку на него.
|
||||
placeholder: |
|
||||
1.
|
||||
2.
|
||||
3.
|
||||
4.
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: expected
|
||||
attributes:
|
||||
label: ✅ Ожидаемое поведение
|
||||
description: Четкое и краткое описание того, что должно было произойти
|
||||
placeholder: Опишите ожидаемое поведение
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: environment
|
||||
attributes:
|
||||
label: 🖥️ Информация о системе
|
||||
description: |
|
||||
Информация о вашей системе (заполните всё применяемое)
|
||||
value: |
|
||||
- **OpenWrt версия**:
|
||||
- **Zapret версия**:
|
||||
- **Роутер модель**:
|
||||
render: markdown
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: strategy
|
||||
attributes:
|
||||
label: ✅ Используемая стратегия NFQWS
|
||||
description: Все параметры стратегии NFQWS, либо её название
|
||||
placeholder: Если проблема вызвана стратегией NFQWS
|
||||
|
||||
- type: textarea
|
||||
id: config
|
||||
attributes:
|
||||
label: ⚙️ Конфигурация
|
||||
description: |
|
||||
Релевантные части конфигурации (удалите чувствительную информацию!)
|
||||
placeholder: |
|
||||
Например:
|
||||
- Содержимое /etc/config/zapret
|
||||
- Конфигурация файервола (опция Flow offloading и т.п.)
|
||||
- Дополнительные конфиги, которые потребуются wireless/network/dhcp и т.д.
|
||||
render: shell
|
||||
9
.github/ISSUE_TEMPLATE/config.yml
vendored
Normal file
9
.github/ISSUE_TEMPLATE/config.yml
vendored
Normal file
@@ -0,0 +1,9 @@
|
||||
blank_issues_enabled: false
|
||||
contact_links:
|
||||
- name: 💬 Installation instructions / Инструкция по установке
|
||||
url: https://github.com/remittor/zapret-openwrt/wiki/Installing-zapret%E2%80%90openwrt-package
|
||||
about: Installation instructions / Инструкция по установке
|
||||
|
||||
- name: 📚 Original documetation / Оригинальная документация к zapret'у
|
||||
url: https://github.com/bol-van/zapret/blob/master/docs/readme.md
|
||||
about: README zapret
|
||||
66
.github/ISSUE_TEMPLATE/feature_request_en.yml
vendored
Normal file
66
.github/ISSUE_TEMPLATE/feature_request_en.yml
vendored
Normal file
@@ -0,0 +1,66 @@
|
||||
---
|
||||
name: ✨ Feature Request
|
||||
description: Suggest a new feature or improvement
|
||||
title: "[FEATURE] "
|
||||
labels: ["enhancement", "needs-discussion"]
|
||||
assignees: []
|
||||
body:
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
Before sending, please:
|
||||
- Check [existing requests](https://github.com/remittor/zapret-openwrt/issues?q=is%3Aissue+label%3Aenhancement)
|
||||
- Make sure the function doesn't exist in [documentation](https://github.com/remittor/zapret-openwrt/wiki/)
|
||||
|
||||
- type: textarea
|
||||
id: summary
|
||||
attributes:
|
||||
label: Brief description
|
||||
description: Brief description of the proposed function
|
||||
placeholder: In one sentence, describe what you want to add...
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: problem
|
||||
attributes:
|
||||
label: The problem it solves
|
||||
description: |
|
||||
Description of the problem or inconvenience this feature will solve
|
||||
placeholder: |
|
||||
There is no possibility now [...]
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: solution
|
||||
attributes:
|
||||
label: 💡 Proposed solution
|
||||
description: A clear and concise description of what you want to achieve
|
||||
placeholder: |
|
||||
I want Zapret to be able to [...]
|
||||
I suggest adding a feature that [...]
|
||||
Could be improved [...]
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: alternatives
|
||||
attributes:
|
||||
label: Workaround
|
||||
description: |
|
||||
Describe any alternative solutions or features you considered.
|
||||
Are there any workarounds you currently use?
|
||||
placeholder: |
|
||||
I'm currently solving this problem by [...]
|
||||
An alternative would be [...]
|
||||
I tried using [...], but it doesn't work because [...]
|
||||
|
||||
- type: textarea
|
||||
id: implementation
|
||||
attributes:
|
||||
label: Implementation ideas (optional)
|
||||
description: |
|
||||
If you have any ideas on how this could be implemented, please share them. Please keep LuCI's limitations in mind.
|
||||
placeholder: |
|
||||
This can be achieved using [...]
|
||||
68
.github/ISSUE_TEMPLATE/feature_request_ru.yml
vendored
Normal file
68
.github/ISSUE_TEMPLATE/feature_request_ru.yml
vendored
Normal file
@@ -0,0 +1,68 @@
|
||||
---
|
||||
name: ✨ Запрос новой функции
|
||||
description: Предложите новую функцию или улучшение для Zapret
|
||||
title: "[FEATURE] "
|
||||
labels: ["enhancement", "needs-discussion"]
|
||||
assignees: []
|
||||
body:
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
Спасибо за предложение новой функции!
|
||||
|
||||
Перед отправкой, пожалуйста:
|
||||
- Проверьте [существующие запросы](https://github.com/remittor/zapret-openwrt/issues?q=is%3Aissue+label%3Aenhancement)
|
||||
- Убедитесь, что функции не существует в [документации](https://github.com/remittor/zapret-openwrt/wiki/)
|
||||
|
||||
- type: textarea
|
||||
id: summary
|
||||
attributes:
|
||||
label: Краткое описание
|
||||
description: Краткое описание предлагаемой функции
|
||||
placeholder: В одном предложении опишите, что вы хотите добавить...
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: problem
|
||||
attributes:
|
||||
label: Проблема, которую решает
|
||||
description: |
|
||||
Описание проблемы или неудобства, которое решит эта функция
|
||||
placeholder: |
|
||||
Сейчас нет возможности [...]
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: solution
|
||||
attributes:
|
||||
label: 💡 Предлагаемое решение
|
||||
description: Четкое и краткое описание того, что вы хотите реализовать
|
||||
placeholder: |
|
||||
Я хочу, чтобы Zapret мог [...]
|
||||
Предлагаю добавить функцию, которая [...]
|
||||
Можно было бы улучшить [...] путем [...]
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: alternatives
|
||||
attributes:
|
||||
label: Workaround
|
||||
description: |
|
||||
Опишите альтернативные решения или функции, которые вы рассматривали
|
||||
Есть ли обходные пути, которые вы используете сейчас?
|
||||
placeholder: |
|
||||
Сейчас я решаю это проблему путем [...]
|
||||
Альтернативой могло бы быть [...]
|
||||
Пробовал использовать [...], но это не подходит потому что [...]
|
||||
|
||||
- type: textarea
|
||||
id: implementation
|
||||
attributes:
|
||||
label: Идеи реализации (опционально)
|
||||
description: |
|
||||
Если у вас есть идеи о том, как это можно реализовать, поделитесь ими. Помните про ограничения LuCI.
|
||||
placeholder: |
|
||||
Это можно реализовать с помощью [...]
|
||||
78
.github/ISSUE_TEMPLATE/help_wanted_en.yml
vendored
Normal file
78
.github/ISSUE_TEMPLATE/help_wanted_en.yml
vendored
Normal file
@@ -0,0 +1,78 @@
|
||||
---
|
||||
name: 🆘 Help wanted
|
||||
description: Ask for help or propose to help
|
||||
title: "[HELP] "
|
||||
labels: ["help wanted"]
|
||||
assignees: []
|
||||
body:
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
Before sending, please:
|
||||
- Check [existing issues](https://github.com/remittor/zapret-openwrt/issues)
|
||||
- Read [documentation](https://github.com/remittor/zapret-openwrt/wiki/)
|
||||
|
||||
- type: textarea
|
||||
id: description
|
||||
attributes:
|
||||
label: 📝 Problem description
|
||||
description: What do you need help with?
|
||||
placeholder: A clear and concise description of the problem
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: reproduction
|
||||
attributes:
|
||||
label: Steps to reproduce
|
||||
description: Steps to reproduce the problem. If you're following a manual, please include a link to it.
|
||||
placeholder: |
|
||||
1.
|
||||
2.
|
||||
3.
|
||||
4.
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: expected
|
||||
attributes:
|
||||
label: ✅ Expected behavior
|
||||
description: A clear and concise description of what was to happen
|
||||
placeholder: Describe the expected behavior
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: environment
|
||||
attributes:
|
||||
label: 🖥️ System Information
|
||||
description: |
|
||||
Information about your system (fill in all that used)
|
||||
value: |
|
||||
- **OpenWrt version**:
|
||||
- **Zapret version**:
|
||||
- **Router model**:
|
||||
render: markdown
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: strategy
|
||||
attributes:
|
||||
label: ✅ The NFQWS strategy used
|
||||
description: All parameters of the NFQWS strategy, or its name
|
||||
placeholder: If the problem is caused by the NFQWS strategy
|
||||
|
||||
- type: textarea
|
||||
id: config
|
||||
attributes:
|
||||
label: ⚙️ System Configurations
|
||||
description: |
|
||||
Relevant parts of the configuration (remove sensitive information!)
|
||||
placeholder: |
|
||||
For example:
|
||||
- Contents of /etc/config/zapret
|
||||
- Firewall configuration (Flow offloading, etc.)
|
||||
- Additional configurations required for wireless/network/dhcp, etc.
|
||||
render: shell
|
||||
78
.github/ISSUE_TEMPLATE/help_wanted_ru.yml
vendored
Normal file
78
.github/ISSUE_TEMPLATE/help_wanted_ru.yml
vendored
Normal file
@@ -0,0 +1,78 @@
|
||||
---
|
||||
name: 🆘 Нужна помощь
|
||||
description: Нужна помощь
|
||||
title: "[HELP] "
|
||||
labels: ["help wanted"]
|
||||
assignees: []
|
||||
body:
|
||||
- type: markdown
|
||||
attributes:
|
||||
value: |
|
||||
Перед отправкой, пожалуйста:
|
||||
- Проверьте [существующие issues](https://github.com/remittor/zapret-openwrt/issues)
|
||||
- Просмотрите [документацию](https://github.com/remittor/zapret-openwrt/wiki/)
|
||||
|
||||
- type: textarea
|
||||
id: description
|
||||
attributes:
|
||||
label: 📝 Описание проблемы
|
||||
description: В чём именно нужна помощь?
|
||||
placeholder: Опишите проблему
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: reproduction
|
||||
attributes:
|
||||
label: Шаги для воспроизведения
|
||||
description: Шаги для воспроизведения проблемы. Если вы настраваете что-то по какому либо мануалу, приложите ссылку на него.
|
||||
placeholder: |
|
||||
1.
|
||||
2.
|
||||
3.
|
||||
4.
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: expected
|
||||
attributes:
|
||||
label: ✅ Ожидаемое поведение
|
||||
description: Четкое и краткое описание того, что должно было произойти
|
||||
placeholder: Опишите ожидаемое поведение
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: environment
|
||||
attributes:
|
||||
label: 🖥️ Информация о системе
|
||||
description: |
|
||||
Информация о вашей системе (заполните всё применяемое)
|
||||
value: |
|
||||
- **OpenWrt версия**:
|
||||
- **Zapret версия**:
|
||||
- **Роутер модель**:
|
||||
render: markdown
|
||||
validations:
|
||||
required: true
|
||||
|
||||
- type: textarea
|
||||
id: strategy
|
||||
attributes:
|
||||
label: ✅ Используемая стратегия NFQWS
|
||||
description: Все параметры стратегии NFQWS, либо её название
|
||||
placeholder: Если проблема вызвана стратегией NFQWS
|
||||
|
||||
- type: textarea
|
||||
id: config
|
||||
attributes:
|
||||
label: ⚙️ Конфигурация
|
||||
description: |
|
||||
Релевантные части конфигурации (удалите чувствительную информацию!)
|
||||
placeholder: |
|
||||
Например:
|
||||
- Содержимое /etc/config/zapret
|
||||
- Конфигурация файервола (опция Flow offloading и т.п.)
|
||||
- Дополнительные конфиги, которые потребуются wireless/network/dhcp и т.д.
|
||||
render: shell
|
||||
4
.github/workflows/build.yml
vendored
4
.github/workflows/build.yml
vendored
@@ -252,9 +252,9 @@ jobs:
|
||||
cat .config
|
||||
echo "------------- .config END -------------------"
|
||||
if [ "$ARCH" = "$LUCI_ARCH" ]; then
|
||||
PKGLIST=`echo package/zapret-openwrt/{zapret,zapret-tpws,zapret-mdig,zapret-ip2net,luci-app-zapret}/compile`
|
||||
PKGLIST=`echo package/zapret-openwrt/{zapret,luci-app-zapret}/compile`
|
||||
else
|
||||
PKGLIST=`echo package/zapret-openwrt/{zapret,zapret-tpws,zapret-mdig,zapret-ip2net}/compile`
|
||||
PKGLIST=`echo package/zapret-openwrt/zapret/compile`
|
||||
fi
|
||||
if [ "$MAX_SPEED" = "false" ]; then
|
||||
make $PKGLIST V=s CONFIG_CCACHE=1 BUILD_LOG=1
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=luci-app-zapret
|
||||
PKG_VERSION:=72.20251218
|
||||
PKG_VERSION:=72.20251227
|
||||
PKG_RELEASE:=1
|
||||
PKG_LICENSE:=MIT
|
||||
PKG_MAINTAINER:=remittor <https://github.com/remittor>
|
||||
|
||||
@@ -404,13 +404,13 @@ return baseclass.extend({
|
||||
E('button', {
|
||||
'id': 'btn_save',
|
||||
'class': 'btn cbi-button-positive important',
|
||||
'click': ui.createHandlerFn(this, this.handleSave),
|
||||
'click': ui.createHandlerFn(this, this.handleSaveAdv),
|
||||
}, _('Save')),
|
||||
]),
|
||||
]);
|
||||
},
|
||||
|
||||
handleSave: function(ev) {
|
||||
handleSaveAdv: function(ev) {
|
||||
let txt = document.getElementById('widget.modal_content');
|
||||
let value = txt.value.trim().replace(/\r\n/g, '\n') + '\n';
|
||||
|
||||
@@ -515,13 +515,13 @@ return baseclass.extend({
|
||||
E('button', {
|
||||
'id': 'btn_save',
|
||||
'class': 'btn cbi-button-positive important',
|
||||
'click': ui.createHandlerFn(this, this.handleSave),
|
||||
'click': ui.createHandlerFn(this, this.handleSaveAdv),
|
||||
}, _('Save')),
|
||||
]),
|
||||
]);
|
||||
},
|
||||
|
||||
handleSave: function(ev) {
|
||||
handleSaveAdv: function(ev) {
|
||||
let txt = document.getElementById('widget.modal_content');
|
||||
let value = txt.value.trim();
|
||||
if (this.multiline) {
|
||||
@@ -544,33 +544,33 @@ return baseclass.extend({
|
||||
}
|
||||
value = value.replace(/˂/g, '<');
|
||||
value = value.replace(/˃/g, '>');
|
||||
uci.set('zapret', this.cfgsec, this.cfgparam, value);
|
||||
uci.save();
|
||||
let elem = document.getElementById("cbi-zapret-" + this.cfgsec + "-_" + 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.querySelector('div').innerHTML = val;
|
||||
} else {
|
||||
elem.querySelector('div').textContent = val;
|
||||
try {
|
||||
let elem2 = null;
|
||||
let elem = document.getElementById("cbi-zapret-" + this.cfgsec + "-_" + this.cfgparam);
|
||||
if (elem) {
|
||||
if (!elem2) {
|
||||
elem2 = elem.querySelector('div');
|
||||
}
|
||||
if (!elem2) {
|
||||
elem2 = elem.querySelector('output');
|
||||
}
|
||||
}
|
||||
if (elem2) {
|
||||
let val = value.trim();
|
||||
if (this.multiline) {
|
||||
val = val.replace(/</g, '˂');
|
||||
val = val.replace(/>/g, '˃');
|
||||
val = val.replace(/\n/g, '<br/>');
|
||||
elem2.innerHTML = val;
|
||||
} else {
|
||||
elem2.textContent = val;
|
||||
}
|
||||
}
|
||||
} catch(e) {
|
||||
console.error('ERROR: cannot found elem for ' + this.cfgparam);
|
||||
}
|
||||
ui.hideModal();
|
||||
/*
|
||||
return uci.save()
|
||||
.then(L.bind(ui.changes.init, ui.changes))
|
||||
.then(L.bind(ui.changes.displayChanges, ui.changes))
|
||||
//.then(L.bind(ui.changes.apply, ui.changes))
|
||||
.then(ui.addNotification(null, E('p', _('Contents have been saved.')), 'info'))
|
||||
.catch(e => {
|
||||
ui.addNotification(null, E('p', _('Unable to save the contents') + ': %s'.format(e.message)));
|
||||
}).finally(() => {
|
||||
ui.hideModal();
|
||||
});
|
||||
*/
|
||||
uci.set('zapret', this.cfgsec, this.cfgparam, value);
|
||||
uci.save().then(ui.hideModal);
|
||||
},
|
||||
|
||||
error: function(e) {
|
||||
@@ -589,13 +589,17 @@ return baseclass.extend({
|
||||
},
|
||||
|
||||
show: function() {
|
||||
//ui.showModal(null, E('p', { 'class': 'spinning' }, _('Loading')) );
|
||||
let content = this.load();
|
||||
//ui.hideModal();
|
||||
if (content === null) {
|
||||
return this.error('Cannot load parameter');
|
||||
}
|
||||
return this.render(content);
|
||||
ui.showModal(null,
|
||||
E('p', { 'class': 'spinning' }, _('Loading'))
|
||||
);
|
||||
L.resolveDefault(this.load(), null)
|
||||
.then(content => {
|
||||
ui.hideModal();
|
||||
return this.render(content);
|
||||
}).catch(e => {
|
||||
ui.hideModal();
|
||||
return this.error(e);
|
||||
})
|
||||
},
|
||||
}),
|
||||
|
||||
|
||||
@@ -132,7 +132,11 @@ return baseclass.extend({
|
||||
}
|
||||
let lastLen = 0;
|
||||
let retCode = -1;
|
||||
let timerBusy = false;
|
||||
let timer = setInterval(async () => {
|
||||
if (timerBusy)
|
||||
return; // skip iteration
|
||||
timerBusy = true;
|
||||
try {
|
||||
let res = await fs.exec('/bin/cat', [ logFile ], null, rpc_opt);
|
||||
if (res.stdout && res.stdout.length > lastLen) {
|
||||
@@ -167,9 +171,16 @@ return baseclass.extend({
|
||||
this.setStage(999);
|
||||
}
|
||||
} catch (e) {
|
||||
if (e.message?.includes('RPC call to file/exec failed with error -32000: Object not found')) {
|
||||
console.warn('WARN: installUpdates: ' + e.message);
|
||||
return; // goto next timer iteration
|
||||
}
|
||||
clearInterval(timer);
|
||||
this.appendLog('ERROR: installUpdates: ' + e.message);
|
||||
this.appendLog('ERROR: installUpdates: ' + e.stack?.trim().split('\n')[0]);
|
||||
this.setStage(999);
|
||||
} finally {
|
||||
timerBusy = false;
|
||||
}
|
||||
}, 500);
|
||||
},
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=zapret-ip2net
|
||||
PKG_VERSION:=72.20251218
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_MAINTAINER:=bol-van
|
||||
PKG_LICENSE:=MIT
|
||||
PKG_LICENSE_FILES:=docs/LICENSE.txt
|
||||
|
||||
PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_VERSION:=994e9c34883ddc95e51c8285f134bd01fd6b6732
|
||||
PKG_SOURCE_DATE:=2025-12-18
|
||||
|
||||
#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_HASH:=skip
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
#TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS)
|
||||
#TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)
|
||||
|
||||
MAKE_PATH:=ip2net
|
||||
|
||||
define Package/$(PKG_NAME)
|
||||
SECTION:=net
|
||||
CATEGORY:=Network
|
||||
TITLE:=ip2net
|
||||
SUBMENU:=Zapret
|
||||
DEPENDS:=+zlib +zapret
|
||||
endef
|
||||
|
||||
define Build/Prepare
|
||||
$(Build/Prepare/Default)
|
||||
rm -f $(PKG_BUILD_DIR)/$(MAKE_PATH)/ip2net
|
||||
endef
|
||||
|
||||
define Package/$(PKG_NAME)/install
|
||||
$(INSTALL_DIR) $(1)/opt/zapret/ip2net
|
||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/ip2net $(1)/opt/zapret/ip2net/
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,$(PKG_NAME)))
|
||||
@@ -1,45 +0,0 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=zapret-mdig
|
||||
PKG_VERSION:=72.20251218
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_MAINTAINER:=bol-van
|
||||
PKG_LICENSE:=MIT
|
||||
PKG_LICENSE_FILES:=docs/LICENSE.txt
|
||||
|
||||
PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_VERSION:=994e9c34883ddc95e51c8285f134bd01fd6b6732
|
||||
PKG_SOURCE_DATE:=2025-12-18
|
||||
|
||||
#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_HASH:=skip
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
#TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS)
|
||||
#TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)
|
||||
|
||||
MAKE_PATH:=mdig
|
||||
|
||||
define Package/$(PKG_NAME)
|
||||
SECTION:=net
|
||||
CATEGORY:=Network
|
||||
TITLE:=mdig
|
||||
SUBMENU:=Zapret
|
||||
DEPENDS:=+zlib +zapret
|
||||
endef
|
||||
|
||||
define Build/Prepare
|
||||
$(Build/Prepare/Default)
|
||||
rm -f $(PKG_BUILD_DIR)/$(MAKE_PATH)/mdig
|
||||
endef
|
||||
|
||||
define Package/$(PKG_NAME)/install
|
||||
$(INSTALL_DIR) $(1)/opt/zapret/mdig
|
||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/mdig $(1)/opt/zapret/mdig/
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,$(PKG_NAME)))
|
||||
@@ -1,45 +0,0 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=zapret-tpws
|
||||
PKG_VERSION:=72.20251218
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_MAINTAINER:=bol-van
|
||||
PKG_LICENSE:=MIT
|
||||
PKG_LICENSE_FILES:=docs/LICENSE.txt
|
||||
|
||||
PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_VERSION:=994e9c34883ddc95e51c8285f134bd01fd6b6732
|
||||
PKG_SOURCE_DATE:=2025-12-18
|
||||
|
||||
#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_HASH:=skip
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
#TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS)
|
||||
#TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)
|
||||
|
||||
MAKE_PATH:=tpws
|
||||
|
||||
define Package/$(PKG_NAME)
|
||||
SECTION:=net
|
||||
CATEGORY:=Network
|
||||
TITLE:=tpws
|
||||
SUBMENU:=Zapret
|
||||
DEPENDS:=+zlib +libcap +zapret
|
||||
endef
|
||||
|
||||
define Build/Prepare
|
||||
$(Build/Prepare/Default)
|
||||
rm -f $(PKG_BUILD_DIR)/$(MAKE_PATH)/tpws
|
||||
endef
|
||||
|
||||
define Package/$(PKG_NAME)/install
|
||||
$(INSTALL_DIR) $(1)/opt/zapret/tpws
|
||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/tpws $(1)/opt/zapret/tpws/
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,$(PKG_NAME)))
|
||||
@@ -5,7 +5,7 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=zapret
|
||||
PKG_VERSION:=72.20251218
|
||||
PKG_VERSION:=72.20251227
|
||||
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:=994e9c34883ddc95e51c8285f134bd01fd6b6732
|
||||
PKG_SOURCE_DATE:=2025-12-18
|
||||
PKG_SOURCE_VERSION:=e95a06c7eeff87e166a5f9ca71547b169c9852e0
|
||||
PKG_SOURCE_DATE:=2025-12-27
|
||||
|
||||
#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?
|
||||
@@ -43,13 +43,18 @@ endef
|
||||
define Build/Prepare
|
||||
$(Build/Prepare/Default)
|
||||
rm -f $(PKG_BUILD_DIR)/$(MAKE_PATH)/nfqws
|
||||
rm -f $(PKG_BUILD_DIR)/ip2net/ip2net
|
||||
rm -f $(PKG_BUILD_DIR)/mdig/mdig
|
||||
endef
|
||||
|
||||
#define Build/Configure
|
||||
#endef
|
||||
|
||||
#define Build/Compile
|
||||
#endef
|
||||
define Build/Compile
|
||||
$(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) $(TARGET_CONFIGURE_OPTS)
|
||||
$(MAKE) -C $(PKG_BUILD_DIR)/ip2net $(TARGET_CONFIGURE_OPTS)
|
||||
$(MAKE) -C $(PKG_BUILD_DIR)/mdig $(TARGET_CONFIGURE_OPTS)
|
||||
endef
|
||||
|
||||
define Package/$(PKG_NAME)/conffiles
|
||||
/etc/config/zapret
|
||||
@@ -61,7 +66,11 @@ endef
|
||||
define Package/$(PKG_NAME)/install
|
||||
$(INSTALL_DIR) $(1)/opt/zapret
|
||||
$(INSTALL_DIR) $(1)/opt/zapret/$(MAKE_PATH)
|
||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/nfqws $(1)/opt/zapret/$(MAKE_PATH)/
|
||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/nfqws $(1)/opt/zapret/$(MAKE_PATH)/
|
||||
$(INSTALL_DIR) $(1)/opt/zapret/ip2net
|
||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ip2net/ip2net $(1)/opt/zapret/ip2net/
|
||||
$(INSTALL_DIR) $(1)/opt/zapret/mdig
|
||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/mdig/mdig $(1)/opt/zapret/mdig/
|
||||
$(INSTALL_DIR) $(1)/opt/zapret/common
|
||||
$(CP) $(PKG_BUILD_DIR)/common/* $(1)/opt/zapret/common/
|
||||
#$(INSTALL_DIR) $(1)/opt/zapret/docs
|
||||
@@ -110,6 +119,9 @@ define Package/$(PKG_NAME)/install
|
||||
chmod 644 $(1)/opt/zapret/init.d/openwrt/custom.d/*.sh
|
||||
chmod 644 $(1)/opt/zapret/config.default
|
||||
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/*
|
||||
endef
|
||||
|
||||
define Package/$(PKG_NAME)/preinst
|
||||
|
||||
@@ -7,13 +7,16 @@ ZAPRET_BASE=/opt/zapret
|
||||
ZAPRET_INITD=/etc/init.d/zapret
|
||||
ZAPRET_ORIG_INITD="$ZAPRET_BASE/init.d/openwrt/zapret"
|
||||
|
||||
ZAP_LOG_TAG=ZAPRET
|
||||
|
||||
ZAPRET_CONFIG="$ZAPRET_BASE/config"
|
||||
ZAPRET_CONFIG_NEW="$ZAPRET_BASE/config.new"
|
||||
ZAPRET_CONFIG_DEF="$ZAPRET_BASE/config.default"
|
||||
|
||||
ZAPRET_CFG=/etc/config/zapret
|
||||
ZAPRET_CFG_NAME=zapret
|
||||
ZAPRET_CFG_SEC_NAME="$( uci -q get $ZAPRET_CFG_NAME.config )"
|
||||
ZAPRET_CFG_SEC=$ZAPRET_CFG_NAME.config
|
||||
ZAPRET_CFG_SEC_NAME="$( uci -q get $ZAPRET_CFG_SEC )"
|
||||
|
||||
. $ZAPRET_BASE/def-cfg.sh
|
||||
|
||||
@@ -148,7 +151,7 @@ function merge_cfg_with_def_values
|
||||
local cfgname=${1:-$ZAPRET_CFG_NAME}
|
||||
local force=$2
|
||||
local cfgfile=/etc/config/$cfgname
|
||||
local NEWCFGNAME="zapret-default"
|
||||
local NEWCFGNAME="$ZAPRET_CFG_NAME-default"
|
||||
local NEWCFGFILE="/etc/config/$NEWCFGNAME"
|
||||
|
||||
local cfg_sec_name="$( uci -q get $ZAPRET_CFG_NAME.config )"
|
||||
@@ -168,7 +171,7 @@ function merge_cfg_with_def_values
|
||||
function remove_cron_task_logs
|
||||
{
|
||||
if [ -f "$CRONTAB_FILE" ]; then
|
||||
sed -i "/-name 'zapret\*.log' -size +/d" "$CRONTAB_FILE"
|
||||
sed -i "/-name '$ZAPRET_CFG_NAME+\*.log' -size +/d" "$CRONTAB_FILE"
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -176,8 +179,8 @@ function insert_cron_task_logs
|
||||
{
|
||||
[ ! -f "$CRONTAB_FILE" ] && touch "$CRONTAB_FILE"
|
||||
[ ! -f "$CRONTAB_FILE" ] && return 1
|
||||
if ! grep -q -e "-name 'zapret\*\.log' -size \+" "$CRONTAB_FILE"; then
|
||||
echo "*/2 * * * * /usr/bin/find /tmp -maxdepth 1 -type f -name 'zapret*.log' -size +2600k -exec rm -f {} \;" >> "$CRONTAB_FILE"
|
||||
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
|
||||
return 0
|
||||
@@ -190,7 +193,7 @@ function init_before_start
|
||||
[ ! -f "$HOSTLIST_FN" ] && touch "$HOSTLIST_FN"
|
||||
chmod 644 $ZAPRET_BASE/ipset/*.txt
|
||||
chmod 666 $ZAPRET_BASE/ipset/*.log
|
||||
rm -f /tmp/zapret*.log
|
||||
rm -f /tmp/$ZAPRET_CFG_NAME+*.log
|
||||
#*/
|
||||
if [ "$DAEMON_LOG_ENABLE" = "1" ]; then
|
||||
insert_cron_task_logs
|
||||
|
||||
@@ -247,13 +247,136 @@ function set_cfg_nfqws_strat
|
||||
commit $cfgname
|
||||
EOF
|
||||
fi
|
||||
if [ "$strat" = "v6_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=multisplit
|
||||
--dpi-desync-split-pos=1,sniext+1
|
||||
--dpi-desync-split-seqovl=1
|
||||
|
||||
--new
|
||||
--filter-tcp=443 ˂HOSTLIST˃
|
||||
--dpi-desync=hostfakesplit
|
||||
--dpi-desync-hostfakesplit-mod=host=rzd.ru
|
||||
--dpi-desync-hostfakesplit-midhost=host-2
|
||||
--dpi-desync-split-seqovl=726
|
||||
--dpi-desync-fooling=badsum,badseq
|
||||
--dpi-desync-badseq-increment=0
|
||||
|
||||
--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
|
||||
uci batch <<-EOF
|
||||
set $cfgname.config.NFQWS_PORTS_TCP='80,443'
|
||||
set $cfgname.config.NFQWS_PORTS_UDP='443'
|
||||
set $cfgname.config.NFQWS_OPT="
|
||||
# Strategy $strat
|
||||
|
||||
--filter-tcp=443
|
||||
--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
|
||||
--hostlist-exclude=/opt/zapret/ipset/zapret-hosts-user-exclude.txt
|
||||
--hostlist-exclude-domains=openwrt.org
|
||||
--ip-id=zero
|
||||
--dpi-desync=multisplit
|
||||
--dpi-desync-split-pos=2,sniext+1
|
||||
--dpi-desync-split-seqovl=679
|
||||
--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
|
||||
|
||||
--new
|
||||
--filter-tcp=80,443 <HOSTLIST>
|
||||
--hostlist-exclude-domains=openwrt.org
|
||||
--dpi-desync=multisplit
|
||||
--dpi-desync-split-pos=2,sniext+1
|
||||
--dpi-desync-split-seqovl=679
|
||||
--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
|
||||
|
||||
--new
|
||||
--filter-udp=443
|
||||
--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
|
||||
--hostlist-exclude=/opt/zapret/ipset/zapret-hosts-user-exclude.txt
|
||||
--dpi-desync=fake
|
||||
--dpi-desync-repeats=6
|
||||
--dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin
|
||||
"
|
||||
commit $cfgname
|
||||
EOF
|
||||
fi
|
||||
if [ "$strat" = "TLS_AUTO_ALT3_by_Flowseal" ]; then
|
||||
uci batch <<-EOF
|
||||
set $cfgname.config.NFQWS_PORTS_TCP='80,443'
|
||||
set $cfgname.config.NFQWS_PORTS_UDP='443'
|
||||
set $cfgname.config.NFQWS_OPT="
|
||||
# Strategy $strat
|
||||
|
||||
--filter-tcp=443
|
||||
--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
|
||||
--hostlist-exclude=/opt/zapret/ipset/zapret-hosts-user-exclude.txt
|
||||
--hostlist-exclude-domains=openwrt.org
|
||||
--ip-id=zero
|
||||
--dpi-desync=fake,multisplit
|
||||
--dpi-desync-split-seqovl=681
|
||||
--dpi-desync-split-pos=1
|
||||
--dpi-desync-fooling=ts
|
||||
--dpi-desync-repeats=8
|
||||
--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
|
||||
--dpi-desync-fake-tls-mod=rnd,dupsid,sni=www.google.com
|
||||
|
||||
--new
|
||||
--filter-tcp=80,443 <HOSTLIST>
|
||||
--hostlist-exclude-domains=openwrt.org
|
||||
--dpi-desync=fake,multisplit
|
||||
--dpi-desync-split-seqovl=681
|
||||
--dpi-desync-split-pos=1
|
||||
--dpi-desync-fooling=ts
|
||||
--dpi-desync-repeats=8
|
||||
--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
|
||||
--dpi-desync-fake-tls-mod=rnd,dupsid,sni=www.google.com
|
||||
|
||||
--new
|
||||
--filter-udp=443
|
||||
--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
|
||||
--hostlist-exclude=/opt/zapret/ipset/zapret-hosts-user-exclude.txt
|
||||
--dpi-desync=fake
|
||||
--dpi-desync-repeats=11
|
||||
--dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin
|
||||
"
|
||||
commit $cfgname
|
||||
EOF
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
function set_cfg_default_values
|
||||
{
|
||||
local opt_flags=${1:--}
|
||||
local opt_strat=${2:-v2_by_StressOzz}
|
||||
local opt_strat=${2:-v6_by_StressOzz}
|
||||
local cfgname=${3:-$ZAPRET_CFG_NAME}
|
||||
|
||||
if ! echo "$opt_flags" | grep -q "(skip_base)"; then
|
||||
|
||||
BIN
zapret/files/fake/tls_clienthello_max_ru.bin
Normal file
BIN
zapret/files/fake/tls_clienthello_max_ru.bin
Normal file
Binary file not shown.
@@ -10,14 +10,14 @@ SCRIPT_FILENAME=$1
|
||||
. /opt/zapret/comfunc.sh
|
||||
|
||||
if ! is_valid_config ; then
|
||||
logger -p err -t ZAPRET "Wrong main config: $ZAPRET_CONFIG"
|
||||
logger -p err -t $ZAP_LOG_TAG "Wrong main config: $ZAPRET_CONFIG"
|
||||
exit 91
|
||||
fi
|
||||
|
||||
. $ZAPRET_ORIG_INITD
|
||||
|
||||
EXEDIR=/opt/zapret
|
||||
ZAPRET_BASE=/opt/zapret
|
||||
EXEDIR=/opt/$ZAPRET_CFG_NAME
|
||||
ZAPRET_BASE=/opt/$ZAPRET_CFG_NAME
|
||||
|
||||
is_run_on_boot && IS_RUN_ON_BOOT=1 || IS_RUN_ON_BOOT=0
|
||||
|
||||
@@ -30,13 +30,13 @@ function enable
|
||||
if [ -n "$ZAPRET_CFG_SEC_NAME" ]; then
|
||||
run_on_boot=$( get_run_on_boot_option )
|
||||
if [ $run_on_boot != 1 ]; then
|
||||
logger -p notice -t ZAPRET "Attempt to enable service, but service blocked!"
|
||||
logger -p notice -t $ZAP_LOG_TAG "Attempt to enable service, but service blocked!"
|
||||
return 61
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
if [ -n "$ZAPRET_CFG_SEC_NAME" ]; then
|
||||
uci set $ZAPRET_CFG_NAME.config.run_on_boot=1
|
||||
uci set $ZAPRET_CFG_SEC.run_on_boot=1
|
||||
uci commit
|
||||
fi
|
||||
/bin/sh /etc/rc.common $ZAPRET_ORIG_INITD enable
|
||||
@@ -49,7 +49,7 @@ function enabled
|
||||
run_on_boot=$( get_run_on_boot_option )
|
||||
if [ $run_on_boot != 1 ]; then
|
||||
if [ "$IS_RUN_ON_BOOT" = "1" ]; then
|
||||
logger -p notice -t ZAPRET "Service is blocked!"
|
||||
logger -p notice -t $ZAP_LOG_TAG "Service is blocked!"
|
||||
fi
|
||||
return 61
|
||||
fi
|
||||
@@ -65,7 +65,7 @@ function boot
|
||||
if [ -n "$ZAPRET_CFG_SEC_NAME" ]; then
|
||||
run_on_boot=$( get_run_on_boot_option )
|
||||
if [ $run_on_boot != 1 ]; then
|
||||
logger -p notice -t ZAPRET "Attempt to run service on boot! Service is blocked!"
|
||||
logger -p notice -t $ZAP_LOG_TAG "Attempt to run service on boot! Service is blocked!"
|
||||
return 61
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
#!/bin/sh
|
||||
# Copyright (c) 2024 remittor
|
||||
|
||||
. /opt/zapret/comfunc.sh
|
||||
EXE_DIR=$(cd "$(dirname "$0")" 2>/dev/null || exit 1; pwd)
|
||||
|
||||
. $EXE_DIR/comfunc.sh
|
||||
|
||||
merge_cfg_with_def_values
|
||||
|
||||
@@ -12,5 +14,5 @@ CONFIGS_SYNC=0
|
||||
|
||||
if [ "$CONFIGS_SYNC" = "1" ]; then
|
||||
# renew main config
|
||||
/opt/zapret/sync_config.sh
|
||||
$ZAPRET_BASE/sync_config.sh
|
||||
fi
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
#!/bin/sh
|
||||
# Copyright (c) 2024 remittor
|
||||
|
||||
. /opt/zapret/comfunc.sh
|
||||
EXE_DIR=$(cd "$(dirname "$0")" 2>/dev/null || exit 1; pwd)
|
||||
|
||||
cfg_run_on_boot="$( uci -q get zapret.config.run_on_boot )"
|
||||
. $EXE_DIR/comfunc.sh
|
||||
|
||||
cfg_run_on_boot="$( uci -q get $ZAPRET_CFG_SEC.run_on_boot )"
|
||||
|
||||
opt_flags=${1:--}
|
||||
opt_strat=$2
|
||||
@@ -15,7 +17,7 @@ fi
|
||||
create_default_cfg "$opt_flags" "$opt_strat"
|
||||
|
||||
if [ "$cfg_run_on_boot" = "1" ]; then
|
||||
uci set zapret.config.run_on_boot=1
|
||||
uci set $ZAPRET_CFG_SEC.run_on_boot=1
|
||||
uci commit
|
||||
fi
|
||||
|
||||
@@ -29,5 +31,5 @@ fi
|
||||
|
||||
if [ "$ZAPRET_SYNC_CONFIG" = "1" ]; then
|
||||
# renew main config
|
||||
/opt/zapret/sync_config.sh
|
||||
$ZAPRET_BASE/sync_config.sh
|
||||
fi
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
#!/bin/sh
|
||||
# Copyright (c) 2024 remittor
|
||||
|
||||
. /opt/zapret/comfunc.sh
|
||||
EXE_DIR=$(cd "$(dirname "$0")" 2>/dev/null || exit 1; pwd)
|
||||
|
||||
. $EXE_DIR/comfunc.sh
|
||||
|
||||
function uncomment_param
|
||||
{
|
||||
@@ -41,7 +43,7 @@ function sync_param
|
||||
{
|
||||
local param=$1
|
||||
local vtype=$2
|
||||
local value="$( uci -q get zapret.config.$param )"
|
||||
local value="$( uci -q get $ZAPRET_CFG_SEC.$param )"
|
||||
uncomment_param $param
|
||||
append_param $param
|
||||
local TAB="$( echo -n -e '\t' )"
|
||||
@@ -51,9 +53,15 @@ function sync_param
|
||||
if [ "$param" = "NFQWS_PORTS_TCP_KEEPALIVE" -o "$param" = "NFQWS_PORTS_UDP_KEEPALIVE" ]; then
|
||||
[ "$value" = "0" ] && value=""
|
||||
fi
|
||||
if [ "$param" = "NFQWS2_PORTS_TCP_KEEPALIVE" -o "$param" = "NFQWS2_PORTS_UDP_KEEPALIVE" ]; then
|
||||
[ "$value" = "0" ] && value=""
|
||||
fi
|
||||
if [ "$param" = "NFQWS_OPT" -a "$value" != "" ]; then
|
||||
value=$( echo -n "$value" | sed '/^#/d' )
|
||||
fi
|
||||
if [ "$param" = "NFQWS2_OPT" -a "$value" != "" ]; then
|
||||
value=$( echo -n "$value" | sed '/^#/d' )
|
||||
fi
|
||||
if [ "$vtype" = "str" ]; then
|
||||
set_param_value_str $param "$value"
|
||||
else
|
||||
@@ -90,21 +98,42 @@ sync_param DAEMON_LOG_FILE str
|
||||
sync_param AUTOHOSTLIST_RETRANS_THRESHOLD
|
||||
sync_param AUTOHOSTLIST_FAIL_THRESHOLD
|
||||
sync_param AUTOHOSTLIST_FAIL_TIME
|
||||
if [ $ZAPRET_CFG_NAME = "zapret2" ]; then
|
||||
sync_param AUTOHOSTLIST_INCOMING_MAXSEQ
|
||||
sync_param AUTOHOSTLIST_RETRANS_MAXSEQ
|
||||
sync_param AUTOHOSTLIST_UDP_IN
|
||||
sync_param AUTOHOSTLIST_UDP_OUT
|
||||
fi
|
||||
sync_param AUTOHOSTLIST_DEBUGLOG
|
||||
|
||||
sync_param NFQWS_ENABLE
|
||||
sync_param DESYNC_MARK
|
||||
sync_param DESYNC_MARK_POSTNAT
|
||||
sync_param FILTER_MARK str
|
||||
sync_param NFQWS_PORTS_TCP str
|
||||
sync_param NFQWS_PORTS_UDP str
|
||||
sync_param NFQWS_TCP_PKT_OUT str
|
||||
sync_param NFQWS_TCP_PKT_IN str
|
||||
sync_param NFQWS_UDP_PKT_OUT str
|
||||
sync_param NFQWS_UDP_PKT_IN str
|
||||
sync_param NFQWS_PORTS_TCP_KEEPALIVE str
|
||||
sync_param NFQWS_PORTS_UDP_KEEPALIVE str
|
||||
sync_param NFQWS_OPT str
|
||||
|
||||
if [ $ZAPRET_CFG_NAME = "zapret" ]; then
|
||||
sync_param NFQWS_ENABLE
|
||||
sync_param NFQWS_PORTS_TCP str
|
||||
sync_param NFQWS_PORTS_UDP str
|
||||
sync_param NFQWS_TCP_PKT_OUT str
|
||||
sync_param NFQWS_TCP_PKT_IN str
|
||||
sync_param NFQWS_UDP_PKT_OUT str
|
||||
sync_param NFQWS_UDP_PKT_IN str
|
||||
sync_param NFQWS_PORTS_TCP_KEEPALIVE str
|
||||
sync_param NFQWS_PORTS_UDP_KEEPALIVE str
|
||||
sync_param NFQWS_OPT str
|
||||
fi
|
||||
if [ $ZAPRET_CFG_NAME = "zapret2" ]; then
|
||||
sync_param NFQWS2_ENABLE
|
||||
sync_param NFQWS2_PORTS_TCP str
|
||||
sync_param NFQWS2_PORTS_UDP str
|
||||
sync_param NFQWS2_TCP_PKT_OUT str
|
||||
sync_param NFQWS2_TCP_PKT_IN str
|
||||
sync_param NFQWS2_UDP_PKT_OUT str
|
||||
sync_param NFQWS2_UDP_PKT_IN str
|
||||
sync_param NFQWS2_PORTS_TCP_KEEPALIVE str
|
||||
sync_param NFQWS2_PORTS_UDP_KEEPALIVE str
|
||||
sync_param NFQWS2_OPT str
|
||||
fi
|
||||
|
||||
ZAPRET_CONFIG="$ZAPRET_CONFIG__SAVED"
|
||||
|
||||
|
||||
@@ -4,14 +4,14 @@
|
||||
. /opt/zapret/comfunc.sh
|
||||
|
||||
# create empty txt files into ipset directory
|
||||
[ ! -f "/opt/zapret/ipset/zapret-hosts-google.txt" ] && touch "/opt/zapret/ipset/zapret-hosts-google.txt"
|
||||
#[ ! -f "/opt/zapret/ipset/zapret-hosts-auto.txt" ] && touch "/opt/zapret/ipset/zapret-hosts-auto.txt"
|
||||
[ ! -f "/opt/zapret/ipset/zapret-hosts-user.txt" ] && touch "/opt/zapret/ipset/zapret-hosts-user.txt"
|
||||
[ ! -f "/opt/zapret/ipset/zapret-hosts-user-ipban.txt" ] && touch "/opt/zapret/ipset/zapret-hosts-user-ipban.txt"
|
||||
#[ ! -f "/opt/zapret/ipset/zapret-ip.txt" ] && touch "/opt/zapret/ipset/zapret-ip.txt"
|
||||
[ ! -f "/opt/zapret/ipset/zapret-ip-user.txt" ] && touch "/opt/zapret/ipset/zapret-ip-user.txt"
|
||||
[ ! -f "/opt/zapret/ipset/zapret-ip-user-exclude.txt" ] && touch "/opt/zapret/ipset/zapret-ip-user-exclude.txt"
|
||||
[ ! -f "/opt/zapret/ipset/zapret-ip-user-ipban.txt" ] && touch "/opt/zapret/ipset/zapret-ip-user-ipban.txt"
|
||||
[ ! -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-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"
|
||||
[ ! -f "$ZAPRET_BASE/ipset/zapret-ip-user.txt" ] && touch "$ZAPRET_BASE/ipset/zapret-ip-user.txt"
|
||||
[ ! -f "$ZAPRET_BASE/ipset/zapret-ip-user-exclude.txt" ] && touch "$ZAPRET_BASE/ipset/zapret-ip-user-exclude.txt"
|
||||
[ ! -f "$ZAPRET_BASE/ipset/zapret-ip-user-ipban.txt" ] && touch "$ZAPRET_BASE/ipset/zapret-ip-user-ipban.txt"
|
||||
|
||||
# create or merge uci-config
|
||||
$ZAPRET_BASE/renew-cfg.sh
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
#!/bin/sh
|
||||
# Copyright (c) 2025 remittor
|
||||
|
||||
. /opt/zapret/comfunc.sh
|
||||
EXE_DIR=$(cd "$(dirname "$0")" 2>/dev/null || exit 1; pwd)
|
||||
|
||||
. $EXE_DIR/comfunc.sh
|
||||
. /usr/share/libubox/jshn.sh
|
||||
. /etc/openwrt_release
|
||||
|
||||
@@ -21,7 +23,7 @@ while getopts "cu:pft:" opt; do
|
||||
esac
|
||||
done
|
||||
|
||||
ZAP_PKG_DIR=/tmp/zapret_pkg
|
||||
ZAP_PKG_DIR=/tmp/$ZAPRET_CFG_NAME-pkg
|
||||
|
||||
if [ "$opt_test" != "" ]; then
|
||||
echo 1; sleep 2;
|
||||
@@ -34,8 +36,13 @@ if [ "$opt_test" != "" ]; then
|
||||
fi
|
||||
|
||||
ZAP_CPU_ARCH=$(get_cpu_arch)
|
||||
ZAP_REL_URL="https://raw.githubusercontent.com/remittor/zapret-openwrt/gh-pages/releases/releases_zap1_$ZAP_CPU_ARCH.json"
|
||||
|
||||
if [ $ZAPRET_CFG_NAME = "zapret" ]; then
|
||||
ZAP_REL_URL="https://raw.githubusercontent.com/remittor/zapret-openwrt/gh-pages/releases/releases_zap1_$ZAP_CPU_ARCH.json"
|
||||
fi
|
||||
if [ $ZAPRET_CFG_NAME = "zapret2" ]; then
|
||||
ZAP_REL_URL="https://raw.githubusercontent.com/remittor/zapret-openwrt/gh-pages/releases/releases_zap2_$ZAP_CPU_ARCH.json"
|
||||
fi
|
||||
CURL_TIMEOUT=5
|
||||
CURL_HEADER1="Accept: application/json"
|
||||
CURL_HEADER2="Cache-Control: no-cache"
|
||||
@@ -72,7 +79,7 @@ function download_json
|
||||
function get_pkg_version
|
||||
{
|
||||
local pkg_name="$1"
|
||||
local ver line pkg_prefix
|
||||
local ver line base
|
||||
if [ "$PKG_MGR" = opkg ]; then
|
||||
ver=$( opkg list-installed "$pkg_name" 2>/dev/null | awk -F' - ' '{print $2}' | tr -d '\r' )
|
||||
if [ -n "$ver" ]; then
|
||||
@@ -81,18 +88,18 @@ function get_pkg_version
|
||||
fi
|
||||
fi
|
||||
if [ "$PKG_MGR" = apk ]; then
|
||||
line=$( apk info -e "$pkg_name" 2>/dev/null || true )
|
||||
line=$( apk info -s "$pkg_name" 2>/dev/null | head -n 1 | awk '{print $1}' || true )
|
||||
if [ -n "$line" ]; then
|
||||
pkg_prefix="${pkg_name}-"
|
||||
base=${line%-r[0-9]*}
|
||||
ver=${base##*-}
|
||||
case "$line" in
|
||||
"$pkg_prefix"*)
|
||||
ver=${line#"$pkg_prefix"}
|
||||
*-r[0-9]*)
|
||||
echo -n "$ver${line#$base}"
|
||||
;;
|
||||
*)
|
||||
ver=${line##*-}
|
||||
echo -n "$ver"
|
||||
;;
|
||||
esac
|
||||
echo -n "$ver"
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
@@ -104,9 +111,10 @@ function normalize_version
|
||||
{
|
||||
local ver="$1"
|
||||
local base
|
||||
local major minor rel
|
||||
local major minor build rel
|
||||
local old_ifs
|
||||
case "$ver" in
|
||||
*-r*)
|
||||
*-r[0-9]*)
|
||||
rel="${ver##*-r}"
|
||||
base="${ver%-r*}"
|
||||
;;
|
||||
@@ -115,11 +123,17 @@ function normalize_version
|
||||
base="$ver"
|
||||
;;
|
||||
esac
|
||||
major="${base%%.*}"
|
||||
minor="${base#*.}"
|
||||
[ -z "$minor" ] && minor=0
|
||||
[ -z "$rel" ] && rel=1
|
||||
echo "$major.$minor.$rel"
|
||||
old_ifs="$IFS" ; IFS='.' ; set -- $base ; IFS="$old_ifs"
|
||||
rel=${rel:-1}
|
||||
major=${1:-0}
|
||||
minor=${2:-0}
|
||||
if [ $ZAPRET_CFG_NAME = "zapret" ]; then
|
||||
echo "$major.$minor.$rel"
|
||||
fi
|
||||
if [ $ZAPRET_CFG_NAME = "zapret2" ]; then
|
||||
build=${3:-0}
|
||||
echo "$major.$minor.$build.$rel"
|
||||
fi
|
||||
}
|
||||
|
||||
function pkg_version_cmp
|
||||
@@ -137,9 +151,22 @@ function pkg_version_cmp
|
||||
x2=$( echo "$ver2" | cut -d. -f2 )
|
||||
[ "$x1" -gt "$x2" ] && { echo -n "G"; return 0; }
|
||||
[ "$x1" -lt "$x2" ] && { echo -n "L"; return 0; }
|
||||
if [ $ZAPRET_CFG_NAME = "zapret2" ]; then
|
||||
# build
|
||||
x1=$( echo "$ver1" | cut -d. -f3 )
|
||||
x2=$( echo "$ver2" | cut -d. -f3 )
|
||||
[ "$x1" -gt "$x2" ] && { echo -n "G"; return 0; }
|
||||
[ "$x1" -lt "$x2" ] && { echo -n "L"; return 0; }
|
||||
fi
|
||||
# release
|
||||
x1=$( echo "$ver1" | cut -d. -f3 )
|
||||
x2=$( echo "$ver2" | cut -d. -f3 )
|
||||
if [ $ZAPRET_CFG_NAME = "zapret" ]; then
|
||||
x1=$( echo "$ver1" | cut -d. -f3 )
|
||||
x2=$( echo "$ver2" | cut -d. -f3 )
|
||||
fi
|
||||
if [ $ZAPRET_CFG_NAME = "zapret2" ]; then
|
||||
x1=$( echo "$ver1" | cut -d. -f4 )
|
||||
x2=$( echo "$ver2" | cut -d. -f4 )
|
||||
fi
|
||||
[ "$x1" -gt "$x2" ] && { echo -n "G"; return 0; }
|
||||
[ "$x1" -lt "$x2" ] && { echo -n "L"; return 0; }
|
||||
echo -n "E"
|
||||
@@ -147,14 +174,24 @@ function pkg_version_cmp
|
||||
|
||||
function download_releases_info
|
||||
{
|
||||
local txt txtlen txtlines generated_at
|
||||
local fname resp hdr txt txtlen txtlines generated_at
|
||||
REL_JSON=
|
||||
echo "Download releases info..."
|
||||
txt=$(download_json $ZAP_REL_URL)
|
||||
fname="${ZAP_REL_URL##*/}"
|
||||
resp=$( curl -s -D - --max-time $CURL_TIMEOUT -H "$CURL_HEADER1" -H "$CURL_HEADER2" "$ZAP_REL_URL" 2>/dev/null )
|
||||
hdr="${resp%%$'\r\n\r\n'*}"
|
||||
status=$( printf '%s\n' "$hdr" | head -n 1 | awk '{print $2}' )
|
||||
if [ "$status" != 200 ]; then
|
||||
echo "ERROR: Cannot download file \"$ZAP_REL_URL\" (status = $status)"
|
||||
return 103
|
||||
fi
|
||||
txtlen=$( printf '%s\n' "$hdr" | awk -F': ' 'BEGIN{IGNORECASE=1} $1=="Content-Length"{print $2}' | tr -d '\r')
|
||||
echo "Content-Length: $txtlen bytes"
|
||||
txt="${resp#*$'\r\n\r\n'}"
|
||||
txtlen=${#txt}
|
||||
txtlines=$(printf '%s\n' "$txt" | wc -l)
|
||||
if [[ $txtlen -lt 64 ]]; then
|
||||
echo "ERROR: Cannot download releases info!"
|
||||
echo "ERROR: Cannot download releases info! (size = $txtlen)"
|
||||
return 104
|
||||
fi
|
||||
echo "Releases info downloaded! Size = $txtlen, Lines = $txtlines"
|
||||
@@ -222,7 +259,7 @@ function get_actual_release
|
||||
done
|
||||
json_cleanup
|
||||
echo "ERROR: latest release for arch \"$ZAP_CPU_ARCH\" not founded!"
|
||||
return 1 # release not founded
|
||||
return 150 # release not founded
|
||||
}
|
||||
|
||||
# -------------------------------------------------------------------------------------------------------
|
||||
@@ -279,7 +316,7 @@ ZAP_PKG_FN=
|
||||
ZAP_PKG_BASE_FN=
|
||||
ZAP_PKG_LUCI_FN=
|
||||
|
||||
ZAP_CUR_PKG_VER=$( get_pkg_version zapret )
|
||||
ZAP_CUR_PKG_VER=$( get_pkg_version $ZAPRET_CFG_NAME )
|
||||
echo "Current installed version: $ZAP_CUR_PKG_VER"
|
||||
|
||||
if [ "$opt_update" = "" ]; then
|
||||
@@ -334,8 +371,8 @@ if [ "$opt_update" != "" ]; then
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
ZAP_PKG_DIR=/tmp/zapret_pkg
|
||||
rm -rf $ZAP_PKG_DIR
|
||||
ZAP_PKG_DIR=/tmp/$ZAPRET_CFG_NAME-pkg
|
||||
rm -rf $ZAP_PKG_DIR 2>/dev/null
|
||||
ZAP_PKG_HDRS=$( curl -s -I -L --max-time $CURL_TIMEOUT -H "$CURL_HEADER2" "$ZAP_PKG_URL" )
|
||||
ZAP_PKG_SIZE=$( echo "$ZAP_PKG_HDRS" | grep -i 'content-length: ' | tail -n1 | awk '{print $2}' | tr -d '\r' )
|
||||
echo "Downloded ZIP-file size = $ZAP_PKG_SIZE bytes"
|
||||
@@ -356,31 +393,39 @@ if [ "$opt_update" != "" ]; then
|
||||
echo "ERROR: downloaded package is incorrect! (size = $ZAP_PKG_SZ)"
|
||||
return 216
|
||||
fi
|
||||
if ! command -v unzip >/dev/null 2>&1; then
|
||||
echo "ERROR: package \"upzip\" not installed!"
|
||||
return 218
|
||||
fi
|
||||
unzip -q "$ZAP_PKG_FN" -d $ZAP_PKG_DIR
|
||||
rm -f "$ZAP_PKG_FN"
|
||||
rm -f "$ZAP_PKG_FN" 2>/dev/null
|
||||
if [ "$PKG_MGR" = "apk" ]; then
|
||||
if [ ! -d "$ZAP_PKG_DIR/apk" ]; then
|
||||
echo "ERROR: APK-files not founded"
|
||||
return 221
|
||||
fi
|
||||
rm -f "$ZAP_PKG_DIR/*.ipk"
|
||||
mv "$ZAP_PKG_DIR/apk/*" "$ZAP_PKG_DIR/"
|
||||
rm -f $ZAP_PKG_DIR/*.ipk 2>/dev/null
|
||||
mv $ZAP_PKG_DIR/apk/* $ZAP_PKG_DIR/
|
||||
else
|
||||
rm -rf "$ZAP_PKG_DIR/apk"
|
||||
rm -rf $ZAP_PKG_DIR/apk 2>/dev/null
|
||||
fi
|
||||
ZAP_PKG_LIST=$( ls -1 "$ZAP_PKG_DIR" )
|
||||
echo "------ Downloaded packages:"
|
||||
echo "$ZAP_PKG_LIST"
|
||||
echo "------"
|
||||
ZAP_PKG_BASE_FN=$( find "$ZAP_PKG_DIR" -maxdepth 1 -type f -name "zapret_*.${ZAP_PKG_EXT}" | head -n 1 )
|
||||
ZAP_PKG_LUCI_FN=$( find "$ZAP_PKG_DIR" -maxdepth 1 -type f -name "luci-app-*.${ZAP_PKG_EXT}" | head -n 1 )
|
||||
if [ "$PKG_MGR" != "apk" ]; then
|
||||
ZAP_PKG_BASE_FN=$( find "$ZAP_PKG_DIR" -maxdepth 1 -type f -name "${ZAPRET_CFG_NAME}_*.${ZAP_PKG_EXT}" | head -n 1 )
|
||||
else
|
||||
ZAP_PKG_BASE_FN=$( find "$ZAP_PKG_DIR" -maxdepth 1 -type f -name "${ZAPRET_CFG_NAME}-[0-9]*.?*.${ZAP_PKG_EXT}" | head -n 1 )
|
||||
fi
|
||||
ZAP_PKG_LUCI_FN=$( find "$ZAP_PKG_DIR" -maxdepth 1 -type f -name "luci-app-${ZAPRET_CFG_NAME}*.${ZAP_PKG_EXT}" | head -n 1 )
|
||||
if [ ! -f "$ZAP_PKG_BASE_FN" ]; then
|
||||
echo "ERROR: File \"zapret_*.${ZAP_PKG_EXT}\" not found!"
|
||||
echo "ERROR: File \"${ZAPRET_CFG_NAME}*.${ZAP_PKG_EXT}\" not found!"
|
||||
return 231
|
||||
fi
|
||||
echo "ZAP_PKG_BASE_FN = $ZAP_PKG_BASE_FN"
|
||||
if [ ! -f "$ZAP_PKG_LUCI_FN" ]; then
|
||||
echo "ERROR: File \"luci-app-*.${ZAP_PKG_EXT}\" not found!"
|
||||
echo "ERROR: File \"luci-app-${ZAPRET_CFG_NAME}*.${ZAP_PKG_EXT}\" not found!"
|
||||
return 232
|
||||
fi
|
||||
echo "ZAP_PKG_LUCI_FN = $ZAP_PKG_LUCI_FN"
|
||||
|
||||
Reference in New Issue
Block a user