From 581d7df844f47e5284245db47b36e21138d2653e Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Thu, 7 Nov 2019 13:55:27 +0100 Subject: [PATCH 1/4] mwan3: fix variable naming The variable IPT is not valid at this point. Set the variable usage to IPT4 fixes this issue. Signed-off-by: Florian Eckert --- net/mwan3/files/lib/mwan3/mwan3.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mwan3/files/lib/mwan3/mwan3.sh b/net/mwan3/files/lib/mwan3/mwan3.sh index ae7b398aa..88159e8b9 100644 --- a/net/mwan3/files/lib/mwan3/mwan3.sh +++ b/net/mwan3/files/lib/mwan3/mwan3.sh @@ -1004,7 +1004,7 @@ mwan3_set_user_iptables_rule() case $proto in tcp|udp) [ "$global_logging" = "1" ] && [ "$rule_logging" = "1" ] && { - $IPT -A mwan3_rules \ + $IPT4 -A mwan3_rules \ -p $proto \ -s $src_ip \ -d $dest_ip $ipset \ From a689e168aaa9c9850e35c5ff3f2f0745d04d5006 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 11 Nov 2019 09:05:49 +0100 Subject: [PATCH 2/4] mwan3: add httping_ssl option Till now we could only ping http targets on port 80. With this change by adding the config boolean config option httping_ssl we could also ping https ping targets on port 443. Signed-off-by: Florian Eckert --- net/mwan3/files/usr/sbin/mwan3track | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/net/mwan3/files/usr/sbin/mwan3track b/net/mwan3/files/usr/sbin/mwan3track index 5a3692230..a88708f06 100755 --- a/net/mwan3/files/usr/sbin/mwan3track +++ b/net/mwan3/files/usr/sbin/mwan3track @@ -61,7 +61,7 @@ main() { local recovery_interval down up size local keep_failure_interval check_quality failure_latency local recovery_latency failure_loss recovery_loss - local max_ttl + local max_ttl httping_ssl [ -z "$5" ] && echo "Error: should not be started manually" && exit 0 @@ -75,6 +75,7 @@ main() { config_load mwan3 config_get track_method $1 track_method ping + config_get_bool httping_ssl $1 httping_ssl 0 validate_track_method $track_method $SRC_IP || { track_method=ping if validate_track_method $track_method; then @@ -149,7 +150,11 @@ main() { result=$? ;; httping) - httping -y $SRC_IP -c $count -t $timeout -q $track_ip &> /dev/null + if [ "$httping_ssl" -eq 1 ]; then + httping -y $SRC_IP -c $count -t $timeout -q "https://$track_ip" &> /dev/null + else + httping -y $SRC_IP -c $count -t $timeout -q "http://$track_ip" &> /dev/null + fi result=$? ;; nping-tcp) From 14dd084662ae9f92091c34a177ef0e9a3c2913c8 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Thu, 14 Nov 2019 08:01:52 +0100 Subject: [PATCH 3/4] mwan3: update version to 2.8.2 Signed-off-by: Florian Eckert --- net/mwan3/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mwan3/Makefile b/net/mwan3/Makefile index cf37fc5b1..26ddb8fe0 100644 --- a/net/mwan3/Makefile +++ b/net/mwan3/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mwan3 -PKG_VERSION:=2.8.1 +PKG_VERSION:=2.8.2 PKG_RELEASE:=1 PKG_MAINTAINER:=Florian Eckert PKG_LICENSE:=GPLv2 From 6d638c3e23f66850cc8bd272b9fe5b9f11bec784 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 18 Nov 2019 09:26:51 +0100 Subject: [PATCH 4/4] mwan3: change license to SPDX compatible identifier Signed-off-by: Florian Eckert --- net/mwan3/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/mwan3/Makefile b/net/mwan3/Makefile index 26ddb8fe0..9815663fc 100644 --- a/net/mwan3/Makefile +++ b/net/mwan3/Makefile @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mwan3 PKG_VERSION:=2.8.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Florian Eckert -PKG_LICENSE:=GPLv2 +PKG_LICENSE:=GPL-2.0 include $(INCLUDE_DIR)/package.mk