PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-02-11 16:06:33 +00:00
Code Issues Projects Releases Wiki Activity

Use sockaddr_storage_equal in place of sockaddr_storage_cmp where

Browse Source 
appropriate.
This commit is contained in:
david
2011-05-07 00:50:54 +00:00
parent eb7202d45c
commit a2e58b4875
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TargetGroup.cc
View File

@@ -565,7 +565,7 @@ bool TargetGroup::is_resolved_address(const struct sockaddr_storage *ss)
return false;
resolvedaddr = *resolvedaddrs.begin();
return sockaddr_storage_cmp(&resolvedaddr, ss) == 0;
return sockaddr_storage_equal(&resolvedaddr, ss);
}
/* Return a string of the name or address that was resolved for this group. */

2
output.cc
View File

@@ -2055,7 +2055,7 @@ static void printtraceroute_normal(Target *currenths) {
sslen = sizeof(addr);
currenths->TargetSockAddr(&addr, &sslen);
while (it != currenths->traceroute_hops.end()
&& sockaddr_storage_cmp(&it->tag, &addr) != 0) {
&& !sockaddr_storage_equal(&it->tag, &addr)) {
shared_hop = &*it;
it++;
}

6
traceroute.cc
View File

@@ -997,7 +997,7 @@ void TracerouteState::set_host_hop(HostState *host, u8 ttl,
}
sslen = sizeof(addr);
host->target->TargetSockAddr(&addr, &sslen);
if (sockaddr_storage_cmp(&hop->tag, &addr) == 0) {
if (sockaddr_storage_equal(&hop->tag, &addr)) {
if (o.debugging > 1) {
log_write(LOG_STDOUT, "%s continuing trace from TTL %d\n",
host->target->targetipstr(), host->current_ttl);
@@ -1204,7 +1204,7 @@ void TracerouteState::read_replies(long timeout) {
sslen = sizeof(ss);
host->target->TargetSockAddr(&ss, &sslen);
if (sockaddr_storage_cmp(&ss, &reply.from_addr) == 0) {
if (sockaddr_storage_equal(&ss, &reply.from_addr)) {
adjust_timeouts2(&probe->sent_time, &reply.rcvdtime, &host->target->to);
if (host->reached_target == 0 || probe->ttl < host->reached_target)
host->reached_target = probe->ttl;
@@ -1371,7 +1371,7 @@ Probe *TracerouteState::lookup_probe(
sslen = sizeof(ss);
(*host_iter)->target->TargetSockAddr(&ss, &sslen);
if (sockaddr_storage_cmp(&ss, target_addr) != 0)
if (!sockaddr_storage_equal(&ss, target_addr))
continue;
for (probe_iter = (*host_iter)->unanswered_probes.begin();
probe_iter != (*host_iter)->unanswered_probes.end();