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

Combine some common tests.

Browse Source
This commit is contained in:
david
2009-11-04 22:29:32 +00:00
parent 5cc0f838b2
commit 2db9068013
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scan_engine.cc
View File

@@ -4595,33 +4595,29 @@ static int get_ping_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
assert(o.af() == AF_INET);
if (probe->protocol() != ip2->ip_p ||
hss->target->v4sourceip()->s_addr != ip->ip_dst.s_addr ||
hss->target->v4sourceip()->s_addr != ip2->ip_src.s_addr ||
hss->target->v4hostip()->s_addr != ip2->ip_dst.s_addr)
continue;
if (ip2->ip_p == IPPROTO_ICMP && USI->ptech.rawicmpscan) {
/* The response was based on a ping packet we sent */
if (hss->target->v4sourceip()->s_addr != ip->ip_dst.s_addr)
continue;
} else if (ip2->ip_p == IPPROTO_TCP && USI->ptech.rawtcpscan) {
struct tcp_hdr *tcp = (struct tcp_hdr *) (((char *) ip2) + 4 * ip2->ip_hl);
if (probe->dport() != ntohs(tcp->th_dport)
|| probe->sport() != ntohs(tcp->th_sport)
|| probe->tcpseq() != ntohl(tcp->th_seq)
|| hss->target->v4sourceip()->s_addr != ip->ip_dst.s_addr)
if (probe->dport() != ntohs(tcp->th_dport) ||
probe->sport() != ntohs(tcp->th_sport) ||
probe->tcpseq() != ntohl(tcp->th_seq))
continue;
} else if (ip2->ip_p == IPPROTO_UDP && USI->ptech.rawudpscan) {
struct udp_hdr *udp = (struct udp_hdr *) ((u8 *) ip2 + ip2->ip_hl * 4);
if (probe->dport() != ntohs(udp->uh_dport) ||
probe->sport() != ntohs(udp->uh_sport) ||
hss->target->v4sourceip()->s_addr != ip->ip_dst.s_addr)
probe->sport() != ntohs(udp->uh_sport))
continue;
} else if (ip2->ip_p == IPPROTO_SCTP && USI->ptech.rawsctpscan) {
struct sctp_hdr *sctp = (struct sctp_hdr *) ((u8 *) ip2 + ip2->ip_hl * 4);
if (probe->dport() != ntohs(sctp->sh_dport) ||
probe->sport() != ntohs(sctp->sh_sport) ||
probe->sctpvtag() != ntohl(sctp->sh_vtag) ||
hss->target->v4sourceip()->s_addr != ip->ip_dst.s_addr)
probe->sctpvtag() != ntohl(sctp->sh_vtag))
continue;
} else if (USI->ptech.rawprotoscan) {
/* Success; we already know that the address and protocol match. */