summaryrefslogtreecommitdiffstats
path: root/usr.sbin/arp/arp.c
diff options
context:
space:
mode:
authorgnn <gnn@FreeBSD.org>2014-04-20 06:46:04 +0000
committergnn <gnn@FreeBSD.org>2014-04-20 06:46:04 +0000
commit756c50107578222d44ddab39114d4bd441b22799 (patch)
tree97db845f35d52ed864ffdfe9cf13d895b8c6d2a5 /usr.sbin/arp/arp.c
parentbe9f211c7802e73ffc6692dffe8c7e829a120271 (diff)
downloadFreeBSD-src-756c50107578222d44ddab39114d4bd441b22799.zip
FreeBSD-src-756c50107578222d44ddab39114d4bd441b22799.tar.gz
MFC: 264174
Speed up the lookup of interfaces when there are a large number of them, such in a system with a large number of VLANs. Submitted by: Nick Rogers
Diffstat (limited to 'usr.sbin/arp/arp.c')
-rw-r--r--usr.sbin/arp/arp.c27
1 files changed, 19 insertions, 8 deletions
diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c
index 25fbb23..932ac95 100644
--- a/usr.sbin/arp/arp.c
+++ b/usr.sbin/arp/arp.c
@@ -104,6 +104,8 @@ static char *rifname;
static time_t expire_time;
static int flags, doing_proxy;
+struct if_nameindex *ifnameindex;
+
/* which function we're supposed to do */
#define F_GET 1
#define F_SET 2
@@ -200,6 +202,9 @@ main(int argc, char *argv[])
break;
}
+ if (ifnameindex != NULL)
+ if_freenameindex(ifnameindex);
+
return (rtn);
}
@@ -558,8 +563,6 @@ search(u_long addr, action_fn *action)
/*
* Display an arp entry
*/
-static char lifname[IF_NAMESIZE];
-static int64_t lifindex = -1;
static void
print_entry(struct sockaddr_dl *sdl,
@@ -568,8 +571,13 @@ print_entry(struct sockaddr_dl *sdl,
const char *host;
struct hostent *hp;
struct iso88025_sockaddr_dl_data *trld;
+ struct if_nameindex *p;
int seg;
+ if (ifnameindex == NULL)
+ if ((ifnameindex = if_nameindex()) == NULL)
+ err(1, "cannot retrieve interface names");
+
if (nflag == 0)
hp = gethostbyaddr((caddr_t)&(addr->sin_addr),
sizeof addr->sin_addr, AF_INET);
@@ -596,12 +604,15 @@ print_entry(struct sockaddr_dl *sdl,
}
} else
printf("(incomplete)");
- if (sdl->sdl_index != lifindex &&
- if_indextoname(sdl->sdl_index, lifname) != NULL) {
- lifindex = sdl->sdl_index;
- printf(" on %s", lifname);
- } else if (sdl->sdl_index == lifindex)
- printf(" on %s", lifname);
+
+ for (p = ifnameindex; p && ifnameindex->if_index &&
+ ifnameindex->if_name; p++) {
+ if (p->if_index == sdl->sdl_index) {
+ printf(" on %s", p->if_name);
+ break;
+ }
+ }
+
if (rtm->rtm_rmx.rmx_expire == 0)
printf(" permanent");
else {
OpenPOWER on IntegriCloud