Minor refactoring

This commit is contained in:
Miroslav Stampar 2013-02-09 20:21:17 +01:00
parent f970b4f240
commit 7c06a937e5

View File

@ -507,6 +507,8 @@ class Metasploit:
if pwnBofCond or smbRelayCond: if pwnBofCond or smbRelayCond:
func() func()
timeout = time.time() - start_time > METASPLOIT_SESSION_TIMEOUT
if not initialized: if not initialized:
match = re.search("session ([\d]+) opened", out) match = re.search("session ([\d]+) opened", out)
@ -519,13 +521,13 @@ class Metasploit:
initialized = True initialized = True
elif time.time() - start_time > METASPLOIT_SESSION_TIMEOUT: elif timeout:
proc.kill() proc.kill()
errMsg = "timeout occurred while attempting " errMsg = "timeout occurred while attempting "
errMsg += "to open a remote session" errMsg += "to open a remote session"
raise SqlmapGenericException(errMsg) raise SqlmapGenericException(errMsg)
if conf.liveTest and time.time() - start_time > METASPLOIT_SESSION_TIMEOUT: if conf.liveTest and timeout:
if initialized: if initialized:
send_all(proc, "exit\n") send_all(proc, "exit\n")
time.sleep(2) time.sleep(2)