Merge r17202:17298 from /nmap-exp/david/nmap-xml. This brings in

structured XML output, automatic closing of XML elements on error, and
inclusion of error messages in XML output.
This commit is contained in:
david 2010-04-14 01:05:51 +00:00
parent 62955f75e6
commit 859ef5ecaf
14 changed files with 1059 additions and 431 deletions

View file

@ -115,7 +115,7 @@ class NmapOps {
const struct timeval *getStartTime() { return &start_time; }
// Number of milliseconds since getStartTime(). The current time is an
// optional argument to avoid an extra gettimeofday() call.
int TimeSinceStartMS(struct timeval *now=NULL);
int TimeSinceStartMS(const struct timeval *now=NULL);
struct in_addr v4source();
const struct in_addr *v4sourceip();