iputils: fix various arping regressions
PATCH 1/1 iputils: fix various arping regressions
arping in iputils s20190709 has several problems, this backports the fixes from s20200821.
- -D, duplicate address detection, always returns failure
- -w -f does not behave correctly
- -w option hangs arping
- -U option returns failure
Signed-off-by Diego Santa Cruz <[email protected]>
--- ...rtially-fix-sent-vs-received-package.patch | 39 ++++++++ ...fix-f-quit-on-first-reply-regression.patch | 39 ++++++++ ...rison-of-different-signedness-warnin.patch | 37 ++++++++ ...ccess-when-unsolicited-ARP-mode-dest.patch | 45 +++++++++ ...ional-timerfd-to-control-when-timeou.patch | 94 +++++++++++++++++++ .../iputils/iputils_s20190709.bb | 5 + 6 files changed, 259 insertions(+) create mode 100644 meta/recipes-extended/iputils/iputils/0001-arping-revert-partially-fix-sent-vs-received-package.patch create mode 100644 meta/recipes-extended/iputils/iputils/0002-arping-fix-f-quit-on-first-reply-regression.patch create mode 100644 meta/recipes-extended/iputils/iputils/0003-arping-Fix-comparison-of-different-signedness-warnin.patch create mode 100644 meta/recipes-extended/iputils/iputils/0004-arping-return-success-when-unsolicited-ARP-mode-dest.patch create mode 100644 meta/recipes-extended/iputils/iputils/0005-arping-use-additional-timerfd-to-control-when-timeou.patch
meta/recipes-extended/iputils/iputils/0001-arping-revert-partially-fix-sent-vs-received-package.patch new file +39 -0
@@ -0,0 +1,39 @@ +From 18f14be80466ddc8fb17a400be82764a779c8dcd Mon Sep 17 00:00:00 2001 +From: Sami Kerola <[email protected]> +Date: Wed, 31 Jul 2019 21:28:12 +0100 +Subject: [PATCH] arping: revert partially - fix sent vs received packages + return value + +Commit 84ca65ca980315c73f929fed8b6f16bbd698c3a0 caused regression. The +arping -D needs return value evaluation that was the earlier default, in +other cases the new return value should be correct. + +Addresses: https://github.com/iputils/iputils/issues/209 +See-also: https://github.com/void-linux/void-packages/issues/13304 +Signed-off-by: Sami Kerola <[email protected]> +Upstream-Status: Backport [https://github.com/iputils/iputils/commit/18f14be80466ddc8fb17a400be82764a779c8dcd] +Signed-off-by: Diego Santa Cruz <[email protected]> +--- + arping.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/arping.c b/arping.c +index 77c9c56..2c87c15 100644 +--- a/arping.c ++++ b/arping.c +@@ -792,7 +792,11 @@ static int event_loop(struct run_state *ctl) + close(tfd); + freeifaddrs(ctl->ifa0); + rc |= finish(ctl); +- rc |= (ctl->sent != ctl->received); ++ if (ctl->dad && ctl->quit_on_reply) ++ /* Duplicate address detection mode return value */ ++ rc |= !(ctl->brd_sent != ctl->received); ++ else ++ rc |= (ctl->sent != ctl->received); + return rc; + } + +-- +2.18.4 +
meta/recipes-extended/iputils/iputils/0002-arping-fix-f-quit-on-first-reply-regression.patch new file +39 -0
@@ -0,0 +1,39 @@ +From 1df5350bdc952b14901fde356b17b78c2bcd4cff Mon Sep 17 00:00:00 2001 +From: Sami Kerola <[email protected]> +Date: Wed, 28 Aug 2019 20:05:22 +0100 +Subject: [PATCH] arping: fix -f quit on first reply regression + +When arping runs together with -f 'quit on first reply' and -w <timeout> +'how long to wait for a reply' the command needs to exit if replies are not +received after wait period. Notice that the exit in case of lost packages +will be 1 signifying failure. Getting a reply results to 0 exit value. + +Addresses: https://bugs.debian.org/935946 +Reported-by: Lucas Nussbaum <[email protected]> +Addresses: https://github.com/iputils/iputils/issues/211 +Reported-by: Noah Meyerhans <[email protected]> +Broken-since: 67e070d08dcbec990e1178360f82b3e2ca4f6d5f +Signed-off-by: Sami Kerola <[email protected]> +Upstream-Status: Backport [https://github.com/iputils/iputils/commit/1df5350bdc952b14901fde356b17b78c2bcd4cff] +Signed-off-by: Diego Santa Cruz <[email protected]> +--- + arping.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/arping.c b/arping.c +index 2c87c15..30884f6 100644 +--- a/arping.c ++++ b/arping.c +@@ -764,7 +764,8 @@ static int event_loop(struct run_state *ctl) + continue; + } + total_expires += exp; +- if (0 < ctl->count && (uint64_t)ctl->count < total_expires) { ++ if ((0 < ctl->count && (uint64_t)ctl->count < total_expires) || ++ (ctl->quit_on_reply && ctl->timeout < total_expires)) { + exit_loop = 1; + continue; + } +-- +2.18.4 +
meta/recipes-extended/iputils/iputils/0003-arping-Fix-comparison-of-different-signedness-warnin.patch new file +37 -0
@@ -0,0 +1,37 @@ +From ec821e572a640bd79aecc3922cb9001f4b6b26f2 Mon Sep 17 00:00:00 2001 +From: Petr Vorel <[email protected]> +Date: Sat, 7 Sep 2019 06:07:19 +0200 +Subject: [PATCH] arping: Fix comparison of different signedness warning +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +../arping.c:768:45: warning: comparison of integer expressions of different signedness: ‘int’ and ‘uint64_t’ {aka ‘long unsigned int’} [-Wsign-compare] + 768 | (ctl->quit_on_reply && ctl->timeout < total_expires)) { + +Fixes: 1df5350 ("arping: fix -f quit on first reply regression") +Reference: https://github.com/iputils/iputils/pull/212 +Acked-by: Sami Kerola <[email protected]> +Signed-off-by: Petr Vorel <[email protected]> +Upstream-Status: Backport [https://github.com/iputils/iputils/commit/ec821e572a640bd79aecc3922cb9001f4b6b26f2] +Signed-off-by: Diego Santa Cruz <[email protected]> +--- + arping.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arping.c b/arping.c +index 2d05728..88319cd 100644 +--- a/arping.c ++++ b/arping.c +@@ -765,7 +765,7 @@ static int event_loop(struct run_state *ctl) + } + total_expires += exp; + if ((0 < ctl->count && (uint64_t)ctl->count < total_expires) || +- (ctl->quit_on_reply && ctl->timeout < total_expires)) { ++ (ctl->quit_on_reply && ctl->timeout < (long)total_expires)) { + exit_loop = 1; + continue; + } +-- +2.18.4 +
meta/recipes-extended/iputils/iputils/0004-arping-return-success-when-unsolicited-ARP-mode-dest.patch new file +45 -0
45 lines not on this page · raw message
meta/recipes-extended/iputils/iputils/0005-arping-use-additional-timerfd-to-control-when-timeou.patch new file +94 -0
94 lines not on this page · raw message
meta/recipes-extended/iputils/iputils_s20190709.bb +5 -0
@@ -15,6 +15,11 @@ SRC_URI = "git://github.com/iputils/iputils \ file://0001-ninfod-fix-systemd-Documentation-url-error.patch \ file://0001-rarpd-rdisc-Drop-PrivateUsers.patch \ file://0001-iputils-Initialize-libgcrypt.patch \ + file://0001-arping-revert-partially-fix-sent-vs-received-package.patch \ + file://0002-arping-fix-f-quit-on-first-reply-regression.patch \ + file://0003-arping-Fix-comparison-of-different-signedness-warnin.patch \ + file://0004-arping-return-success-when-unsolicited-ARP-mode-dest.patch \ + file://0005-arping-use-additional-timerfd-to-control-when-timeou.patch \ " SRCREV = "13e00847176aa23683d68fce1d17ffb523510946"
Signature · 1 line
2.18.4