rpms/iputils/devel iputils-20020927-12-arping.patch, NONE, 1.1 iputils.spec, 1.22, 1.23

[fedora-cvs-commits at redhat.com]

Author: rvokal

Update of /cvs/dist/rpms/iputils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21030

Modified Files:
	iputils.spec 
Added Files:
	iputils-20020927-12-arping.patch 
Log Message:
  - fixed arping timeout (#165715)

iputils-20020927-12-arping.patch:
 arping.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE iputils-20020927-12-arping.patch ---
--- iputils/arping.c.orig	2001-10-05 18:42:47.000000000 -0400
+++ iputils/arping.c	2005-07-13 13:07:45.406217716 -0400
@@ -166,10 +166,12 @@ void catcher(void)
 	if (start.tv_sec==0)
 		start = tv;
 
-	if (count-- == 0 || (timeout && MS_TDIFF(tv,start) > timeout*1000 + 500))
+	if ((timeout && MS_TDIFF(tv,start) > timeout*1000 + 500) ||
+		((count == 0) && (!timeout)))
 		finish();
 
 	if (last.tv_sec==0 || MS_TDIFF(tv,last) > 500) {
+		count--;
 		send_pack(s, src, dst, &me, &he);
 		if (count == 0 && unsolicited)
 			finish();
@@ -510,6 +512,8 @@ main(int argc, char **argv)
 		sigaddset(&sset, SIGINT);
 		sigprocmask(SIG_BLOCK, &sset, &osset);
 		recv_pack(packet, cc, &from);
+		if(received == count)
+			exit(0);
 		sigprocmask(SIG_SETMASK, &osset, NULL);
 	}
 }


Index: iputils.spec
===================================================================
RCS file: /cvs/dist/rpms/iputils/devel/iputils.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- iputils.spec	18 Jul 2005 07:15:50 -0000	1.22
+++ iputils.spec	12 Aug 2005 10:08:18 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: Network monitoring tools including ping.
 Name: iputils
 Version: 20020927
-Release: 24
+Release: 25
 License: BSD
 Group: System Environment/Daemons
 Source0: http://www.tux.org/pub/net/ip-routing/%{name}-ss020927.tar.gz
@@ -23,6 +23,7 @@
 #Patch12: iputils-arping.patch
 Patch13: iputils-20020927-ia64_align.patch
 Patch14: iputils-arping_buf_overflow.patch
+Patch15: iputils-20020927-12-arping.patch
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-root
 BuildPreReq: docbook-utils perl-SGMLSpm
@@ -54,6 +55,7 @@
 #%patch12 -b .arping
 %patch13 -p1 -b .align
 %patch14 -p1 -b .buf_overflow
+%patch15 -p1 -b .timeout
 
 %build
 %ifarch s390 s390x
@@ -150,6 +152,9 @@
 %config(noreplace) %{_sysconfdir}/rc.d/init.d/rdisc
 
 %changelog
+* Fri Aug 12 2005 Radek Vokal <rvokal at redhat.com> 20020927-25
+- fixed arping timeout (#165715)
+
 * Mon Jul 18 2005 Radek Vokal <rvokal at redhat.com> 20020927-24
 - fixed arping buffer overflow (#163383)