1
0
mirror of https://github.com/nmap/nmap.git synced 2026-02-10 23:46:34 +00:00

Replace bin.lua with string packing in a couple of my scripts

This commit is contained in:
dmiller
2017-03-09 05:13:46 +00:00
parent 001318408c
commit 8cbd5d8391
2 changed files with 7 additions and 7 deletions

View File

@@ -2,7 +2,7 @@ local comm = require "comm"
local datetime = require "datetime"
local shortport = require "shortport"
local stdnse = require "stdnse"
local bin = require "bin"
local string = require "string"
local nmap = require "nmap"
local os = require "os"
@@ -29,13 +29,13 @@ action = function(host, port)
local status, result = comm.exchange(host, port, "", {bytes=4})
if status then
local _, stamp
local stamp
local width = #result
if width == 4 then
_, stamp = bin.unpack(">I", result)
stamp = string.unpack(">I4", result)
port.version.extrainfo = "32 bits"
elseif width == 8 then
_, stamp = bin.unpack(">I", result)
stamp = string.unpack(">I4", result)
port.version.extrainfo = "64 bits"
else
stdnse.debug1("Odd response: %s", stdnse.filename_escape(result))

View File

@@ -1,10 +1,10 @@
local bin = require "bin"
local datafiles = require "datafiles"
local ipOps = require "ipOps"
local nmap = require "nmap"
local shortport = require "shortport"
local snmp = require "snmp"
local stdnse = require "stdnse"
local string = require "string"
local U = require "lpeg-utility"
local comm = require "comm"
@@ -98,12 +98,12 @@ action = function (host, port)
local output = stdnse.output_table()
-- Decode the msgAuthoritativeEngineID octet-string
local engineID = decoded[1]
local pos, enterprise = bin.unpack(">I", engineID)
local enterprise, pos = string.unpack(">I4", engineID)
if enterprise > 0x80000000 then
enterprise = enterprise - 0x80000000
output.enterprise = ENTERPRISE_NUMS[enterprise]
local format, data
pos, format = bin.unpack("C", engineID, pos)
format, pos = string.unpack("B", engineID, pos)
if format == 1 then
output.engineIDFormat = "ipv4"
output.engineIDData = ipOps.str_to_ip(engineID:sub(pos,pos+3))