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

Printing interface names:

Browse Source 
o Restore historical behaviour of appending '*' if interface is down,
  and we have enough space to print it (usually we don't). [1]
o Do not truncate interface names when printing in encoded format.
o Report interface flags into encoded format.

PR:		199873 [1]
Sponsored by:	Nginx, Inc.
This commit is contained in:
glebius 2015-05-06 16:43:44 +00:00
parent 7776059e98
commit f9e194c452
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
usr.bin/netstat/if.c
View File

@ -315,7 +315,7 @@ intpr(int interval, void (*pfunc)(char *), int af)
for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
bool network = false, link = false;
char *name;
char *name, *xname, buf[IFNAMSIZ+1];
if (interface != NULL && strcmp(ifa->ifa_name, interface) != 0)
continue;
@ -341,10 +341,20 @@ intpr(int interval, void (*pfunc)(char *), int af)
xo_open_instance("interface");
if ((ifa->ifa_flags & IFF_UP) == 0) {
xname = stpcpy(buf, name);
*xname++ = '*';
*xname = '\0';
xname = buf;
} else
xname = name;
if (Wflag)
xo_emit("{tk:name/%-7.7s}", name);
xo_emit("{etk:name/%s}{e:flags/0x%x}{d:/%7.7s}",
name, ifa->ifa_flags, xname);
else
xo_emit("{tk:name/%-5.5s}", name);
xo_emit("{etk:name/%s}{e:flags/0x%x}{d:/%5.5s}",
name, ifa->ifa_flags, xname);
#define IFA_MTU(ifa) (((struct if_data *)(ifa)->ifa_data)->ifi_mtu)
show_stat("lu", 6, "mtu", IFA_MTU(ifa), IFA_MTU(ifa));