From aac82901d3c1b2aaed4540f145c5e4caaa2e3aaf Mon Sep 17 00:00:00 2001
From: fyodor <fyodor@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Sat, 11 Aug 2007 04:47:38 +0000
Subject: [PATCH] merge soc07 r5005:5016 - Adding <times> element for the
 host's final times (srtt, rttvar, to)

---
 docs/nmap.dtd | 9 ++++++++-
 nmap.cc       | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/docs/nmap.dtd b/docs/nmap.dtd
index 0bfa426e8..0865d411b 100644
--- a/docs/nmap.dtd
+++ b/docs/nmap.dtd
@@ -132,7 +132,7 @@
 <!ELEMENT host		( status, address , (address | hostnames |
                           smurf | ports | os | distance | uptime | 
                           tcpsequence | ipidsequence | tcptssequence |
-                          hostscript | trace)* ) >
+                          hostscript | trace)*, times ) >
 
 <!-- these elements are written by output.c:write_xml_initial_hostinfo() -->
 <!ELEMENT status	EMPTY >
@@ -297,6 +297,13 @@
      errorstr   CDATA #IMPLIED
 >
 
+<!ELEMENT times EMPTY>
+<!ATTLIST times
+	srtt	CDATA	#REQUIRED
+	rttvar	CDATA	#REQUIRED
+	to	CDATA	#REQUIRED
+>
+
 <!-- these elements are generated in output.c:printfinaloutput() -->
 <!ELEMENT runstats	(finished, hosts) >
 
diff --git a/nmap.cc b/nmap.cc
index 05e288720..b09c1a241 100644
--- a/nmap.cc
+++ b/nmap.cc
@@ -1764,6 +1764,8 @@ int nmap_main(int argc, char *argv[]) {
       if (o.debugging) 
 	log_write(LOG_STDOUT, "Final times for host: srtt: %d rttvar: %d  to: %d\n", 
 		  currenths->to.srtt, currenths->to.rttvar, currenths->to.timeout);
+      log_write(LOG_XML, "<times srtt=\"%d\" rttvar=\"%d\" to=\"%d\" />\n",
+		currenths->to.srtt, currenths->to.rttvar, currenths->to.timeout);
       log_write(LOG_NORMAL|LOG_SKID|LOG_STDOUT|LOG_MACHINE,"\n");
       log_write(LOG_XML, "</host>\n");
     }