From 6160feae55ee79a5fe86cf07d39b7c92ea5ad843 Mon Sep 17 00:00:00 2001
From: fyodor <fyodor@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Tue, 20 Mar 2007 21:21:07 +0000
Subject: [PATCH] merge Kris's traceroute fix (r4596)

---
 docs/nmap.xsl | 6 +++++-
 traceroute.cc | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/nmap.xsl b/docs/nmap.xsl
index 4f6f417eb..6eb7e8803 100644
--- a/docs/nmap.xsl
+++ b/docs/nmap.xsl
@@ -696,7 +696,11 @@
 <xsl:template match="trace">
   <h3>traceroute</h3>
   <ul>
-      <li>port: <xsl:value-of select="@port" /></li>
+      <xsl:choose>
+        <xsl:when test="@port">
+          <li>port: <xsl:value-of select="@port" /></li>
+        </xsl:when>
+      </xsl:choose>
       <li>proto: <xsl:value-of select="@proto" /></li>
        <xsl:for-each select="error">
         <li>error: <xsl:value-of select="@errorstr"/></li>
diff --git a/traceroute.cc b/traceroute.cc
index 7776297a7..2cc353eef 100644
--- a/traceroute.cc
+++ b/traceroute.cc
@@ -1061,7 +1061,9 @@ Traceroute::outputXMLTrace(TraceGroup * tg) {
     short ttl_count;
 
     /* XML traceroute header */
-    log_write(LOG_XML, "<trace port=\"%d\" ", tg->dport);
+    log_write(LOG_XML, "<trace ");
+    if ((o.pingscan && (o.pingtype & PINGTYPE_TCP || o.pingtype & PINGTYPE_UDP)) || (!o.ipprotscan && !o.pingscan))
+	log_write(LOG_XML, "port=\"%d\" ", tg->dport);
     if((proto = nmap_getprotbynum(htons(tg->proto))))
         log_write(LOG_XML, "proto=\"%s\"", proto->p_name);
     else