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-02-01 04:00:10 +08:00
parent d417673075
commit d04eaa59bd
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
luci-app-passwall2/Makefile
View File

@ -5,7 +5,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall2 PKG_NAME:=luci-app-passwall2
PKG_VERSION:=1.25-3 PKG_VERSION:=1.25-4
PKG_RELEASE:= PKG_RELEASE:=
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \

11
luci-app-passwall2/root/usr/share/passwall2/subscribe.lua
View File

@ -392,7 +392,12 @@ local function processData(szType, content, add_mode, add_from)
result.remarks = info.ps result.remarks = info.ps
-- result.mux = 1 -- result.mux = 1
-- result.mux_concurrency = 8 -- result.mux_concurrency = 8
if not info.net then
info.net = "tcp"
end
info.net = string.lower(info.net) info.net = string.lower(info.net)
result.transport = info.net
if info.net == 'ws' then if info.net == 'ws' then
result.ws_host = info.host result.ws_host = info.host
result.ws_path = info.path result.ws_path = info.path
@ -427,7 +432,6 @@ local function processData(szType, content, add_mode, add_from)
if info.net == 'grpc' then if info.net == 'grpc' then
result.grpc_serviceName = info.path result.grpc_serviceName = info.path
end end
result.transport = info.net
if not info.security then result.security = "auto" end if not info.security then result.security = "auto" end
if info.tls == "tls" or info.tls == "1" then if info.tls == "tls" or info.tls == "1" then
result.tls = "1" result.tls = "1"
@ -660,7 +664,11 @@ local function processData(szType, content, add_mode, add_from)
result.address = host_port result.address = host_port
end end
if not params.type then
params.type = "tcp"
end
params.type = string.lower(params.type) params.type = string.lower(params.type)
result.transport = params.type
if params.type == 'ws' then if params.type == 'ws' then
result.ws_host = params.host result.ws_host = params.host
result.ws_path = params.path result.ws_path = params.path
@ -695,7 +703,6 @@ local function processData(szType, content, add_mode, add_from)
if params.serviceName then result.grpc_serviceName = params.serviceName end if params.serviceName then result.grpc_serviceName = params.serviceName end
result.grpc_mode = params.mode result.grpc_mode = params.mode
end end
result.transport = params.type
result.encryption = params.encryption or "none" result.encryption = params.encryption or "none"