PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-11 02:09:03 +00:00
Code Issues Projects Releases Wiki Activity

merge soc07 r4896 - Patch to make sure traceroute always displays the last hop, even if consolidation is total

Browse Source
This commit is contained in:
fyodor
2007-08-11 04:13:07 +00:00
parent cafec3593d
commit 0b33c98ebb
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
traceroute.cc
View File

@@ -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 ((it = tg->TraceProbes.find (ttl_count)) == tg->TraceProbes.end ()) {
if (common_consolidation && ttl_count == tg->hopDistance) { if (common_consolidation && ttl_count == tg->hopDistance) {
if(ttl_count-2 == 1) { if(ttl_count-2 == 1) {
@@ -992,14 +992,14 @@ Traceroute::outputTarget (Target * t) {
} else { } else {
Tbl->addItemFormatted(row_count, RTT_COL, false, "--> %d", ttl_count-2); Tbl->addItemFormatted(row_count, RTT_COL, false, "--> %d", ttl_count-2);
} }
common_consolidation = false;
break; break;
} }
continue; continue;
} }
/* Here we consolidate the probe that first matched the common path */ /* Here we consolidate the probe that first matched the common path */
if (ttl_count <= tg->consolidation_start) if (ttl_count < tg->consolidation_start)
continue; continue;
tp = tg->TraceProbes[ttl_count]; tp = tg->TraceProbes[ttl_count];
@@ -1008,9 +1008,10 @@ Traceroute::outputTarget (Target * t) {
if(ttl_count-1 == 1) { if(ttl_count-1 == 1) {
Tbl->addItemFormatted(row_count, RTT_COL, false, "--", ttl_count-1); Tbl->addItemFormatted(row_count, RTT_COL, false, "--", ttl_count-1);
Tbl->addItemFormatted(row_count, HOST_COL,false, "%s", hostStr(commonPath[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); Tbl->addItemFormatted(row_count, RTT_COL, false, "--> %d", ttl_count-1);
common_consolidation = false; }
common_consolidation = false;
} }
row_count++; row_count++;