From 8480421e1e1b511864d6f6a4c9d5e519dbc20f8f Mon Sep 17 00:00:00 2001 From: actions Date: Wed, 5 Jun 2024 18:00:07 +0800 Subject: [PATCH] luci-app-passwall: sync upstream last commit: https://github.com/xiaorouji/openwrt-passwall/commit/0c4e73c407f33abff1cc276b0b4f7a399f552e89 --- luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua | 2 +- patch-luci-app-passwall.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua index 1204cbe83..5590dd9cb 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua @@ -73,7 +73,7 @@ local doh_validate = function(self, value, t) for i = 1, #val do local v = val[i] if v then - if not datatypes.ipmask4(v) then + if not datatypes.ipmask4(v) and not datatypes.ipmask6(v) then flag = 1 end end diff --git a/patch-luci-app-passwall.patch b/patch-luci-app-passwall.patch index 2b7817d81..49c6a2719 100644 --- a/patch-luci-app-passwall.patch +++ b/patch-luci-app-passwall.patch @@ -24,7 +24,7 @@ index e52338c..7c71fff 100644 if code ~= 0 then local use_time = luci.sys.exec("echo -n '" .. result .. "' | awk -F ':' '{print $2}'") diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua -index 89378ee..1204cbe 100644 +index ef406ad..5590dd9 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua @@ -332,6 +332,12 @@ o:value("9.9.9.9", "9.9.9.9 (Quad9-Recommended)")