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

Avoid additional portlist lookup when setting port state

Browse Source
This commit is contained in:
dmiller
2024-02-26 23:10:50 +00:00
parent 073afa805d
commit 1a4d41a6b7
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
portlist.cc
View File

@@ -482,18 +482,19 @@ void PortList::setPortState(u16 portno, u8 protocol, int state) {
assert(protocol!=IPPROTO_IP || portno<256);
oldport = lookupPort(portno, protocol);
if (oldport != NULL) {
bool created = false;
current = createPort(portno, protocol, &created);
if (!created) {
/* We must discount our statistics from the old values. Also warn
if a complete duplicate */
if (o.debugging && oldport->state == state) {
if (o.debugging && current->state == state) {
error("Duplicate port (%hu/%s)", portno, proto2ascii_lowercase(protocol));
}
state_counts_proto[proto][oldport->state]--;
state_counts_proto[proto][current->state]--;
} else {
state_counts_proto[proto][default_port_state[proto].state]--;
}
current = createPort(portno, protocol);
current->state = state;
state_counts_proto[proto][state]++;
@@ -633,7 +634,7 @@ const Port *PortList::lookupPort(u16 portno, u8 protocol) const {
}
/* Create the port if it doesn't exist; otherwise this is like lookupPort. */
Port *PortList::createPort(u16 portno, u8 protocol) {
Port *PortList::createPort(u16 portno, u8 protocol, bool *created) {
Port *p;
u16 mapped_portno;
u8 mapped_protocol;
@@ -650,9 +651,11 @@ Port *PortList::createPort(u16 portno, u8 protocol) {
p->state = default_port_state[mapped_protocol].state;
p->reason.reason_id = ER_NORESPONSE;
port_list[mapped_protocol][mapped_portno] = p;
if (created) *created = true;
}
else if (created) *created = false;
return port_list[mapped_protocol][mapped_portno];
return p;
}
int PortList::forgetPort(u16 portno, u8 protocol) {

2
portlist.h
View File

@@ -268,7 +268,7 @@ class PortList {
void mapPort(u16 *portno, u8 *protocol) const;
/* Get Port structure from PortList structure.*/
const Port *lookupPort(u16 portno, u8 protocol) const;
Port *createPort(u16 portno, u8 protocol);
Port *createPort(u16 portno, u8 protocol, bool *created=NULL);
/* Set Port structure to PortList structure.*/
void setPortEntry(u16 portno, u8 protocol, Port *port);