nse_check_globals cleanup

This commit is contained in:
patrik 2012-08-14 18:47:46 +00:00
parent 860d791aa1
commit 17e56e8271
5 changed files with 16 additions and 11 deletions

View file

@ -1,3 +1,5 @@
local bin = require "bin"
local io = require "io"
local jdwp = require "jdwp"
local stdnse = require "stdnse"
local nmap = require "nmap"
@ -78,8 +80,7 @@ action = function(host, port)
local result
status, result = jdwp.invokeObjectMethod(socket,0,injectedClass.instance,injectedClass.thread,injectedClass.id,runMethodID,1,runArgs)
-- get the result string
local stringID
_,_,stringID = bin.unpack(">CL",result)
local _,_,stringID = bin.unpack(">CL",result)
status,result = jdwp.readString(socket,0,stringID)
return stdnse.format_output(true,result)
end

View file

@ -1,3 +1,5 @@
local bin = require "bin"
local io = require "io"
local jdwp = require "jdwp"
local stdnse = require "stdnse"
local nmap = require "nmap"
@ -78,8 +80,7 @@ action = function(host, port)
local result
status, result = jdwp.invokeObjectMethod(socket,0,injectedClass.instance,injectedClass.thread,injectedClass.id,runMethodID,0,nil)
-- get the result string
local stringID
_,_,stringID = bin.unpack(">CL",result)
local _,_,stringID = bin.unpack(">CL",result)
status,result = jdwp.readString(socket,0,stringID)
-- parse results
return stdnse.format_output(true,result)

View file

@ -1,3 +1,5 @@
local bin = require "bin"
local io = require "io"
local jdwp = require "jdwp"
local stdnse = require "stdnse"
local nmap = require "nmap"
@ -70,8 +72,7 @@ action = function(host, port)
local result
status, result = jdwp.invokeObjectMethod(socket,0,injectedClass.instance,injectedClass.thread,injectedClass.id,runMethodID,0,nil)
-- get the result string
local stringID
_,_,stringID = bin.unpack(">CL",result)
local _,_,stringID = bin.unpack(">CL",result)
status,result = jdwp.readString(socket,0,stringID)
-- parse results
return stdnse.format_output(true,result)

View file

@ -3,6 +3,7 @@ local packet = require "packet"
local ipOps = require "ipOps"
local bin = require "bin"
local stdnse = require "stdnse"
local string = require "string"
local target = require "target"
local table = require "table"
@ -136,7 +137,7 @@ local mrinfoListen = function(interface, timeout, responses)
local condvar = nmap.condvar(responses)
local start = nmap.clock_ms()
local listener = nmap.new_socket()
local p, mrinfo_raw, status, l3data, response
local p, mrinfo_raw, status, l3data, response, _
-- IGMP packets that are sent to our host
local filter = 'ip proto 2 and dst host ' .. interface.address