CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-08-04 14:49:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Look up the service name whenever service detection doesn't find a

Browse source 
match, not only for PROBESTATE_EXCLUDED. Otherwise a serviceDeductions
gets allocated but its name doesn't get set. Later, when a
serviceDeductions is present with no name, XML output doesn't print the
service element.
This commit is contained in:
david 2010-04-30 17:21:38 +00:00
parent 5fdf2aed63
commit db328f191f
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
portlist.cc
View file

@ -330,7 +330,15 @@ void PortList::setServiceProbeResults(u16 portno, int protocol,
|| sres == PROBESTATE_FINISHED_SOFTMATCHED) {
port->service->dtype = SERVICE_DETECTION_PROBED;
port->service->name_confidence = 10;
} else if (sres == PROBESTATE_EXCLUDED) {
} else if (sres == PROBESTATE_FINISHED_TCPWRAPPED) {
port->service->dtype = SERVICE_DETECTION_PROBED;
if (sname == NULL)
sname = "tcpwrapped";
port->service->dtype = SERVICE_DETECTION_TABLE;
port->service->name_confidence = 8;
} else {
/* PROBESTATE_FINISHED_NOMATCH, PROBESTATE_EXCLUDED, PROBESTATE_INCOMPLETE.
Just look up the service name if none is provided. */
if (sname == NULL) {
struct servent *service;
service = nmap_getservbyport(htons(portno), IPPROTO2STR(protocol));
@ -339,12 +347,6 @@ void PortList::setServiceProbeResults(u16 portno, int protocol,
}
port->service->dtype = SERVICE_DETECTION_TABLE;
port->service->name_confidence = 2; // Since we didn't even check it, we aren't very confident
} else if (sres == PROBESTATE_FINISHED_TCPWRAPPED) {
port->service->dtype = SERVICE_DETECTION_PROBED;
if (sname == NULL)
sname = "tcpwrapped";
port->service->dtype = SERVICE_DETECTION_TABLE;
port->service->name_confidence = 8;
}
// port->serviceprobe_results = sres;