PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-10 17:59:04 +00:00
Code Issues Projects Releases Wiki Activity

Majek's Portlist change patch

Browse Source
This commit is contained in:
fyodor
2006-05-14 05:00:58 +00:00
parent 396a6c6d48
commit 37fac543b5
10 changed files with 295 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scan_engine.cc
View File

@@ -1683,7 +1683,7 @@ static bool ultrascan_port_pspec_update(UltraScanInfo *USI,
} else assert(0);
/* First figure out the current state */
currentp = hss->target->ports.lookupPort(portno, proto);
currentp = hss->target->ports.getPortEntry(portno, proto);
if (!currentp) {
oldstate = PORT_TESTING;
hss->ports_finished++;
@@ -3632,8 +3632,8 @@ void pos_scan(Target *target, u16 *portarray, int numports, stype scantype) {
if (scantype != RPC_SCAN)
fatal("pos_scan now handles only rpc scan");
if (target->ports.state_counts[PORT_OPEN] == 0 &&
(o.servicescan || target->ports.state_counts[PORT_OPENFILTERED] == 0))
if (target->ports.getStateCounts(PORT_OPEN) == 0 &&
(o.servicescan || target->ports.getStateCounts(PORT_OPENFILTERED) == 0))
return; // RPC Scan only works against already known-open ports
if (o.debugging)
@@ -3708,11 +3708,11 @@ void pos_scan(Target *target, u16 *portarray, int numports, stype scantype) {
/* Make sure we have ports left to scan */
while(1) {
if (doingOpenFiltered) {
rsi.rpc_current_port = target->ports.nextPort(rsi.rpc_current_port, 0,
PORT_OPENFILTERED, true);
rsi.rpc_current_port = target->ports.nextPort(rsi.rpc_current_port, TCPANDUDP,
PORT_OPENFILTERED);
} else {
rsi.rpc_current_port = target->ports.nextPort(rsi.rpc_current_port,
0, PORT_OPEN, true);
TCPANDUDP, PORT_OPEN);
if (!rsi.rpc_current_port && !o.servicescan) {
doingOpenFiltered = true;
continue;