luci-app-vssr: sync with upstream source

This commit is contained in:
CN_SZTL 2020-10-29 22:31:33 +08:00
parent 6b1af41606
commit bdcd93bde5
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
4 changed files with 15 additions and 2 deletions

View File

@ -342,6 +342,11 @@ o:depends('transport', 'kcp')
o.default = 2
o.rmempty = true
o = s:option(Value, 'seed', translate('Seed'))
o.depends('transport', 'kcp')
o.default = ''
o.rmempty = true
o = s:option(Flag, 'congestion', translate('Congestion'))
o:depends('transport', 'kcp')
o.rmempty = true

View File

@ -280,6 +280,9 @@
try {
el('.kcp_guise').value = ssm.type;
} catch (err) { }
try {
el('.seed').value = ssm.seed;
} catch (err) { }
}
if (ssm.tls == "tls") {
try {

View File

@ -197,7 +197,8 @@ function gen_outbound(server_node, tags, local_ports)
congestion = (server.congestion == '1') and true or false,
readBufferSize = tonumber(server.read_buffer_size),
writeBufferSize = tonumber(server.write_buffer_size),
header = {type = server.kcp_guise}
header = {type = server.kcp_guise},
seed = server.seed
} or
nil,
wsSettings = (server.transport == 'ws') and (server.ws_path ~= nil or server.ws_host ~= nil) and

View File

@ -264,7 +264,11 @@ local function processData(szType, content)
result.alias = '[' .. content.airport .. '] ' .. content.remarks
end
if not result.alias then
result.alias = result.server .. ':' .. result.server_port
if result.server and result.server_port then
result.alias = result.server .. ':' .. result.server_port
else
result.alias = "NULL"
end
end
-- alias 不参与 hashkey 计算
local alias = result.alias