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

Include the target address in the NI IPv6 OS probe.

Browse Source 
This was missing; likely this probe was never getting any responses. The
same probe in ipv6fp.py worked.
This commit is contained in:
david
2011-10-25 09:41:19 +00:00
parent 1ba3b554f8
commit 52da18b72d
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG
View File

@@ -1,5 +1,11 @@
# Nmap Changelog ($Id$); -*-text-*- # Nmap Changelog ($Id$); -*-text-*-
o Fixed a bug in the IPv6 OS probe called NI. The Node Information
Query didn't include the target address as the payload, so at least
OS X didn't respond. This differed from the probe sent by the
ipv6fp.py program from which some of our fingerprints were derived.
[David]
o [NSE] Fixed an error in the mssql library that was causing the o [NSE] Fixed an error in the mssql library that was causing the
broadcast-ms-sql-discover script to fail when trying to update port version broadcast-ms-sql-discover script to fail when trying to update port version
information. [Patrik] information. [Patrik]

4
FPEngine.cc
View File

@@ -1610,6 +1610,7 @@ int FPHost6::build_probe_list() {
routing = new RoutingHeader(); routing = new RoutingHeader();
hopbyhop2 = new HopByHopHeader(); hopbyhop2 = new HopByHopHeader();
icmp6 = new ICMPv6Header(); icmp6 = new ICMPv6Header();
payload = new RawData();
this->target_host->SourceSockAddr(&ss, &slen); this->target_host->SourceSockAddr(&ss, &slen);
ip6->setSourceAddress(ss6->sin6_addr); ip6->setSourceAddress(ss6->sin6_addr);
this->target_host->TargetSockAddr(&ss, &slen); this->target_host->TargetSockAddr(&ss, &slen);
@@ -1650,9 +1651,10 @@ int FPHost6::build_probe_list() {
ip6->setHopLimit(get_hoplimit()); ip6->setHopLimit(get_hoplimit());
ip6->setNextHeader("ICMPv6"); ip6->setNextHeader("ICMPv6");
ip6->setNextElement(icmp6); ip6->setNextElement(icmp6);
icmp6->setNextElement(payload);
payload->store((u8 *) &ss6->sin6_addr, IP6_ADDR_LEN);
icmp6->setType(ICMPv6_NODEINFOQUERY); icmp6->setType(ICMPv6_NODEINFOQUERY);
icmp6->setCode(ICMPv6_NODEINFOQUERY_IPv6ADDR); icmp6->setCode(ICMPv6_NODEINFOQUERY_IPv6ADDR);
icmp6->setTargetAddress(ss6->sin6_addr); // Should still contain target's addr
icmp6->setQtype(NI_QTYPE_IPv4ADDRS); icmp6->setQtype(NI_QTYPE_IPv4ADDRS);
icmp6->setA(); icmp6->setA();
icmp6->setNonce((u8 *) "\x01\x02\x03\x04\x05\x06\x07\x0a"); icmp6->setNonce((u8 *) "\x01\x02\x03\x04\x05\x06\x07\x0a");