ソースを参照

Merge pull request #1224 from zxlhhyccc/patch-23

luci-app-ssr-plus: Fix minor errors and failure to start issues
coolsnowwolf 2 年 前
コミット
67dff7a464

+ 3 - 3
luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua

@@ -370,8 +370,8 @@ o:depends("type", "tuic")
 
 o = s:option(ListValue, "udp_relay_mode", translate("UDP relay mode"))
 o:depends("type", "tuic")
-o:value("native", translate("native UDP characteristics")
-o:value("quic", translate("lossless UDP relay using QUIC streams")
+o:value("native", translate("native UDP characteristics"))
+o:value("quic", translate("lossless UDP relay using QUIC streams"))
 o.default = "native"
 o.rmempty = true
 
@@ -890,4 +890,4 @@ if is_finded("kcptun-client") then
 	o:depends("type", "ss")
 end
 
-return m
+return m

+ 5 - 5
luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua

@@ -314,10 +314,10 @@ local tuic = {
 				certificates = server.certificate and { server.certpath } or nil,
 				udp_relay_mode = server.udp_relay_mode,
 				congestion_control = server.congestion_control,
-				heartbeat = server.heartbeat .. "s",
-				timeout = server.timeout .. "s",
-				gc_interval = server.gc_interval .. "s",
-				gc_lifetime = server.gc_lifetime .. "s",
+				heartbeat = server.heartbeat,
+				timeout = server.timeout,
+				gc_interval = server.gc_interval,
+				gc_lifetime = server.gc_lifetime,
 				alpn = server.tls_alpn,
 				disable_sni = (server.disable_sni == "1"),
 				zero_rtt_handshake = (server.zero_rtt_handshake == "1"),
@@ -326,7 +326,7 @@ local tuic = {
         },
 		["local"] = {
 				server = "[::]:" .. tonumber(local_port),
-				dual_stack = dual_stack = (server.tuic_dual_stack == "1") and true or false,
+				dual_stack = (server.tuic_dual_stack == "1") and true or false,
 				max_packet_size = server.tuic_max_package_size
 		}
 }