PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-01-25 23:59:01 +00:00
Code Issues Projects Releases Wiki Activity

o Fixed several byte-order bugs in Traceroute. [Kris]

Browse Source
This commit is contained in:
kris
2008-06-14 07:06:12 +00:00
parent 47bc9d4c4f
commit 3dc65c8b2c
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@@ -45,6 +45,8 @@ o Fixed an integer overflow which prevented a target specification
o Fixed some memory leaks in NSE found with Valgrind. [Kris]
o Fixed several byte-order bugs in Traceroute. [Kris]
o Nmap now returns correct values for --iflist in windows even
if interface aliases have been set. Previously it would misreport
the windevices and not list all interfaces. [Michael]

14
traceroute.cc
View File

@@ -437,19 +437,19 @@ Traceroute::readTraceResponses () {
tcp = (struct tcp_hdr *) ((u8 *) ip2 + ip2->ip_hl * 4);
if (ntohs(ip2->ip_len) - (ip2->ip_hl * 4) < 2)
break;
sport = htons (tcp->th_sport);
sport = ntohs (tcp->th_sport);
} else if (ip2->ip_p == IPPROTO_UDP) {
udp = (struct udp_hdr *) ((u8 *) ip2 + ip2->ip_hl * 4);
if (ntohs(ip2->ip_len) - (ip2->ip_hl * 4) < 2)
break;
sport = htons (udp->uh_sport);
sport = ntohs (udp->uh_sport);
} else if (ip2->ip_p == IPPROTO_ICMP) {
icmp2 = (struct icmp *) ((char *) ip2 + 4 * ip2->ip_hl);
if (ntohs(ip2->ip_len) - (ip2->ip_hl * 4) < 8)
break;
sport = ntohs(icmp2->icmp_id);
} else {
sport = htons(ip2->ip_id);
sport = ntohs(ip2->ip_id);
}
ipaddr = ip2->ip_dst.s_addr;
}
@@ -540,8 +540,8 @@ Traceroute::readTraceResponses () {
else
break;
if (tg->TraceProbes.find (htons (tcp->th_dport)) != tg->TraceProbes.end ())
tp = tg->TraceProbes[htons (tcp->th_dport)];
if (tg->TraceProbes.find (ntohs (tcp->th_dport)) != tg->TraceProbes.end ())
tp = tg->TraceProbes[ntohs (tcp->th_dport)];
else
break;
@@ -584,8 +584,8 @@ Traceroute::readTraceResponses () {
else
break;
if (tg->TraceProbes.find (htons (udp->uh_dport)) != tg->TraceProbes.end ())
tp = tg->TraceProbes[htons (udp->uh_dport)];
if (tg->TraceProbes.find (ntohs (udp->uh_dport)) != tg->TraceProbes.end ())
tp = tg->TraceProbes[ntohs (udp->uh_dport)];
else
break;