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

Remove bin.lua calls from packetdecoders.lua

Browse Source
This commit is contained in:
dmiller
2018-08-29 03:06:37 +00:00
parent 82c61cb0e2
commit a5d29ee861
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
nselib/data/packetdecoders.lua
View File

@@ -1,4 +1,3 @@
local bin = require "bin"
local ipOps = require "ipOps" local ipOps = require "ipOps"
local packet = require "packet" local packet = require "packet"
local stdnse = require "stdnse" local stdnse = require "stdnse"
@@ -374,7 +373,7 @@ udp = {
-- this, but it will do for now. First, we need to -- this, but it will do for now. First, we need to
-- extract the xid as the parse function checks that it -- extract the xid as the parse function checks that it
-- was the same as in the request, which we didn't do. -- was the same as in the request, which we didn't do.
local pos, msgtype, _, _, _, xid = bin.unpack("<CCCCA4", data) local msgtype, xid = string.unpack("<B xxx c4", data)
-- attempt to parse the data -- attempt to parse the data
local status, result = dhcp.dhcp_parse(data, xid) local status, result = dhcp.dhcp_parse(data, xid)
@@ -418,7 +417,6 @@ udp = {
process = function(self, layer3) process = function(self, layer3)
local dns = require('dns') local dns = require('dns')
local bin = require('bin')
local netbios = require('netbios') local netbios = require('netbios')
local tab = require('tab') local tab = require('tab')
local p = packet.Packet:new( layer3, #layer3 ) local p = packet.Packet:new( layer3, #layer3 )
@@ -471,17 +469,13 @@ udp = {
end, end,
process = function(self, layer3) process = function(self, layer3)
local bin = require('bin')
local netbios = require('netbios') local netbios = require('netbios')
local tab = require('tab')
local ipOps = require("ipOps")
local p = packet.Packet:new( layer3, #layer3 ) local p = packet.Packet:new( layer3, #layer3 )
local data = layer3:sub(p.udp_offset + 9) local data = layer3:sub(p.udp_offset + 9)
local pos, ip, _, src, dst = 5 local ip, src, dst = string.unpack(">c4 xxxxxx c34 c34", data, 5)
pos, ip, _, _, _, src, dst = bin.unpack(">ISSSA34A34", data, pos)
ip = ipOps.fromdword(ip) ip = ipOps.str_to_ip(ip)
src = netbios.name_decode(src) src = netbios.name_decode(src)
dst = netbios.name_decode(dst) dst = netbios.name_decode(dst)
stdnse.debug1("Decoded BROWSER: %s, %s, %s", ip, src, dst) stdnse.debug1("Decoded BROWSER: %s, %s, %s", ip, src, dst)
@@ -637,7 +631,6 @@ udp = {
process = function(self, layer3) process = function(self, layer3)
local p = packet.Packet:new( layer3, #layer3 ) local p = packet.Packet:new( layer3, #layer3 )
local data = layer3:sub(p.udp_offset + 9) local data = layer3:sub(p.udp_offset + 9)
local ipOps = require("ipOps")
local State = { local State = {
[0] = "Initial", [0] = "Initial",
@@ -654,11 +647,11 @@ udp = {
[2] = "Resign", [2] = "Resign",
} }
local pos, version, op, state, _, _, prio, group, _, secret = bin.unpack("CCCCCCCCz", data) local version, op, state, prio, group, secret, pos = string.unpack("BBBxxBBxz", data)
if ( version ~= 0 ) then return end if ( version ~= 0 ) then return end
pos = pos + ( 7 - #secret ) pos = pos + ( 7 - #secret )
local virtip local virtip
pos, virtip = bin.unpack(">I", data, pos) virtip, pos = string.unpack(">I4", data, pos)
if ( not(self.dups[p.ip_src]) ) then if ( not(self.dups[p.ip_src]) ) then
if ( not(self.results) ) then if ( not(self.results) ) then
@@ -781,7 +774,6 @@ udp = {
process = function(self, layer3) process = function(self, layer3)
local dns = require('dns') local dns = require('dns')
local bin = require('bin')
local p = packet.Packet:new( layer3, #layer3 ) local p = packet.Packet:new( layer3, #layer3 )
local data = layer3:sub(p.udp_offset + 9) local data = layer3:sub(p.udp_offset + 9)
local dresp = dns.decode(data) local dresp = dns.decode(data)
@@ -801,7 +793,7 @@ udp = {
for i in ipairs(dresp.answers) do for i in ipairs(dresp.answers) do
if ( dresp.answers[i]['data'] ) then if ( dresp.answers[i]['data'] ) then
local _, data = bin.unpack("p", dresp.answers[i]['data']) local data = string.unpack("s1", dresp.answers[i]['data'])
if ( data ) then if ( data ) then
model = data:match("^model=(.*)") model = data:match("^model=(.*)")
if ( model ) then if ( model ) then