PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-16 04:39:03 +00:00
Code Issues Projects Releases Wiki Activity

Remove own ntohl() and use packet.u32() instead. Patch from Sven Klemm

Browse Source
This commit is contained in:
fyodor
2008-01-08 23:13:38 +00:00
parent 188442662d
commit 2cf283480f
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/rpcinfo.nse
View File

@@ -6,7 +6,7 @@ license = "See nmaps COPYING for licence"
categories = {"safe","discovery"} categories = {"safe","discovery"}
require "shortport" require "shortport"
require "bit" require "packet"
require "stdnse" require "stdnse"
local rpc_numbers = {} local rpc_numbers = {}
@@ -56,14 +56,8 @@ action = function(host, port)
catch = function() socket:close() end catch = function() socket:close() end
try = nmap.new_try( catch ) try = nmap.new_try( catch )
try( fillrpc() ) try( fillrpc() )
local ntohl = function( s )
return bit.lshift(s:byte(1),24) + bit.lshift(s:byte(2),16) +
bit.lshift(s:byte(3),8) + s:byte(4)
end
local request = string.char(0x80,0,0,40) -- fragment header local request = string.char(0x80,0,0,40) -- fragment header
request = request .. transaction_id -- transaction id request = request .. transaction_id -- transaction id
request = request .. "\0\0\0\0\0\0\0\2" -- message type: call (0) and rpc version 2 request = request .. "\0\0\0\0\0\0\0\2" -- message type: call (0) and rpc version 2
@@ -98,10 +92,10 @@ action = function(host, port)
local dir = { udp = {}, tcp = {}} local dir = { udp = {}, tcp = {}}
local rpc_prog, rpc_vers, rpc_proto, rpc_port local rpc_prog, rpc_vers, rpc_proto, rpc_port
while answer:byte(4) == 1 and answer:len() >= 20 do while answer:byte(4) == 1 and answer:len() >= 20 do
rpc_prog = ntohl( answer:sub(5,8)) rpc_prog = packet.u32( answer, 4 )
rpc_vers = ntohl( answer:sub(9,12)) rpc_vers = packet.u32( answer, 8 )
rpc_proto = ntohl( answer:sub(13,16)) rpc_proto = packet.u32( answer, 12 )
rpc_port = ntohl( answer:sub(17,20)) rpc_port = packet.u32( answer, 16 )
answer = answer:sub(21) answer = answer:sub(21)
if rpc_proto == 6 then if rpc_proto == 6 then
rpc_proto = "tcp" rpc_proto = "tcp"