CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-10-21 11:22:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make host.bin_ip and host.bin_ip_src work with IPv6 addresses.

Browse source
This commit is contained in:
david 2011-06-25 00:51:52 +00:00
parent a33b7331fa
commit b4cdf40769
2 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG
View file

@ -1,5 +1,8 @@
# Nmap Changelog ($Id$); -*-text-*-
o [NSE] The host.bin_ip and host.bin_ip_src entries now also work with
16-byte IPv6 addresses. [David]
o [NSE] Added smtp-vuln-cve2010-4344, a script that checks and exploits two
vulnerabilities in the Exim SMTP Server:
o CVE-2010-4344: A heap overflow vulnerability.

36
nse_nmaplib.cc
View file

@ -81,6 +81,25 @@ void set_portinfo (lua_State *L, const Target *target, const Port *port)
lua_setfield(L, -2, "version");
}
/* Push a string containing the binary contents of the given address. If ss has
an unknown address family, push nil. */
static void push_bin_ip(lua_State *L, const struct sockaddr_storage *ss)
{
if (ss->ss_family == AF_INET) {
const struct sockaddr_in *sin;
sin = (struct sockaddr_in *) ss;
lua_pushlstring(L, (char *) &sin->sin_addr.s_addr, IP_ADDR_LEN);
} else if (ss->ss_family == AF_INET6) {
const struct sockaddr_in6 *sin6;
sin6 = (struct sockaddr_in6 *) ss;
lua_pushlstring(L, (char *) &sin6->sin6_addr.s6_addr, IP6_ADDR_LEN);
} else {
lua_pushnil(L);
}
}
/* set host ip, host name and target name onto the
* table which is currently on the stack
* set name of the os run by the host onto the
@ -113,18 +132,11 @@ void set_hostinfo(lua_State *L, Target *currenths) {
}
setsfield(L, -1, "interface", currenths->deviceName());
setnfield(L, -1, "interface_mtu", currenths->MTU());
if ((u32)(currenths->v4host().s_addr))
{
struct in_addr adr = currenths->v4host();
lua_pushlstring(L, (const char *) &adr, 4);
lua_setfield(L, -2, "bin_ip");
}
if ((u32)(currenths->v4source().s_addr))
{
struct in_addr adr = currenths->v4source();
lua_pushlstring(L, (const char *) &adr, 4);
lua_setfield(L, -2, "bin_ip_src");
}
push_bin_ip(L, currenths->TargetSockAddr());
lua_setfield(L, -2, "bin_ip");
push_bin_ip(L, currenths->SourceSockAddr());
lua_setfield(L, -2, "bin_ip_src");
lua_newtable(L);
setnfield(L, -1, "srtt", (lua_Number) currenths->to.srtt / 1000000.0);