vether(4) has a long name. Let's extend to output of these tools to
80 chars to make vetherX fit in the columns.
Before:
=======
# arp -an
Host Ethernet Address Netif Expire Flags
10.188.70.17 fe:e1:ba:d0:d5:6d vio0 16m27s
10.188.70.70 70:5f:ca:21:8d:70 vio0 permanent l
10.188.211.70 fe:e1:ba:d0:da:4f vether0 permanent l
# ndp -an
Neighbor Linklayer Address Netif Expire S Flags
fe80::725f:caff:fe21:8d70%vio0 70:5f:ca:21:8d:70 vio0 permanent R l
fe80::fce1:baff:fed0:d56d%vio0 fe:e1:ba:d0:d5:6d vio0 expired R
fe80::fce1:baff:fed0:da4f%vether0 fe:e1:ba:d0:da:4f vether0 permanent R l
After:
======
# arp -an
Host Ethernet Address Netif Expire Flags
10.188.70.17 fe:e1:ba:d0:d5:6d vio0 8m33s
10.188.70.70 70:5f:ca:21:8d:70 vio0 permanent l
10.188.211.70 fe:e1:ba:d0:da:4f vether0 permanent l
# ndp -an
Neighbor Linklayer Address Netif Expire S Flags
fdd7:e83e:66bc:70:3e97:eff:fea7:9b2 (incomplete) vio0 expired N
fdd7:e83e:66bc:70:725f:caff:fe21:8d70 70:5f:ca:21:8d:70 vio0 permanent R l
fe80::725f:caff:fe21:8d70%vio0 70:5f:ca:21:8d:70 vio0 permanent R l
fe80::fce1:baff:fed0:d56d%vio0 fe:e1:ba:d0:d5:6d vio0 1s D
fe80::fce1:baff:fed0:da4f%vether0 fe:e1:ba:d0:da:4f vether0 permanent R l
ok?
Index: arp/arp.c
===================================================================
RCS file: /cvs/src/usr.sbin/arp/arp.c,v
retrieving revision 1.76
diff -u -p -r1.76 arp.c
--- arp/arp.c 27 Aug 2016 04:15:52 -0000 1.76
+++ arp/arp.c 28 Nov 2016 09:59:41 -0000
@@ -366,7 +366,7 @@ overwrite:
#define W_ADDR 36
#define W_LL 17
-#define W_IF 6
+#define W_IF 7
/*
* Display an individual arp entry
@@ -381,7 +381,7 @@ get(const char *host)
if (getinetaddr(host, &sin->sin_addr) == -1)
exit(1);
- printf("%-*.*s %-*.*s %*.*s %-10.10s %5s\n",
+ printf("%-*.*s %-*.*s %*.*s %-9.9s %5s\n",
W_ADDR, W_ADDR, "Host", W_LL, W_LL, "Ethernet Address",
W_IF, W_IF, "Netif", "Expire", "Flags");
@@ -509,7 +509,7 @@ search(in_addr_t addr, void (*action)(st
void
dump(void)
{
- printf("%-*.*s %-*.*s %*.*s %-10.10s %5s\n",
+ printf("%-*.*s %-*.*s %*.*s %-9.9s %5s\n",
W_ADDR, W_ADDR, "Host", W_LL, W_LL, "Ethernet Address",
W_IF, W_IF, "Netif", "Expire", "Flags");
@@ -555,14 +555,14 @@ print_entry(struct sockaddr_dl *sdl, str
llwidth, llwidth, ether_str(sdl), ifwidth, ifwidth, ifname);
if (rtm->rtm_flags & (RTF_PERMANENT_ARP|RTF_LOCAL))
- printf(" %-10.10s", "permanent");
+ printf(" %-9.9s", "permanent");
else if (rtm->rtm_rmx.rmx_expire == 0)
- printf(" %-10.10s", "static");
+ printf(" %-9.9s", "static");
else if (rtm->rtm_rmx.rmx_expire > now.tv_sec)
- printf(" %-10.10s",
+ printf(" %-9.9s",
sec2str(rtm->rtm_rmx.rmx_expire - now.tv_sec));
else
- printf(" %-10.10s", "expired");
+ printf(" %-9.9s", "expired");
printf(" %s%s\n",
(rtm->rtm_flags & RTF_LOCAL) ? "l" : "",
Index: ndp/ndp.c
===================================================================
RCS file: /cvs/src/usr.sbin/ndp/ndp.c,v
retrieving revision 1.78
diff -u -p -r1.78 ndp.c
--- ndp/ndp.c 15 Aug 2016 08:52:03 -0000 1.78
+++ ndp/ndp.c 28 Nov 2016 10:01:10 -0000
@@ -550,7 +550,7 @@ delete:
#define W_ADDR 36
#define W_LL 17
-#define W_IF 6
+#define W_IF 7
/*
* Dump the entire neighbor cache
