298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-19 03:43:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/coolsnowwolf/lede

Browse Source
This commit is contained in:
coolsnowwolf 2018-10-20 23:38:31 +08:00
commit 2deb00db70
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package/lean/luci-app-v2ray-pro/luasrc/model/cbi/v2raypro.lua
View File

@ -100,6 +100,7 @@ network_type = s:taboption("main",ListValue, "network_type", translate("Network
network_type:value("tcp")
network_type:value("kcp")
network_type:value("ws")
network_type:value("h2")
-- tcp settings
tcp_obfs = s:taboption("main",ListValue, "tcp_obfs", translate("TCP Obfs"))
@ -159,6 +160,14 @@ ws_headers = s:taboption("main",Value, "ws_headers", translate("WebSocket Header
ws_headers:depends("network_type", "ws")
ws_headers.datatype = "host"
-- http/2 settings
h2_path = s:taboption("main",Value, "h2_path", translate("HTTP Path"))
h2_path:depends("network_type", "h2")
h2_domain = s:taboption("main",Value, "h2_domain", translate("HTTP Domain"))
h2_domain:depends("network_type", "h2")
h2_domain.datatype = "host"
-- others
tls = s:taboption("main",Flag, "tls", translate("TLS"))
tls.rmempty = false

7
package/lean/luci-app-v2ray-pro/root/etc/v2ray/gen_config.lua
View File

@ -137,6 +137,13 @@ local v2ray = {
Host = ucursor:get(conf_path, "v2raypro", "ws_headers")
} or nil,
} or nil,
httpSettings = (v2ray_stream_mode == "h2") and {
path = ucursor:get(conf_path, "v2raypro", "h2_path"),
host = (ucursor:get(conf_path, "v2raypro", "h2_domain") ~= nil) and {
ucursor:get(conf_path, "v2raypro", "h2_domain")
} or nil,
} or nil,
},
mux = {
enabled = (ucursor:get(conf_path, "v2raypro", "mux") == "1") and true or false