d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When specifying an interface to ifconfig, first look up the interface

Browse Source 
index, then retrieve statistics for that index, rather than retrieving
all interfaces and then looking for a matching name.  This allows the
user to refer to an interface via an alias name.

While I'm here, also perform a few assorted cleanups.
This commit is contained in:
Jonathan Lemon 2001-10-17 18:30:13 +00:00
parent 8071913df2
commit 1643c8f3eb
1 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
sbin/ifconfig/ifconfig.c
View File

@ -421,15 +421,13 @@ main(argc, argv)
{ {
int c; int c;
int all, namesonly, downonly, uponly; int all, namesonly, downonly, uponly;
int foundit = 0, need_nl = 0; int need_nl = 0;
const struct afswtch *afp = 0; const struct afswtch *afp = 0;
int addrcount; int addrcount, ifindex;
struct if_msghdr *ifm, *nextifm; struct if_msghdr *ifm, *nextifm;
struct ifa_msghdr *ifam; struct ifa_msghdr *ifam;
struct sockaddr_dl *sdl; struct sockaddr_dl *sdl;
char *buf, *lim, *next; char *buf, *lim, *next;
size_t needed; size_t needed;
int mib[6]; int mib[6];
@ -499,6 +497,7 @@ main(argc, argv)
if (argc > 1) if (argc > 1)
usage(); usage();
ifindex = 0;
if (argc == 1) { if (argc == 1) {
for (afp = afs; afp->af_name; afp++) for (afp = afs; afp->af_name; afp++)
if (strcmp(afp->af_name, *argv) == 0) { if (strcmp(afp->af_name, *argv) == 0) {
@ -532,6 +531,9 @@ main(argc, argv)
if (argc == 0) if (argc == 0)
exit(0); exit(0);
} }
ifindex = if_nametoindex(name);
if (ifindex == 0)
errx(1, "interface %s does not exist", name);
} }
/* Check for address family */ /* Check for address family */
@ -548,9 +550,9 @@ main(argc, argv)
mib[0] = CTL_NET; mib[0] = CTL_NET;
mib[1] = PF_ROUTE; mib[1] = PF_ROUTE;
mib[2] = 0; mib[2] = 0;
mib[3] = 0; /* address family */ mib[3] = 0; /* address family */
mib[4] = NET_RT_IFLIST; mib[4] = NET_RT_IFLIST;
mib[5] = 0; mib[5] = ifindex; /* interface index */
/* if particular family specified, only ask about it */ /* if particular family specified, only ask about it */
if (afp) if (afp)
@ -598,6 +600,8 @@ main(argc, argv)
addrcount++; addrcount++;
next += nextifm->ifm_msglen; next += nextifm->ifm_msglen;
} }
strncpy(name, sdl->sdl_data, sdl->sdl_nlen);
name[sdl->sdl_nlen] = '\0';
if (all || namesonly) { if (all || namesonly) {
if (uponly) if (uponly)
@ -606,8 +610,6 @@ main(argc, argv)
if (downonly) if (downonly)
if (flags & IFF_UP) if (flags & IFF_UP)
continue; /* not down */ continue; /* not down */
strncpy(name, sdl->sdl_data, sdl->sdl_nlen);
name[sdl->sdl_nlen] = '\0';
if (namesonly) { if (namesonly) {
if (afp == NULL || if (afp == NULL ||
afp->af_status != ether_status || afp->af_status != ether_status ||
@ -619,36 +621,21 @@ main(argc, argv)
} }
continue; continue;
} }
} else {
if (strlen(name) != sdl->sdl_nlen)
continue; /* not same len */
if (strncmp(name, sdl->sdl_data, sdl->sdl_nlen) != 0)
continue; /* not same name */
} }
if (argc > 0) if (argc > 0)
ifconfig(argc, argv, afp); ifconfig(argc, argv, afp);
else else
status(afp, addrcount, sdl, ifm, ifam); status(afp, addrcount, sdl, ifm, ifam);
if (all == 0 && namesonly == 0) {
foundit++; /* flag it as 'done' */
break;
}
} }
free(buf); free(buf);
if (namesonly && need_nl > 0) if (namesonly && need_nl > 0)
putchar('\n'); putchar('\n');
if (all == 0 && namesonly == 0 && foundit == 0)
errx(1, "interface %s does not exist", name);
exit (0); exit (0);
} }
int int
ifconfig(argc, argv, afp) ifconfig(argc, argv, afp)
int argc; int argc;
@ -1144,7 +1131,7 @@ status(afp, addrcount, sdl, ifm, ifam)
allfamilies = 0; allfamilies = 0;
ifr.ifr_addr.sa_family = afp->af_af == AF_LINK ? AF_INET : afp->af_af; ifr.ifr_addr.sa_family = afp->af_af == AF_LINK ? AF_INET : afp->af_af;
strncpy(ifr.ifr_name, name, sizeof ifr.ifr_name); strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
if ((s = socket(ifr.ifr_addr.sa_family, SOCK_DGRAM, 0)) < 0) if ((s = socket(ifr.ifr_addr.sa_family, SOCK_DGRAM, 0)) < 0)
err(1, "socket"); err(1, "socket");
@ -1962,7 +1949,6 @@ ifmaybeload(name)
int fileid, modid; int fileid, modid;
char ifkind[35], *cp, *dp; char ifkind[35], *cp, *dp;
/* turn interface and unit into module name */ /* turn interface and unit into module name */
strcpy(ifkind, "if_"); strcpy(ifkind, "if_");
for (cp = name, dp = ifkind + 3; for (cp = name, dp = ifkind + 3;