mirror of
https://github.com/nmap/nmap.git
synced 2026-08-03 22:29:06 +00:00
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:
parent
62955f75e6
commit
859ef5ecaf
14 changed files with 1059 additions and 431 deletions
|
|
@ -157,7 +157,7 @@ const struct in_addr *NmapOps::v4sourceip() {
|
|||
|
||||
// Number of milliseconds since getStartTime(). The current time is an
|
||||
// optional argument to avoid an extra gettimeofday() call.
|
||||
int NmapOps::TimeSinceStartMS(struct timeval *now) {
|
||||
int NmapOps::TimeSinceStartMS(const struct timeval *now) {
|
||||
struct timeval tv;
|
||||
if (!now)
|
||||
gettimeofday(&tv, NULL);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue