diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua
index 5a73d7aa..9812fe5b 100644
--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua
@@ -322,15 +322,6 @@ o.rewrite_option = "method"
for a, t in ipairs(ss_method_list) do o:value(t) end
o:depends({ [_n("protocol")] = "shadowsocks" })
-o = s:option(Flag, _n("iv_check"), translate("IV Check"))
-o:depends({ [_n("protocol")] = "shadowsocks", [_n("ss_method")] = "aes-128-gcm" })
-o:depends({ [_n("protocol")] = "shadowsocks", [_n("ss_method")] = "aes-256-gcm" })
-o:depends({ [_n("protocol")] = "shadowsocks", [_n("ss_method")] = "chacha20-poly1305" })
-o:depends({ [_n("protocol")] = "shadowsocks", [_n("ss_method")] = "xchacha20-poly1305" })
-
-o = s:option(Flag, _n("uot"), translate("UDP over TCP"))
-o:depends({ [_n("protocol")] = "shadowsocks" })
-
o = s:option(ListValue, _n("flow"), translate("flow"))
o.default = ""
o:value("", translate("Disable"))
@@ -420,7 +411,6 @@ o:value("http/1.1")
o:value("h2,http/1.1")
o:value("h3,h2,http/1.1")
o:depends({ [_n("tls")] = true, [_n("reality")] = false })
-o:depends({ [_n("protocol")] = "hysteria2" })
-- o = s:option(Value, _n("minversion"), translate("minversion"))
-- o.default = "1.3"
@@ -776,11 +766,6 @@ o.default = 0
o = s:option(Flag, _n("tcpMptcp"), "tcpMptcp", translate("Enable Multipath TCP, need to be enabled in both server and client configuration."))
o.default = 0
-o = s:option(Value, _n("preconns"), translate("Pre-connections"), translate("Number of early established connections to reduce latency."))
-o.datatype = "uinteger"
-o.placeholder = 0
-o:depends({ [_n("protocol")] = "vless" })
-
o = s:option(ListValue, _n("domain_resolver"), translate("Domain DNS Resolve"))
o.description = translate("If the node address is a domain name, this DNS will be used for resolution.") .. "
" .. string.format('%s',
translate("Note: For node-specific DNS only. Keep Auto to avoid extra overhead."))
diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/server/type/ray.lua b/luci-app-passwall/luasrc/model/cbi/passwall/server/type/ray.lua
index 9c63beea..c36ad6e1 100644
--- a/luci-app-passwall/luasrc/model/cbi/passwall/server/type/ray.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/server/type/ray.lua
@@ -97,9 +97,6 @@ o.rewrite_option = "method"
for a, t in ipairs(x_ss_method_list) do o:value(t) end
o:depends({ [_n("protocol")] = "shadowsocks" })
-o = s:option(Flag, _n("iv_check"), translate("IV Check"))
-o:depends({ [_n("protocol")] = "shadowsocks" })
-
o = s:option(ListValue, _n("ss_network"), translate("Transport"))
o.default = "tcp,udp"
o:value("tcp", "TCP")
@@ -230,7 +227,6 @@ o:value("http/1.1")
o:value("h2,http/1.1")
o:value("h3,h2,http/1.1")
o:depends({ [_n("tls")] = true, [_n("reality")] = false })
-o:depends({ [_n("protocol")] = "hysteria2"})
o = s:option(Flag, _n("use_mldsa65Seed"), translate("ML-DSA-65"))
o.default = "0"
diff --git a/luci-app-passwall/luasrc/passwall/util_xray.lua b/luci-app-passwall/luasrc/passwall/util_xray.lua
index 85b5e794..16ac119e 100644
--- a/luci-app-passwall/luasrc/passwall/util_xray.lua
+++ b/luci-app-passwall/luasrc/passwall/util_xray.lua
@@ -361,43 +361,18 @@ function gen_outbound(flag, node, tag, proxy_table)
end)()
} or nil,
settings = {
- vnext = (node.protocol == "vmess" or node.protocol == "vless") and {
- {
- address = node.address,
- port = tonumber(node.port),
- users = {
- {
- id = node.uuid,
- level = 0,
- security = (node.protocol == "vmess") and node.security or nil,
- testpre = (node.protocol == "vless") and tonumber(node.preconns) or nil,
- encryption = (node.protocol == "vless") and ((node.encryption and node.encryption ~= "") and node.encryption or "none") or nil,
- flow = (node.protocol == "vless"
- and (node.tls == "1" or (node.encryption and node.encryption ~= "" and node.encryption ~= "none"))
- and node.flow and node.flow ~= "") and node.flow or nil
- }
- }
- }
- } or nil,
- servers = (node.protocol == "socks" or node.protocol == "http" or node.protocol == "shadowsocks" or node.protocol == "trojan") and {
- {
- address = node.address,
- port = tonumber(node.port),
- method = (node.method == "chacha20-ietf-poly1305" and "chacha20-poly1305") or
- (node.method == "xchacha20-ietf-poly1305" and "xchacha20-poly1305") or
- (node.method ~= "" and node.method) or nil,
- ivCheck = (node.protocol == "shadowsocks") and node.iv_check == "1" or nil,
- uot = (node.protocol == "shadowsocks") and node.uot == "1" or nil,
- password = node.password or "",
- users = (node.username and node.password) and {
- {
- user = node.username,
- pass = node.password
- }
- } or nil
- }
- } or nil,
- address = (node.protocol == "wireguard" and node.wireguard_local_address) or (node.protocol == "hysteria" and node.address) or nil,
+ address = (node.protocol == "wireguard") and node.wireguard_local_address or node.address,
+ port = tonumber(node.port),
+ id = (node.protocol == "vmess" or node.protocol == "vless") and node.uuid or nil,
+ encryption = (node.protocol == "vless") and ((node.encryption and node.encryption ~= "") and node.encryption or "none") or nil,
+ flow = (node.protocol == "vless" and (node.tls == "1" or (node.encryption and node.encryption ~= "" and node.encryption ~= "none"))
+ and node.flow and node.flow ~= "") and node.flow or nil,
+ security = (node.protocol == "vmess") and node.security or nil,
+ user = (node.protocol == "socks" or node.protocol == "http") and node.username or nil,
+ pass = (node.protocol == "socks" or node.protocol == "http") and node.password or nil,
+ password = (node.protocol == "shadowsocks" or node.protocol == "trojan") and node.password or nil,
+ method = (node.protocol == "shadowsocks") and ((node.method == "chacha20-ietf-poly1305" and "chacha20-poly1305") or
+ (node.method == "xchacha20-ietf-poly1305" and "xchacha20-poly1305") or (node.method ~= "" and node.method) or nil) or nil,
secretKey = (node.protocol == "wireguard") and node.wireguard_secret_key or nil,
peers = (node.protocol == "wireguard") and {
{
@@ -409,8 +384,8 @@ function gen_outbound(flag, node, tag, proxy_table)
} or nil,
mtu = (node.protocol == "wireguard" and node.wireguard_mtu) and tonumber(node.wireguard_mtu) or nil,
reserved = (node.protocol == "wireguard" and node.wireguard_reserved) and node.wireguard_reserved or nil,
- port = (node.protocol == "hysteria" and node.port) and tonumber(node.port) or nil,
- version = node.protocol == "hysteria" and 2 or nil
+ version = (node.protocol == "hysteria") and 2 or nil,
+ level = 0
}
}
@@ -538,7 +513,6 @@ function gen_config_server(node)
settings = {
method = node.method,
password = node.password,
- ivCheck = ("1" == node.iv_check) and true or false,
network = node.ss_network or "TCP,UDP"
}
elseif node.protocol == "trojan" then
diff --git a/luci-app-passwall/po/zh-cn/passwall.po b/luci-app-passwall/po/zh-cn/passwall.po
index 2cb0a40d..f810aeca 100644
--- a/luci-app-passwall/po/zh-cn/passwall.po
+++ b/luci-app-passwall/po/zh-cn/passwall.po
@@ -1387,9 +1387,6 @@ msgstr "只推荐与 VLESS-TCP-XTLS-Vision 搭配使用。"
msgid "Password"
msgstr "密码"
-msgid "IV Check"
-msgstr "IV 检查"
-
msgid "UDP over TCP"
msgstr "TCP 封装 UDP"
@@ -1402,12 +1399,6 @@ msgstr "本地端口"
msgid "Fast Open"
msgstr "快速打开"
-msgid "Pre-connections"
-msgstr "预连接"
-
-msgid "Number of early established connections to reduce latency."
-msgstr "预连接的数量,用于降低延迟。"
-
msgid "Need node support required"
msgstr "需要节点支持"
diff --git a/tuic-client/Makefile b/tuic-client/Makefile
index 5a4503a2..7efa98f8 100644
--- a/tuic-client/Makefile
+++ b/tuic-client/Makefile
@@ -5,12 +5,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=tuic-client
-PKG_VERSION:=1.8.5
+PKG_VERSION:=1.8.6
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/Itsusinn/tuic/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=c67700a4d70cfdd6f5f7991147b716efa4141c2ecfd9f14187560a70fbf50020
+PKG_HASH:=2ddd401f414aa7e6fa52d711e234edcc11646a79a65eda781023d003aa1e06c3
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_MAINTAINER:=Tianling Shen
diff --git a/v2ray-geodata/Makefile b/v2ray-geodata/Makefile
index 9499e991..28e71d20 100644
--- a/v2ray-geodata/Makefile
+++ b/v2ray-geodata/Makefile
@@ -21,13 +21,13 @@ define Download/geoip
HASH:=a322dfb6bfd8987c83453c39582a07771c9deddf9f8f7d2d19c7927ebd5e76c8
endef
-GEOSITE_VER:=20260609060640
+GEOSITE_VER:=20260609115341
GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER)
define Download/geosite
URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/
URL_FILE:=dlc.dat
FILE:=$(GEOSITE_FILE)
- HASH:=59d305a1642a199b53a0817e6c01f1f7e0bf00d4e24bc4b228aa9cb3c387bb77
+ HASH:=9c76c69ee7e5efabbc1e6349f9b78467399bb19eefd4418ba59ff042ad07011f
endef
GEOSITE_IRAN_VER:=202606080206