rpms/traceroute/devel traceroute-1.0.4-trace_stop.patch, NONE, 1.1 traceroute.spec, 1.23, 1.24

[fedora-cvs-commits at redhat.com]

Author: rvokal

Update of /cvs/dist/rpms/traceroute/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4122

Modified Files:
	traceroute.spec 
Added Files:
	traceroute-1.0.4-trace_stop.patch 
Log Message:
- traceroute can not continue past destination host (#199342)

traceroute-1.0.4-trace_stop.patch:
 traceroute.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE traceroute-1.0.4-trace_stop.patch ---
--- traceroute-1.0.4/traceroute.c.orig	2006-07-19 01:46:17.000000000 +0200
+++ traceroute-1.0.4/traceroute.c	2006-07-19 01:52:05.000000000 +0200
@@ -620,6 +620,7 @@
 	if (opt_debug)
 		fprintf(stderr, "received hop %u response\n", hop->ttl);
 
+	if (!sameaddr (&p->responder, &dst_addr)) {
 	/* Handle error codes */
 	errstring = errbuf;
 	if (p->ee.ee_origin == SO_EE_ORIGIN_ICMP) {
@@ -690,7 +691,7 @@
 				break;
 
 			case ICMP6_DST_UNREACH_NOPORT:
-				/* we've reached the destintation host */
+				/* we've reached the destination host */
 				errstring = 0;
 				break;
 
@@ -701,6 +702,8 @@
 			break;
 		}
 	}
+	} else // we've reached the destination host
+	  errstring = 0;
 
 	if (errstring == errbuf) {
 		snprintf(errbuf, sizeof(errbuf), "icmp-%d-%d",


Index: traceroute.spec
===================================================================
RCS file: /cvs/dist/rpms/traceroute/devel/traceroute.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- traceroute.spec	12 Jul 2006 08:32:14 -0000	1.23
+++ traceroute.spec	19 Jul 2006 12:34:47 -0000	1.24
@@ -1,12 +1,13 @@
 Summary: Traces the route taken by packets over a TCP/IP network.
 Name: traceroute
 Version: 1.0.4
-Release: 1.2.1
+Release: 2
 Epoch: 2
 License: GPL
 Group: Applications/Internet
 Source: ftp://ftp.lst.de/pub/people/okir/traceroute/%{name}-%{version}.tar.bz2
 Patch0: traceroute-1.0.4-compat.patch
+Patch1: traceroute-1.0.4-trace_stop.patch
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
@@ -28,6 +29,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .compat
+%patch1 -p1 -b .trace_stop
 
 %build
 %ifarch s390 s390x
@@ -57,6 +59,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Wed Jul 19 2006 Radek Vokal <rvokal at redhat.com> - 2:1.0.4-2
+- traceroute can not continue past destination host (#199342)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2:1.0.4-1.2.1
 - rebuild