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

Fix up indentation in route_dst in tcpip.cc (no code changes). This function

Browse Source 
has been messed up for a while and I was having trouble reading it. I changed
it to use the mix of 8-wide tabs and spaces used by most of the rest of the
file.
This commit is contained in:
david
2008-06-18 22:30:38 +00:00
parent da3f573795
commit c67369c6b2
1 changed files with 46 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
tcpip.cc
View File

@@ -3094,7 +3094,7 @@ bool route_dst(const struct sockaddr_storage *const dst, struct route_nfo *rnfo)
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) //WARNING: THIS IS NEVER USED(i think)
iface = getInterfaceByIP(&spoofss); iface = getInterfaceByIP(&spoofss);
} }
} }
@@ -3102,55 +3102,56 @@ bool route_dst(const struct sockaddr_storage *const dst, struct route_nfo *rnfo)
//dont use this method for user specified devices //dont use this method for user specified devices
if(!*o.device) { if(!*o.device) {
ifaces = getinterfaces(&numifaces); ifaces = getinterfaces(&numifaces);
/* I suppose that I'll first determine whether it is a direct connect instance */ /* I suppose that I'll first determine whether it is a direct connect
for(ifnum=0; ifnum < numifaces; ifnum++) { instance */
for(ifnum=0; ifnum < numifaces; ifnum++) {
ifsin = (struct sockaddr_in *) &ifaces[ifnum].addr; ifsin = (struct sockaddr_in *) &ifaces[ifnum].addr;
if (ifsin->sin_family != AF_INET) continue; if (ifsin->sin_family != AF_INET) continue;
if (dstsin->sin_addr.s_addr == ifsin->sin_addr.s_addr && if (dstsin->sin_addr.s_addr == ifsin->sin_addr.s_addr &&
ifaces[ifnum].device_type != devt_loopback) { ifaces[ifnum].device_type != devt_loopback) {
/* Trying to scan one of the machine's own interfaces -- we need /* Trying to scan one of the machine's own interfaces -- we need to use
to use the localhost device for this */ the localhost device for this */
for(i=0; i < numifaces; i++) for(i=0; i < numifaces; i++)
if (ifaces[i].device_type == devt_loopback) if (ifaces[i].device_type == devt_loopback)
break; break;
if (i < numifaces) { if (i < numifaces) {
rnfo->direct_connect = true; rnfo->direct_connect = true;
memcpy(&rnfo->ii, &ifaces[i], sizeof(rnfo->ii)); memcpy(&rnfo->ii, &ifaces[i], sizeof(rnfo->ii));
/* But the source address we want to use is the target addy */ /* But the source address we want to use is the target addy */
if (o.spoofsource) if (o.spoofsource)
memcpy(&rnfo->srcaddr, &spoofss, sizeof(rnfo->srcaddr)); memcpy(&rnfo->srcaddr, &spoofss, sizeof(rnfo->srcaddr));
else else
memcpy(&rnfo->srcaddr, &ifaces[ifnum].addr, sizeof(rnfo->srcaddr)); memcpy(&rnfo->srcaddr, &ifaces[ifnum].addr, sizeof(rnfo->srcaddr));
return true; return true;
} }
/* Hmmm ... no localhost -- I guess I'll just try using the device /* Hmmm ... no localhost -- I guess I'll just try using the device
itself */ itself */
} }
mask = htonl((unsigned long) (0-1) << (32 - ifaces[ifnum].netmask_bits)); mask = htonl((unsigned long) (0-1) << (32 - ifaces[ifnum].netmask_bits));
if ((ifsin->sin_addr.s_addr & mask) == (dstsin->sin_addr.s_addr & mask)) { if ((ifsin->sin_addr.s_addr & mask) == (dstsin->sin_addr.s_addr & mask)) {
rnfo->direct_connect = 1; rnfo->direct_connect = 1;
memcpy(&rnfo->ii, &ifaces[ifnum], sizeof(rnfo->ii)); memcpy(&rnfo->ii, &ifaces[ifnum], sizeof(rnfo->ii));
if (!o.spoofsource) { if (!o.spoofsource) {
memcpy(&rnfo->srcaddr, &ifaces[ifnum].addr, sizeof(rnfo->srcaddr)); memcpy(&rnfo->srcaddr, &ifaces[ifnum].addr, sizeof(rnfo->srcaddr));
} }
return true; return true;
} }
} }
} }
if (*o.device) { if (*o.device) {
iface = getInterfaceByName(o.device); iface = getInterfaceByName(o.device);
if (!iface) { if (!iface) {
fatal("Could not find interface %s which was specified by -e", o.device); fatal("Could not find interface %s which was specified by -e", o.device);
} }
/* Is it directly connected? */ /* Is it directly connected? */
mask = htonl((unsigned long) (0-1) << (32 - iface->netmask_bits)); mask = htonl((unsigned long) (0-1) << (32 - iface->netmask_bits));
ifsin = (struct sockaddr_in *) &(iface->addr); ifsin = (struct sockaddr_in *) &(iface->addr);
if ((ifsin->sin_addr.s_addr & mask) == (dstsin->sin_addr.s_addr & mask)) if ((ifsin->sin_addr.s_addr & mask) == (dstsin->sin_addr.s_addr & mask))
rnfo->direct_connect = 1; rnfo->direct_connect = 1;
else { else {
rnfo->direct_connect = 0; rnfo->direct_connect = 0;
} }
} else { } else {
rnfo->direct_connect = false; rnfo->direct_connect = false;
} }
@@ -3162,18 +3163,18 @@ bool route_dst(const struct sockaddr_storage *const dst, struct route_nfo *rnfo)
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. */ /* Yay, found a matching route. */
if(*o.device){ if(*o.device){
if(strcmp(routes[i].device->devname, iface->devname) != 0) { if(strcmp(routes[i].device->devname, iface->devname) != 0) {
//ignore routes that arent on the device we specified! //ignore routes that arent on the device we specified!
continue; continue;
} else { } else {
memcpy(&rnfo->srcaddr, &(iface->addr), sizeof(rnfo->srcaddr)); memcpy(&rnfo->srcaddr, &(iface->addr), sizeof(rnfo->srcaddr));
memcpy(&rnfo->ii, iface, sizeof(rnfo->ii)); memcpy(&rnfo->ii, iface, sizeof(rnfo->ii));
} }
} else { } else {
memcpy(&rnfo->ii, routes[i].device, sizeof(rnfo->ii)); memcpy(&rnfo->ii, routes[i].device, sizeof(rnfo->ii));
if (!o.spoofsource) { if (!o.spoofsource) {
memcpy(&rnfo->srcaddr, &routes[i].device->addr, sizeof(rnfo->srcaddr)); 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;