PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-02-09 23:16:32 +00:00
Code Issues Projects Releases Wiki Activity

Fixing the assertion failure: "Target.cc:396: void Target::stopTimeOutClock(const timeval*): Assertion 'htn.toclock_running == true' failed." This was caused when a target had scripts in multiple run levels. The problem was the time-out clocks added for --host-timeout support in NSE (r6657--appears to be present since 4.52). Now the time-out clocks are started before each runlevel execution, which (besides not failing assert) makes more sense because the timer would have been counting even when the target had no scripts in the current runlevel.

Browse Source
This commit is contained in:
kris
2008-04-16 17:56:48 +00:00
parent f2938a2d37
commit 44a4cb90e6
2 changed files with 16 additions and 4 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 Fixed an assertion failure caused when a host had NSE scripts in
multiple runlevels. This in turn also fixes --host-timeout behavior
in NSE. [Kris]
o Removed the "class" attribute from the tcpsequence element in XML
output. For a long time it had always been "unknown class" because
Nmap doesn't calculate a class anymore. The XML output version has

16
nse_main.cc
View File

@@ -145,6 +145,7 @@ int script_scan(std::vector<Target*> &targets) {
int status;
std::vector<Target*>::iterator target_iter;
std::list<std::list<struct thread_record> >::iterator runlevel_iter;
std::list<struct thread_record>::iterator thr_iter;
std::list<struct thread_record> torun_threads;
lua_State* l;
@@ -212,6 +213,15 @@ int script_scan(std::vector<Target*> &targets) {
SCRIPT_ENGINE,
running_scripts.front().runlevel);)
/* Start the time-out clocks for targets with scripts in this
* runlevel. The clock is stopped in process_finalize().
*/
for (thr_iter = running_scripts.begin();
thr_iter != running_scripts.end();
thr_iter++)
if (!thr_iter->rr->host->timeOutClockRunning())
thr_iter->rr->host->startTimeOutClock(NULL);
status = process_mainloop(l);
if(status != SCRIPT_ENGINE_SUCCESS){
goto finishup;
@@ -343,7 +353,8 @@ int process_mainloop(lua_State* l) {
}
// If the target still has scripts in either running_scripts
// or waiting_scripts then it is still running
// or waiting_scripts then it is still running. This only
// pertains to scripts in the current runlevel.
int has_target_finished(Target *target) {
std::list<struct thread_record>::iterator iter;
@@ -442,9 +453,6 @@ int process_preparehost(lua_State* l, Target* target, std::list<struct thread_re
std::vector<run_record>::iterator iter;
struct run_record rr;
if (!target->timeOutClockRunning())
target->startTimeOutClock(NULL);
/* find the matching hostrules
* */
lua_getglobal(l, HOSTTESTS);