PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-28 18:39:03 +00:00
Code Issues Projects Releases Wiki Activity

Use if_indextoname instead of our own intf_name function.

Browse Source
This commit is contained in:
david
2011-08-30 04:18:57 +00:00
parent 96a785e67d
commit d7302d7608
1 changed files with 4 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
libnetutil/netutil.cc
View File

@@ -2879,31 +2879,6 @@ static int set_sockaddr(struct sockaddr_storage *ss, int af, void *data) {
return 0;
}
/* Get an interface name from an index number. */
static int intf_name(int index, char *name, size_t len) {
struct ifreq ifr;
int s;
s = socket(AF_INET, SOCK_DGRAM, 0);
if (s < 0)
return -1;
ifr.ifr_ifindex = index;
if (ioctl(s, SIOCGIFNAME, &ifr) < 0)
goto bail;
strncpy(name, ifr.ifr_name, len);
if (name[len - 1] != '\0')
goto bail;
close(s);
return 0;
bail:
close(s);
return -1;
}
/* Does route_dst using the Linux-specific rtnetlink interface. See rtnetlink(3)
and rtnetlink(7). */
static int route_dst_netlink(const struct sockaddr_storage *dst,
@@ -3030,12 +3005,13 @@ static int route_dst_netlink(const struct sockaddr_storage *dst,
if (!sockaddr_storage_equal(dst, &rnfo->nexthop))
rnfo->direct_connect = 0;
} else if (rtattr->rta_type == RTA_OIF && ii == NULL) {
char namebuf[32];
char namebuf[IFNAMSIZ];
char *p;
int intf_index;
intf_index = *(int *) RTA_DATA(rtattr);
rc = intf_name(intf_index, namebuf, sizeof(namebuf));
assert(rc != -1);
p = if_indextoname(intf_index, namebuf);
assert(p != NULL);
ii = getInterfaceByName(namebuf, rtmsg->rtm_family);
if (ii == NULL)
netutil_fatal("%s: can't find interface \"%s\"", __func__, namebuf);