mirror of
https://github.com/nmap/nmap.git
synced 2025-12-22 15:39:03 +00:00
o [NSE] Applied patch from Daniel Miller that fixes bug in several scripts and
libraries http://seclists.org/nmap-dev/2012/q2/593 [Daniel Miller]
This commit is contained in:
@@ -1,5 +1,8 @@
|
|||||||
# Nmap Changelog ($Id$); -*-text-*-
|
# Nmap Changelog ($Id$); -*-text-*-
|
||||||
|
|
||||||
|
o [NSE] Applied patch from Daniel Miller that fixes bug in several scripts and
|
||||||
|
libraries http://seclists.org/nmap-dev/2012/q2/593 [Daniel Miller]
|
||||||
|
|
||||||
o [NSE] Added the script smb-ls that lists files on SMB shares and produces
|
o [NSE] Added the script smb-ls that lists files on SMB shares and produces
|
||||||
output similar to the dir command on Windows. [Patrik Karlsson]
|
output similar to the dir command on Windows. [Patrik Karlsson]
|
||||||
|
|
||||||
|
|||||||
@@ -746,7 +746,7 @@ end
|
|||||||
-- @param fqdn containing the fully qualified domain name
|
-- @param fqdn containing the fully qualified domain name
|
||||||
-- @return encQ containing the encoded value
|
-- @return encQ containing the encoded value
|
||||||
local function encodeFQDN(fqdn)
|
local function encodeFQDN(fqdn)
|
||||||
if ( not(fqdn) or #fqdn == 0 ) then return end
|
if ( not(fqdn) or #fqdn == 0 ) then return string.char(0) end
|
||||||
|
|
||||||
local parts = stdnse.strsplit("%.", fqdn)
|
local parts = stdnse.strsplit("%.", fqdn)
|
||||||
local encQ = ""
|
local encQ = ""
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ local json = require "json"
|
|||||||
local stdnse = require "stdnse"
|
local stdnse = require "stdnse"
|
||||||
local tab = require "tab"
|
local tab = require "tab"
|
||||||
local table = require "table"
|
local table = require "table"
|
||||||
|
local ipOps = require "ipOps"
|
||||||
|
|
||||||
description = [[
|
description = [[
|
||||||
Lists the geographic locations of each hop in a traceroute and optionally
|
Lists the geographic locations of each hop in a traceroute and optionally
|
||||||
@@ -97,7 +98,7 @@ action = function(host)
|
|||||||
name = ("%s"):format(hop.ip)
|
name = ("%s"):format(hop.ip)
|
||||||
end
|
end
|
||||||
local rtt = tonumber(hop.times.srtt) * 1000
|
local rtt = tonumber(hop.times.srtt) * 1000
|
||||||
if ( not(ipops.isPrivate(hop.ip) ) ) then
|
if ( not(ipOps.isPrivate(hop.ip) ) ) then
|
||||||
local lat, lon, reg, ctry = geoLookup(hop.ip)
|
local lat, lon, reg, ctry = geoLookup(hop.ip)
|
||||||
table.insert(coordinates, { hop = count, lat = lat, lon = lon })
|
table.insert(coordinates, { hop = count, lat = lat, lon = lon })
|
||||||
tab.addrow( output, count, ("%.2f"):format(rtt), name, ("%d,%d %s (%s)"):format(lat, lon, ctry, reg) )
|
tab.addrow( output, count, ("%.2f"):format(rtt), name, ("%d,%d %s (%s)"):format(lat, lon, ctry, reg) )
|
||||||
|
|||||||
@@ -50,12 +50,8 @@ discoverThread = function( funcname, host, port, results )
|
|||||||
local helper = wsdd.Helper:new(host, port)
|
local helper = wsdd.Helper:new(host, port)
|
||||||
helper:setTimeout(timeout)
|
helper:setTimeout(timeout)
|
||||||
|
|
||||||
if ( func ) then
|
|
||||||
local status, result = helper[funcname](helper)
|
local status, result = helper[funcname](helper)
|
||||||
if ( status ) then table.insert(results, result) end
|
if ( status ) then table.insert(results, result) end
|
||||||
else
|
|
||||||
stdnse.print_debug("ERROR: Failed to call function: %s", funcname)
|
|
||||||
end
|
|
||||||
condvar("broadcast")
|
condvar("broadcast")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user