From 8ee963caee009d4e3f8f33bd651079ef7942c783 Mon Sep 17 00:00:00 2001
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Sat, 10 Mar 2018 03:09:39 +0000
Subject: [PATCH] Use BruteSocket in a bunch of brute scripts

---
 nselib/ajp.lua                      | 8 ++++----
 nselib/cvs.lua                      | 4 ++--
 nselib/informix.lua                 | 4 ++--
 nselib/iscsi.lua                    | 4 ++--
 nselib/membase.lua                  | 4 ++--
 nselib/omp2.lua                     | 6 +++---
 nselib/redis.lua                    | 4 ++--
 nselib/rpcap.lua                    | 4 ++--
 nselib/rsync.lua                    | 4 ++--
 nselib/socks.lua                    | 4 ++--
 nselib/tn3270.lua                   | 4 ++--
 nselib/tns.lua                      | 4 ++--
 nselib/xmpp.lua                     | 8 ++++----
 scripts/ajp-brute.nse               | 2 +-
 scripts/cassandra-brute.nse         | 2 +-
 scripts/cics-user-brute.nse         | 2 +-
 scripts/cvs-brute.nse               | 2 +-
 scripts/deluge-rpc-brute.nse        | 2 +-
 scripts/dpap-brute.nse              | 2 +-
 scripts/informix-brute.nse          | 2 +-
 scripts/ipmi-brute.nse              | 2 +-
 scripts/iscsi-brute.nse             | 2 +-
 scripts/membase-brute.nse           | 2 +-
 scripts/metasploit-xmlrpc-brute.nse | 2 +-
 scripts/mikrotik-routeros-brute.nse | 2 +-
 scripts/mmouse-brute.nse            | 2 +-
 scripts/mongodb-brute.nse           | 2 +-
 scripts/mysql-brute.nse             | 2 +-
 scripts/nessus-brute.nse            | 2 +-
 scripts/nessus-xmlrpc-brute.nse     | 2 +-
 scripts/nping-brute.nse             | 2 +-
 scripts/omp2-brute.nse              | 2 +-
 scripts/openvas-otp-brute.nse       | 2 +-
 scripts/oracle-brute.nse            | 2 +-
 scripts/pcanywhere-brute.nse        | 2 +-
 scripts/pop3-brute.nse              | 2 +-
 scripts/redis-brute.nse             | 2 +-
 scripts/rexec-brute.nse             | 2 +-
 scripts/rlogin-brute.nse            | 2 +-
 scripts/rpcap-brute.nse             | 2 +-
 scripts/rsync-brute.nse             | 2 +-
 scripts/socks-brute.nse             | 2 +-
 scripts/svn-brute.nse               | 2 +-
 scripts/telnet-brute.nse            | 2 +-
 scripts/tso-brute.nse               | 2 +-
 scripts/vmauthd-brute.nse           | 2 +-
 scripts/xmpp-brute.nse              | 2 +-
 47 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/nselib/ajp.lua b/nselib/ajp.lua
