Compare commits

...

8 Commits

Author SHA1 Message Date
remittor
55daf2f006 Bump version to v72.20251122 2025-11-22 11:58:46 +03:00
remittor
c60b70a02f config: Update default configs (by StressOzz v2) 2025-11-22 11:58:26 +03:00
remittor
44ff0ec3e1 Bump version to v72.20251022 2025-10-22 15:15:29 +03:00
remittor
65d90d8ed3 luci: Open each link on new page 2025-10-22 15:11:39 +03:00
remittor
e8dfb187e3 Bump version to v72.20250924 2025-09-24 13:25:50 +03:00
remittor
1b2057f00f luci: Add examples for custom.d scripts 2025-09-23 12:09:18 +03:00
remittor
7941f12c63 Bump version to v71.20250918 2025-09-18 15:17:37 +03:00
remittor
81f4b493f6 Add FILTER_MARK support 2025-09-18 15:17:18 +03:00
13 changed files with 290 additions and 64 deletions

View File

@@ -5,7 +5,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-zapret
PKG_VERSION:=71.20250708
PKG_VERSION:=72.20251122
PKG_LICENSE:=MIT
PKG_MAINTAINER:=remittor <https://github.com/remittor>

View File

@@ -114,7 +114,7 @@ return view.extend({
o.rawhtml = true;
o.default = '<hr style="width: 620px; height: 1px; margin: 1px 0 1px; border-top: 1px solid;">';
if (url) {
o.default += '<br/>' + _('Help') + ': <a href=%s>%s</a>'.format(url);
o.default += '<br/>' + _('Help') + ': <a target=_blank href=%s>%s</a>'.format(url);
}
};
@@ -149,7 +149,7 @@ return view.extend({
};
let desc = locname;
if (multiline == 2) {
desc += '<br/>' + _('Example') + ': <a href=%s>%s</a>'.format(tools.nfqws_opt_url);
desc += '<br/>' + _('Example') + ': <a target=_blank href=%s>%s</a>'.format(tools.nfqws_opt_url);
}
btn.onclick = () => new tools.longstrEditDialog('config', param, param, desc, rows, multiline).show();
};
@@ -168,6 +168,11 @@ return view.extend({
o.rmempty = false;
o.datatype = 'string';
o = s.taboption(tabname, form.Value, 'FILTER_MARK', _('FILTER_MARK'));
o.rmempty = false;
o.validate = function(section_id, value) { return true; };
o.write = function(section_id, value) { return form.Value.prototype.write.call(this, section_id, (value == null || value.trim() == '') ? "\t" : value.trim()); };
o = s.taboption(tabname, form.Value, 'NFQWS_PORTS_TCP', _('NFQWS_PORTS_TCP'));
o.rmempty = false;
o.datatype = 'string';
@@ -358,7 +363,16 @@ return view.extend({
o.inputtitle = _('Edit');
o.inputstyle = 'edit btn';
o.description = fn;
let desc = (num == tools.discord_num) ? _('Example') + ': <a href=%s>%s</a>'.format(tools.discord_url) : '';
let desc = '';
if (num == tools.discord_num) {
desc = _('Example') + ': ';
for (let k = 0; k < tools.discord_url.length; k++) {
let url = tools.discord_url[k];
if (k > 0) desc += ' <br> ';
const filename = url.substring(url.lastIndexOf("/") + 1).split("?")[0];
desc += '<a target=_blank href=' + url + '>' + filename + '</a>';
}
}
o.onclick = () => new tools.fileEditDialog(fn, name, desc, '', 15).show();
}

View File

@@ -52,7 +52,11 @@ return baseclass.extend({
customdPrefixList : [ 10, 20, 50, 60, 90 ] ,
customdFileFormat : '/opt/zapret/init.d/openwrt/custom.d/%s-script.sh',
discord_num : 50,
discord_url : 'https://github.com/bol-van/zapret/blob/4e8e3a9ed9dbeb1156db68dfaa7b353051c13797/init.d/custom.d.examples.linux/50-discord',
discord_url : [ 'https://github.com/bol-van/zapret/blob/4e8e3a9ed9dbeb1156db68dfaa7b353051c13797/init.d/custom.d.examples.linux/50-discord',
'https://github.com/bol-van/zapret/blob/b251ea839cc8f04c45090314ef69fce69f2c00f2/init.d/custom.d.examples.linux/50-discord-media',
'https://github.com/bol-van/zapret/blob/b251ea839cc8f04c45090314ef69fce69f2c00f2/init.d/custom.d.examples.linux/50-stun4all',
'https://github.com/bol-van/zapret/tree/master/init.d/custom.d.examples.linux'
],
nfqws_opt_url : 'https://github.com/remittor/zapret-openwrt/discussions/168',
autoHostListFN : '/opt/zapret/ipset/zapret-hosts-auto.txt',

View File

@@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=zapret-ip2net
PKG_VERSION:=71.20250708
PKG_VERSION:=72.20251122
PKG_MAINTAINER:=bol-van
PKG_LICENSE:=MIT
@@ -9,8 +9,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=c60f9c9027a6db533c84f90ebbad40c058b424e7
PKG_SOURCE_DATE:=2025-07-08
PKG_SOURCE_VERSION:=97cefbace9eee57c5f3799743df9d755690dac4c
PKG_SOURCE_DATE:=2025-11-22
#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?

View File

@@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=zapret-mdig
PKG_VERSION:=71.20250708
PKG_VERSION:=72.20251122
PKG_MAINTAINER:=bol-van
PKG_LICENSE:=MIT
@@ -9,8 +9,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=c60f9c9027a6db533c84f90ebbad40c058b424e7
PKG_SOURCE_DATE:=2025-07-08
PKG_SOURCE_VERSION:=97cefbace9eee57c5f3799743df9d755690dac4c
PKG_SOURCE_DATE:=2025-11-22
#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?

View File

@@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=zapret-tpws
PKG_VERSION:=71.20250708
PKG_VERSION:=72.20251122
PKG_MAINTAINER:=bol-van
PKG_LICENSE:=MIT
@@ -9,8 +9,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=c60f9c9027a6db533c84f90ebbad40c058b424e7
PKG_SOURCE_DATE:=2025-07-08
PKG_SOURCE_VERSION:=97cefbace9eee57c5f3799743df9d755690dac4c
PKG_SOURCE_DATE:=2025-11-22
#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?

View File

@@ -5,7 +5,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=zapret
PKG_VERSION:=71.20250708
PKG_VERSION:=72.20251122
PKG_MAINTAINER:=bol-van
PKG_LICENSE:=MIT
@@ -13,8 +13,8 @@ PKG_LICENSE_FILES:=docs/LICENSE.txt
PKG_SOURCE_URL:=https://github.com/bol-van/zapret.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=c60f9c9027a6db533c84f90ebbad40c058b424e7
PKG_SOURCE_DATE:=2025-07-08
PKG_SOURCE_VERSION:=97cefbace9eee57c5f3799743df9d755690dac4c
PKG_SOURCE_DATE:=2025-11-22
#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?

View File

@@ -56,6 +56,13 @@ DESYNC_MARK=0x40000000
DESYNC_MARK_POSTNAT=0x20000000
# do not pass outgoing traffic to tpws/nfqws not marked with this bit
# this setting allows to write your own rules to limit traffic that should be fooled
# for example based on source IP or incoming interface name
# no filter if not defined
FILTER_MARK=""
TPWS_SOCKS_ENABLE=0
# tpws socks listens on this port on localhost and LAN interfaces
TPPORT_SOCKS=987

View File

@@ -29,6 +29,7 @@ function set_cfg_default_values
set $cfgname.config.NFQWS_ENABLE='1'
set $cfgname.config.DESYNC_MARK='0x40000000'
set $cfgname.config.DESYNC_MARK_POSTNAT='0x20000000'
set $cfgname.config.FILTER_MARK='$TAB'
set $cfgname.config.NFQWS_PORTS_TCP='80,443'
set $cfgname.config.NFQWS_PORTS_UDP='443'
set $cfgname.config.NFQWS_TCP_PKT_OUT='9'
@@ -38,30 +39,27 @@ function set_cfg_default_values
set $cfgname.config.NFQWS_PORTS_TCP_KEEPALIVE='0'
set $cfgname.config.NFQWS_PORTS_UDP_KEEPALIVE='0'
set $cfgname.config.NFQWS_OPT="
--filter-tcp=80 <HOSTLIST>
--dpi-desync=fake,fakedsplit
--dpi-desync-autottl=2
--dpi-desync-fooling=badsum
--filter-tcp=443
--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
--hostlist=/opt/zapret/ipset/zapret-hosts-user.txt
--hostlist-exclude-domains=openwrt.org
--dpi-desync=fake,fakeddisorder
--dpi-desync-split-pos=10,midsld
--dpi-desync-fake-tls=/opt/zapret/files/fake/tls_clienthello_www_google_com.bin
--dpi-desync-fake-tls-mod=rnd,dupsid,sni=fonts.google.com
--dpi-desync-fake-tls=0x0F0F0F0F
--dpi-desync-fake-tls-mod=none
--dpi-desync-fakedsplit-pattern=/opt/zapret/files/fake/tls_clienthello_vk_com.bin
--dpi-desync-split-seqovl=336
--dpi-desync-split-seqovl-pattern=/opt/zapret/files/fake/tls_clienthello_gosuslugi_ru.bin
--dpi-desync-fooling=badseq,badsum
--dpi-desync-badseq-increment=0
--new
--filter-tcp=443 --hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
--dpi-desync=fake,multidisorder
--dpi-desync-split-pos=1,midsld
--dpi-desync-repeats=11
--dpi-desync-fooling=badsum
--dpi-desync-fake-tls-mod=rnd,dupsid,sni=www.google.com
--new
--filter-udp=443 --hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
--filter-udp=443
--hostlist=/opt/zapret/ipset/zapret-hosts-google.txt
--dpi-desync=fake
--dpi-desync-repeats=11
--dpi-desync-repeats=6
--dpi-desync-fake-quic=/opt/zapret/files/fake/quic_initial_www_google_com.bin
--new
--filter-udp=443 <HOSTLIST_NOAUTO>
--dpi-desync=fake
--dpi-desync-repeats=11
--new
--filter-tcp=443 <HOSTLIST>
--dpi-desync=multidisorder
--dpi-desync-split-pos=1,sniext+1,host+1,midsld-2,midsld,midsld+2,endhost-1
"
# save changes
commit $cfgname

View File

@@ -1,25 +1,45 @@
cdn.youtube.com
fonts.googleapis.com
fonts.gstatic.com
ggpht.com
googleapis.com
googleusercontent.com
googlevideo.com
youtubei.googleapis.com
ytimg.com
yt3.ggpht.com
yt4.ggpht.com
youtube.com
youtubeembeddedplayer.googleapis.com
ytimg.l.google.com
i.ytimg.com
i9.ytimg.com
jnn-pa.googleapis.com
youtube-nocookie.com
youtube-ui.l.google.com
yt-video-upload.l.google.com
kids.youtube.com
m.youtube.com
manifest.googlevideo.com
music.youtube.com
nhacmp3youtube.com
returnyoutubedislikeapi.com
s.ytimg.com
signaler-pa.youtube.com
studio.youtube.com
tv.youtube.com
wide-youtube.l.google.com
youtu.be
youtube.googleapis.com
yt.be
withyoutube.com
youtu.be
youtube.com
youtube.googleapis.com
youtubeeducation.com
youtubeembeddedplayer.googleapis.com
youtubefanfest.com
youtubegaming.com
youtubei.googleapis.com
youtubekids.com
youtubemobilesupport.com
youtube-nocookie.com
youtube-ui.l.google.com
yt.be
yt3.ggpht.com
yt3.googleusercontent.com
yt4.ggpht.com
ytimg.com
ytimg.l.google.com
yting.com
yt-video-upload.l.google.com
youtube.ae
youtube.al
youtube.am

View File

@@ -3,18 +3,178 @@
172.16.0.0/12
192.168.0.0/16
169.254.0.0/16
100.64.0.0/10
::1
fc00::/7
fe80::/10
play.google.com
android.com
google-analytics.com
googleusercontent.com
gstatic.com
gvt1.com
ggpht.com
dl.google.com
dl-ssl.google.com
android.clients.google.com
gvt2.com
gvt3.com
####################################
gosuslugi.ru
#################################### Epicgames
3lateral.com
accountportal-website-prod07.ol.epicgames.com
account-public-service-prod03.ol.epicgames.com
accounts.epicgames.com
api.epicgames.dev
artstation.com
battlebreakers.com
capturingreality.com
catalog-public-service-prod06.ol.epicgames.com
cdn1.unrealengine.com
cdn2.unrealengine.com
cubicmotion.com
datarouter.ol.epicgames.com
datastorage-public-service-liveegs.live.use1a.on.epicgames.com
download.epicgames.com
download2.epicgames.com
download3.epicgames.com
download4.epicgames.com
eac-cdn.com
easy.ac
easyanticheat.net
entitlement-public-service-prod08.ol.epicgames.com
epicgames.com
epicgames.dev
epicgamescdn.com
epicgames-download1.akamaized.net
et.epicgames.com
fab.com
fastly-download.epicgames.com
fortnite.com
friends-public-service-prod06.ol.epicgames.com
hyprsense.com
launcher-public-service-prod06.ol.epicgames.com
launcherwaitingroom-public-service-prod06.ol.epicgames.com
launcher-website-prod07.ol.epicgames.com
library-service.live.use1a.on.epicgames.com
lightswitch-public-service-prod06.ol.epicgames.com
metrics.ol.epicgames.com
ol.epicgames.com
orderprocessor-public-service-ecomprod01.ol.epicgames.com
paragon.com
playparagon.com
quixel.com
quixel.se
radgametools.com
realityscan.com
roborecall.com
shadowcomplex.com
sketchfab.com
spyjinx.com
static-assets-prod.epicgames.com
store.epicgames.com
store-content.ak.epicgames.com
store-site-backend-static.ak.epicgames.com
tracking.epicgames.com
twinmotion.com
unrealengine.com
unrealtournament.com
ut-public-service-prod10.ol.epicgames.com
#################################### Steam
api.steampowered.com
avatars.fastly.steamstatic.com
cdn.akamai.steamstatic.com
cdn.cloudflare.steamstatic.com
cdn.fastly.steamstatic.com
cdn.steamcommunity.com
cdn.steamstatic.com
checkout.steampowered.com
clan.fastly.steamstatic.com
client-download.steampowered.com
client-update.queniuqe.com
community.cloudflare.steamstatic.com
community.fastly.steamstatic.com
community.steampowered.com
community.steamstatic.com
cs.steampowered.com
dl.steam.clngaa.com
edge.steam-dns.top.comcast.net
gstore.val.manlaxy.com
help.steampowered.com
login.steampowered.com
media.steampowered.com
partner.steamgames.com
partner.steampowered.com
playartifact.com
s.team
scontent.steamusercontent.com
shared.fastly.steamstatic.com
shared.steamstatic.com
steam.apac.qtlglb.com
steam.cdn.on.net
steam.cdn.orcon.net.nz
steam.cdn.slingshot.co.nz
steam.cdn.webra.ru
steam.eca.qtlglb.com
steam.naeu.qtlglb.com
steam.ru.qtlglb.com
steam.tv
steam-api.com
steambroadcast.akamaized.net
steambroadcast.com
steamcdn.com
steamcdn.net
steamcdn-a.akamaihd.net
steamcdn-a.akamaihd.net.edgesuite.net
steamcdn-a.akamaized.net
steamchat.com
steam-chat.com
steamcloudsweden.blob.core.windows.net
steamcommunity.akamaized.net
steamcommunity.cloudflare.steamstatic.com
steamcommunity.com
steamcommunity-a.akamaihd.net
steamcommunity-a.akamaihd.net.edgesuite.net
steamcommunity-a.akamaized.net
steamcontent.com
steamcontent-a.akamaihd.net
steamdeck.com
steamdeckcdn.akamaized.net
steamdeckusercontent.com
steamgames.com
steamgames.net
steammobile.akamaized.net
steampipe.akamaized.net
steampipe-kr.akamaized.net
steampipe-partner.akamaized.net
steampowered.com
steamserver.net
steamstat.us
steamstatic.akamaized.net
steamstatic.com
steamstore-a.akamaihd.net
steamusercontent.com
steamusercontent-a.akamaihd.net
steamuserimages-a.akamaihd.net
steamvideo-a.akamaihd.net
store.akamai.steamstatic.com
store.cloudflare.steamstatic.com
store.fastly.steamstatic.com
store.steampowered.com
support.steampowered.com
underlords.com
valve.net
valvecdn.com
valvecontent.com
valvesoftware.com
valvesoftware.net
workshop.steampowered.com
#################################### OpenWRT
archive.openwrt.org
cdn.openwrt.org
dev.openwrt.org
downloads.openwrt.org
forum.openwrt.org
fwdownloads.openwrt.org
gh.openwrt.org
git.openwrt.org
github.com
lede-project.org
lists.openwrt.org
mirror-01.infra.openwrt.org
mirror-02.infra.openwrt.org
mirror-03.infra.openwrt.org
mirror-04.infra.openwrt.org
openwrt.gitlab.io
openwrt.org
wiki.openwrt.org
####################################

View File

@@ -1 +1,23 @@
abra-cadabra.com
dis.gd
discord-attachments-uploads-prd.storage.googleapis.com
discord.app
discord.co
discord.com
discord.design
discord.dev
discord.gift
discord.gifts
discord.gg
discord.media
discord.new
discord.store
discord.status
discord-activities.com
discordactivities.com
discordapp.com
discordapp.net
discordcdn.com
discordmerch.com
discordpartygames.com
discordsays.com
discordsez.com

View File

@@ -95,6 +95,7 @@ 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