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

Portreasons Restructuring. icmpt_to_reason added.

Browse Source
This commit is contained in:
colin
2011-05-26 19:46:29 +00:00
parent c41e778215
commit 5d3e0e688c
4 changed files with 150 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scan_engine.cc
View File

@@ -4313,7 +4313,7 @@ static bool get_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
sizeof(struct ip));
break;
}
current_reason = icmp->icmp_code+ER_ICMPCODE_MOD;
current_reason = icmp_to_reason(icmp->icmp_type, icmp->icmp_code);
if (newstate == PORT_UNKNOWN) break;
goodone = true;
}
@@ -4405,7 +4405,7 @@ static bool get_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
hss->target->ports.setStateReason(IPPROTO_ICMP, IPPROTO_IP, ER_ECHOREPLY,
ip_icmp->ip_ttl, reason_sip);
else
hss->target->ports.setStateReason(IPPROTO_ICMP, IPPROTO_IP, icmp->icmp_type+ER_ICMPCODE_MOD,
hss->target->ports.setStateReason(IPPROTO_ICMP, IPPROTO_IP, icmp_to_reason(icmp->icmp_type, icmp->icmp_code),
ip_icmp->ip_ttl, reason_sip);
}
if (!goodone) goodone = true;
@@ -4486,9 +4486,7 @@ static int get_ping_pcap_result(UltraScanInfo *USI, struct timeval *stime) {
continue;
}
current_reason = ping->type + ER_ICMPTYPE_MOD;
if (current_reason == ER_DESTUNREACH)
current_reason = ping->code + ER_ICMPCODE_MOD;
current_reason = icmp_to_reason(ping->type, ping->code);
/* Echo reply, Timestamp reply, or Address Mask Reply. RFCs 792 and 950. */
if (USI->ptech.rawicmpscan && (ping->type == 0 || ping->type == 14 || ping->type == 18)) {