index 1d0bfbf7d..7d8c2ffcc 100644
--- a/nselib/ajp.lua
+++ b/nselib/ajp.lua
@@ -281,8 +281,8 @@ Comm = {
   -- @name Comm.connect
   -- @return status true on success, false on failure
   -- @return err string containing error message on failure
-  connect = function(self)
-    self.socket = nmap.new_socket()
+  connect = function(self, socket)
+    self.socket = socket or nmap.new_socket()
     self.socket:set_timeout(self.options.timeout or 5000)
     return self.socket:connect(self.host, self.port)
   end,
@@ -371,9 +371,9 @@ Helper = {
   -- @name Helper.connect
   -- @return status true on success, false on failure
   -- @return err string containing error message on failure
-  connect = function(self)
+  connect = function(self, socket)
     self.comm = Comm:new(self.host, self.port, self.opt)
-    return self.comm:connect()
+    return self.comm:connect(socket)
   end,
 
   getOption = function(self, options, key)
diff --git a/nselib/cvs.lua b/nselib/cvs.lua
index 2eb421d99..d767778f0 100644
--- a/nselib/cvs.lua
+++ b/nselib/cvs.lua
@@ -25,8 +25,8 @@ Helper = {
     return o
   end,
 
-  connect = function(self)
-    self.socket = nmap.new_socket()
+  connect = function(self, socket)
+    self.socket = socket or nmap.new_socket()
     return self.socket:connect(self.host, self.port)
   end,
 
diff --git a/nselib/informix.lua b/nselib/informix.lua
index d92759f8c..e4b64ac11 100644
--- a/nselib/informix.lua
+++ b/nselib/informix.lua
@@ -1173,7 +1173,6 @@ Helper = {
     self.__index = self
     o.host = host
     o.port = port
-    o.socket = nmap.new_socket()
     o.instance = instance or "nmap_probe"
     return o
   end,
@@ -1182,9 +1181,10 @@ Helper = {
   --
   -- @return true on success, false on failure
   -- @return err containing error message when status is false
-  Connect = function( self )
+  Connect = function( self, socket )
     local status, data
     local conn, packet
+    self.socket = socket or nmap.new_socket()
 
     -- Some Informix server seem to take a LOT of time to respond?!
     self.socket:set_timeout(20000)
diff --git a/nselib/iscsi.lua b/nselib/iscsi.lua
index 6d3ddf7b9..f83dc1b62 100644
--- a/nselib/iscsi.lua
+++ b/nselib/iscsi.lua
@@ -550,7 +550,6 @@ Helper = {
     setmetatable(o, self)
     self.__index = self
     o.host, o.port = host, port
-    o.socket = nmap.new_socket()
     return o
   end,
 
@@ -558,7 +557,8 @@ Helper = {
   --
   -- @return status true on success, false on failure
   -- @return err string containing error message is status is false
-  connect = function( self )
+  connect = function( self, socket )
+    self.socket = socket or nmap.new_socket()
     self.socket:set_timeout(10000)
     local status, err = self.socket:connect(self.host, self.port, "tcp")
     if ( not(status) ) then return false, err end
diff --git a/nselib/membase.lua b/nselib/membase.lua
index c361517bc..37a13945e 100644
--- a/nselib/membase.lua
+++ b/nselib/membase.lua
@@ -259,8 +259,8 @@ Helper = {
 
   -- Connects the socket to the server
   -- @return true on success, false on failure
-  connect = function(self)
-    self.socket = nmap.new_socket()
+  connect = function(self, socket)
+    self.socket = socket or nmap.new_socket()
     self.socket:set_timeout(self.options.timeout or 10000)
     return self.socket:connect(self.host, self.port)
   end,
diff --git a/nselib/omp2.lua b/nselib/omp2.lua
index 945f57cab..83c38cdd2 100644
--- a/nselib/omp2.lua
+++ b/nselib/omp2.lua
@@ -43,15 +43,15 @@ end
 Session = {
 
   --- Creates a new session object
-  new = function(self, o)
+  new = function(self, socket)
 
-    o = o or {}
+    local o = {}
     setmetatable(o, self)
     self.__index = self
 
     o.username = nmap.registry.args["omp2.username"]
     o.password = nmap.registry.args["omp2.password"]
-    o.socket = nmap.new_socket()
+    o.socket = socket or nmap.new_socket()
 
     return o
   end,
diff --git a/nselib/redis.lua b/nselib/redis.lua
index b88d5e2ef..50b28b850 100644
--- a/nselib/redis.lua
+++ b/nselib/redis.lua
@@ -125,8 +125,8 @@ Helper = {
     return o
   end,
 
-  connect = function(self)
-    self.socket = nmap.new_socket()
+  connect = function(self, socket)
+    self.socket = socket or nmap.new_socket()
     return self.socket:connect(self.host, self.port)
   end,
 
diff --git a/nselib/rpcap.lua b/nselib/rpcap.lua
index 1c82f78c0..869ce8ebf 100644
--- a/nselib/rpcap.lua
+++ b/nselib/rpcap.lua
@@ -289,8 +289,8 @@ Comm = {
   -- @param host table
   -- @param port table
   -- @return o instance of Comm
-  new = function(self, host, port)
-    local o = { host = host, port = port, socket = nmap.new_socket() }
+  new = function(self, host, port, socket)
+    local o = { host = host, port = port, socket = socket or nmap.new_socket() }
     setmetatable(o, self)
     self.__index = self
     return o
diff --git a/nselib/rsync.lua b/nselib/rsync.lua
index ac06c27ab..6bd84fda3 100644
--- a/nselib/rsync.lua
+++ b/nselib/rsync.lua
@@ -49,8 +49,8 @@ Helper = {
   -- Connects to the rsync server
   -- @return status, true on success, false on failure
   -- @return err string containing an error message if status is false
-  connect = function(self)
-    self.socket = nmap.new_socket()
+  connect = function(self, socket)
+    self.socket = socket or nmap.new_socket()
     self.socket:set_timeout(self.options.timeout or 5000)
     local status, err = self.socket:connect(self.host, self.port)
     if ( not(status) ) then
diff --git a/nselib/socks.lua b/nselib/socks.lua
index a48d347df..37c601715 100644
--- a/nselib/socks.lua
+++ b/nselib/socks.lua
@@ -198,8 +198,8 @@ Helper = {
   -- @param auth_method table containing the auth. methods to request
   -- @return status true on success, false on failure
   -- @return response table containing the response or err string on failure
-  connect = function(self, auth_method)
-    self.socket = nmap.new_socket()
+  connect = function(self, auth_method, socket)
+    self.socket = socket or nmap.new_socket()
     self.socket:set_timeout(self.options.timeout or 10000)
     local status, err = self.socket:connect(self.host, self.port)
     if ( not(status) ) then
diff --git a/nselib/tn3270.lua b/nselib/tn3270.lua
index 268baa3b1..a196722f3 100644
--- a/nselib/tn3270.lua
+++ b/nselib/tn3270.lua
@@ -232,9 +232,9 @@ Telnet = {
 
   --- Creates a new TN3270 Client object
 
-  new = function(self)
+  new = function(self, socket)
     local o = {
-      socket = nmap.new_socket(),
+      socket = socket or nmap.new_socket(),
       -- TN3270 Buffers
       buffer         = {},
       fa_buffer      = {},
diff --git a/nselib/tns.lua b/nselib/tns.lua
index b8e691bf7..c817253e7 100644
--- a/nselib/tns.lua
+++ b/nselib/tns.lua
@@ -1569,11 +1569,11 @@ Helper = {
   -- @param port table containing the port table as received by action
   -- @param instance string containing the instance name
   -- @return o new instance of Helper
-  new = function(self, host, port, instance )
+  new = function(self, host, port, instance, socket )
     local o = {
       host = host,
       port = port,
-      socket = nmap.new_socket(),
+      socket = socket or nmap.new_socket(),
       dbinstance = instance or stdnse.get_script_args('tns.sid') or "orcl"
     }
     o.socket:set_timeout(30000)
diff --git a/nselib/xmpp.lua b/nselib/xmpp.lua
index 2ec1fb075..a319c2d2f 100644
--- a/nselib/xmpp.lua
+++ b/nselib/xmpp.lua
@@ -187,13 +187,13 @@ XMPP = {
   -- @name XMPP.connect
   -- @return status true on success, false on failure
   -- @return err string containing an error message if status is false
-  connect = function(self)
+  connect = function(self, socket)
     assert(self.servername,
     "Cannot connect to XMPP server without valid server name")
 
     -- we may be reconnecting using SSL
     if ( not(self.socket) ) then
-      self.socket = nmap.new_socket()
+      self.socket = socket or nmap.new_socket()
       self.socket:set_timeout(self.options.timeout * 1000)
       local status, err = self.socket:connect(self.host, self.port)
       if ( not(status) ) then
@@ -412,13 +412,13 @@ Helper = {
   -- @name Helper.connect
   -- @return status true on success, false on failure
   -- @return err string containing an error message is status is false
-  connect = function(self)
+  connect = function(self, socket)
     if ( not(self.host.targetname) and
       not(self.options.servername) ) then
       return false, "ERROR: Cannot connect to XMPP server without valid server name"
     end
     self.state = "CONNECTED"
-    return self.xmpp:connect()
+    return self.xmpp:connect(socket)
   end,
 
   --- Login to the XMPP server
diff --git a/scripts/ajp-brute.nse b/scripts/ajp-brute.nse
index 94b29fadf..76c9a1e72 100644
--- a/scripts/ajp-brute.nse
+++ b/scripts/ajp-brute.nse
@@ -52,7 +52,7 @@ Driver = {
   end,
 
   connect = function(self)
-    return self.helper:connect()
+    return self.helper:connect(brute.new_socket())
   end,
 
   disconnect = function(self)
diff --git a/scripts/cassandra-brute.nse b/scripts/cassandra-brute.nse
index 5eedcd807..c2f6ebd67 100644
--- a/scripts/cassandra-brute.nse
+++ b/scripts/cassandra-brute.nse
@@ -37,7 +37,7 @@ portrule = shortport.port_or_service({9160}, {"cassandra"})
 Driver = {
 
   new = function(self, host, port, options)
-    local o = { host = host, port = port, socket = nmap.new_socket() }
+    local o = { host = host, port = port, socket = brute.new_socket() }
     setmetatable(o, self)
     self.__index = self
     return o
diff --git a/scripts/cics-user-brute.nse b/scripts/cics-user-brute.nse
index 7dc122c63..51055086b 100644
--- a/scripts/cics-user-brute.nse
+++ b/scripts/cics-user-brute.nse
@@ -58,7 +58,7 @@ Driver = {
     o.host = host
     o.port = port
     o.options = options
-    o.tn3270 = tn3270.Telnet:new()
+    o.tn3270 = tn3270.Telnet:new(brute.new_socket())
     return o
   end,
   connect = function( self )
diff --git a/scripts/cvs-brute.nse b/scripts/cvs-brute.nse
index 314830398..3cb57455b 100644
--- a/scripts/cvs-brute.nse
+++ b/scripts/cvs-brute.nse
@@ -51,7 +51,7 @@ Driver =
   end,
 
   connect = function( self )
-    self.helper:connect()
+    self.helper:connect(brute.new_socket())
     return true
   end,
 
diff --git a/scripts/deluge-rpc-brute.nse b/scripts/deluge-rpc-brute.nse
index c0e5ada83..1dbbc06be 100644
--- a/scripts/deluge-rpc-brute.nse
+++ b/scripts/deluge-rpc-brute.nse
@@ -92,7 +92,7 @@ Driver = {
 
   connect = function(self)
     local status, err
-    self.socket = nmap.new_socket()
+    self.socket = brute.new_socket()
     self.socket:set_timeout(
       ((self.host.times and self.host.times.timeout) or 8) * 1000)
 
diff --git a/scripts/dpap-brute.nse b/scripts/dpap-brute.nse
index 7961eb406..99f49b210 100644
--- a/scripts/dpap-brute.nse
+++ b/scripts/dpap-brute.nse
@@ -45,7 +45,7 @@ Driver = {
   end,
 
   connect = function( self )
-    self.socket = nmap.new_socket()
+    self.socket = brute.new_socket()
     self.socket:set_timeout(5000)
     return self.socket:connect(self.host, self.port, "tcp")
   end,
diff --git a/scripts/informix-brute.nse b/scripts/informix-brute.nse
index 398c51c24..59a99c40a 100644
--- a/scripts/informix-brute.nse
+++ b/scripts/informix-brute.nse
@@ -59,7 +59,7 @@ Driver =
     local status, data
     self.helper = informix.Helper:new( self.host, self.port, "on_nmap_dummy" )
 
-    status, data = self.helper:Connect()
+    status, data = self.helper:Connect(brute.new_socket())
     if ( not(status) ) then
       return status, data
     end
diff --git a/scripts/ipmi-brute.nse b/scripts/ipmi-brute.nse
index 170683a92..bf0f098df 100644
--- a/scripts/ipmi-brute.nse
+++ b/scripts/ipmi-brute.nse
@@ -39,7 +39,7 @@ Driver = {
   end,
 
   connect = function(self)
-    self.socket = nmap.new_socket()
+    self.socket = brute.new_socket()
     self.socket:set_timeout(
       ((self.host.times and self.host.times.timeout) or 8) * 1000)
     self.socket:connect(self.host, self.port, "udp")
diff --git a/scripts/iscsi-brute.nse b/scripts/iscsi-brute.nse
index f1c2c9780..97a731201 100644
--- a/scripts/iscsi-brute.nse
+++ b/scripts/iscsi-brute.nse
@@ -44,7 +44,7 @@ Driver = {
 
   connect = function( self )
     self.helper = iscsi.Helper:new( self.host, self.port )
-    return self.helper:connect()
+    return self.helper:connect(brute.new_socket())
   end,
 
   login = function( self, username, password )
diff --git a/scripts/membase-brute.nse b/scripts/membase-brute.nse
index da6133c4c..462a7f8e1 100644
--- a/scripts/membase-brute.nse
+++ b/scripts/membase-brute.nse
@@ -46,7 +46,7 @@ Driver = {
 
   connect = function(self)
     self.helper = membase.Helper:new(self.host, self.port)
-    return self.helper:connect()
+    return self.helper:connect(brute.new_socket())
   end,
 
   login = function(self, username, password)
diff --git a/scripts/metasploit-xmlrpc-brute.nse b/scripts/metasploit-xmlrpc-brute.nse
index 4e0b8adaf..5413440d8 100644
--- a/scripts/metasploit-xmlrpc-brute.nse
+++ b/scripts/metasploit-xmlrpc-brute.nse
@@ -44,7 +44,7 @@ Driver =
   end,
 
   connect = function ( self )
-    self.socket = nmap.new_socket()
+    self.socket = brute.new_socket()
     if ( not(self.socket:connect(self.host, self.port, self.opts)) ) then
       return false
     end
diff --git a/scripts/mikrotik-routeros-brute.nse b/scripts/mikrotik-routeros-brute.nse
index 6bda8050b..a87f7d939 100644
--- a/scripts/mikrotik-routeros-brute.nse
+++ b/scripts/mikrotik-routeros-brute.nse
@@ -48,7 +48,7 @@ Driver =
   end,
 
   connect = function( self )
-    self.s = nmap.new_socket("tcp")
+    self.s = brute.new_socket()
     self.s:set_timeout(self.options['timeout'])
     return self.s:connect(self.host, self.port, "tcp")
   end,
diff --git a/scripts/mmouse-brute.nse b/scripts/mmouse-brute.nse
index 0d83ee62a..8c732e323 100644
--- a/scripts/mmouse-brute.nse
+++ b/scripts/mmouse-brute.nse
@@ -49,7 +49,7 @@ Driver = {
   end,
 
   connect = function( self )
-    self.socket = nmap.new_socket()
+    self.socket = brute.new_socket()
     self.socket:set_timeout(arg_timeout)
     return self.socket:connect(self.host, self.port)
   end,
diff --git a/scripts/mongodb-brute.nse b/scripts/mongodb-brute.nse
index db8d1837d..9e45ab146 100644
--- a/scripts/mongodb-brute.nse
+++ b/scripts/mongodb-brute.nse
@@ -38,7 +38,7 @@ portrule = shortport.port_or_service({27017}, {"mongodb"})
 Driver = {
 
   new = function(self, host, port, options)
-    local o = { host = host, port = port, sock = nmap.new_socket() }
+    local o = { host = host, port = port, sock = brute.new_socket() }
     setmetatable(o, self)
     self.__index = self
     return o
diff --git a/scripts/mysql-brute.nse b/scripts/mysql-brute.nse
index 07bced879..fcd070487 100644
--- a/scripts/mysql-brute.nse
+++ b/scripts/mysql-brute.nse
@@ -53,7 +53,7 @@ Driver = {
   end,
 
   connect = function( self )
-    self.socket = nmap.new_socket()
+    self.socket = brute.new_socket()
     local status, err = self.socket:connect(self.host, self.port)
     self.socket:set_timeout(arg_timeout)
     if(not(status)) then
diff --git a/scripts/nessus-brute.nse b/scripts/nessus-brute.nse
index 2c4a5a919..2e43d9cd9 100644
--- a/scripts/nessus-brute.nse
+++ b/scripts/nessus-brute.nse
@@ -48,7 +48,7 @@ Driver =
   end,
 
   connect = function( self )
-    self.socket = nmap.new_socket()
+    self.socket = brute.new_socket()
     if ( not(self.socket:connect(self.host, self.port, "ssl")) ) then
       return false
     end
diff --git a/scripts/nessus-xmlrpc-brute.nse b/scripts/nessus-xmlrpc-brute.nse
index c62e4e14a..5e50cb0f1 100644
--- a/scripts/nessus-xmlrpc-brute.nse
+++ b/scripts/nessus-xmlrpc-brute.nse
@@ -48,7 +48,7 @@ local function authenticate(host, port, username, password)
   }
 
   local data = table.concat(headers, "\r\n") .. "\r\n\r\n" .. post_data
-  local socket = nmap.new_socket()
+  local socket = brute.new_socket()
   socket:set_timeout(arg_timeout)
 
   local status, err = socket:connect(host, port)
diff --git a/scripts/nping-brute.nse b/scripts/nping-brute.nse
index 08a831a37..6d4db5539 100644
--- a/scripts/nping-brute.nse
+++ b/scripts/nping-brute.nse
@@ -126,7 +126,7 @@ Driver =
   end,
 
   connect = function(self)
-    self.socket = nmap.new_socket()
+    self.socket = brute.new_socket()
     return self.socket:connect(self.host, self.port)
   end,
 
diff --git a/scripts/omp2-brute.nse b/scripts/omp2-brute.nse
index a0e302f7a..ade592205 100644
--- a/scripts/omp2-brute.nse
+++ b/scripts/omp2-brute.nse
@@ -34,7 +34,7 @@ Driver = {
     self.__index = self
     o.host = host
     o.port = port
-    o.session = omp2.Session:new()
+    o.session = omp2.Session:new(brute.new_socket())
     return o
   end,
 
diff --git a/scripts/openvas-otp-brute.nse b/scripts/openvas-otp-brute.nse
index 0e194211a..6556db306 100644
--- a/scripts/openvas-otp-brute.nse
+++ b/scripts/openvas-otp-brute.nse
@@ -43,7 +43,7 @@ Driver =
   end,
 
   connect = function ( self )
-    self.socket = nmap.new_socket()
+    self.socket = brute.new_socket()
     if ( not(self.socket:connect(self.host, self.port, "ssl")) ) then
       return false
     end
diff --git a/scripts/oracle-brute.nse b/scripts/oracle-brute.nse
index df8c4edc1..8a949877c 100644
--- a/scripts/oracle-brute.nse
+++ b/scripts/oracle-brute.nse
@@ -98,7 +98,7 @@ Driver =
     self.helper = ConnectionPool[coroutine.running()]
     if ( self.helper ) then return true end
 
-    self.helper = tns.Helper:new( self.host, self.port, self.sid )
+    self.helper = tns.Helper:new( self.host, self.port, self.sid, brute.new_socket() )
 
     -- This loop is intended for handling failed connections
     -- A connection may fail for a number of different reasons.
diff --git a/scripts/pcanywhere-brute.nse b/scripts/pcanywhere-brute.nse
index 3c737287f..f8daeb6d8 100644
--- a/scripts/pcanywhere-brute.nse
+++ b/scripts/pcanywhere-brute.nse
@@ -70,7 +70,7 @@ Driver = {
   end,
 
   connect = function( self )
-    self.socket = nmap.new_socket()
+    self.socket = brute.new_socket()
     local response
     local err
     local status = false
diff --git a/scripts/pop3-brute.nse b/scripts/pop3-brute.nse
index 1479a68d4..b9354219a 100644
--- a/scripts/pop3-brute.nse
+++ b/scripts/pop3-brute.nse
@@ -46,7 +46,7 @@ Driver = {
   -- @return false, brute.Error object on failure
   connect = function(self)
 
-    self.socket = nmap.new_socket()
+    self.socket = brute.new_socket()
     local opts = {timeout=10000, recv_before=true}
     local best_opt, line, _
     self.socket, _, best_opt, line = comm.tryssl(self.host, self.port, "" , opts)
diff --git a/scripts/redis-brute.nse b/scripts/redis-brute.nse
index 8d4de9c6f..8f5b9a1d3 100644
--- a/scripts/redis-brute.nse
+++ b/scripts/redis-brute.nse
@@ -43,7 +43,7 @@ Driver = {
 
   connect = function( self )
     self.helper = redis.Helper:new(self.host, self.port)
-    return self.helper:connect()
+    return self.helper:connect(brute.new_socket())
   end,
 
   login = function( self, username, password )
diff --git a/scripts/rexec-brute.nse b/scripts/rexec-brute.nse
index 5e62cf250..64062b0e8 100644
--- a/scripts/rexec-brute.nse
+++ b/scripts/rexec-brute.nse
@@ -62,7 +62,7 @@ Driver = {
   end,
 
   connect = function(self)
-    self.socket = nmap.new_socket()
+    self.socket = brute.new_socket()
     self.socket:set_timeout(self.timeout)
     local status, err = self.socket:connect(self.host, self.port)
     if ( not(status) ) then
diff --git a/scripts/rlogin-brute.nse b/scripts/rlogin-brute.nse
index f9168695f..d6293a991 100644
--- a/scripts/rlogin-brute.nse
+++ b/scripts/rlogin-brute.nse
@@ -56,7 +56,7 @@ Driver = {
 
     local status
 
-    self.socket = nmap.new_socket()
+    self.socket = brute.new_socket()
     -- apparently wee need a source port below 1024
     -- this approach is not very elegant as it causes address already in
     -- use errors when the same src port is hit in a short time frame.
diff --git a/scripts/rpcap-brute.nse b/scripts/rpcap-brute.nse
index 37c3ca58f..bbd1ebcb8 100644
--- a/scripts/rpcap-brute.nse
+++ b/scripts/rpcap-brute.nse
@@ -33,7 +33,7 @@ portrule = shortport.port_or_service(2002, "rpcap", "tcp")
 Driver = {
 
   new = function(self, host, port)
-    local o = { helper = rpcap.Helper:new(host, port) }
+    local o = { helper = rpcap.Helper:new(host, port, brute.new_socket()) }
     setmetatable(o, self)
     self.__index = self
     return o
diff --git a/scripts/rsync-brute.nse b/scripts/rsync-brute.nse
index c7fd19d64..d605e2008 100644
--- a/scripts/rsync-brute.nse
+++ b/scripts/rsync-brute.nse
@@ -44,7 +44,7 @@ Driver = {
 
   connect = function(self)
     self.helper = rsync.Helper:new(self.host, self.port, self.options)
-    return self.helper:connect()
+    return self.helper:connect(brute.new_socket())
   end,
 
   login = function(self, username, password)
diff --git a/scripts/socks-brute.nse b/scripts/socks-brute.nse
index 1693404df..1da8a53f7 100644
--- a/scripts/socks-brute.nse
+++ b/scripts/socks-brute.nse
@@ -40,7 +40,7 @@ Driver = {
 
   connect = function ( self )
     self.helper = socks.Helper:new(self.host, self.port, { timeout = 10000 })
-    return self.helper:connect()
+    return self.helper:connect(nil, brute.new_socket())
   end,
 
   login = function( self, username, password )
diff --git a/scripts/svn-brute.nse b/scripts/svn-brute.nse
index 89ee9b745..e45cf6841 100644
--- a/scripts/svn-brute.nse
+++ b/scripts/svn-brute.nse
@@ -67,7 +67,7 @@ svn =
     local repo_url = ( "svn://%s/%s" ):format(self.host.ip, self.repo)
     local status, msg
 
-    self.socket = nmap.new_socket()
+    self.socket = brute.new_socket()
 
     local result
     status, result = self.socket:connect(self.host, self.port)
diff --git a/scripts/telnet-brute.nse b/scripts/telnet-brute.nse
index ef7c6b0c5..17fce2032 100644
--- a/scripts/telnet-brute.nse
+++ b/scripts/telnet-brute.nse
@@ -145,7 +145,7 @@ local Connection = { methods = {} }
 -- @param port Telnet port
 -- @return Connection object or nil (if the operation failed)
 Connection.new = function (host, port, proto)
-  local soc = nmap.new_socket(proto)
+  local soc = brute.new_socket(proto)
   if not soc then return nil end
   return setmetatable({
                         socket = soc,
diff --git a/scripts/tso-brute.nse b/scripts/tso-brute.nse
index 80df50ae8..c05c61650 100644
--- a/scripts/tso-brute.nse
+++ b/scripts/tso-brute.nse
@@ -73,7 +73,7 @@ Driver = {
     o.host = host
     o.port = port
     o.options = options
-    o.tn3270 = tn3270.Telnet:new()
+    o.tn3270 = tn3270.Telnet:new(brute.new_socket())
     return o
   end,
   connect = function( self )
diff --git a/scripts/vmauthd-brute.nse b/scripts/vmauthd-brute.nse
index 8d1c42fb5..cdaf70512 100644
--- a/scripts/vmauthd-brute.nse
+++ b/scripts/vmauthd-brute.nse
@@ -41,7 +41,7 @@ Driver = {
   end,
 
   connect = function(self)
-    self.socket = nmap.new_socket()
+    self.socket = brute.new_socket()
     return self.socket:connect(self.host, self.port)
   end,
 
diff --git a/scripts/xmpp-brute.nse b/scripts/xmpp-brute.nse
index 2d33df1cf..e1ed4168c 100644
--- a/scripts/xmpp-brute.nse
+++ b/scripts/xmpp-brute.nse
@@ -64,7 +64,7 @@ Driver =
     self.helper = ConnectionPool[coroutine.running()]
     if ( not(self.helper) ) then
       self.helper = xmpp.Helper:new( self.host, self.port, self.options )
-      local status, err = self.helper:connect()
+      local status, err = self.helper:connect(brute.new_socket())
       if ( not(status) ) then return false, err end
       ConnectionPool[coroutine.running()] = self.helper
     end