zhao/openwrt_helloworld
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci: make sing-box gRPC-lite work

Browse Source 
客户端不需要编译with_grpc也可以连接*ray的标准grpc，反之编译了with_grpc则不能连接sing-box的grpc-lite服务器。

所以客户端不需要编译with_grpc，sing-box grpc-lite兼容标准grpc，标准grpc不兼容grpc-lite
This commit is contained in:
Gzxhwq 2023-09-15 23:07:49 +08:00 committed by sbwml
parent 107978eb73
commit f6e54f57ed
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua
View File

@ -433,6 +433,7 @@ if singbox_tags:find("with_quic") then
end end
if singbox_tags:find("with_grpc") then if singbox_tags:find("with_grpc") then
o:value("grpc", "gRPC") o:value("grpc", "gRPC")
else o:value("grpc", "gRPC-lite")
end end
o:depends({ [option_name("protocol")] = "vmess" }) o:depends({ [option_name("protocol")] = "vmess" })
o:depends({ [option_name("protocol")] = "vless" }) o:depends({ [option_name("protocol")] = "vless" })
@ -499,7 +500,6 @@ o = s:option(Value, option_name("ws_earlyDataHeaderName"), translate("Early data
o:depends({ [option_name("ws_enableEarlyData")] = true }) o:depends({ [option_name("ws_enableEarlyData")] = true })
-- [[ gRPC部分 ]]-- -- [[ gRPC部分 ]]--
if singbox_tags:find("with_grpc") then
o = s:option(Value, option_name("grpc_serviceName"), "ServiceName") o = s:option(Value, option_name("grpc_serviceName"), "ServiceName")
o:depends({ [option_name("transport")] = "grpc" }) o:depends({ [option_name("transport")] = "grpc" })
@ -517,7 +517,6 @@ if singbox_tags:find("with_grpc") then
o = s:option(Flag, option_name("grpc_permit_without_stream"), translate("Permit without stream")) o = s:option(Flag, option_name("grpc_permit_without_stream"), translate("Permit without stream"))
o.default = "0" o.default = "0"
o:depends({ [option_name("grpc_health_check")] = true }) o:depends({ [option_name("grpc_health_check")] = true })
end
-- [[ Mux ]]-- -- [[ Mux ]]--
o = s:option(Flag, option_name("mux"), translate("Mux")) o = s:option(Flag, option_name("mux"), translate("Mux"))