From 811894e17fcdbec0e22af45ba7e9d10be9d7bcba Mon Sep 17 00:00:00 2001
From: coolsnowwolf <coolsnowwolf@gmail.com>
Date: Fri, 30 Nov 2018 22:52:43 +0800
Subject: [PATCH] luci-app-mwan3helper: enable ipsets at startup

---
 package/lean/luci-app-mwan3helper/Makefile       |  2 +-
 .../luasrc/model/cbi/mwan3helper/client.lua      |  3 ++-
 .../luci-app-mwan3helper/po/zh-cn/mwan3helper.po | 12 ++++++++++++
 .../root/etc/init.d/mwan3helper                  | 16 ++++++++--------
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/package/lean/luci-app-mwan3helper/Makefile b/package/lean/luci-app-mwan3helper/Makefile
index f61493976d..cd14c00376 100644
--- a/package/lean/luci-app-mwan3helper/Makefile
+++ b/package/lean/luci-app-mwan3helper/Makefile
@@ -9,7 +9,7 @@ LUCI_TITLE:=LuCI support for MWAN3 Helper
 LUCI_DEPENDS:=+luci-app-mwan3 +pdnsd-alt +dnsmasq-full +ipset
 LUCI_PKGARCH:=all
 PKG_VERSION:=1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 include $(TOPDIR)/feeds/luci/luci.mk
 
diff --git a/package/lean/luci-app-mwan3helper/luasrc/model/cbi/mwan3helper/client.lua b/package/lean/luci-app-mwan3helper/luasrc/model/cbi/mwan3helper/client.lua
index da466f1813..466b28c77e 100644
--- a/package/lean/luci-app-mwan3helper/luasrc/model/cbi/mwan3helper/client.lua
+++ b/package/lean/luci-app-mwan3helper/luasrc/model/cbi/mwan3helper/client.lua
@@ -10,8 +10,9 @@ s = m:section(TypedSection, "mwan3helper")
 s.addremove = false
 s.anonymous = true
 
-o = s:option(Flag, "enabled", translate("Enable"))
+o = s:option(Flag, "enabled", translate("Enable GFW IPSet"))
 o.rmempty = false
+o.description = translate("启用 DNS 防污染并打开GFW IPSet（与SSR的GFW列表模式不能同时开启）")
 
 o = s:option(ListValue, "dns", translate("Anti-pollution DNS Server"))
 o:value("208.67.222.222:443", translate("OpenDNS (208.67.222.222)"))
diff --git a/package/lean/luci-app-mwan3helper/po/zh-cn/mwan3helper.po b/package/lean/luci-app-mwan3helper/po/zh-cn/mwan3helper.po
index eb419ca31c..ff41800367 100644
--- a/package/lean/luci-app-mwan3helper/po/zh-cn/mwan3helper.po
+++ b/package/lean/luci-app-mwan3helper/po/zh-cn/mwan3helper.po
@@ -1,3 +1,13 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
 msgid "MWAN3 Helper"
 msgstr "MWAN3 分流助手"
 
@@ -10,3 +20,5 @@ msgstr "IPSet列表"
 msgid "MWAN3 Helper generate IPSets"
 msgstr "自动生成中国地址段和各大ISP运营商的 IPSet 地址段，并解决国外域名的污染问题，帮助MWAN3分流 ISP/WireGuard 等"
 
+msgid "Enable GFW IPSet"
+msgstr "启用 GFW IPSet"
\ No newline at end of file
diff --git a/package/lean/luci-app-mwan3helper/root/etc/init.d/mwan3helper b/package/lean/luci-app-mwan3helper/root/etc/init.d/mwan3helper
index de991540d1..6247ec2308 100755
--- a/package/lean/luci-app-mwan3helper/root/etc/init.d/mwan3helper
+++ b/package/lean/luci-app-mwan3helper/root/etc/init.d/mwan3helper
@@ -137,16 +137,16 @@ stop_pdnsd() {
 
 
 start(){
+  /etc/mwan3helper/genipset.sh cn '/etc/mwan3helper/all_cn.txt'
+  /etc/mwan3helper/genipset.sh ct '/etc/mwan3helper/chinatelecom.txt'
+  /etc/mwan3helper/genipset.sh cnc '/etc/mwan3helper/unicom_cnc.txt'
+  /etc/mwan3helper/genipset.sh cmcc '/etc/mwan3helper/cmcc.txt'
+  /etc/mwan3helper/genipset.sh crtc '/etc/mwan3helper/crtc.txt'
+  /etc/mwan3helper/genipset.sh cernet '/etc/mwan3helper/cernet.txt'
+  /etc/mwan3helper/genipset.sh gwbn '/etc/mwan3helper/gwbn.txt'
+  /etc/mwan3helper/genipset.sh othernet '/etc/mwan3helper/othernet.txt'
   en=$(uci get mwan3helper.config.enabled 2>/dev/null)
   if [ $en -eq 1 ];  then
-    /etc/mwan3helper/genipset.sh cn '/etc/mwan3helper/all_cn.txt'
-    /etc/mwan3helper/genipset.sh ct '/etc/mwan3helper/chinatelecom.txt'
-    /etc/mwan3helper/genipset.sh cnc '/etc/mwan3helper/unicom_cnc.txt'
-    /etc/mwan3helper/genipset.sh cmcc '/etc/mwan3helper/cmcc.txt'
-    /etc/mwan3helper/genipset.sh crtc '/etc/mwan3helper/crtc.txt'
-    /etc/mwan3helper/genipset.sh cernet '/etc/mwan3helper/cernet.txt'
-    /etc/mwan3helper/genipset.sh gwbn '/etc/mwan3helper/gwbn.txt'
-    /etc/mwan3helper/genipset.sh othernet '/etc/mwan3helper/othernet.txt'
     start_pdnsd
     mkdir -p /tmp/etc/dnsmasq-mwan3.d
     ipset -N gfwlist hash:net 2>/dev/null