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

Move banners announcing the start of a script scan phase out of the

Browse Source 
threads_iter function.
This commit is contained in:
david
2011-01-08 07:20:42 +00:00
parent 9857411032
commit acffcdfc82
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
nse_main.lua
View File

@@ -968,13 +968,24 @@ local function main (hosts, scantype)
insert(runlevels[script.runlevel], script);
end
if (scantype == NSE_PRE_SCAN) then
print_verbose(1, "Script Pre-scanning.");
elseif (scantype == NSE_SCAN) then
if #hosts > 1 then
print_verbose(1, "Script scanning %d hosts.", #hosts);
elseif #hosts == 1 then
print_verbose(1, "Script scanning %s.", hosts[1].ip);
end
elseif (scantype == NSE_POST_SCAN) then
print_verbose(1, "Script Post-scanning.");
end
for runlevel, scripts in ipairs(runlevels) do
-- This iterator is passed to the run function. It returns one new script
-- thread on demand until exhausted.
local function threads_iter ()
-- activate prerule scripts
if (scantype == NSE_PRE_SCAN) then
print_verbose(1, "Script Pre-scanning.");
for _, script in ipairs(scripts) do
local thread = script:new_thread("prerule");
if thread then
@@ -984,12 +995,6 @@ local function main (hosts, scantype)
end
-- activate hostrule and portrule scripts
elseif (scantype == NSE_SCAN) then
if #hosts > 1 then
print_verbose(1, "Script scanning %d hosts.", #hosts);
elseif #hosts == 1 then
print_verbose(1, "Script scanning %s.", hosts[1].ip);
end
-- Check hostrules for this host.
for j, host in ipairs(hosts) do
for _, script in ipairs(scripts) do
@@ -1012,7 +1017,6 @@ local function main (hosts, scantype)
end
-- activate postrule scripts
elseif (scantype == NSE_POST_SCAN) then
print_verbose(1, "Script Post-scanning.");
for _, script in ipairs(scripts) do
local thread = script:new_thread("postrule");
if thread then