Better naming

stamparm · stamparm · commit c0e59d94a987 · 2013-02-08T16:28:58.000+01:00
diff --git a/lib/core/settings.py b/lib/core/settings.py
@@ -513,8 +513,8 @@
 # Minimum field entry length needed for encoded content (hex, base64,...) check
 MIN_ENCODED_LEN_CHECK = 5
 
-# Timeout in seconds in which Meterpreter session has to be initialized
-METERPRETER_INIT_TIMEOUT = 120
+# Timeout in seconds in which Metasploit remote session has to be initialized
+METASPLOIT_SESSION_TIMEOUT = 120
 
 # CSS style used in HTML dump format
 HTML_DUMP_CSS_STYLE = """<style>
diff --git a/lib/takeover/metasploit.py b/lib/takeover/metasploit.py
@@ -32,7 +32,7 @@
 from lib.core.exception import SqlmapFilePathException
 from lib.core.exception import SqlmapGenericException
 from lib.core.settings import IS_WIN
-from lib.core.settings import METERPRETER_INIT_TIMEOUT
+from lib.core.settings import METASPLOIT_SESSION_TIMEOUT
 from lib.core.settings import UNICODE_ENCODING
 from lib.core.subprocessng import blockingReadFromFD
 from lib.core.subprocessng import blockingWriteToFD
@@ -516,7 +516,7 @@ def _controlMsfCmd(self, proc, func):
                             send_all(proc, "whoami\n" if Backend.isOs(OS.WINDOWS) else "uname -a ; id\n")
                         if conf.liveTest:
                             send_all(proc, "exit\n")
-                    elif time.time() - start_time > METERPRETER_INIT_TIMEOUT:
+                    elif time.time() - start_time > METASPLOIT_SESSION_TIMEOUT:
                         proc.kill()
                         errMsg = "Timeout occurred while attempting "
                         errMsg += "to open a remote session"
