diff options
author | Hiroki Sato <hrs@FreeBSD.org> | 2014-05-21 10:04:51 +0000 |
---|---|---|
committer | Hiroki Sato <hrs@FreeBSD.org> | 2014-05-21 10:04:51 +0000 |
commit | c4f55e08beeed021bc74b815b530706e776a726f (patch) | |
tree | e094a2816de2da0af182456c4e21b7db576313d9 | |
parent | c13c64fa63702e9722a6f7dab50b21ba8800686d (diff) | |
download | src-c4f55e08beeed021bc74b815b530706e776a726f.tar.gz src-c4f55e08beeed021bc74b815b530706e776a726f.zip |
- Fix a bug which can make sysctl() fail when -F is specified.
- Increase WID_IF_DEFAULT() from 6 to 8 (the default for AF_INET6) because
we have interfaces with longer names than 6 chars like epairN{a,b}.
- Style fixes.
Notes
Notes:
svn path=/head/; revision=266494
-rw-r--r-- | usr.bin/netstat/route.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c index 78d6d56f580b..75556150e04b 100644 --- a/usr.bin/netstat/route.c +++ b/usr.bin/netstat/route.c @@ -230,13 +230,13 @@ pr_family(int af1) #ifndef INET6 #define WID_DST_DEFAULT(af) 18 /* width of destination column */ #define WID_GW_DEFAULT(af) 18 /* width of gateway column */ -#define WID_IF_DEFAULT(af) (Wflag ? 8 : 6) /* width of netif column */ +#define WID_IF_DEFAULT(af) (Wflag ? 10 : 8) /* width of netif column */ #else #define WID_DST_DEFAULT(af) \ ((af) == AF_INET6 ? (numeric_addr ? 33: 18) : 18) #define WID_GW_DEFAULT(af) \ ((af) == AF_INET6 ? (numeric_addr ? 29 : 18) : 18) -#define WID_IF_DEFAULT(af) ((af) == AF_INET6 ? 8 : (Wflag ? 8 : 6)) +#define WID_IF_DEFAULT(af) ((af) == AF_INET6 ? 8 : (Wflag ? 10 : 8)) #endif /*INET6*/ static int wid_dst; @@ -586,17 +586,13 @@ p_rtable_sysctl(int fibnum, int af) mib[4] = NET_RT_DUMP; mib[5] = 0; mib[6] = fibnum; - if (sysctl(mib, nitems(mib), NULL, &needed, NULL, 0) < 0) { + if (sysctl(mib, nitems(mib), NULL, &needed, NULL, 0) < 0) err(EX_OSERR, "sysctl: net.route.0.%d.dump.%d estimate", af, fibnum); - } - - if ((buf = malloc(needed)) == 0) { + if ((buf = malloc(needed)) == NULL) errx(2, "malloc(%lu)", (unsigned long)needed); - } - if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) { + if (sysctl(mib, nitems(mib), buf, &needed, NULL, 0) < 0) err(1, "sysctl: net.route.0.%d.dump.%d", af, fibnum); - } lim = buf + needed; for (next = buf; next < lim; next += rtm->rtm_msglen) { rtm = (struct rt_msghdr *)next; |