1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 12:41:29 +00:00

Fix -PE for IPv6

This commit is contained in:
dmiller
2015-02-20 18:56:39 +00:00
parent 6ba9936d24
commit febc009a13
2 changed files with 5 additions and 1 deletions

View File

@@ -1,5 +1,9 @@
# Nmap Changelog ($Id$); -*-text-*- # Nmap Changelog ($Id$); -*-text-*-
o Fix ICMP Echo (-PE) host discovery for IPv6, broken since 6.45, caused by
failing to set the ICMP ID for outgoing packets which is used to match
incoming responses. [Andrew Waters]
o Solve a crash on Windows 8.1 on Surface Pro 3 caused by WinPcap trying to o Solve a crash on Windows 8.1 on Surface Pro 3 caused by WinPcap trying to
write an error message to a NULL pointer. [Peter Malecka] write an error message to a NULL pointer. [Peter Malecka]

View File

@@ -193,7 +193,7 @@ void UltraProbe::setIP(u8 *ippacket, u32 len, const probespec *pspec) {
sctp = (struct sctp_hdr *) data; sctp = (struct sctp_hdr *) data;
probes.IP.pd.sctp.sport = ntohs(sctp->sh_sport); probes.IP.pd.sctp.sport = ntohs(sctp->sh_sport);
probes.IP.pd.sctp.vtag = ntohl(sctp->sh_vtag); probes.IP.pd.sctp.vtag = ntohl(sctp->sh_vtag);
} else if (hdr == IPPROTO_ICMP) { } else if (hdr == IPPROTO_ICMP || hdr == IPPROTO_ICMPV6) {
icmp = (struct ppkt *) data; icmp = (struct ppkt *) data;
probes.IP.pd.icmp.ident = ntohs(icmp->id); probes.IP.pd.icmp.ident = ntohs(icmp->id);
} }