gh-mirrors/openwrt-packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2026-01-10 11:44:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

mwan3: update to version 1.5-7

Browse Source 
Fixed issue where an manual ifup-ed interface would immediatly go down again
Remove from init as mwan3 is not a service

Signed-off-by: Jeroen Louwes <jeroen.louwes@gmail.com>
This commit is contained in:
Adze1502
2014-10-02 09:57:50 +02:00
parent 26b38b7dda
commit e1c07f13cc
4 changed files with 46 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
net/mwan3/files/etc/hotplug.d/iface/15-mwan3
View File

@@ -49,6 +49,17 @@ mwan3_set_general_iptables()
$IPT -F mwan3_rules
}
mwan3_set_general_rules()
{
if [ -z "$($IP rule list | awk '$1 == "2253:"')" ]; then
$IP rule add pref 2253 fwmark 0xfd00/0xff00 blackhole
fi
if [ -z "$($IP rule list | awk '$1 == "2254:"')" ]; then
$IP rule add pref 2254 fwmark 0xfe00/0xff00 unreachable
fi
}
mwan3_set_connected_iptables()
{
local connected_networks
@@ -112,18 +123,8 @@ mwan3_set_iface_rules()
$IP rule del pref $(($iface_id+2000))
done
while [ -n "$($IP rule list | awk '$1 == "2253:"')" ]; do
$IP rule del pref 2253
done
while [ -n "$($IP rule list | awk '$1 == "2254:"')" ]; do
$IP rule del pref 2254
done
[ $ACTION == "ifup" ] && $IP rule add pref $(($iface_id+1000)) iif $DEVICE lookup main
[ $ACTION == "ifup" ] && $IP rule add pref $(($iface_id+2000)) fwmark $(($iface_id*256))/0xff00 lookup $iface_id
$IP rule add pref 2253 fwmark 0xfd00/0xff00 blackhole
$IP rule add pref 2254 fwmark 0xfe00/0xff00 unreachable
}
mwan3_track()
@@ -136,6 +137,11 @@ mwan3_track()
}
config_list_foreach $INTERFACE track_ip mwan3_list_track_ips
if [ -e /var/run/mwan3track-$INTERFACE.pid ] ; then
kill $(cat /var/run/mwan3track-$INTERFACE.pid) &> /dev/null
rm /var/run/mwan3track-$INTERFACE.pid &> /dev/null
fi
if [ -n "$track_ips" ]; then
config_get reliability $INTERFACE reliability 1
config_get count $INTERFACE count 1
@@ -299,7 +305,7 @@ mwan3_ifupdown()
sleep 1
let counter++
if [ "$counter" -ge 10 ]; then
$LOG warn "Could not find gateway for interface $INTERFACE (${DEVICE:-unknown})" && return 0
$LOG warn "Could not find gateway for interface $INTERFACE ($DEVICE)" && return 0
fi
done
@@ -318,6 +324,7 @@ mwan3_ifupdown()
$LOG notice "$ACTION interface $INTERFACE (${DEVICE:-unknown})"
mwan3_set_general_iptables
mwan3_set_general_rules
mwan3_set_iface_iptables
mwan3_set_iface_route
mwan3_set_iface_rules
@@ -328,14 +335,15 @@ mwan3_ifupdown()
config_foreach mwan3_set_user_rules_iptables rule
}
local IP IPT LOG
[ -n "$ACTION" ] || exit 0
[ -n "$INTERFACE" ] || exit 0
if [ $ACTION == "ifup" ]; then
[ -n "$DEVICE" ] || exit 0
fi
local IP IPT LOG
IP="/usr/sbin/ip -4"
IPT="/usr/sbin/iptables -t mangle -w"
LOG="/usr/bin/logger -t mwan3 -p"