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

Merge pull request #5185 from kubco2/mwan3-improve-logs

Browse source 
mwan3: Improve logs when member metric is too big
This commit is contained in:
Hannu Nyman 2017-12-07 21:17:14 +02:00 committed by GitHub
commit 9863f23b9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 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.6.8
PKG_VERSION:=2.6.9
PKG_RELEASE:=1
PKG_MAINTAINER:=Florian Eckert <fe@dev.tdt.de>
PKG_LICENSE:=GPLv2

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

@ -10,6 +10,7 @@ CONNTRACK_FILE="/proc/net/nf_conntrack"
MWAN3_STATUS_DIR="/var/run/mwan3"
MWAN3TRACK_STATUS_DIR="/var/run/mwan3track"
DEFAULT_LOWEST_METRIC=256
[ -d $MWAN3_STATUS_DIR ] || mkdir -p $MWAN3_STATUS_DIR/iface_state
# mwan3's MARKing mask (at least 3 bits should be set)
@ -480,6 +481,7 @@ mwan3_set_policy()
config_get weight $1 weight 1
[ -n "$iface" ] || return 0
[ "$metric" -gt $DEFAULT_LOWEST_METRIC ] && $LOG warn "Member interface $iface has >$DEFAULT_LOWEST_METRIC metric. Not appending to policy" && return 0
mwan3_get_iface_id id $iface
@ -587,10 +589,10 @@ mwan3_create_policies_iptables()
esac
done
lowest_metric_v4=256
lowest_metric_v4=$DEFAULT_LOWEST_METRIC
total_weight_v4=0
lowest_metric_v6=256
lowest_metric_v6=$DEFAULT_LOWEST_METRIC
total_weight_v6=0
config_list_foreach $1 use_member mwan3_set_policy