More generic approach for number of pre-open sockets (Issue #1540)

stamparm · stamparm · commit 58e049a60d25 · 2015-11-17T02:45:27.000+01:00
diff --git a/lib/core/option.py b/lib/core/option.py
@@ -122,7 +122,6 @@
 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 _():
         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
@@ -466,9 +466,6 @@
 # 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
 
