rpms/iputils
6
0
Fork 0
Code Issues Pull Requests Releases Activity

import iputils-20180629-6.el8

Browse Source
This commit is contained in:
CentOS Sources 2020-12-16 16:35:45 +00:00 committed by Andrew Lukoshko
parent 3545300d80
commit b808a44386
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
SOURCES/ping-add-support-for-sub-second-timeouts.patch
View File

@ -1,4 +1,4 @@
From 1308c7679307e80e638bccce2a6e5eb721fa9d27 Mon Sep 17 00:00:00 2001 From 9633d828e8166e47af733cbc6563ac93e5e06a30 Mon Sep 17 00:00:00 2001
From: Jan Macku <jamacku@redhat.com> From: Jan Macku <jamacku@redhat.com>
Date: Wed, 9 Dec 2020 10:23:09 +0100 Date: Wed, 9 Dec 2020 10:23:09 +0100
Subject: [PATCH] ping: add support for sub-second timeouts Subject: [PATCH] ping: add support for sub-second timeouts
@ -17,11 +17,11 @@ Backported from upstream PATCH:
918e824dc13a39e4d68fcd82fd2d248c9fba6bbd Claudius Zingerli <gitmail@zeuz.ch> 918e824dc13a39e4d68fcd82fd2d248c9fba6bbd Claudius Zingerli <gitmail@zeuz.ch>
93dfb95d48977d151dbe94983e4998959e748aee Rosen Penev <rosenp@gmail.com> 93dfb95d48977d151dbe94983e4998959e748aee Rosen Penev <rosenp@gmail.com>
--- ---
ping.c | 91 ++++++++++++++++++++++++++++++++++++++-------------------- ping.c | 89 ++++++++++++++++++++++++++++++++++++++--------------------
1 file changed, 60 insertions(+), 31 deletions(-) 1 file changed, 58 insertions(+), 31 deletions(-)
diff --git a/ping.c b/ping.c diff --git a/ping.c b/ping.c
index d9a3f5d..fec2453 100644 index d9a3f5d..33f7d45 100644
--- a/ping.c --- a/ping.c
+++ b/ping.c +++ b/ping.c
@@ -57,6 +57,7 @@ @@ -57,6 +57,7 @@
@ -32,7 +32,7 @@ index d9a3f5d..fec2453 100644
#ifndef ICMP_FILTER #ifndef ICMP_FILTER
#define ICMP_FILTER 1 #define ICMP_FILTER 1
@@ -192,6 +193,40 @@ static void set_socket_option(socket_st *sock, int level, int optname, const voi @@ -192,6 +193,38 @@ static void set_socket_option(socket_st *sock, int level, int optname, const voi
} }
} }
@ -64,16 +64,14 @@ index d9a3f5d..fec2453 100644
+ } + }
+ return num; + return num;
+err: +err:
+ if (errno == ERANGE) + fprintf(stderr, "%s: %s", err_msg, str);
+ error(2, errno, "%s: %s", err_msg, str); + exit(2);
+ error(2, 0, "%s: %s", err_msg, str);
+ return num;
+} +}
+ +
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
@@ -298,30 +333,19 @@ main(int argc, char **argv) @@ -298,30 +331,19 @@ main(int argc, char **argv)
options |= F_PTIMEOFDAY; options |= F_PTIMEOFDAY;
break; break;
case 'i': case 'i':
@ -117,7 +115,7 @@ index d9a3f5d..fec2453 100644
case 'I': case 'I':
/* IPv6 */ /* IPv6 */
if (strchr(optarg, ':')) { if (strchr(optarg, ':')) {
@@ -460,13 +484,18 @@ main(int argc, char **argv) @@ -460,13 +482,18 @@ main(int argc, char **argv)
} }
break; break;
case 'W': case 'W':
@ -144,5 +142,5 @@ index d9a3f5d..fec2453 100644
usage(); usage();
break; break;
-- --
2.28.0 2.29.2

8
SPECS/iputils.spec
View File

@ -3,7 +3,7 @@
Summary: Network monitoring tools including ping Summary: Network monitoring tools including ping
Name: iputils Name: iputils
Version: 20180629 Version: 20180629
Release: 4%{?dist} Release: 6%{?dist}
# some parts are under the original BSD (ping.c) # some parts are under the original BSD (ping.c)
# some are under GPLv2+ (tracepath.c) # some are under GPLv2+ (tracepath.c)
License: BSD and GPLv2+ License: BSD and GPLv2+
@ -169,6 +169,12 @@ install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}/%{_unitdir}
%endif %endif
%changelog %changelog
* Tue Dec 15 2020 Jan Macku <jamacku@redhat.com> - 20180629-6
- Exit on error (#1852638)
* Thu Dec 10 2020 Jan Macku <jamacku@redhat.com> - 20180629-5
- Change error() -> fprintf() reported by covscan (#1852638)
* Wed Dec 09 2020 Jan Macku <jamacku@redhat.com> - 20180629-4 * Wed Dec 09 2020 Jan Macku <jamacku@redhat.com> - 20180629-4
- Fix infinite loop caused by subsecond timeouts (#1852638) - Fix infinite loop caused by subsecond timeouts (#1852638)