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

Merge pull request #4174 from TDT-GmbH/mwan3-add-ubus-check

Browse source 
net/mwan3: add ubus interface check
This commit is contained in:
champtar 2017-03-24 11:54:19 -07:00 committed by GitHub
commit 499ec98653
3 changed files with 43 additions and 13 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
PKG_NAME:=mwan3
PKG_VERSION:=2.2
PKG_VERSION:=2.3
PKG_RELEASE:=5
PKG_MAINTAINER:=Florian Eckert <fe@dev.tdt.de>
PKG_LICENSE:=GPLv2

25
net/mwan3/files/etc/hotplug.d/iface/15-mwan3
View file

@ -22,15 +22,24 @@ fi
[ -x /usr/sbin/ip6tables ] || exit 7
[ -x /usr/bin/logger ] || exit 8
config_get family $INTERFACE family ipv4
if [ "$family" == "ipv4" ]; then
network_get_gateway gateway $INTERFACE
elif [ "$family" == "ipv6" ]; then
network_get_gateway6 gateway $INTERFACE
fi
if [ "$ACTION" == "ifup" ]; then
config_get family $INTERFACE family ipv4
if [ "$family" = "ipv4" ]; then
ubus call network.interface.${INTERFACE}_4 status &>/dev/null
if [ "$?" -eq "0" ]; then
network_get_gateway gateway ${INTERFACE}_4
else
network_get_gateway gateway $INTERFACE
fi
elif [ "$family" = "ipv6" ]; then
ubus call network.interface.${INTERFACE}_6 status &>/dev/null
if [ "$?" -eq "0" ]; then
network_get_gateway6 gateway ${INTERFACE}_6
else
network_get_gateway6 gateway ${INTERFACE}
fi
fi
[ -n "$gateway" ] || exit 9
fi

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

@ -130,7 +130,12 @@ mwan3_create_iface_iptables()
if [ "$family" == "ipv4" ]; then
network_get_ipaddr src_ip $1
ubus call network.interface.${1}_4 status &>/dev/null
if [ "$?" -eq "0" ]; then
network_get_ipaddr src_ip ${1}_4
else
network_get_ipaddr src_ip $1
fi
$IPS -! create mwan3_connected list:set
@ -166,7 +171,12 @@ mwan3_create_iface_iptables()
if [ "$family" == "ipv6" ]; then
network_get_ipaddr6 src_ipv6 $1
ubus call network.interface.${1}_6 status &>/dev/null
if [ "$?" -eq "0" ]; then
network_get_ipaddr6 src_ipv6 ${1}_6
else
network_get_ipaddr6 src_ipv6 $1
fi
$IPS -! create mwan3_connected_v6 hash:net family inet6
@ -238,8 +248,13 @@ mwan3_create_iface_route()
[ -n "$id" ] || return 0
if [ "$family" == "ipv4" ]; then
ubus call network.interface.${1}_4 status &>/dev/null
if [ "$?" -eq "0" ]; then
network_get_gateway route_args ${1}_4
else
network_get_gateway route_args $1
fi
network_get_gateway route_args $1
route_args="via $route_args dev $2"
$IP4 route flush table $id
@ -248,7 +263,13 @@ mwan3_create_iface_route()
if [ "$family" == "ipv6" ]; then
network_get_gateway6 route_args $1
ubus call network.interface.${1}_6 status &>/dev/null
if [ "$?" -eq "0" ]; then
network_get_gateway6 route_args ${1}_6
else
network_get_gateway6 route_args $1
fi
route_args="via $route_args dev $2"
$IP6 route flush table $id