From bc04956c5978d82fdf1780e5af25d5921e54ba08 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Fri, 6 May 2022 22:26:35 +0200 Subject: [PATCH] batctl: Merge bugfixes from 2022.1 * ping: Skip sleep after last packet Signed-off-by: Sven Eckelmann --- ...tl-ping-Skip-sleep-after-last-packet.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 batctl/patches/0001-batctl-ping-Skip-sleep-after-last-packet.patch diff --git a/batctl/patches/0001-batctl-ping-Skip-sleep-after-last-packet.patch b/batctl/patches/0001-batctl-ping-Skip-sleep-after-last-packet.patch new file mode 100644 index 0000000..568991c --- /dev/null +++ b/batctl/patches/0001-batctl-ping-Skip-sleep-after-last-packet.patch @@ -0,0 +1,29 @@ +From: Sven Eckelmann +Date: Fri, 22 Apr 2022 11:14:08 +0200 +Subject: batctl: ping: Skip sleep after last packet + +The -i option for ping is documented as interval between ping requests. But +the sleep was also applied after all the requested pings already sent out. +As result, the user had to wait additional time until the statistics for +the (limited) ping test was printed. + +Just skip the last sleep in case there will be no next ping packet to avoid +this problem. + +Reported-by: Roman Le bg +Signed-off-by: Sven Eckelmann +Origin: upstream, https://git.open-mesh.org/batctl.git/commit/47d063213d5843d1ca33c557bd4a874db3e90e9e) + +--- a/ping.c ++++ b/ping.c +@@ -282,6 +282,10 @@ read_packet: + } + + sleep: ++ /* skip last sleep in case no more packets will be sent out */ ++ if (loop_count == 0) ++ continue; ++ + if (loop_interval > 0) + sleep(loop_interval); + else if ((tv.tv_sec != 0) || (tv.tv_usec != 0))