From 4e7858709c780b010c51ab07cbdd6f38def27de9 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Fri, 24 Apr 2020 20:46:29 +0200 Subject: [PATCH] batctl: Merge bugfixes from 2020.1 * Return EXIT_FAILURE when throughputmeter failed Signed-off-by: Sven Eckelmann --- batctl/Makefile | 2 +- ...IT_FAILURE-when-throughputmeter-fail.patch | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 batctl/patches/0001-batctl-Return-EXIT_FAILURE-when-throughputmeter-fail.patch diff --git a/batctl/Makefile b/batctl/Makefile index 4e67512..c74fdbd 100644 --- a/batctl/Makefile +++ b/batctl/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batctl PKG_VERSION:=2018.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_HASH:=27877d0da6916f88a6cecbbb3f3d23cc4558ef7c7294324bf4fd050ed606b553 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/batctl/patches/0001-batctl-Return-EXIT_FAILURE-when-throughputmeter-fail.patch b/batctl/patches/0001-batctl-Return-EXIT_FAILURE-when-throughputmeter-fail.patch new file mode 100644 index 0000000..87858f9 --- /dev/null +++ b/batctl/patches/0001-batctl-Return-EXIT_FAILURE-when-throughputmeter-fail.patch @@ -0,0 +1,37 @@ +From: Leonardo Mörlein +Date: Wed, 8 Apr 2020 23:49:03 +0200 +Subject: batctl: Return EXIT_FAILURE when throughputmeter failed + +The command returned a success even an error was shown during the +execution. + + $ (sudo batctl tp 77:77:77:77:77:77 && echo true) || echo false + Destination unreachable + true + +Instead it should indicate a failure when the kernel replied with a +non-success return_value: + + $ (sudo ./batctl tp 77:77:77:77:77:77 && echo true) || echo false + Destination unreachable + false + +Fixes: f109b3473f86 ("batctl: introduce throughput meter support") +Signed-off-by: Leonardo Mörlein +[sven@narfation.org: adjusted commit message] +Signed-off-by: Sven Eckelmann + +Origin: upstream, https://git.open-mesh.org/batctl.git/commit/df8bf5164b6904f61ae0b0db090fb5bb41b4f06d + +diff --git a/tp_meter.c b/tp_meter.c +index c7904857865c5b2a51cf30e7963394dd9b6c029c..403c88452b4ad56f4049f64829c6d2bdd015810a 100644 +--- a/tp_meter.c ++++ b/tp_meter.c +@@ -480,6 +480,7 @@ int tp_meter(char *mesh_iface, int argc, char **argv) + goto out; + } + ++ ret = EXIT_FAILURE; + switch (result.return_value) { + case BATADV_TP_REASON_DST_UNREACHABLE: + fprintf(stderr, "Destination unreachable\n");