Merge pull request #1889 from zxlhhyccc/tuic

Tuic

Author: zxlhhyccc

luci-app-ssr-plus/root/etc/uci-defaults/luci-ssr-plus

@@ -14,7 +14,7 @@ uci -q batch <<-EOF
 	set firewall.shadowsocksr=include
 	set firewall.shadowsocksr.type=script
 	set firewall.shadowsocksr.path=/var/etc/shadowsocksr.include
-	set firewall.shadowsocksr.reload=1
+	$(command -v fw4 >/dev/null 2>&1 || echo "set firewall.shadowsocksr.reload=1")
 	commit firewall
 EOF
 

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

@@ -410,12 +410,14 @@ end
 					keepAlivePeriod = (server.flag_quicparam == "1" and server.keepaliveperiod) and tonumber(server.keepaliveperiod) or nil,
 					disablePathMTUDiscovery = (server.flag_quicparam == "1" and tostring(server.disablepathmtudiscovery) == "1") and true or nil
 				} or nil,
-				udpmasks = (server.flag_obfs == "1" and (server.v2ray_protocol == "hysteria2" and server.obfs_type and server.obfs_type ~= "")) and {
-					{
-						type = server.obfs_type,
-						settings = server.salamander and {
-							password = server.salamander
-						} or nil
+				finalmask = (server.flag_obfs == "1" and (server.v2ray_protocol == "hysteria2" and server.obfs_type and server.obfs_type ~= "")) and {
+					udp = {
+						{
+							type = server.obfs_type,
+							settings = server.salamander and {
+								password = server.salamander
+							} or nil
+						}
 					}
 				} or nil,
 				sockopt = {