=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/netstat/show.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- src/usr.bin/netstat/show.c 2010/05/19 13:07:15 1.31 +++ src/usr.bin/netstat/show.c 2010/07/29 16:35:40 1.32 @@ -1,4 +1,4 @@ -/* $OpenBSD: show.c,v 1.31 2010/05/19 13:07:15 chl Exp $ */ +/* $OpenBSD: show.c,v 1.32 2010/07/29 16:35:40 bluhm Exp $ */ /* $NetBSD: show.c,v 1.1 1996/11/15 18:01:41 gwr Exp $ */ /* @@ -245,10 +245,13 @@ "Flags", "Refs", "Use", "Mtu", "Prio", "Interface"); break; default: - printf("%-*.*s %-*.*s %-6.6s %5.5s %8.8s %5.5s %4.4s %s\n", + printf("%-*.*s %-*.*s %-6.6s %5.5s %8.8s %5.5s %4.4s %s", WID_DST(af), WID_DST(af), "Destination", WID_GW(af), WID_GW(af), "Gateway", "Flags", "Refs", "Use", "Mtu", "Prio", "Iface"); + if (vflag) + printf(" %s", "Label"); + putchar('\n'); break; } } @@ -311,8 +314,11 @@ else printf("%5s ", "-"); putchar((rtm->rtm_rmx.rmx_locks & RTV_MTU) ? 'L' : ' '); - printf(" %2d %.16s", rtm->rtm_priority, + printf(" %2d %-5.16s", rtm->rtm_priority, if_indextoname(rtm->rtm_index, ifbuf)); + if (vflag && rti_info[RTAX_LABEL]) + printf(" %s", ((struct sockaddr_rtlabel *) + rti_info[RTAX_LABEL])->sr_label); putchar('\n'); }