From c0e59d94a98774eb051e3f9b59461e619b9bdf65 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Fri, 8 Feb 2013 16:28:58 +0100
Subject: [PATCH] Better naming

---
 lib/core/settings.py       | 4 ++--
 lib/takeover/metasploit.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/core/settings.py b/lib/core/settings.py
index 1fed17493..b433d9f8e 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -513,8 +513,8 @@ FORM_SEARCH_REGEX = r"(?si)<form(?!.+<form).+?</form>"
 # 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
index 1a3b5dd05..da3b6c5fe 100644
--- a/lib/takeover/metasploit.py
+++ b/lib/takeover/metasploit.py
@@ -32,7 +32,7 @@ from lib.core.exception import SqlmapDataException
 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 @@ class Metasploit:
                             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"