From 817f8d9e52ca065a03527ecb17d5601dacedd61f Mon Sep 17 00:00:00 2001
From: ejlbell <ejlbell@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Thu, 23 Aug 2007 10:07:01 +0000
Subject: [PATCH] Traceroute: remove empty timed out XML hop elements

---
 traceroute.cc | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/traceroute.cc b/traceroute.cc
index ee5b35ac0..e98380e1f 100644
--- a/traceroute.cc
+++ b/traceroute.cc
@@ -1129,16 +1129,13 @@ Traceroute::outputXMLTrace(TraceGroup * tg) {
         if(tp->probeType() == PROBE_TTL)
             break;
 
-        log_write(LOG_XML, "<hop ttl=\"%d\"", tp->ttl);
-
         if(tp->timing.getState() == P_TIMEDOUT) {
-            log_write(LOG_XML, "/>\n");
             continue;
-        }
+	}
 
         timediff = TIMEVAL_SUBTRACT (tp->timing.recvTime, tp->timing.sendTime);
-        log_write(LOG_XML, " rtt=\"%.2f\" ipaddr=\"%s\"",
-                 (float)timediff/1000, tp->ipReplyStr());
+
+        log_write(LOG_XML, "<hop ttl=\"%d\" rtt=\"%.2f\" ipaddr=\"%s\"", tp->ttl, (float)timediff/1000, tp->ipReplyStr());
         if(tp->HostName() != NULL)
             log_write(LOG_XML, " host=\"%s\"", tp->HostName());
         log_write(LOG_XML, "/>\n");
@@ -1152,7 +1149,6 @@ Traceroute::outputXMLTrace(TraceGroup * tg) {
     /* traceroute XML footer */
     log_write(LOG_XML, "</trace>\n");
     log_flush(LOG_XML);
-
 } 
 
 TraceGroup::TraceGroup (u32 dip, u16 sport, u16 dport, u8 proto) {