PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 12:41:29 +00:00
Code Issues Projects Releases Wiki Activity

merge Kris's traceroute fix (r4596)

Browse Source
This commit is contained in:
fyodor
2007-03-20 21:21:07 +00:00
parent fdde853f08
commit 6160feae55
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/nmap.xsl
View File

@@ -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>

4
traceroute.cc
View File

@@ -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