contrib/meshwizard: add support for setting up qos on wan

diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/read_defaults.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/read_defaults.sh
index c5036631d41c193779ee1b73493995f1137fe90c..cb0d319a2d8bf61e67ad772ada9df36a917f3165 100755 (executable)
--- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/read_defaults.sh
+++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/read_defaults.sh
@@ -30,6 +30,6 @@ for v in system wifi_device wifi_iface interface alias dhcp olsr_interface olsr_
 done
 
 # read values from meshwizard
-for v in system luci_main contact community wan lan general ipv6; do
+for v in system luci_main contact community wan lan general ipv6 qos; do
         get_var meshwizard.$v
 done

diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_qos.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_qos.sh
new file mode 100755 (executable)
index 0000000..25884b3
--- /dev/null
+++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_qos.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+# sets up qos-scripts for the wan interface
+
+. /lib/functions.sh
+. $dir/functions.sh
+
+if [ ! -f /etc/config/qos ]; then
+       echo "NOT setting up QOS because /etc/config/qos-scripts was not found"
+else
+       uci batch <<- EOF
+               set qos.wan.enabled=1
+               set qos.wan.upload=$wan_up
+               set qos.wan.download=$wan_down
+       EOF
+       uci_commitverbose "Setup QOS on WAN interface." qos
+
+fi

diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh
index f7ee7cf9debe374d02d0394931b10389d4fe10f3..77c6cd95e90e4f977aed4546a58b2e23acc61c45 100755 (executable)
--- a/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh
+++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/wizard.sh
@@ -12,7 +12,7 @@
 . /lib/functions.sh
 
 echo "
-/* Meshwizard 0.1.0 */
+/* Meshwizard 0.2.0 */
 "
 
 # config
@@ -71,6 +71,10 @@ if [ "$wan_proto" == "dhcp" ]; then
        $dir/helpers/setup_wan_dhcp.sh
 fi
 
+if [ -n "$wan_down" -a -n "$wan_up" ]; then
+       $dir/helpers/setup_qos.sh
+fi
+
 if [ "$lan_proto" == "static" ] && [ -n "$lan_ip4addr" ] && [ -n "$lan_netmask" ]; then
        $dir/helpers/setup_lan_static.sh
 fi