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

luci-app-passwall2: sync upstream

Browse Source
This commit is contained in:
actions 2024-03-02 16:30:09 +08:00
parent ea3c32bd4a
commit 6a51b3ddfd
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
luci-app-passwall2/luasrc/model/cbi/passwall2/server/type/ray.lua
View File

@ -142,7 +142,7 @@ o:depends({ [option_name("tls")] = true })
o = s:option(Value, option_name("reality_private_key"), translate("Private Key")) o = s:option(Value, option_name("reality_private_key"), translate("Private Key"))
o:depends({ [option_name("reality")] = true }) o:depends({ [option_name("reality")] = true })
o = s:option(Value, option_name("reality_shortId"), translate("Short Id")) o = s:option(DynamicList, option_name("reality_shortId"), translate("Short Id"))
o:depends({ [option_name("reality")] = true }) o:depends({ [option_name("reality")] = true })
o = s:option(Value, option_name("reality_dest"), translate("Dest")) o = s:option(Value, option_name("reality_dest"), translate("Dest"))
@ -300,8 +300,7 @@ o = s:option(Value, option_name("grpc_serviceName"), "ServiceName")
o:depends({ [option_name("transport")] = "grpc" }) o:depends({ [option_name("transport")] = "grpc" })
o = s:option(Flag, option_name("acceptProxyProtocol"), translate("acceptProxyProtocol"), translate("Whether to receive PROXY protocol, when this node want to be fallback or forwarded by proxy, it must be enable, otherwise it cannot be used.")) o = s:option(Flag, option_name("acceptProxyProtocol"), translate("acceptProxyProtocol"), translate("Whether to receive PROXY protocol, when this node want to be fallback or forwarded by proxy, it must be enable, otherwise it cannot be used."))
o:depends({ [option_name("transport")] = "tcp" }) o.default = "0"
o:depends({ [option_name("transport")] = "ws" })
-- [[ Fallback部分 ]]-- -- [[ Fallback部分 ]]--
o = s:option(Flag, option_name("fallback"), translate("Fallback")) o = s:option(Flag, option_name("fallback"), translate("Fallback"))

11
luci-app-passwall2/luasrc/passwall2/util_xray.lua
View File

@ -430,7 +430,6 @@ function gen_config_server(node)
} }
} or nil, } or nil,
tcpSettings = (node.transport == "tcp") and { tcpSettings = (node.transport == "tcp") and {
acceptProxyProtocol = (node.acceptProxyProtocol and node.acceptProxyProtocol == "1") and true or false,
header = { header = {
type = node.tcp_guise, type = node.tcp_guise,
request = (node.tcp_guise == "http") and { request = (node.tcp_guise == "http") and {
@ -453,7 +452,6 @@ function gen_config_server(node)
header = {type = node.mkcp_guise} header = {type = node.mkcp_guise}
} or nil, } or nil,
wsSettings = (node.transport == "ws") and { wsSettings = (node.transport == "ws") and {
acceptProxyProtocol = (node.acceptProxyProtocol and node.acceptProxyProtocol == "1") and true or false,
headers = (node.ws_host) and {Host = node.ws_host} or nil, headers = (node.ws_host) and {Host = node.ws_host} or nil,
path = node.ws_path path = node.ws_path
} or nil, } or nil,
@ -470,7 +468,10 @@ function gen_config_server(node)
} or nil, } or nil,
grpcSettings = (node.transport == "grpc") and { grpcSettings = (node.transport == "grpc") and {
serviceName = node.grpc_serviceName serviceName = node.grpc_serviceName
} or nil } or nil,
sockopt = {
acceptProxyProtocol = (node.acceptProxyProtocol and node.acceptProxyProtocol == "1") and true or false
}
} }
} }
}, },
@ -503,9 +504,7 @@ function gen_config_server(node)
node.reality_serverNames node.reality_serverNames
}, },
privateKey = node.reality_private_key, privateKey = node.reality_private_key,
shortIds = { shortIds = node.reality_shortId or ""
node.reality_shortId
}
} or nil } or nil
end end
end end