From 0b33c98ebb2d8c2a149ef5d9fd1d30adb1169d5c Mon Sep 17 00:00:00 2001
From: fyodor <fyodor@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Sat, 11 Aug 2007 04:13:07 +0000
Subject: [PATCH] merge soc07 r4896 - Patch to make sure traceroute always
 displays the last hop, even if consolidation is total

---
 traceroute.cc | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/traceroute.cc b/traceroute.cc
index 98d59b69d..7cb8aa2be 100644
--- a/traceroute.cc
+++ b/traceroute.cc
@@ -983,7 +983,7 @@ Traceroute::outputTarget (Target * t) {
             }
         }
 
-        /* If we cannot find a traceprobe we are probably still consolidating */
+ 	/* here we print the final hop for a trace that is fully consolidated */
         if ((it = tg->TraceProbes.find (ttl_count)) == tg->TraceProbes.end ()) {
 		if (common_consolidation && ttl_count == tg->hopDistance) {
 			if(ttl_count-2 == 1) {
@@ -992,14 +992,14 @@ Traceroute::outputTarget (Target * t) {
 			} else {
 				Tbl->addItemFormatted(row_count, RTT_COL, false, "--> %d", ttl_count-2);
 			}
+			common_consolidation = false;
 			break;
 		}
-
 		continue;
 	}
         /* Here we consolidate the probe that first matched the common path */
-        if (ttl_count <= tg->consolidation_start)
-            continue;
+        if (ttl_count < tg->consolidation_start) 
+              continue;
 
         tp = tg->TraceProbes[ttl_count];
 
@@ -1008,9 +1008,10 @@ Traceroute::outputTarget (Target * t) {
             if(ttl_count-1 == 1) {
                 Tbl->addItemFormatted(row_count, RTT_COL, false, "--", ttl_count-1);
                 Tbl->addItemFormatted(row_count, HOST_COL,false,  "%s", hostStr(commonPath[ttl_count-1]));
-            } else
+            } else {
                 Tbl->addItemFormatted(row_count, RTT_COL, false, "--> %d", ttl_count-1);
-                common_consolidation = false;
+	    }
+            common_consolidation = false;
         }
 
         row_count++;