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

removed a redundant loop from route_dst() in tcpip.cc

Browse Source
This commit is contained in:
michael
2008-06-18 20:41:45 +00:00
parent da94206212
commit 2cdb6d9a2a
1 changed files with 74 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
tcpip.cc
View File

@@ -3089,60 +3089,18 @@ bool route_dst(const struct sockaddr_storage *const dst, struct route_nfo *rnfo)
if (dstsin->sin_family != AF_INET)
fatal("Sorry -- %s currently only supports IPv4", __func__);
/* First let us deal with the case where a user requested a specific spoofed IP/dev */
if (o.spoofsource || *o.device) {
if (o.spoofsource) {
memcpy(&rnfo->srcaddr, &spoofss, sizeof(rnfo->srcaddr));
o.SourceSockAddr(&spoofss, &spoofsslen);
if (!*o.device) {
/* Look up the device corresponding to src IP, if any ... */
//WARNING: THIS IS NEVER USED(i think)
iface = getInterfaceByIP(&spoofss);
}
}
if (*o.device) {
iface = getInterfaceByName(o.device);
if (!iface)
fatal("Could not find interface %s which was specified by -e", o.device);
}
if (iface) {
/* Is it directly connected? */
mask = htonl((unsigned long) (0-1) << (32 - iface->netmask_bits));
ifsin = (struct sockaddr_in *) &(iface->addr);
if ((ifsin->sin_addr.s_addr & mask) == (dstsin->sin_addr.s_addr & mask))
rnfo->direct_connect = 1;
else {
rnfo->direct_connect = 0;
/* must find the next hop by checking route table ... */
routes = getsysroutes(&numroutes);
/* Now we simply go through the list and take the first match */
for(i=0; i < numroutes; i++) {
if (strcmp(routes[i].device->devname, iface->devname) == 0 &&
(routes[i].dest & routes[i].netmask) ==
(dstsin->sin_addr.s_addr & routes[i].netmask)) {
/* Yay, found a matching route. */
ifsin = (struct sockaddr_in *) &rnfo->nexthop;
ifsin->sin_family = AF_INET;
ifsin->sin_addr.s_addr = routes[i].gw.s_addr;
break;
}
}
if(i == numroutes){
return false;
}
}
memcpy(&rnfo->ii, iface, sizeof(rnfo->ii));
if (o.spoofsource)
memcpy(&rnfo->srcaddr, &spoofss, sizeof(rnfo->srcaddr));
else
memcpy(&rnfo->srcaddr, &(iface->addr), sizeof(rnfo->srcaddr));
return true;
}
/* Control will get here if -S was specified to a non-interface
IP, but no interface was specified with -e. We will try to
determine the proper interface in that case */
}
//dont use this method for user specified devices
if(!*o.device) {
ifaces = getinterfaces(&numifaces);
/* I suppose that I'll first determine whether it is a direct connect instance */
for(ifnum=0; ifnum < numifaces; ifnum++) {
@@ -3172,28 +3130,51 @@ bool route_dst(const struct sockaddr_storage *const dst, struct route_nfo *rnfo)
if ((ifsin->sin_addr.s_addr & mask) == (dstsin->sin_addr.s_addr & mask)) {
rnfo->direct_connect = 1;
memcpy(&rnfo->ii, &ifaces[ifnum], sizeof(rnfo->ii));
if (o.spoofsource)
memcpy(&rnfo->srcaddr, &spoofss, sizeof(rnfo->srcaddr));
else
if (!o.spoofsource) {
memcpy(&rnfo->srcaddr, &ifaces[ifnum].addr, sizeof(rnfo->srcaddr));
}
return true;
}
}
}
/* OK, so it isn't directly connected. Let's do some routing! */
if (*o.device) {
iface = getInterfaceByName(o.device);
if (!iface) {
fatal("Could not find interface %s which was specified by -e", o.device);
}
/* Is it directly connected? */
mask = htonl((unsigned long) (0-1) << (32 - iface->netmask_bits));
ifsin = (struct sockaddr_in *) &(iface->addr);
if ((ifsin->sin_addr.s_addr & mask) == (dstsin->sin_addr.s_addr & mask))
rnfo->direct_connect = 1;
else {
rnfo->direct_connect = 0;
}
} else {
rnfo->direct_connect = false;
}
routes = getsysroutes(&numroutes);
/* Now we simply go through the list and take the first match */
for(i=0; i < numroutes; i++) {
if ((routes[i].dest & routes[i].netmask) ==
(dstsin->sin_addr.s_addr & routes[i].netmask)) {
if ((routes[i].dest & routes[i].netmask) == (dstsin->sin_addr.s_addr & routes[i].netmask)) {
/* Yay, found a matching route. */
if(*o.device){
if(strcmp(routes[i].device->devname, iface->devname) != 0) {
//ignore routes that arent on the device we specified!
continue;
} else {
memcpy(&rnfo->srcaddr, &(iface->addr), sizeof(rnfo->srcaddr));
memcpy(&rnfo->ii, iface, sizeof(rnfo->ii));
}
} else {
memcpy(&rnfo->ii, routes[i].device, sizeof(rnfo->ii));
if (o.spoofsource)
memcpy(&rnfo->srcaddr, &spoofss, sizeof(rnfo->srcaddr));
else
if (!o.spoofsource) {
memcpy(&rnfo->srcaddr, &routes[i].device->addr, sizeof(rnfo->srcaddr));
}
}
ifsin = (struct sockaddr_in *) &rnfo->nexthop;
ifsin->sin_family = AF_INET;
ifsin->sin_addr.s_addr = routes[i].gw.s_addr;