luci-app-passwall2: sync upstream

last commit: 83e2f6e3c0

luci-app-passwall2/luasrc/model/cbi/passwall2/client/global.lua

@@ -351,9 +351,9 @@ o.default = "1"
 o.rmempty = false
 
 if (m:get("@global_forwarding[0]", "use_nft") or "0") == "1" then
-	o = s:taboption("DNS", Button, "clear_ipset", translate("Clear NFTSET"), translate("Try this feature if the rule modification does not take effect."))
+	o = s:taboption("DNS", Button, "clear_ipset", translate("Clear NFTSet"), translate("Try this feature if the rule modification does not take effect."))
 else
-	o = s:taboption("DNS", Button, "clear_ipset", translate("Clear IPSET"), translate("Try this feature if the rule modification does not take effect."))
+	o = s:taboption("DNS", Button, "clear_ipset", translate("Clear IPSet"), translate("Try this feature if the rule modification does not take effect."))
 end
 o.inputstyle = "remove"
 function o.write(e, e)

luci-app-passwall2/luasrc/model/cbi/passwall2/server/type/ray.lua

@@ -364,7 +364,7 @@ o.default = 0
 o:depends({ [_n("fallback")] = true })
 ]]--
 
-o = s:option(DynamicList, _n("fallback_list"), "Fallback", translate("dest,path"))
+o = s:option(DynamicList, _n("fallback_list"), "Fallback", translate("format: dest,path,xver"))
 o:depends({ [_n("fallback")] = true })
 
 o = s:option(Flag, _n("bind_local"), translate("Bind Local"), translate("When selected, it can only be accessed localhost."))

luci-app-passwall2/luasrc/passwall2/util_xray.lua

@@ -369,19 +369,19 @@ function gen_config_server(node)
 			local fallbackStr = node.fallback_list[i]
 			if fallbackStr then
 				local tmp = {}
-				string.gsub(fallbackStr, '[^' .. "," .. ']+', function(w)
+				string.gsub(fallbackStr, '[^,]+', function(w)
 					table.insert(tmp, w)
 				end)
 				local dest = tmp[1] or ""
 				local path = tmp[2]
-				if dest:find("%.") then
+				local xver = tonumber(tmp[3])
-				else
+				if not dest:find("%.") then
 					dest = tonumber(dest)
 				end
 				fallbacks[i] = {
 					path = path,
 					dest = dest,
-					xver = 1
+					xver = xver
 				}
 			end
 		end

luci-app-passwall2/po/zh-cn/passwall2.po

@@ -178,6 +178,9 @@ msgstr "强制需要代理的设备使用专用 DNS 服务器。"
 msgid "Clear IPSet"
 msgstr "清空 IPSet"
 
+msgid "Clear NFTSet"
+msgstr "清空 NFTSet"
+
 msgid "Try this feature if the rule modification does not take effect."
 msgstr "如果修改规则后没有生效，请尝试此功能。"
 

luci-app-passwall2/root/usr/share/passwall2/iptables.sh

@@ -468,7 +468,7 @@ load_acl() {
 				$ip6t_m -A PSW2 $(comment "$remarks") ${_ipt_source} -p udp -j RETURN 2>/dev/null
 				unset ipt_tmp ipt_j _ipt_source msg msg2
 			done
-			unset enabled sid remarks sources tcp_no_redir_ports udp_no_redir_ports tcp_redir_ports udp_redir_ports node interface
+			unset enabled sid remarks sources tcp_no_redir_ports udp_no_redir_ports tcp_redir_ports udp_redir_ports node interface write_ipset_direct
 			unset node_remark _acl_list
 		done
 	}

luci-app-passwall2/root/usr/share/passwall2/nftables.sh

@@ -519,7 +519,7 @@ load_acl() {
 				nft "add rule $NFTABLE_NAME PSW2_MANGLE_V6 meta l4proto udp ${_ipt_source} counter return comment \"$remarks\"" 2>/dev/null
 				unset nft_chain nft_j _ipt_source msg msg2
 			done
-			unset enabled sid remarks sources tcp_proxy_mode udp_proxy_mode tcp_no_redir_ports udp_no_redir_ports tcp_redir_ports udp_redir_ports node interface
+			unset enabled sid remarks sources tcp_proxy_mode udp_proxy_mode tcp_no_redir_ports udp_no_redir_ports tcp_redir_ports udp_redir_ports node interface write_ipset_direct
 			unset redir_port node_remark _acl_list
 		done
 	}