diff --git a/dae/Makefile b/dae/Makefile index e4ae1c7e..a4b614f2 100644 --- a/dae/Makefile +++ b/dae/Makefile @@ -10,7 +10,7 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=3c7254170e8976ea5d678ad0d8f8648d4385a8e1 +PKG_SOURCE_VERSION:=2a007b399210ceb25e0538d381bbbe9d86a302e4 PKG_SOURCE_URL:=https://github.com/olicesx/dae.git PKG_MIRROR_HASH:=skip diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua index 3a2bdfe8..a62cfeeb 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua @@ -592,10 +592,6 @@ if singbox_tags:find("with_utls") then o:depends({ [_n("reality")] = true }) end -o = s:option(Flag, _n("anytls_disable_reuse"), translate("Disable TLS Reuse")) -o.default = 0 -o:depends({ [_n("protocol")] = "anytls" }) - o = s:option(ListValue, _n("transport"), translate("Transport")) o:value("tcp", "TCP") o:value("http", "HTTP") diff --git a/luci-app-passwall/luasrc/passwall/util_sing-box.lua b/luci-app-passwall/luasrc/passwall/util_sing-box.lua index 3ce1303d..f4d08d60 100644 --- a/luci-app-passwall/luasrc/passwall/util_sing-box.lua +++ b/luci-app-passwall/luasrc/passwall/util_sing-box.lua @@ -613,7 +613,6 @@ function gen_outbound(flag, node, tag, proxy_table) idle_session_check_interval = "30s", idle_session_timeout = "30s", min_idle_session = 5, - disable_reuse = (node.anytls_disable_reuse == "1") and true or nil, tls = tls } end diff --git a/luci-app-passwall/po/zh-cn/passwall.po b/luci-app-passwall/po/zh-cn/passwall.po index 1ba0f873..7137cdf4 100644 --- a/luci-app-passwall/po/zh-cn/passwall.po +++ b/luci-app-passwall/po/zh-cn/passwall.po @@ -2156,6 +2156,3 @@ msgstr "Gecko 包大小(最大)" msgid "valid time (hh:mm)" msgstr "有效时间(hh:mm)" - -msgid "Disable TLS Reuse" -msgstr "禁用 TLS 连接复用" diff --git a/luci-app-passwall/root/usr/share/passwall/clash_subconverter.lua b/luci-app-passwall/root/usr/share/passwall/clash_subconverter.lua index bee9e131..bc6ec421 100644 --- a/luci-app-passwall/root/usr/share/passwall/clash_subconverter.lua +++ b/luci-app-passwall/root/usr/share/passwall/clash_subconverter.lua @@ -478,8 +478,6 @@ local function encode_anytls(node) table.insert(p, "insecure=" .. (o.tls.insecure and "1" or "0")) end - if node["disable-reuse"] then table.insert(p, "disable_reuse=1") end - if #p > 0 then link = link .. "?" .. table.concat(p, "&") end diff --git a/luci-app-passwall/root/usr/share/passwall/subscribe.lua b/luci-app-passwall/root/usr/share/passwall/subscribe.lua index 7cab8ba7..b0d11daf 100755 --- a/luci-app-passwall/root/usr/share/passwall/subscribe.lua +++ b/luci-app-passwall/root/usr/share/passwall/subscribe.lua @@ -1580,7 +1580,6 @@ local function processData(szType, content, add_mode, group, sub_cfg) end result.port = port result.tls_allowInsecure = params.allowinsecure or params.insecure - result.anytls_disable_reuse = params.disable_reuse end elseif szType == 'naive+https' or szType == 'naive+quic' then if has_singbox then