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 sockaddr comparisons in raw scans

Browse Source
This commit is contained in:
dmiller
2022-11-02 02:12:38 +00:00
parent 4eee4f2e1f
commit 1375f44416
3 changed files with 47 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scan_engine.cc
View File

@@ -967,6 +967,8 @@ void UltraScanInfo::Init(std::vector<Target *> &Targets, const struct scan_lists
unblock_socket(rawsd);*/ unblock_socket(rawsd);*/
ethsd = NULL; ethsd = NULL;
} }
/* Raw scan types also need to know the source IP. */
Targets[0]->SourceSockAddr(&sourceSockAddr, NULL);
} }
base_port = UltraScanInfo::increment_base_port(); base_port = UltraScanInfo::increment_base_port();
} }

3
scan_engine.h
View File

@@ -630,11 +630,14 @@ public:
u32 seqmask; /* This mask value is used to encode values in sequence u32 seqmask; /* This mask value is used to encode values in sequence
numbers. It is set randomly in UltraScanInfo::Init() */ numbers. It is set randomly in UltraScanInfo::Init() */
u16 base_port; u16 base_port;
const struct sockaddr_storage *SourceSockAddr() const { return &sourceSockAddr; }
private: private:
unsigned int numInitialTargets; unsigned int numInitialTargets;
std::multiset<HostScanStats *, HssPredicate>::iterator nextI; std::multiset<HostScanStats *, HssPredicate>::iterator nextI;
// All targets in an invocation will have the same source address.
struct sockaddr_storage sourceSockAddr;
/* We encode per-probe information like the tryno in the source /* We encode per-probe information like the tryno in the source
port, for protocols that use ports. (Except when o.magic_port_set is port, for protocols that use ports. (Except when o.magic_port_set is
true--then we honor the requested source port.) The tryno is true--then we honor the requested source port.) The tryno is

130
scan_engine_raw.cc
View File

@@ -295,7 +295,6 @@ static bool sport_decode(u16 base_portno, u16 portno,
static bool icmp_probe_match(const UltraScanInfo *USI, const UltraProbe *probe, static bool icmp_probe_match(const UltraScanInfo *USI, const UltraProbe *probe,
const struct ppkt *ping, const struct ppkt *ping,
const struct sockaddr_storage *target_src,
const struct sockaddr_storage *src, const struct sockaddr_storage *src,
const struct sockaddr_storage *dst, const struct sockaddr_storage *dst,
u8 proto, u8 proto,
@@ -304,10 +303,6 @@ static bool icmp_probe_match(const UltraScanInfo *USI, const UltraProbe *probe,
if (!probe->check_proto_port(proto, ntohs(ping->id), 0)) if (!probe->check_proto_port(proto, ntohs(ping->id), 0))
return false; return false;
/* Ensure the connection info matches. */
if (sockaddr_storage_cmp(target_src, dst) != 0)
return false;
/* Don't match a timestamp request with an echo reply, for example. */ /* Don't match a timestamp request with an echo reply, for example. */
if (proto == IPPROTO_ICMP && if (proto == IPPROTO_ICMP &&
((ping->type == 0 && probe->pspec()->pd.icmp.type != 8) || ((ping->type == 0 && probe->pspec()->pd.icmp.type != 8) ||
@@ -330,17 +325,13 @@ static bool icmp_probe_match(const UltraScanInfo *USI, const UltraProbe *probe,
} }
static bool tcp_probe_match(const UltraScanInfo *USI, const UltraProbe *probe, static bool tcp_probe_match(const UltraScanInfo *USI, const UltraProbe *probe,
const struct sockaddr_storage *ss, const struct tcp_hdr *tcp, const struct tcp_hdr *tcp,
const struct sockaddr_storage *src, const struct sockaddr_storage *dst, const struct sockaddr_storage *src, const struct sockaddr_storage *dst,
u32 ipid) { u32 ipid) {
const struct probespec_tcpdata *probedata; const struct probespec_tcpdata *probedata;
tryno_t tryno = {0}; tryno_t tryno = {0};
bool goodseq; bool goodseq;
/* Ensure the connection info matches. */
if (sockaddr_storage_cmp(ss, dst) != 0)
return false;
// If magic port is *not* set, then tryno is in the source port, and we // If magic port is *not* set, then tryno is in the source port, and we
// already checked that it matches. // already checked that it matches.
if (o.magic_port_set) { if (o.magic_port_set) {
@@ -414,8 +405,6 @@ int get_ping_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
unsigned int listsz; unsigned int listsz;
reason_t current_reason = ER_NORESPONSE; reason_t current_reason = ER_NORESPONSE;
const struct sockaddr_storage *target_src = NULL, *target_dst = NULL;
const void *data = NULL; const void *data = NULL;
unsigned int datalen; unsigned int datalen;
struct abstract_ip_hdr hdr; struct abstract_ip_hdr hdr;
@@ -450,6 +439,9 @@ int get_ping_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
data = ip_get_data(ip_tmp, &datalen, &hdr); data = ip_get_data(ip_tmp, &datalen, &hdr);
if (data == NULL) if (data == NULL)
continue; continue;
// If it's not sent to us, we don't care.
if (sockaddr_storage_cmp(USI->SourceSockAddr(), &hdr.dst) != 0)
continue;
/* First check if it is ICMP, TCP, or UDP */ /* First check if it is ICMP, TCP, or UDP */
if (hdr.proto == IPPROTO_ICMP || hdr.proto == IPPROTO_ICMPV6) { if (hdr.proto == IPPROTO_ICMP || hdr.proto == IPPROTO_ICMPV6) {
@@ -475,8 +467,6 @@ int get_ping_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
probeI = hss->probes_outstanding.end(); probeI = hss->probes_outstanding.end();
listsz = hss->num_probes_outstanding(); listsz = hss->num_probes_outstanding();
target_src = hss->target->SourceSockAddr();
/* A check for weird_responses is needed here. This is not currently /* A check for weird_responses is needed here. This is not currently
possible because we don't have a good way to look up the original possible because we don't have a good way to look up the original
target of an ICMP probe based on the response. (massping encoded an target of an ICMP probe based on the response. (massping encoded an
@@ -496,7 +486,7 @@ int get_ping_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
probeI--; probeI--;
probe = *probeI; probe = *probeI;
if (!icmp_probe_match(USI, probe, ping, target_src, &hdr.src, &hdr.dst, hdr.proto, hdr.ipid)) if (!icmp_probe_match(USI, probe, ping, &hdr.src, &hdr.dst, hdr.proto, hdr.ipid))
continue; continue;
goodone = true; goodone = true;
@@ -546,6 +536,9 @@ int get_ping_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
if (encaps_hdr.proto == IPPROTO_SCTP && !USI->ptech.rawsctpscan) if (encaps_hdr.proto == IPPROTO_SCTP && !USI->ptech.rawsctpscan)
continue; continue;
} }
// If it didn't come from us, we don't care.
if (sockaddr_storage_cmp(USI->SourceSockAddr(), &encaps_hdr.src) != 0)
continue;
hss = USI->findHost(&encaps_hdr.dst); hss = USI->findHost(&encaps_hdr.dst);
if (!hss) if (!hss)
@@ -554,18 +547,12 @@ int get_ping_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
probeI = hss->probes_outstanding.end(); probeI = hss->probes_outstanding.end();
listsz = hss->num_probes_outstanding(); listsz = hss->num_probes_outstanding();
target_src = hss->target->SourceSockAddr();
target_dst = hss->target->TargetSockAddr();
/* Find the probe that provoked this response. */ /* Find the probe that provoked this response. */
for (probenum = 0; probenum < listsz; probenum++) { for (probenum = 0; probenum < listsz; probenum++) {
probeI--; probeI--;
probe = *probeI; probe = *probeI;
if (probe->protocol() != encaps_hdr.proto || if (probe->protocol() != encaps_hdr.proto)
sockaddr_storage_cmp(target_src, &hdr.dst) != 0 ||
sockaddr_storage_cmp(target_src, &encaps_hdr.src) != 0 ||
sockaddr_storage_cmp(target_dst, &encaps_hdr.dst) != 0)
continue; continue;
if ((encaps_hdr.proto == IPPROTO_ICMP || encaps_hdr.proto == IPPROTO_ICMPV6) if ((encaps_hdr.proto == IPPROTO_ICMP || encaps_hdr.proto == IPPROTO_ICMPV6)
@@ -610,7 +597,7 @@ int get_ping_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
// If it's Port or Proto unreachable and the address matches, it's up. // If it's Port or Proto unreachable and the address matches, it's up.
if (((hdr.proto == IPPROTO_ICMP && (ping->code == 2 || ping->code == 3)) if (((hdr.proto == IPPROTO_ICMP && (ping->code == 2 || ping->code == 3))
|| (hdr.proto == IPPROTO_ICMPV6 && ping->code == 4)) || (hdr.proto == IPPROTO_ICMPV6 && ping->code == 4))
&& sockaddr_storage_cmp(target_dst, &hdr.src) == 0) { && sockaddr_storage_cmp(hss->target->TargetSockAddr(), &hdr.src) == 0) {
/* The ICMP or ICMPv6 error came directly from the target, so it's up. */ /* The ICMP or ICMPv6 error came directly from the target, so it's up. */
goodone = true; goodone = true;
newstate = HOST_UP; newstate = HOST_UP;
@@ -680,7 +667,6 @@ int get_ping_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
setTargetMACIfAvailable(hss->target, &linkhdr, &hdr.src, 0); setTargetMACIfAvailable(hss->target, &linkhdr, &hdr.src, 0);
probeI = hss->probes_outstanding.end(); probeI = hss->probes_outstanding.end();
listsz = hss->num_probes_outstanding(); listsz = hss->num_probes_outstanding();
target_src = hss->target->SourceSockAddr();
u16 sport = ntohs(tcp->th_sport); u16 sport = ntohs(tcp->th_sport);
u16 dport = ntohs(tcp->th_dport); u16 dport = ntohs(tcp->th_dport);
@@ -693,7 +679,7 @@ int get_ping_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
if (!probe->check_proto_port(hdr.proto, dport, sport)) if (!probe->check_proto_port(hdr.proto, dport, sport))
continue; continue;
if (!tcp_probe_match(USI, probe, target_src, tcp, &hdr.src, &hdr.dst, hdr.ipid)) if (!tcp_probe_match(USI, probe, tcp, &hdr.src, &hdr.dst, hdr.ipid))
continue; continue;
goodone = true; goodone = true;
@@ -720,11 +706,11 @@ int get_ping_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
hss = USI->findHost(&hdr.src); hss = USI->findHost(&hdr.src);
if (!hss) if (!hss)
continue; // Not from a host that interests us continue; // Not from a host that interests us
probeI = hss->probes_outstanding.end(); probeI = hss->probes_outstanding.end();
listsz = hss->num_probes_outstanding(); listsz = hss->num_probes_outstanding();
goodone = false; goodone = false;
target_src = hss->target->SourceSockAddr();
u16 sport = ntohs(udp->uh_sport); u16 sport = ntohs(udp->uh_sport);
u16 dport = ntohs(udp->uh_dport); u16 dport = ntohs(udp->uh_dport);
@@ -735,10 +721,6 @@ int get_ping_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
if (!probe->check_proto_port(hdr.proto, dport, sport)) if (!probe->check_proto_port(hdr.proto, dport, sport))
continue; continue;
/* Ensure the connection info matches. */
if (sockaddr_storage_cmp(target_src, &hdr.dst) != 0)
continue;
/* Sometimes we get false results when scanning localhost with /* Sometimes we get false results when scanning localhost with
-p- because we scan localhost with src port = dst port and -p- because we scan localhost with src port = dst port and
see our outgoing packet and think it is a response. */ see our outgoing packet and think it is a response. */
@@ -766,7 +748,6 @@ int get_ping_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
listsz = hss->num_probes_outstanding(); listsz = hss->num_probes_outstanding();
goodone = false; goodone = false;
target_src = hss->target->SourceSockAddr();
u16 sport = ntohs(sctp->sh_sport); u16 sport = ntohs(sctp->sh_sport);
u16 dport = ntohs(sctp->sh_dport); u16 dport = ntohs(sctp->sh_dport);
@@ -777,10 +758,6 @@ int get_ping_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
if (!probe->check_proto_port(hdr.proto, dport, sport)) if (!probe->check_proto_port(hdr.proto, dport, sport))
continue; continue;
/* Ensure the connection info matches. */
if (sockaddr_storage_cmp(target_src, &hdr.dst) != 0)
continue;
/* Sometimes we get false results when scanning localhost with /* Sometimes we get false results when scanning localhost with
-p- because we scan localhost with src port = dst port and -p- because we scan localhost with src port = dst port and
see our outgoing packet and think it is a response. */ see our outgoing packet and think it is a response. */
@@ -834,8 +811,6 @@ int get_ping_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
} while (!goodone && !timedout); } while (!goodone && !timedout);
if (goodone && newstate != HOST_UNKNOWN) { if (goodone && newstate != HOST_UNKNOWN) {
target_dst = hss->target->TargetSockAddr();
if (probe->isPing()) if (probe->isPing())
ultrascan_ping_update(USI, hss, probeI, &USI->now, adjust_timing); ultrascan_ping_update(USI, hss, probeI, &USI->now, adjust_timing);
else { else {
@@ -847,7 +822,7 @@ int get_ping_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
setTargetMACIfAvailable(hss->target, &linkhdr, &hdr.src, 0); setTargetMACIfAvailable(hss->target, &linkhdr, &hdr.src, 0);
hss->target->reason.reason_id = current_reason; hss->target->reason.reason_id = current_reason;
hss->target->reason.ttl = hdr.ttl; hss->target->reason.ttl = hdr.ttl;
if (sockaddr_storage_cmp(&hdr.src, target_dst) != 0) { if (sockaddr_storage_cmp(&hdr.src, hss->target->TargetSockAddr()) != 0) {
hss->target->reason.set_ip_addr(&hdr.src); hss->target->reason.set_ip_addr(&hdr.src);
} }
} }
@@ -910,7 +885,7 @@ void begin_sniffer(UltraScanInfo *USI, std::vector<Target *> &Targets) {
pcap_filter.append(filterstr); pcap_filter.append(filterstr);
} else if (USI->prot_scan || (USI->ping_scan && USI->ptech.rawprotoscan)) { } else if (USI->prot_scan || (USI->ping_scan && USI->ptech.rawprotoscan)) {
pcap_filter = "dst host "; pcap_filter = "dst host ";
pcap_filter += inet_ntop_ez(Targets[0]->SourceSockAddr(), sizeof(struct sockaddr_storage)); pcap_filter += inet_ntop_ez(USI->SourceSockAddr(), sizeof(struct sockaddr_storage));
if (doIndividual) { if (doIndividual) {
pcap_filter += " and (icmp or icmp6 or ("; pcap_filter += " and (icmp or icmp6 or (";
pcap_filter += dst_hosts; pcap_filter += dst_hosts;
@@ -919,7 +894,7 @@ void begin_sniffer(UltraScanInfo *USI, std::vector<Target *> &Targets) {
} else if (USI->tcp_scan || USI->udp_scan || USI->sctp_scan || USI->ping_scan) { } else if (USI->tcp_scan || USI->udp_scan || USI->sctp_scan || USI->ping_scan) {
bool first = false; bool first = false;
pcap_filter = "dst host "; pcap_filter = "dst host ";
pcap_filter += inet_ntop_ez(Targets[0]->SourceSockAddr(), sizeof(struct sockaddr_storage)); pcap_filter += inet_ntop_ez(USI->SourceSockAddr(), sizeof(struct sockaddr_storage));
pcap_filter += " and (icmp or icmp6"; pcap_filter += " and (icmp or icmp6";
if (doIndividual) { if (doIndividual) {
pcap_filter += " or ("; pcap_filter += " or (";
@@ -1044,11 +1019,7 @@ UltraProbe *sendNDScanProbe(UltraScanInfo *USI, HostScanStats *hss,
multicast_prefix[12] = 0xff; multicast_prefix[12] = 0xff;
memcpy(&ns_dst_ip6, multicast_prefix, sizeof(multicast_prefix)); memcpy(&ns_dst_ip6, multicast_prefix, sizeof(multicast_prefix));
const struct sockaddr_storage *source; const struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) USI->SourceSockAddr();
const struct sockaddr_in6 *sin6;
source = hss->target->SourceSockAddr();
sin6 = (struct sockaddr_in6 *) &source;
struct icmpv6_msg_nd ns_msg; struct icmpv6_msg_nd ns_msg;
ns_msg.icmpv6_flags = htons(0); ns_msg.icmpv6_flags = htons(0);
@@ -1639,6 +1610,7 @@ bool get_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
bool goodone = false; bool goodone = false;
bool timedout = false; bool timedout = false;
bool adjust_timing = true; bool adjust_timing = true;
bool from_target = true;
struct timeval rcvdtime; struct timeval rcvdtime;
struct link_header linkhdr; struct link_header linkhdr;
unsigned int bytes; unsigned int bytes;
@@ -1682,12 +1654,13 @@ bool get_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
timedout = true; timedout = true;
} }
const struct sockaddr_storage *target_src = NULL, *target_dst = NULL;
datalen = bytes; datalen = bytes;
data = ip_get_data(ip_tmp, &datalen, &hdr); data = ip_get_data(ip_tmp, &datalen, &hdr);
if (data == NULL) if (data == NULL)
continue; continue;
/* Ensure the connection info matches. */
if (sockaddr_storage_cmp(USI->SourceSockAddr(), &hdr.dst) != 0)
continue;
if (USI->prot_scan) { if (USI->prot_scan) {
hss = USI->findHost(&hdr.src); hss = USI->findHost(&hdr.src);
@@ -1730,7 +1703,6 @@ bool get_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
setTargetMACIfAvailable(hss->target, &linkhdr, &hdr.src, 0); setTargetMACIfAvailable(hss->target, &linkhdr, &hdr.src, 0);
probeI = hss->probes_outstanding.end(); probeI = hss->probes_outstanding.end();
listsz = hss->num_probes_outstanding(); listsz = hss->num_probes_outstanding();
target_src = hss->target->SourceSockAddr();
u16 sport = ntohs(tcp->th_sport); u16 sport = ntohs(tcp->th_sport);
u16 dport = ntohs(tcp->th_dport); u16 dport = ntohs(tcp->th_dport);
@@ -1743,7 +1715,7 @@ bool get_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
if (!probe->check_proto_port(hdr.proto, dport, sport)) if (!probe->check_proto_port(hdr.proto, dport, sport))
continue; continue;
if (!tcp_probe_match(USI, probe, target_src, tcp, &hdr.src, &hdr.dst, hdr.ipid)) if (!tcp_probe_match(USI, probe, tcp, &hdr.src, &hdr.dst, hdr.ipid))
continue; continue;
if (!probe->isPing()) { if (!probe->isPing()) {
@@ -1786,7 +1758,6 @@ bool get_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
goodone = false; goodone = false;
target_src = hss->target->SourceSockAddr();
u16 sport = ntohs(sctp->sh_sport); u16 sport = ntohs(sctp->sh_sport);
u16 dport = ntohs(sctp->sh_dport); u16 dport = ntohs(sctp->sh_dport);
@@ -1797,9 +1768,6 @@ bool get_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
if (!probe->check_proto_port(hdr.proto, dport, sport)) if (!probe->check_proto_port(hdr.proto, dport, sport))
continue; continue;
/* Ensure the connection info matches. */
if (sockaddr_storage_cmp(target_src, &hdr.dst) != 0)
continue;
/* Sometimes we get false results when scanning localhost with /* Sometimes we get false results when scanning localhost with
-p- because we scan localhost with src port = dst port and -p- because we scan localhost with src port = dst port and
@@ -1875,6 +1843,10 @@ bool get_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
if (USI->sctp_scan && encaps_hdr.proto != IPPROTO_SCTP) if (USI->sctp_scan && encaps_hdr.proto != IPPROTO_SCTP)
continue; continue;
// If it didn't come from us, we don't care.
if (sockaddr_storage_cmp(USI->SourceSockAddr(), &encaps_hdr.src) != 0)
continue;
/* ensure this packet relates to a packet to the host /* ensure this packet relates to a packet to the host
we are scanning ... */ we are scanning ... */
hss = USI->findHost(&encaps_hdr.dst); hss = USI->findHost(&encaps_hdr.dst);
@@ -1882,18 +1854,14 @@ bool get_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
continue; // Not from a host that interests us continue; // Not from a host that interests us
probeI = hss->probes_outstanding.end(); probeI = hss->probes_outstanding.end();
listsz = hss->num_probes_outstanding(); listsz = hss->num_probes_outstanding();
from_target = sockaddr_storage_cmp(hss->target->TargetSockAddr(), &hdr.src) == 0;
target_src = hss->target->SourceSockAddr();
target_dst = hss->target->TargetSockAddr();
goodone = false; goodone = false;
/* Find the matching probe */ /* Find the matching probe */
for (probenum = 0; probenum < listsz && !goodone; probenum++) { for (probenum = 0; probenum < listsz && !goodone; probenum++) {
probeI--; probeI--;
probe = *probeI; probe = *probeI;
if (probe->protocol() != encaps_hdr.proto || if (probe->protocol() != encaps_hdr.proto)
sockaddr_storage_cmp(target_src, &encaps_hdr.src) != 0 ||
sockaddr_storage_cmp(target_dst, &encaps_hdr.dst) != 0)
continue; continue;
if (encaps_hdr.proto == IPPROTO_TCP && !USI->prot_scan) { if (encaps_hdr.proto == IPPROTO_TCP && !USI->prot_scan) {
@@ -1927,18 +1895,15 @@ bool get_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
newstate = PORT_FILTERED; newstate = PORT_FILTERED;
break; break;
case 2: /* protocol unreachable */ case 2: /* protocol unreachable */
if (USI->scantype == IPPROT_SCAN && if (USI->scantype == IPPROT_SCAN && from_target)
sockaddr_storage_cmp(target_dst, &hdr.src) == 0) {
newstate = PORT_CLOSED; newstate = PORT_CLOSED;
} else else
newstate = PORT_FILTERED; newstate = PORT_FILTERED;
break; break;
case 3: /* Port unreach */ case 3: /* Port unreach */
if (USI->scantype == UDP_SCAN && if (from_target && USI->scantype == UDP_SCAN)
sockaddr_storage_cmp(target_dst, &hdr.src) == 0)
newstate = PORT_CLOSED; newstate = PORT_CLOSED;
else if (USI->scantype == IPPROT_SCAN && else if (from_target && USI->scantype == IPPROT_SCAN)
sockaddr_storage_cmp(target_dst, &hdr.src) == 0)
newstate = PORT_OPEN; newstate = PORT_OPEN;
else else
newstate = PORT_FILTERED; newstate = PORT_FILTERED;
@@ -2002,6 +1967,10 @@ bool get_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
if (USI->sctp_scan && encaps_hdr.proto != IPPROTO_SCTP) if (USI->sctp_scan && encaps_hdr.proto != IPPROTO_SCTP)
continue; continue;
// If it didn't come from us, we don't care.
if (sockaddr_storage_cmp(USI->SourceSockAddr(), &encaps_hdr.src) != 0)
continue;
/* ensure this packet relates to a packet to the host /* ensure this packet relates to a packet to the host
we are scanning ... */ we are scanning ... */
hss = USI->findHost(&encaps_hdr.dst); hss = USI->findHost(&encaps_hdr.dst);
@@ -2009,18 +1978,14 @@ bool get_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
continue; // Not from a host that interests us continue; // Not from a host that interests us
probeI = hss->probes_outstanding.end(); probeI = hss->probes_outstanding.end();
listsz = hss->num_probes_outstanding(); listsz = hss->num_probes_outstanding();
from_target = sockaddr_storage_cmp(hss->target->TargetSockAddr(), &hdr.src) == 0;
target_src = hss->target->SourceSockAddr();
target_dst = hss->target->TargetSockAddr();
goodone = false; goodone = false;
/* Find the matching probe */ /* Find the matching probe */
for (probenum = 0; probenum < listsz && !goodone; probenum++) { for (probenum = 0; probenum < listsz && !goodone; probenum++) {
probeI--; probeI--;
probe = *probeI; probe = *probeI;
if (probe->protocol() != encaps_hdr.proto || if (probe->protocol() != encaps_hdr.proto)
sockaddr_storage_cmp(target_src, &encaps_hdr.src) != 0 ||
sockaddr_storage_cmp(target_dst, &encaps_hdr.dst) != 0)
continue; continue;
if (encaps_hdr.proto == IPPROTO_TCP && !USI->prot_scan) { if (encaps_hdr.proto == IPPROTO_TCP && !USI->prot_scan) {
@@ -2073,11 +2038,9 @@ bool get_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
break; break;
case ICMPV6_UNREACH_PORT: case ICMPV6_UNREACH_PORT:
current_reason = ER_PORTUNREACH; current_reason = ER_PORTUNREACH;
if (USI->scantype == UDP_SCAN && if (from_target && USI->scantype == UDP_SCAN)
sockaddr_storage_cmp(target_dst, &hdr.src) == 0)
newstate = PORT_CLOSED; newstate = PORT_CLOSED;
else if (USI->scantype == IPPROT_SCAN && else if (from_target && USI->scantype == IPPROT_SCAN)
sockaddr_storage_cmp(target_dst, &hdr.src) == 0)
newstate = PORT_OPEN; newstate = PORT_OPEN;
else else
newstate = PORT_FILTERED; newstate = PORT_FILTERED;
@@ -2096,12 +2059,10 @@ bool get_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
newstate = PORT_OPEN; newstate = PORT_OPEN;
break; break;
case ICMPV6_PARAMPROBLEM_NEXTHEADER: case ICMPV6_PARAMPROBLEM_NEXTHEADER:
if (USI->scantype == IPPROT_SCAN && if (from_target && USI->scantype == IPPROT_SCAN)
sockaddr_storage_cmp(target_dst, &hdr.src) == 0) {
newstate = PORT_CLOSED; newstate = PORT_CLOSED;
} else { else
newstate = PORT_FILTERED; newstate = PORT_FILTERED;
}
break; break;
default: default:
error("Unexpected ICMPv6 type/code %d/%d unreachable packet:\n", error("Unexpected ICMPv6 type/code %d/%d unreachable packet:\n",
@@ -2129,7 +2090,6 @@ bool get_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
continue; // Not from a host that interests us continue; // Not from a host that interests us
probeI = hss->probes_outstanding.end(); probeI = hss->probes_outstanding.end();
listsz = hss->num_probes_outstanding(); listsz = hss->num_probes_outstanding();
target_src = hss->target->SourceSockAddr();
u16 sport = ntohs(udp->uh_sport); u16 sport = ntohs(udp->uh_sport);
u16 dport = ntohs(udp->uh_dport); u16 dport = ntohs(udp->uh_dport);
@@ -2143,10 +2103,6 @@ bool get_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
if (!probe->check_proto_port(hdr.proto, dport, sport)) if (!probe->check_proto_port(hdr.proto, dport, sport))
continue; continue;
/* Ensure the connection info matches. */
if (sockaddr_storage_cmp(target_src, &hdr.dst) != 0)
continue;
/* Sometimes we get false results when scanning localhost with /* Sometimes we get false results when scanning localhost with
-p- because we scan localhost with src port = dst port and -p- because we scan localhost with src port = dst port and
see our outgoing packet and think it is a response. */ see our outgoing packet and think it is a response. */
@@ -2171,9 +2127,7 @@ bool get_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
} while (!goodone && !timedout); } while (!goodone && !timedout);
if (goodone) { if (goodone) {
const struct sockaddr_storage *target_dst = hss->target->TargetSockAddr(); if (from_target)
if (sockaddr_storage_cmp(&hdr.src, target_dst) == 0)
reason_sip.ss_family = AF_UNSPEC; reason_sip.ss_family = AF_UNSPEC;
else else
reason_sip = hdr.src; reason_sip = hdr.src;