PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-17 13:09:02 +00:00
Code Issues Projects Releases Wiki Activity

Pass host and port tables instead of host.ip and port.number in http.lua

Browse Source 
and comm.lua.
This commit is contained in:
david
2010-08-16 17:41:57 +00:00
parent 0e3c861ea0
commit abbe5324bd
2 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
nselib/comm.lua
View File

@@ -40,23 +40,13 @@ end
-- Sets up the socket and connects to host:port -- Sets up the socket and connects to host:port
local setup_connect = function(host, port, opts) local setup_connect = function(host, port, opts)
if type(host) ~= "table" then
host = {ip = host}
end
local target = host.ip
if type(port) ~= "table" then
port = {number = port}
end
local sock = nmap.new_socket() local sock = nmap.new_socket()
if opts.timeout then if opts.timeout then
sock:set_timeout(opts.timeout) sock:set_timeout(opts.timeout)
end end
local status, err = sock:connect(target, port.number, opts.proto) local status, err = sock:connect(host, port, opts.proto)
if not status then if not status then
return status, err return status, err
@@ -187,7 +177,7 @@ end
-- --
-- Default timeout is set to 8000. -- Default timeout is set to 8000.
-- --
-- @param ip The destination host IP -- @param host The destination host IP
-- @param port The destination host port -- @param port The destination host port
-- @param protocol The protocol for the connection -- @param protocol The protocol for the connection
-- @param data The first data payload of the connection -- @param data The first data payload of the connection
@@ -195,7 +185,7 @@ end
-- @return response The response received for the payload -- @return response The response received for the payload
-- @return early_resp If opt recv_before is true, returns the value -- @return early_resp If opt recv_before is true, returns the value
-- of the first receive (before sending data) -- of the first receive (before sending data)
local function opencon(ip, port, protocol, data, opts) local function opencon(host, port, protocol, data, opts)
local sd = nmap.new_socket() local sd = nmap.new_socket()
-- check for connect_timeout or timeout option -- check for connect_timeout or timeout option
@@ -208,7 +198,7 @@ local function opencon(ip, port, protocol, data, opts)
sd:set_timeout(8000) sd:set_timeout(8000)
end end
local status = sd:connect(ip, port, protocol) local status = sd:connect(host, port, protocol)
if not status then if not status then
sd:close() sd:close()
return nil, nil, nil return nil, nil, nil
@@ -263,8 +253,6 @@ end
-- of the first receive (before sending data) -- of the first receive (before sending data)
function tryssl(host, port, data, opts) function tryssl(host, port, data, opts)
local opt1, opt2 = bestoption(port) local opt1, opt2 = bestoption(port)
if type(port) == 'table' then port = port.number end
if type(host) == 'table' then host = host.ip end
local best = opt1 local best = opt1
local sd, response, early_resp = opencon(host, port, opt1, data, opts) local sd, response, early_resp = opencon(host, port, opt1, data, opts)
if not sd then if not sd then

6
nselib/http.lua
View File

@@ -978,10 +978,6 @@ request = function(host, port, data, options)
options = options or {} options = options or {}
if type(host) == 'table' then
host = host.ip
end
if type(port) == 'table' then if type(port) == 'table' then
if port.protocol and port.protocol ~= 'tcp' then if port.protocol and port.protocol ~= 'tcp' then
stdnse.print_debug(1, "http.request() supports the TCP protocol only, your request to %s cannot be completed.", host) stdnse.print_debug(1, "http.request() supports the TCP protocol only, your request to %s cannot be completed.", host)
@@ -1253,7 +1249,7 @@ pipeline = function(host, port, allReqs)
-- Connect to host and send all the requests at once! -- Connect to host and send all the requests at once!
if count >= limit or not socket:get_info() then if count >= limit or not socket:get_info() then
socket:connect(host.ip, port.number, bopt) socket:connect(host, port, bopt)
partial = "" partial = ""
count = 0 count = 0
end end