mirror of
https://github.com/nmap/nmap.git
synced 2025-12-10 09:49:05 +00:00
removed a redundant loop from route_dst() in tcpip.cc
This commit is contained in:
michael
167
tcpip.cc
167
tcpip.cc
@@ -3089,111 +3089,92 @@ bool route_dst(const struct sockaddr_storage *const dst, struct route_nfo *rnfo)
|
|||||||
if (dstsin->sin_family != AF_INET)
|
if (dstsin->sin_family != AF_INET)
|
||||||
fatal("Sorry -- %s currently only supports IPv4", __func__);
|
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) {
|
||||||
if (o.spoofsource || *o.device) {
|
memcpy(&rnfo->srcaddr, &spoofss, sizeof(rnfo->srcaddr));
|
||||||
if (o.spoofsource) {
|
o.SourceSockAddr(&spoofss, &spoofsslen);
|
||||||
o.SourceSockAddr(&spoofss, &spoofsslen);
|
if (!*o.device) {
|
||||||
if (!*o.device) {
|
/* Look up the device corresponding to src IP, if any ... */
|
||||||
/* Look up the device corresponding to src IP, if any ... */
|
//WARNING: THIS IS NEVER USED(i think)
|
||||||
iface = getInterfaceByIP(&spoofss);
|
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 */
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ifaces = getinterfaces(&numifaces);
|
//dont use this method for user specified devices
|
||||||
/* I suppose that I'll first determine whether it is a direct connect instance */
|
if(!*o.device) {
|
||||||
for(ifnum=0; ifnum < numifaces; ifnum++) {
|
ifaces = getinterfaces(&numifaces);
|
||||||
ifsin = (struct sockaddr_in *) &ifaces[ifnum].addr;
|
/* I suppose that I'll first determine whether it is a direct connect instance */
|
||||||
if (ifsin->sin_family != AF_INET) continue;
|
for(ifnum=0; ifnum < numifaces; ifnum++) {
|
||||||
if (dstsin->sin_addr.s_addr == ifsin->sin_addr.s_addr &&
|
ifsin = (struct sockaddr_in *) &ifaces[ifnum].addr;
|
||||||
ifaces[ifnum].device_type != devt_loopback) {
|
if (ifsin->sin_family != AF_INET) continue;
|
||||||
/* Trying to scan one of the machine's own interfaces -- we need
|
if (dstsin->sin_addr.s_addr == ifsin->sin_addr.s_addr &&
|
||||||
to use the localhost device for this */
|
ifaces[ifnum].device_type != devt_loopback) {
|
||||||
for(i=0; i < numifaces; i++)
|
/* Trying to scan one of the machine's own interfaces -- we need
|
||||||
if (ifaces[i].device_type == devt_loopback)
|
to use the localhost device for this */
|
||||||
break;
|
for(i=0; i < numifaces; i++)
|
||||||
if (i < numifaces) {
|
if (ifaces[i].device_type == devt_loopback)
|
||||||
rnfo->direct_connect = true;
|
break;
|
||||||
memcpy(&rnfo->ii, &ifaces[i], sizeof(rnfo->ii));
|
if (i < numifaces) {
|
||||||
/* But the source address we want to use is the target addy */
|
rnfo->direct_connect = true;
|
||||||
if (o.spoofsource)
|
memcpy(&rnfo->ii, &ifaces[i], sizeof(rnfo->ii));
|
||||||
memcpy(&rnfo->srcaddr, &spoofss, sizeof(rnfo->srcaddr));
|
/* But the source address we want to use is the target addy */
|
||||||
else
|
if (o.spoofsource)
|
||||||
memcpy(&rnfo->srcaddr, &ifaces[ifnum].addr, sizeof(rnfo->srcaddr));
|
memcpy(&rnfo->srcaddr, &spoofss, sizeof(rnfo->srcaddr));
|
||||||
return true;
|
else
|
||||||
|
memcpy(&rnfo->srcaddr, &ifaces[ifnum].addr, sizeof(rnfo->srcaddr));
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
/* Hmmm ... no localhost -- I guess I'll just try using the device
|
||||||
|
itself */
|
||||||
|
}
|
||||||
|
mask = htonl((unsigned long) (0-1) << (32 - ifaces[ifnum].netmask_bits));
|
||||||
|
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, &ifaces[ifnum].addr, sizeof(rnfo->srcaddr));
|
||||||
|
}
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
/* Hmmm ... no localhost -- I guess I'll just try using the device
|
|
||||||
itself */
|
|
||||||
}
|
|
||||||
mask = htonl((unsigned long) (0-1) << (32 - ifaces[ifnum].netmask_bits));
|
|
||||||
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
|
|
||||||
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) {
|
||||||
rnfo->direct_connect = false;
|
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);
|
routes = getsysroutes(&numroutes);
|
||||||
/* Now we simply go through the list and take the first match */
|
/* Now we simply go through the list and take the first match */
|
||||||
for(i=0; i < numroutes; i++) {
|
for(i=0; i < numroutes; i++) {
|
||||||
if ((routes[i].dest & routes[i].netmask) ==
|
if ((routes[i].dest & routes[i].netmask) == (dstsin->sin_addr.s_addr & routes[i].netmask)) {
|
||||||
(dstsin->sin_addr.s_addr & routes[i].netmask)) {
|
|
||||||
/* Yay, found a matching route. */
|
/* Yay, found a matching route. */
|
||||||
memcpy(&rnfo->ii, routes[i].device, sizeof(rnfo->ii));
|
if(*o.device){
|
||||||
if (o.spoofsource)
|
if(strcmp(routes[i].device->devname, iface->devname) != 0) {
|
||||||
memcpy(&rnfo->srcaddr, &spoofss, sizeof(rnfo->srcaddr));
|
//ignore routes that arent on the device we specified!
|
||||||
else
|
continue;
|
||||||
memcpy(&rnfo->srcaddr, &routes[i].device->addr, sizeof(rnfo->srcaddr));
|
} 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, &routes[i].device->addr, sizeof(rnfo->srcaddr));
|
||||||
|
}
|
||||||
|
}
|
||||||
ifsin = (struct sockaddr_in *) &rnfo->nexthop;
|
ifsin = (struct sockaddr_in *) &rnfo->nexthop;
|
||||||
ifsin->sin_family = AF_INET;
|
ifsin->sin_family = AF_INET;
|
||||||
ifsin->sin_addr.s_addr = routes[i].gw.s_addr;
|
ifsin->sin_addr.s_addr = routes[i].gw.s_addr;
|
||||||
|
|||||||
Reference in New Issue
Block a user