[packages] multiwan: Reverted back from using LAN as default route in main routing...

SVN-Revision: 22043

diff --git a/net/multiwan/Makefile b/net/multiwan/Makefile
index af1493ee9873998dd89d50dde04039229baceeab..a9dc36a8510541c79443d51a9d500218be33ea30 100644 (file)
--- a/net/multiwan/Makefile
+++ b/net/multiwan/Makefile
@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=multiwan
-PKG_VERSION:=1.0.15
-PKG_RELEASE:=2
+PKG_VERSION:=1.0.16
+PKG_RELEASE:=0
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/net/multiwan/files/etc/config/multiwan b/net/multiwan/files/etc/config/multiwan
index 56d34dde05ce26ddf66ac6145e4e166594f72bf7..c02854bffd1a7cabe6b4961c93658dab726f1e0b 100644 (file)
--- a/net/multiwan/files/etc/config/multiwan
+++ b/net/multiwan/files/etc/config/multiwan
@@ -1,7 +1,6 @@
 
 config 'multiwan' 'config'
        option 'default_route' 'balancer'
-       option 'lan_if' 'lan'
 
 config 'interface' 'wan'
        option 'weight' '10'

diff --git a/net/multiwan/files/usr/bin/multiwan b/net/multiwan/files/usr/bin/multiwan
index 8a269af874d169663e1bccce31a3f4e75122e6c6..bfafb609fb1c34c7f4f1615a4fefe506d98ecb4a 100755 (executable)
--- a/net/multiwan/files/usr/bin/multiwan
+++ b/net/multiwan/files/usr/bin/multiwan
@@ -732,7 +732,6 @@ local gateway
 local group
 local ifname
 local ipaddr
-local lanip
 local i
 
 echo "## Refreshing Routing Tables ##"
@@ -757,15 +756,7 @@ ip route flush table $(expr $i + 170) > /dev/null 2>&1
 
 if [ "$gateway" != "x" -a "$ipaddr" != "x" -a "$ifname" != "x" ]; then
 ip route add default via $gateway table $(expr $i + 170) src $ipaddr proto static
-ip route del default > /dev/null 2>&1
-
-   if [ ! -z $lan_if ]; then
-      lanip=`uci -q -P /var/state get network.${lan_if}.ipaddr`
-   else
-      lanip=`uci -q -P /var/state get network.lan.ipaddr`
-   fi
-
-ip route add default via $lanip > /dev/null 2>&1
+route add default gw $gateway > /dev/null 2>&1
 fi
 done
 
@@ -1064,7 +1055,6 @@ wancount=0
 config_clear
 config_load "multiwan"
 config_get default_route    config default_route
-config_get lan_if           config lan_if
 config_get debug            config debug 
 
 config_foreach acquire_wan_data interface