From 58e049a60d250b881af60091215c75daa3f5c01a Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Tue, 17 Nov 2015 02:45:27 +0100 Subject: [PATCH] More generic approach for number of pre-open sockets (Issue #1540) --- lib/core/option.py | 3 +-- lib/core/settings.py | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/core/option.py b/lib/core/option.py index b666c79a6..d8a9a467d 100644 --- a/lib/core/option.py +++ b/lib/core/option.py @@ -122,7 +122,6 @@ from lib.core.settings import NULL from lib.core.settings import PARAMETER_SPLITTING_REGEX from lib.core.settings import PROBLEMATIC_CUSTOM_INJECTION_PATTERNS from lib.core.settings import SITE -from lib.core.settings import SOCKET_PRE_CONNECT_QUEUE_SIZE from lib.core.settings import SQLMAP_ENVIRONMENT_PREFIX from lib.core.settings import SUPPORTED_DBMS from lib.core.settings import SUPPORTED_OS @@ -1028,7 +1027,7 @@ def _setSocketPreConnect(): while kb.threadContinue: try: for address in socket._ready: - if len(socket._ready[address]) < SOCKET_PRE_CONNECT_QUEUE_SIZE: + if len(socket._ready[address]) < conf.threads: s = socket.socket() s._connect(address) with kb.locks.socket: diff --git a/lib/core/settings.py b/lib/core/settings.py index 72d7a906f..d478ae50a 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -466,9 +466,6 @@ ROTATING_CHARS = ('\\', '|', '|', '/', '-') # Approximate chunk length (in bytes) used by BigArray objects (only last chunk and cached one are held in memory) BIGARRAY_CHUNK_SIZE = 1024 * 1024 -# Maximum number of socket pre-connects -SOCKET_PRE_CONNECT_QUEUE_SIZE = 3 - # Only console display last n table rows TRIM_STDOUT_DUMP_SIZE = 256