From e9e8a5beaa4bdccada477a5486e9b879eeacbb24 Mon Sep 17 00:00:00 2001 From: FluffyTigerfear <20527882+AmberisMyShiba@users.noreply.github.com> Date: Wed, 31 Jan 2024 15:07:07 +0800 Subject: [PATCH] Fix the hysteria configuration's generation function if some values do not exist. Improve more compatibilities and stabilities for gen_config.lua to create a hysteria config-file Update gen_config.lua --- .../root/usr/share/shadowsocksr/gen_config.lua | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua b/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua index 02603c3cf..91498b0bf 100755 --- a/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua +++ b/luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua @@ -392,7 +392,7 @@ local ss = { reuse_port = true } local hysteria = { - server = (server.port_range and (server.server .. ":" .. server.port_range)) or (server.server_port and (server.server .. ":" .. server.server_port)), + server = (server.server_port and (server.port_range and (server.server .. ":" .. server.server_port .. "," .. server.port_range) or server.server .. ":" .. server.server_port) or (server.port_range and server.server .. ":" .. server.port_range or server.server .. ":443")), bandwidth = { up = tonumber(server.uplink_capacity) and tonumber(server.uplink_capacity) .. " mbps" or nil, down = tonumber(server.downlink_capacity) and tonumber(server.downlink_capacity) .. " mbps" or nil @@ -401,12 +401,13 @@ local hysteria = { listen = "0.0.0.0:" .. tonumber(socks_port), disable_udp = false } or nil, - transport = { - type = server.transport_protocol, - udp = { - hopInterval = tonumber(server.hopinterval) and tonumber(server.hopinterval) .. "s" or "30s" - } - }, + transport = (server.transport_protocol) and { + type = (server.transport_protocol) or udp, + udp = (server.port_range and (server.hopinterval) and { + hopInterval = (server.port_range and (tonumber(server.hopinterval) .. "s") or nil) + } or nil) + } or nil, + --[[ tcpTProxy = (proto:find("tcp") and local_port ~= "0") and { listen = "0.0.0.0:" .. tonumber(local_port)