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

Make ``ifconfig -l ether'' only list interfaces that speak Ethernet.

Browse Source 
PR:		118987
Approved by:	ken (mentor)
This commit is contained in:
Will Andrews 2009-11-25 00:00:57 +00:00
parent cbc4ea28e2
commit c3582a1967
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=199770
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sbin/ifconfig/ifconfig.c
View File

@ -147,7 +147,7 @@ main(int argc, char *argv[])
struct ifaddrs *ifap, *ifa; struct ifaddrs *ifap, *ifa;
struct ifreq paifr; struct ifreq paifr;
const struct sockaddr_dl *sdl; const struct sockaddr_dl *sdl;
char options[1024], *cp; char options[1024], *cp, *namecp = NULL;
const char *ifname; const char *ifname;
struct option *p; struct option *p;
size_t iflen; size_t iflen;
@ -294,7 +294,7 @@ main(int argc, char *argv[])
sdl = (const struct sockaddr_dl *) ifa->ifa_addr; sdl = (const struct sockaddr_dl *) ifa->ifa_addr;
else else
sdl = NULL; sdl = NULL;
if (cp != NULL && strcmp(cp, ifa->ifa_name) == 0) if (cp != NULL && strcmp(cp, ifa->ifa_name) == 0 && !namesonly)
continue; continue;
iflen = strlcpy(name, ifa->ifa_name, sizeof(name)); iflen = strlcpy(name, ifa->ifa_name, sizeof(name));
if (iflen >= sizeof(name)) { if (iflen >= sizeof(name)) {
@ -308,16 +308,32 @@ main(int argc, char *argv[])
continue; continue;
if (uponly && (ifa->ifa_flags & IFF_UP) == 0) if (uponly && (ifa->ifa_flags & IFF_UP) == 0)
continue; continue;
ifindex++;
/* /*
* Are we just listing the interfaces? * Are we just listing the interfaces?
*/ */
if (namesonly) { if (namesonly) {
if (namecp == cp)
continue;
if (afp != NULL) {
/* special case for "ether" address family */
if (!strcmp(afp->af_name, "ether")) {
if (sdl == NULL ||
sdl->sdl_type != IFT_ETHER ||
sdl->sdl_alen != ETHER_ADDR_LEN)
continue;
} else {
if (ifa->ifa_addr->sa_family != afp->af_af)
continue;
}
}
namecp = cp;
ifindex++;
if (ifindex > 1) if (ifindex > 1)
printf(" "); printf(" ");
fputs(name, stdout); fputs(name, stdout);
continue; continue;
} }
ifindex++;
if (argc > 0) if (argc > 0)
ifconfig(argc, argv, 0, afp); ifconfig(argc, argv, 0, afp);