🍉 Sync 2026-05-26 21:02:29

luci-app-passwall/root/usr/share/passwall/clash_subconverter.lua

@@ -66,10 +66,10 @@ local function build_common(node)
 
 	local ech_opts = node["ech-opts"]
 	if ech_opts and ech_opts.enable == true then
-		if ech_opts.config then
-			o.tls.ech = ech_opts.config
-		elseif ech_opts["query-server-name"] then
+		if ech_opts["query-server-name"] then
 			o.tls.ech = ech_opts["query-server-name"] .. "+https://223.5.5.5/dns-query"
+		elseif ech_opts.config then
+			o.tls.ech = ech_opts.config
 		end
 	end
 

luci-app-passwall/root/usr/share/passwall/subscribe.lua

@@ -683,6 +683,11 @@ local function processData(szType, content, add_mode, group, sub_cfg)
 			result.tls = "0"
 		end
 
+		if info.ech and info.ech ~= "" then
+			result.ech = "1"
+			result.ech_config = info.ech
+		end
+
 		result.tcp_fast_open = info.tfo
 
 		info.fm = (info.fm and info.fm ~= "") and UrlDecode(info.fm) or nil