PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-01-04 05:39:01 +00:00
Code Issues Projects Releases Wiki Activity

Replace IP address parsing with functions from ipOps

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

45
nselib/afp.lua
View File

@@ -113,6 +113,7 @@
local bin = require "bin"
local bit = require "bit"
local ipOps = require "ipOps"
local nmap = require "nmap"
local os = require "os"
local stdnse = require "stdnse"
@@ -706,15 +707,14 @@ Proto = {
-- return an error? maybe not, lets just ignore this
elseif tag == 0x01 then
-- four byte ip
local octet = {}
pos, octet[1], octet[2], octet[3], octet[4] = bin.unpack("CCCC", packet.data, pos)
table.insert(result.network_addresses, string.format("%d.%d.%d.%d", octet[1], octet[2], octet[3], octet[4]))
local ip
ip, pos = string.unpack("c4", packet.data, pos)
table.insert(result.network_addresses, ipOps.str_to_ip(ip))
elseif tag == 0x02 then
-- four byte ip and two byte port
local octet = {}
local port
pos, octet[1], octet[2], octet[3], octet[4], port = bin.unpack(">CCCCS", packet.data, pos)
table.insert(result.network_addresses, string.format("%d.%d.%d.%d:%d", octet[1], octet[2], octet[3], octet[4], port))
local ip, port
ip, port, pos = string.unpack("c4 >I2", packet.data, pos)
table.insert(result.network_addresses, string.format("%s:%d", ipOps.str_to_ip(ip), port))
elseif tag == 0x03 then
-- ddp address (two byte network, one byte
-- node, one byte socket) not tested, anyone
@@ -735,37 +735,24 @@ Proto = {
-- four byte ip and two byte port, client
-- should use ssh. not tested, should work as it
-- is the same as tag 0x02
local octet = {}
local port
pos, octet[1], octet[2], octet[3], octet[4], port = bin.unpack(">CCCCS", packet.data, pos)
table.insert(result.network_addresses, string.format("ssh://%d.%d.%d.%d:%d", octet[1], octet[2], octet[3], octet[4], port))
local ip, port
ip, port, pos = string.unpack("c4 >I2", packet.data, pos)
table.insert(result.network_addresses, string.format("ssh://%s:%d", ipOps.str_to_ip(ip), port))
elseif tag == 0x06 then
-- 16 byte ipv6
-- not tested, but should work (next tag is
-- tested)
local octet = {}
local ip
ip, pos = string.unpack("c16", packet.data, pos)
for j = 1, 8 do
local o
pos, o = bin.unpack(">S", packet.data, pos)
octet[j] = string.format("%04x", o)
end
table.insert(result.network_addresses, table.concat(octet, ':'))
table.insert(result.network_addresses, ipOps.str_to_ip(ip))
elseif tag == 0x07 then
-- 16 byte ipv6 and two byte port
local octet = {}
local port
for j = 1, 8 do
local o
pos, o = bin.unpack(">S", packet.data, pos)
octet[j] = string.format("%04x", o)
end
pos, port = bin.unpack(">S", packet.data, pos)
local ip, port
ip, port, pos = string.unpack(">c16 I2", packet.data, pos)
table.insert(result.network_addresses,
string.format("[%s]:%d", table.concat(octet, ':'), port))
string.format("[%s]:%d", ipOps.str_to_ip(ip), port))
end
end