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

Reduce a level of indirection in traceroute entries in NSE

Browse Source
This commit is contained in:
dmiller
2018-06-28 03:43:24 +00:00
parent a0418c0b89
commit 7d724a69a2
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/scripting.xml
View File

@@ -1905,7 +1905,7 @@ host.os = {
This is an array of traceroute hops, present when the This is an array of traceroute hops, present when the
<option>--traceroute</option> option was used. Each entry is a <option>--traceroute</option> option was used. Each entry is a
host table with fields <literal>name</literal>, host table with fields <literal>name</literal>,
<literal>ip</literal> and <literal>times.srtt</literal> (round <literal>ip</literal> and <literal>srtt</literal> (round
trip time). The TTL for an entry is implicit given its position trip time). The TTL for an entry is implicit given its position
in the table. An empty table represents a timed-out hop. in the table. An empty table represents a timed-out hop.
</para> </para>

2
nse_nmaplib.cc
View File

@@ -205,9 +205,7 @@ void set_hostinfo(lua_State *L, Target *currenths) {
nseU_setsfield(L, -1, "ip", inet_ntop_ez(&it->addr, sizeof(it->addr))); nseU_setsfield(L, -1, "ip", inet_ntop_ez(&it->addr, sizeof(it->addr)));
if (!it->name.empty()) if (!it->name.empty())
nseU_setsfield(L, -1, "name", it->name.c_str()); nseU_setsfield(L, -1, "name", it->name.c_str());
lua_newtable(L);
nseU_setnfield(L, -1, "srtt", it->rtt / 1000.0); nseU_setnfield(L, -1, "srtt", it->rtt / 1000.0);
lua_setfield(L, -2, "times");
} }
lua_rawseti(L, -2, lua_rawlen(L, -2)+1); lua_rawseti(L, -2, lua_rawlen(L, -2)+1);
} }

2
scripts/traceroute-geolocation.nse
View File

@@ -154,7 +154,7 @@ action = function(host)
-- avoid timedout hops, marked as empty entries -- avoid timedout hops, marked as empty entries
-- do not add the current scanned host.ip -- do not add the current scanned host.ip
if hop.ip then if hop.ip then
local rtt = tonumber(hop.times.srtt) * 1000 local rtt = tonumber(hop.srtt) * 1000
local geo local geo
if not ipOps.isPrivate(hop.ip) then if not ipOps.isPrivate(hop.ip) then
-- be sure not to cache the target address, since it's not likely to be -- be sure not to cache the target address, since it's not likely to be