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

Remove the now-unused getInterfaceByIP function from tcpip.cc. (Really, it was

Browse Source 
not used before because of how the logic for o.spoofsource and o.device is
handled in nmap.cc.) Its basic purpose remains in the function ipaddr2devname.
This commit is contained in:
david
2008-06-18 23:03:24 +00:00
parent b9ae121838
commit 130f794664
1 changed files with 19 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
tcpip.cc
View File

@@ -2533,27 +2533,29 @@ void set_pcap_filter(const char *device,
pcap_freecode(&fcode);
}
/* The 'dev' passed in must be at least 32 bytes long */
int ipaddr2devname( char *dev, const struct in_addr *addr ) {
struct interface_info *mydevs;
int numdevs;
int i;
struct sockaddr_in *sin;
/* The 'dev' passed in must be at least 32 bytes long. Returns 0 on success. */
int ipaddr2devname(char *dev, const struct in_addr *addr) {
struct interface_info *ifaces;
struct sockaddr_in *sin;
int numifaces;
int i;
mydevs = getinterfaces(&numdevs);
ifaces = getinterfaces(&numifaces);
if (!mydevs) return -1;
if (ifaces == NULL)
return -1;
for(i=0; i < numdevs; i++) {
sin = (struct sockaddr_in *) &mydevs[i].addr;
if (sin->sin_family != AF_INET)
continue;
if (addr->s_addr == sin->sin_addr.s_addr) {
Strncpy(dev, mydevs[i].devname, 32);
return 0;
for (i = 0; i < numifaces; i++) {
sin = (struct sockaddr_in *) &ifaces[i].addr;
if (sin->sin_family != AF_INET)
continue;
if (addr->s_addr == sin->sin_addr.s_addr) {
Strncpy(dev, ifaces[i].devname, 32);
return 0;
}
}
}
return -1;
return -1;
}
int devname2ipaddr(char *dev, struct in_addr *addr) {
@@ -2866,29 +2868,6 @@ int sd;
return mydevs;
}
/* Looks for an interface assigned to the given IP (ss), and returns
the interface_info for the first one found. If non found, returns NULL */
struct interface_info *getInterfaceByIP(struct sockaddr_storage *ss) {
struct sockaddr_in *sin = (struct sockaddr_in *) ss;
struct sockaddr_in *ifsin;
struct interface_info *ifaces;
int numifaces = 0;
int ifnum;
if (sin->sin_family != AF_INET)
fatal("%s called with non-IPv4 address", __func__);
ifaces = getinterfaces(&numifaces);
for(ifnum=0; ifnum < numifaces; ifnum++) {
ifsin = (struct sockaddr_in *) &ifaces[ifnum].addr;
if (ifsin->sin_family != AF_INET) continue;
if (sin->sin_addr.s_addr == ifsin->sin_addr.s_addr)
return &ifaces[ifnum];
}
return NULL;
}
/* Looks for an interface with the given name (iname), and returns the
corresponding interface_info if found. Will accept a match of
devname or devfullname. Returns NULL if none found */