net/mwan3: make mwan3 mask configurable over uci

Add new global config option mmx_mask.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

diff --git a/net/mwan3/files/lib/mwan3/mwan3.sh b/net/mwan3/files/lib/mwan3/mwan3.sh
index 43600568ff2c643958b8339a3c6e176c1a2243f1..0ff91d1b77951e348ce30f472738d3b105bc5ed1 100644 (file)
--- a/net/mwan3/files/lib/mwan3/mwan3.sh
+++ b/net/mwan3/files/lib/mwan3/mwan3.sh
@@ -11,7 +11,15 @@ CONNTRACK_FILE="/proc/net/nf_conntrack"
 MWAN3_STATUS_DIR="/var/run/mwan3track"
 
 # mwan3's MARKing mask (at least 3 bits should be set)
-MMX_MASK=0xff00
+if [ -e "${MWAN3_STATUS_DIR}/mmx_mask" ]; then
+       MMX_MASK=$(cat "${MWAN3_STATUS_DIR}/mmx_mask")
+else
+       config_load mwan3
+       config_get MMX_MASK globals mmx_mask '0xff00'
+       mkdir -p "${MWAN3_STATUS_DIR}"
+       echo "$MMX_MASK" > "${MWAN3_STATUS_DIR}/mmx_mask"
+       $LOG notice "Using firewall mask ${MMX_MASK}"
+fi
 
 # counts how many bits are set to 1
 # n&(n-1) clears the lowest bit set to 1

diff --git a/net/mwan3/files/usr/sbin/mwan3 b/net/mwan3/files/usr/sbin/mwan3
index 1168ba37c0c1eb7df5af1f286a13fac2518e0fc4..b323b8aaea92be06a8c8f575a2877a85aee644ee 100755 (executable)
--- a/net/mwan3/files/usr/sbin/mwan3
+++ b/net/mwan3/files/usr/sbin/mwan3
@@ -160,6 +160,7 @@ stop()
        done
 
        mwan3_lock_clean
+       rm -rf "${MWAN3_STATUS_DIR}/mmx_mask"
 }
 
 restart() {