From 9e299d2592ea806f07d6dc77ff37b8ac99c206a5 Mon Sep 17 00:00:00 2001 From: Vadim Vetrov Date: Mon, 30 Dec 2024 12:37:41 +0300 Subject: [PATCH] Support for #207 --- kyoutubeUnblock/Makefile | 4 ++-- .../resources/view/youtubeUnblock/configuration.js | 12 +++++++++++- youtubeUnblock/Makefile | 4 ++-- youtubeUnblock/files/etc/init.d/youtubeUnblock | 2 +- .../files/etc/uci-defaults/99-youtubeUnblock.sh | 1 + youtubeUnblockEntware/Makefile | 4 ++-- 6 files changed, 19 insertions(+), 8 deletions(-) diff --git a/kyoutubeUnblock/Makefile b/kyoutubeUnblock/Makefile index 61c7b35..cb8730a 100644 --- a/kyoutubeUnblock/Makefile +++ b/kyoutubeUnblock/Makefile @@ -6,8 +6,8 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=youtubeUnblock PKG_VERSION:=1.0.0 -PKG_REV:=bc345ed6d489f184116d1b3f8e7037c928710d8b -PKG_RELEASE:=5 +PKG_REV:=254b36359953c8cee61982543cf2ace8e7745273 +PKG_RELEASE:=6 PKG_SOURCE_URL:=https://github.com/Waujito/youtubeUnblock.git PKG_SOURCE_PROTO:=git diff --git a/luci-app-youtubeUnblock/htdocs/luci-static/resources/view/youtubeUnblock/configuration.js b/luci-app-youtubeUnblock/htdocs/luci-static/resources/view/youtubeUnblock/configuration.js index 542a0e1..2b093e7 100644 --- a/luci-app-youtubeUnblock/htdocs/luci-static/resources/view/youtubeUnblock/configuration.js +++ b/luci-app-youtubeUnblock/htdocs/luci-static/resources/view/youtubeUnblock/configuration.js @@ -157,7 +157,7 @@ return view.extend({ o.default = o.disabled; o.rmempty = false; - o = s.option(form.ListValue, "udp_mode", _("UDP mode"), _("This flag specifies udp handling strategy. If drop udp packets will be dropped (useful for quic when browser can fallback to tcp), if fake udp will be faked.")); + o = s.option(form.ListValue, "udp_mode", _("UDP mode"), _("Faking strategy for udp. checksum will fake UDP checksum, ttl won't fake but will make UDP content relatively small, none is no faking.")); o.widget = "radio" o.depends("quic_drop", "0"); o.value("fake", "fake"); @@ -165,6 +165,16 @@ return view.extend({ o.default = "fake"; o.rmempty = false; + o = s.option(form.ListValue, "udp_faking_strategy", _("UDP faking strategy"), _("This flag specifies udp handling strategy. If drop udp packets will be dropped (useful for quic when browser can fallback to tcp), if fake udp will be faked.")); + o.widget = "radio" + o.depends("quic_drop", "0"); + o.value("none", "none"); + o.value("checksum", "checksum"); + o.value("ttl", "ttl"); + o.default = "none"; + o.rmempty = false; + + o = s.option(form.Value, "udp_fake_seq_len", _("UDP fake seq length"), _("Specifies how much faking packets will be sent over the network.")); o.depends("udp_mode", "fake"); o.default = 6 diff --git a/youtubeUnblock/Makefile b/youtubeUnblock/Makefile index d34dac1..e68d677 100644 --- a/youtubeUnblock/Makefile +++ b/youtubeUnblock/Makefile @@ -4,8 +4,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=youtubeUnblock PKG_VERSION:=1.0.0 -PKG_REV:=bc345ed6d489f184116d1b3f8e7037c928710d8b -PKG_RELEASE:=5 +PKG_REV:=254b36359953c8cee61982543cf2ace8e7745273 +PKG_RELEASE:=6 PKG_SOURCE_URL:=https://github.com/Waujito/youtubeUnblock.git PKG_SOURCE_PROTO:=git diff --git a/youtubeUnblock/files/etc/init.d/youtubeUnblock b/youtubeUnblock/files/etc/init.d/youtubeUnblock index 4ae76e9..a5fee3e 100755 --- a/youtubeUnblock/files/etc/init.d/youtubeUnblock +++ b/youtubeUnblock/files/etc/init.d/youtubeUnblock @@ -89,7 +89,7 @@ parse_sections_options() { fi append_opts_boolean "$config" fake_sni frag_sni_reverse frag_sni_faked frag_middle_sni synfake - append_opts "$config" fake_sni_seq_len fake_sni_type fake_custom_payload faking_strategy faking_ttl fake_seq_offset frag frag_sni_pos fk_winsize seg2delay synfake_len sni_detection udp_mode udp_fake_seq_len udp_fake_len udp_filter_quic + append_opts "$config" fake_sni_seq_len fake_sni_type fake_custom_payload faking_strategy faking_ttl fake_seq_offset frag frag_sni_pos fk_winsize seg2delay synfake_len sni_detection udp_mode udp_fake_seq_len udp_fake_len udp_filter_quic udp_faking_strategy append_commasep_list "$config" exclude_domains udp_dport_filter append_opts_btoggler "$config" quic_drop diff --git a/youtubeUnblock/files/etc/uci-defaults/99-youtubeUnblock.sh b/youtubeUnblock/files/etc/uci-defaults/99-youtubeUnblock.sh index c82a0a7..66f09cc 100644 --- a/youtubeUnblock/files/etc/uci-defaults/99-youtubeUnblock.sh +++ b/youtubeUnblock/files/etc/uci-defaults/99-youtubeUnblock.sh @@ -51,5 +51,6 @@ set youtubeUnblock.@section[0].udp_mode='fake' set youtubeUnblock.@section[0].udp_fake_seq_len='6' set youtubeUnblock.@section[0].udp_fake_len='64' set youtubeUnblock.@section[0].udp_filter_quic='disabled' +set youtubeUnblock.@section[0].udp_faking_strategy='none' EOI uci commit diff --git a/youtubeUnblockEntware/Makefile b/youtubeUnblockEntware/Makefile index d12e74f..e500f66 100644 --- a/youtubeUnblockEntware/Makefile +++ b/youtubeUnblockEntware/Makefile @@ -4,8 +4,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=youtubeUnblockEntware PKG_VERSION:=1.0.0 -PKG_REV:=bc345ed6d489f184116d1b3f8e7037c928710d8b -PKG_RELEASE:=5 +PKG_REV:=254b36359953c8cee61982543cf2ace8e7745273 +PKG_RELEASE:=6 PKG_SOURCE_URL:=https://github.com/Waujito/youtubeUnblock.git PKG_SOURCE_PROTO:=git