CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-08-03 22:29:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix XML traceroute output. I accidentally left in one part of the old

Browse source 
stateful TraceProbes design, which was otherwise removed in r15197.
This commit is contained in:
david 2009-08-26 23:49:20 +00:00
parent 8a8ae22532
commit d254c85b42
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
traceroute.cc
View file

@ -1024,7 +1024,8 @@ Traceroute::outputTarget(Target * t) {
/* print a trace in xml */
void
Traceroute::outputXMLTrace(TraceGroup * tg) {
map < u16, TraceProbe * >::const_iterator it;
map < u8, TraceProbe * >::const_iterator it;
map < u8, TraceProbe * >ttlProbes;
TraceProbe *tp = NULL;
const char *hostname_tmp = NULL;
struct in_addr addr;
@ -1048,8 +1049,10 @@ Traceroute::outputXMLTrace(TraceGroup * tg) {
}
log_write(LOG_XML, ">\n");
ttlProbes = tg->consolidateHops();
/* add missing hosts host from the common path */
for (ttl_count = 1 ; ttl_count < tg->TraceProbes.begin()->second->ttl; ttl_count++) {
for (ttl_count = 1 ; ttl_count < ttlProbes.begin()->second->ttl; ttl_count++) {
addr.s_addr = commonPath[ttl_count];
log_write(LOG_XML, "<hop ttl=\"%d\" rtt=\"--\" ", ttl_count);
log_write(LOG_XML, "ipaddr=\"%s\"", inet_ntoa(addr));
@ -1060,7 +1063,7 @@ Traceroute::outputXMLTrace(TraceGroup * tg) {
/* display normal traceroute nodes. Consolidation based on the common path
* is not performed */
for (it = tg->TraceProbes.begin() ;it != tg->TraceProbes.end(); it++) {
for (it = ttlProbes.begin(); it != ttlProbes.end(); it++) {
tp = it->second;
if (tp->probeType() == PROBE_TTL)