PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-01-11 00:49:02 +00:00
Code Issues Projects Releases Wiki Activity

Add "hosthint" element to XML.

Browse Source 
This feature allows programs consuming XML output to know when a target
has been found to be "up" before all scan phases are completed. This is
helpful for allocating storage, communicating scan progress, or
estimating total scan duration. Closes #1858.
This commit is contained in:
dmiller
2020-01-11 07:05:01 +00:00
parent c978ba14ca
commit 6ed754b438
5 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@@ -1,5 +1,9 @@
#Nmap Changelog ($Id$); -*-text-*-
o New XML output "hosthint" tag emitted during host discovery when a target is
found to be up. This gives earlier notification than waiting for the
hostgroup to finish all scan phases. [Paul Miseiko]
o [GH#917] New UDP payloads for GPRS Tunneling Protocol (GTP) on ports 2123,
2152, and 3386. [Guillaume Teissier]

3
docs/nmap.dtd
View File

@@ -150,6 +150,9 @@
comment CDATA #IMPLIED
>
<!-- these elements are written by scan_engine.c:ultrascan_host_pspec_update() -->
<!ELEMENT hosthint (status,address,hostnames)* >
<!-- these elements are written by output.c:write_xml_initial_hostinfo() -->
<!ELEMENT status EMPTY >
<!ATTLIST status state %host_states; #REQUIRED

8
output.cc
View File

@@ -1389,6 +1389,14 @@ static void write_xml_initial_hostinfo(Target *currenths,
log_flush_all();
}
void write_xml_hosthint(Target *currenths) {
xml_start_tag("hosthint");
write_xml_initial_hostinfo(currenths, (currenths->flags & HOST_UP) ? "up" : "down");
xml_end_tag();
xml_newline();
log_flush_all();
}
static void write_xml_osclass(const OS_Classification *osclass, double accuracy) {
xml_open_start_tag("osclass");
xml_attribute("type", "%s", osclass->Device_Type);

3
output.h
View File

@@ -264,6 +264,9 @@ void write_host_header(Target *currenths);
machine log. */
void write_host_status(Target *currenths);
/* Writes host status info to the XML stream wrapped in a <hosthint> tag */
void write_xml_hosthint(Target *currenths);
/* Prints the formatted OS Scan output to stdout, logfiles, etc (but only
if an OS Scan was performed */
void printosscanoutput(Target *currenths);

8
scan_engine.cc
View File

@@ -148,6 +148,7 @@
#include "targets.h"
#include "utils.h"
#include "nmap_error.h"
#include "output.h"
#include "struct_ip.h"
@@ -2036,6 +2037,13 @@ static bool ultrascan_host_pspec_update(UltraScanInfo *USI, HostScanStats *hss,
if (hss->target->flags != HOST_UP) {
assert(newstate == HOST_UP || newstate == HOST_DOWN);
hss->target->flags = newstate;
/* For port scans (not -sn) where output may be delayed until more scan
* phases are done, emit a hosthint element during host discovery when a
* target is found to be up. */
if (oldstate != newstate && newstate == HOST_UP &&
!o.noportscan && USI->ping_scan) {
write_xml_hosthint(hss->target);
}
}
return hss->target->flags != oldstate;
}