mirror of
https://github.com/nmap/nmap.git
synced 2025-12-10 17:59:04 +00:00
nselib stdnse.print_debug -> stdnse.debug
$ f() { find -name \*.lua -exec /bin/echo sed -i "$1" {} \; ; }
$ f 's/stdnse.print_debug( *\([0-9]*\) *, */stdnse.debug\1(/'
$ f 's/stdnse.print_debug( *"\(.*\))/stdnse.debug1("\1)/'
This commit is contained in:
@@ -106,7 +106,7 @@ local function load_fingerprints()
|
||||
|
||||
-- Check if fingerprints are cached
|
||||
if(nmap.registry.ike_fingerprints ~= nil) then
|
||||
stdnse.print_debug(1, "ike: Loading cached fingerprints")
|
||||
stdnse.debug1("ike: Loading cached fingerprints")
|
||||
return nmap.registry.ike_fingerprints
|
||||
end
|
||||
|
||||
@@ -115,11 +115,11 @@ local function load_fingerprints()
|
||||
filename_full = nmap.fetchfile('nselib/data/ike-fingerprints.lua')
|
||||
|
||||
-- Load the file
|
||||
stdnse.print_debug(1, "ike: Loading fingerprints: %s", filename_full)
|
||||
stdnse.debug1("ike: Loading fingerprints: %s", filename_full)
|
||||
local env = setmetatable({fingerprints = {}}, {__index = _G});
|
||||
file = loadfile(filename_full, "t", env)
|
||||
if( not(file) ) then
|
||||
stdnse.print_debug(1, "ike: Couldn't load the file: %s", filename_full)
|
||||
stdnse.debug1("ike: Couldn't load the file: %s", filename_full)
|
||||
return false, "Couldn't load fingerprint file: " .. filename_full
|
||||
end
|
||||
file()
|
||||
@@ -175,9 +175,9 @@ local function extract_payloads(packet)
|
||||
|
||||
-- debug
|
||||
if PAYLOADS[np] == 'VID' then
|
||||
stdnse.print_debug(2, 'IKE: Found IKE Header: %s: %s - %s', np, PAYLOADS[np], payload)
|
||||
stdnse.debug2('IKE: Found IKE Header: %s: %s - %s', np, PAYLOADS[np], payload)
|
||||
else
|
||||
stdnse.print_debug(2, 'IKE: Found IKE Header: %s: %s', np, PAYLOADS[np])
|
||||
stdnse.debug2('IKE: Found IKE Header: %s: %s', np, PAYLOADS[np])
|
||||
end
|
||||
|
||||
-- Store payload
|
||||
@@ -241,7 +241,7 @@ local function lookup(vendor_ids)
|
||||
local debug_string = ''
|
||||
if row.vendor ~= nil then debug_string = debug_string .. row.vendor .. ' ' end
|
||||
if row.version ~= nil then debug_string = debug_string .. row.version end
|
||||
stdnse.print_debug(2, "IKE: Fingerprint: %s matches %s", vendor_id, debug_string)
|
||||
stdnse.debug2("IKE: Fingerprint: %s matches %s", vendor_id, debug_string)
|
||||
|
||||
-- Only store the first match
|
||||
if info.vendor == nil then
|
||||
@@ -251,7 +251,7 @@ local function lookup(vendor_ids)
|
||||
|
||||
elseif row.category == 'attribute' then
|
||||
info.attribs[ #info.attribs + 1] = row
|
||||
stdnse.print_debug(2, "IKE: Attribute: %s matches %s", vendor_id, row.text)
|
||||
stdnse.debug2("IKE: Attribute: %s matches %s", vendor_id, row.text)
|
||||
break
|
||||
end
|
||||
end
|
||||
@@ -280,7 +280,7 @@ local function lookup(vendor_ids)
|
||||
if info.vendor.vendor ~= nil then debug_string = debug_string .. info.vendor.vendor .. ' ' end
|
||||
if info.vendor.version ~= nil then debug_string = debug_string .. info.vendor.version .. ' ' end
|
||||
if info.vendor.ostype ~= nil then debug_string = debug_string .. info.vendor.ostype end
|
||||
stdnse.print_debug(2, 'IKE: No vendor match, but ordering match found: %s', debug_string)
|
||||
stdnse.debug2('IKE: No vendor match, but ordering match found: %s', debug_string)
|
||||
|
||||
return info
|
||||
|
||||
@@ -292,7 +292,7 @@ local function lookup(vendor_ids)
|
||||
debug_string = ''
|
||||
if info.vendor.vendor ~= nil then debug_string = debug_string .. info.vendor.vendor .. ' to ' end
|
||||
if row.ostype ~= nil then debug_string = debug_string .. row.ostype end
|
||||
stdnse.print_debug(2, 'IKE: Vendor and ordering match. OS updated: %s', debug_string)
|
||||
stdnse.debug2('IKE: Vendor and ordering match. OS updated: %s', debug_string)
|
||||
|
||||
return info
|
||||
|
||||
@@ -302,7 +302,7 @@ local function lookup(vendor_ids)
|
||||
debug_string = ''
|
||||
if info.vendor.vendor ~= nil then debug_string = debug_string .. info.vendor.vendor .. ' vs ' end
|
||||
if row.vendor ~= nil then debug_string = debug_string .. row.vendor end
|
||||
stdnse.print_debug(2, 'IKE: Found an ordering match, but vendors do not match. %s', debug_string)
|
||||
stdnse.debug2('IKE: Found an ordering match, but vendors do not match. %s', debug_string)
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user