Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #6060 from TDT-AG/pr/20180516-net-mwan3-fixes

Browse source 
Pr/20180516 net mwan3 fixes
This commit is contained in:
Hannu Nyman 2018-05-16 16:48:32 +03:00 committed by GitHub
commit 72c92eed62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/mwan3/Makefile
View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=mwan3 PKG_NAME:=mwan3
PKG_VERSION:=2.6.15 PKG_VERSION:=2.6.16
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MAINTAINER:=Florian Eckert <fe@dev.tdt.de> PKG_MAINTAINER:=Florian Eckert <fe@dev.tdt.de>
PKG_LICENSE:=GPLv2 PKG_LICENSE:=GPLv2

6
net/mwan3/files/lib/mwan3/mwan3.sh
View file

@ -492,11 +492,9 @@ mwan3_track_signal()
local pid local pid
pid="$(pgrep -f "mwan3track $1 $2")" pid="$(pgrep -f "mwan3track $1 $2")"
if [ "${pid}" != "" ]; then [ "${pid}" != "" ] && {
kill -USR1 "${pid}" kill -USR1 "${pid}"
else }
$LOG warn "Unable to send signal USR1 to mwan3track on interface $1 with pid ${pid}"
fi
} }
mwan3_set_policy() mwan3_set_policy()

41
net/mwan3/files/usr/sbin/mwan3
View file

@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
. /lib/functions.sh . /lib/functions.sh
. /usr/share/libubox/jshn.sh
. /lib/functions/network.sh . /lib/functions/network.sh
. /lib/mwan3/mwan3.sh . /lib/mwan3/mwan3.sh
@ -42,7 +43,7 @@ ifdown()
ifup() ifup()
{ {
local device enabled local device enabled up l3_device
config_load mwan3 config_load mwan3
@ -60,12 +61,14 @@ ifup()
exit 0 exit 0
} }
json_load $(ubus -S call network.interface.$1 status)
json_get_vars up l3_device
config_get enabled "$1" enabled 0 config_get enabled "$1" enabled 0
device=$(uci -p /var/state get network.$1.ifname) &> /dev/null if [ "$up" -eq 1 ] \
&& [ -n "$l3_device" ] \
if [ -n "$device" ] ; then && [ "$enabled" -eq 1 ]; then
[ "$enabled" -eq 1 ] && ACTION=ifup INTERFACE=$1 DEVICE=$device /sbin/hotplug-call iface ACTION=ifup INTERFACE=$1 DEVICE=$l3_device /sbin/hotplug-call iface
fi fi
} }
@ -118,7 +121,7 @@ status()
start() start()
{ {
local enabled local enabled src_ip local_source
config_load mwan3 config_load mwan3
config_get_bool enabled globals 'enabled' 0 config_get_bool enabled globals 'enabled' 0
@ -127,12 +130,30 @@ start()
exit 0 exit 0
} }
config_get local_source globals local_source 'none'
[ "${local_source}" = "none" ] || {
src_ip=$(uci_get_state mwan3 globals src_ip)
[ "${src_ip}" != "" ] && {
ip route del default via "${src_ip}" dev lo 1>/dev/null 2>&1
ip addr del "${src_ip}/32" dev lo 1>/dev/null 2>&1
}
network_get_ipaddr src_ip "${local_source}"
if [ "${src_ip}" = "" ]; then
$LOG warn "Unable to set source ip for own initiated traffic (${local_source})"
else
ip addr add "${src_ip}/32" dev lo
ip route add default via "${src_ip}" dev lo
uci_toggle_state mwan3 globals src_ip "${src_ip}"
fi
}
config_foreach ifup interface config_foreach ifup interface
} }
stop() stop()
{ {
local ipset route rule table IP IPT pid local ipset route rule table IP IPT pid src_ip
for pid in $(pgrep -f "mwan3track"); do for pid in $(pgrep -f "mwan3track"); do
kill -TERM "$pid" > /dev/null 2>&1 kill -TERM "$pid" > /dev/null 2>&1
@ -178,6 +199,12 @@ stop()
mwan3_lock_clean mwan3_lock_clean
rm -rf $MWAN3_STATUS_DIR $MWAN3TRACK_STATUS_DIR rm -rf $MWAN3_STATUS_DIR $MWAN3TRACK_STATUS_DIR
src_ip=$(uci_get_state mwan3 globals src_ip)
[ "${src_ip}" = "" ] || {
ip route del default via "${src_ip}" dev lo 1>/dev/null 2>&1
ip addr del "${src_ip}/32" dev lo 1>/dev/null 2>&1
}
} }
restart() { restart() {