pool/iputils
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 728978 from home:pevik:branches:network:utilities

Browse Source 
- Fix arping -w problem (https://github.com/iputils/iputils/issues/211)
 * added arping-fix-f-quit-on-first-reply-regression.patch
 (upstream commit 1df5350)

OBS-URL: https://build.opensuse.org/request/show/728978
OBS-URL: https://build.opensuse.org/package/show/network:utilities/iputils?expand=0&rev=78
This commit is contained in:
Petr Vorel 2019-09-09 10:06:17 +00:00 committed by Git OBS Bridge
parent 74f031719a
commit f37f14ff6e
3 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
arping-fix-f-quit-on-first-reply-regression.patch Normal file
View File

@ -0,0 +1,38 @@
From 1df5350bdc952b14901fde356b17b78c2bcd4cff Mon Sep 17 00:00:00 2001
From: Sami Kerola <kerolasa@iki.fi>
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 <lucas@debian.org>
Addresses: https://github.com/iputils/iputils/issues/211
Reported-by: Noah Meyerhans <noahm@debian.org>
Broken-since: 67e070d08dcbec990e1178360f82b3e2ca4f6d5f
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
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.22.1

7
iputils.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Sep 6 12:01:34 UTC 2019 - Petr Vorel <pvorel@suse.cz>
- Fix arping -w problem (https://github.com/iputils/iputils/issues/211)
* added arping-fix-f-quit-on-first-reply-regression.patch
(upstream commit 1df5350)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Aug 20 17:31:48 UTC 2019 - Martin Wilck <mwilck@suse.com> Tue Aug 20 17:31:48 UTC 2019 - Martin Wilck <mwilck@suse.com>

2
iputils.spec
View File

@ -28,6 +28,7 @@ Source1: rarpd.service
Patch1: iputils-sec-ping-unblock.diff Patch1: iputils-sec-ping-unblock.diff
Patch2: iputils-ping-interrupt.diff Patch2: iputils-ping-interrupt.diff
Patch3: arping-revert-partially-fix-sent-vs-received-package.patch Patch3: arping-revert-partially-fix-sent-vs-received-package.patch
Patch4: arping-fix-f-quit-on-first-reply-regression.patch
BuildRequires: docbook5-xsl-stylesheets BuildRequires: docbook5-xsl-stylesheets
BuildRequires: docbook_5 BuildRequires: docbook_5
BuildRequires: iso_ent BuildRequires: iso_ent
@ -69,6 +70,7 @@ out their IP addresses.
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
%build %build
# Export CFLAGS so we can also benefit from the ones the Makefile sets for us # Export CFLAGS so we can also benefit from the ones the Makefile sets for us