jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-01 02:03:31 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Move the IFSTATUS stuff after the address listing.

Browse Source
This commit is contained in:
Poul-Henning Kamp 1999-06-19 20:07:24 +00:00
parent 767bc8ad79
commit 6003dc8e9b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=48027
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sbin/ifconfig/ifconfig.c
View File

@ -42,7 +42,7 @@ static const char copyright[] =
static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94"; static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94";
#endif #endif
static const char rcsid[] = static const char rcsid[] =
"$Id: ifconfig.c,v 1.40 1999/06/06 09:17:30 phk Exp $"; "$Id: ifconfig.c,v 1.41 1999/06/19 18:42:19 phk Exp $";
#endif /* not lint */ #endif /* not lint */
#include <sys/param.h> #include <sys/param.h>
@ -758,10 +758,6 @@ status(afp, addrcount, sdl, ifm, ifam)
printf(" mtu %d", mtu); printf(" mtu %d", mtu);
putchar('\n'); putchar('\n');
strncpy(ifs.ifs_name, name, sizeof ifs.ifs_name);
if (ioctl(s, SIOCGIFSTATUS, &ifs) == 0)
printf("%s", ifs.ascii);
while (addrcount > 0) { while (addrcount > 0) {
info.rti_addrs = ifam->ifam_addrs; info.rti_addrs = ifam->ifam_addrs;
@ -806,6 +802,10 @@ status(afp, addrcount, sdl, ifm, ifam)
if (allfamilies || afp->af_status == vlan_status) if (allfamilies || afp->af_status == vlan_status)
vlan_status(s, NULL); vlan_status(s, NULL);
#endif #endif
strncpy(ifs.ifs_name, name, sizeof ifs.ifs_name);
if (ioctl(s, SIOCGIFSTATUS, &ifs) == 0)
printf("%s", ifs.ascii);
if (!allfamilies && !p && afp->af_status != media_status && if (!allfamilies && !p && afp->af_status != media_status &&
afp->af_status != ether_status && afp->af_status != vlan_status) afp->af_status != ether_status && afp->af_status != vlan_status)
warnx("%s has no %s interface address!", name, afp->af_name); warnx("%s has no %s interface address!", name, afp->af_name);