1
0
mirror of https://github.com/nmap/nmap.git synced 2026-01-07 23:19:02 +00:00

Replace IP address parsing with functions from ipOps

This commit is contained in:
dmiller
2017-03-14 18:59:12 +00:00
parent cc644955c4
commit f89d7610b0
5 changed files with 27 additions and 49 deletions

View File

@@ -52,6 +52,7 @@
local bin = require "bin"
local bit = require "bit"
local ipOps = require "ipOps"
local math = require "math"
local msrpctypes = require "msrpctypes"
local netbios = require "netbios"
@@ -1266,9 +1267,9 @@ function epmapper_lookup(smbstate,handle)
elseif address_type == 0x08 then
pos,lookup_response.udp_port = bin.unpack(">S",data,pos)
elseif address_type == 0x09 then
local i1,i2,i3,i4
pos,i1,i2,i3,i4 = bin.unpack("CCCC",data,pos)
lookup_response.ip_addr = string.format("%d.%d.%d.%d",i1,i2,i3,i4)
local ip
ip, pos = string.unpack("c4", data, pos)
lookup_response.ip_addr = ipOps.str_to_ip(ip)
elseif address_type == 0x0f then
lookup_response.ncacn_np = string.sub(data,pos,pos+address_len-2)
floor_len = floor_len + address_len - 2