From 69a76b3999fa96e5cd98588855149a3b3759ed5f Mon Sep 17 00:00:00 2001
From: coolsnowwolf <coolsnowwolf@gmail.com>
Date: Mon, 5 Nov 2018 13:59:28 +0800
Subject: [PATCH] let luci app wrtbwmon compatible with Flowoffload

---
 package/lean/luci-app-wrtbwmon/Makefile                  | 2 +-
 .../luasrc/model/cbi/wrtbwmon/config.lua                 | 4 ++--
 package/lean/luci-app-wrtbwmon/luasrc/view/wrtbwmon.htm  | 4 ++--
 .../root/etc/uci-defaults/luci-wrtbwmon                  | 9 +++++++++
 package/lean/luci-app-wrtbwmon/root/etc/wrtbwmon.include | 1 +
 5 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100755 package/lean/luci-app-wrtbwmon/root/etc/wrtbwmon.include

diff --git a/package/lean/luci-app-wrtbwmon/Makefile b/package/lean/luci-app-wrtbwmon/Makefile
index 19dc241cc..b6a7882f9 100644
--- a/package/lean/luci-app-wrtbwmon/Makefile
+++ b/package/lean/luci-app-wrtbwmon/Makefile
@@ -9,7 +9,7 @@ LUCI_TITLE:=LuCI support for Wrtbwmon
 LUCI_DEPENDS:=+luci-app-nlbwmon
 LUCI_PKGARCH:=all
 PKG_VERSION:=1.0
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 include $(TOPDIR)/feeds/luci/luci.mk
 
diff --git a/package/lean/luci-app-wrtbwmon/luasrc/model/cbi/wrtbwmon/config.lua b/package/lean/luci-app-wrtbwmon/luasrc/model/cbi/wrtbwmon/config.lua
index 10edc41cf..b7f8c9328 100644
--- a/package/lean/luci-app-wrtbwmon/luasrc/model/cbi/wrtbwmon/config.lua
+++ b/package/lean/luci-app-wrtbwmon/luasrc/model/cbi/wrtbwmon/config.lua
@@ -2,8 +2,8 @@ local m = Map("wrtbwmon", "详细设置")
 
 local s = m:section(NamedSection, "general", "wrtbwmon", "通用设置")
 
-local o = s:option(Flag, "persist", "写入数据库到ROM",
-    "把统计数据写入 /etc/config 中避免重启或者升级后丢失 （需要占用ROM空间并降低闪存寿命）")
+local o = s:option(Flag, "persist", "写入数据库到 ROM",
+    "把统计数据写入 /etc/config 中避免重启或者升级后丢失 （需要占用 ROM 空间并降低闪存寿命）")
 o.rmempty = false
 
 function o.write(self, section, value)
diff --git a/package/lean/luci-app-wrtbwmon/luasrc/view/wrtbwmon.htm b/package/lean/luci-app-wrtbwmon/luasrc/view/wrtbwmon.htm
index 21bac7a45..a42e6f08c 100644
--- a/package/lean/luci-app-wrtbwmon/luasrc/view/wrtbwmon.htm
+++ b/package/lean/luci-app-wrtbwmon/luasrc/view/wrtbwmon.htm
@@ -1,5 +1,5 @@
 <%+header%>
-<h2>客户端实时流量监测 (暂不兼容SFE和FLOW加速)</h2>
+<h2>客户端实时流量监测</h2>
 <p style="position:relative;">
     <button id="resetDatabase" class="cbi-button" style="position:absolute;right:0;bottom:0;">重置统计数据库</button>
 </p>
@@ -29,7 +29,7 @@
         </label>
         <br/>
         <label>
-            <small>合并计算MAC地址相同的客户端流量</small>
+            <small>合并计算客户端流量</small>
             <input id="perHostTotals" type="checkbox" style="vertical-align:middle;"/>
         </label>
         <!-- label>
diff --git a/package/lean/luci-app-wrtbwmon/root/etc/uci-defaults/luci-wrtbwmon b/package/lean/luci-app-wrtbwmon/root/etc/uci-defaults/luci-wrtbwmon
index c86001a6f..bcb5b337f 100755
--- a/package/lean/luci-app-wrtbwmon/root/etc/uci-defaults/luci-wrtbwmon
+++ b/package/lean/luci-app-wrtbwmon/root/etc/uci-defaults/luci-wrtbwmon
@@ -1,5 +1,14 @@
 #!/bin/sh
 
+uci -q batch <<-EOF >/dev/null
+	delete firewall.wrtbwmon
+	set firewall.wrtbwmon=include
+	set firewall.wrtbwmon.type=script
+	set firewall.wrtbwmon.path='/etc/wrtbwmon.include'
+	set firewall.wrtbwmon.reload=1
+  commit firewall
+EOF
+
 /etc/init.d/wrtbwmon enable
 /etc/init.d/wrtbwmon start
 exit 0
diff --git a/package/lean/luci-app-wrtbwmon/root/etc/wrtbwmon.include b/package/lean/luci-app-wrtbwmon/root/etc/wrtbwmon.include
new file mode 100755
index 000000000..fcf2de7ca
--- /dev/null
+++ b/package/lean/luci-app-wrtbwmon/root/etc/wrtbwmon.include
@@ -0,0 +1 @@
+/etc/init.d/wrtbwmon restart