diff options
| author | obrien <obrien@FreeBSD.org> | 2013-02-08 16:10:16 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2013-02-08 16:10:16 +0000 |
| commit | 3028e3f8aba938dfd0bf9fda987b8a72140b8027 (patch) | |
| tree | b2f038222ff8a70f687652441df00d2b564c8abe /usr.bin/netstat | |
| parent | 952a6d5a7cd3d3f9007acfa06805262fc04a105f (diff) | |
| parent | 1d08d5f677c1dfa810e381073590adbae19cc69f (diff) | |
| download | FreeBSD-src-3028e3f8aba938dfd0bf9fda987b8a72140b8027.zip FreeBSD-src-3028e3f8aba938dfd0bf9fda987b8a72140b8027.tar.gz | |
Sync with HEAD.
Diffstat (limited to 'usr.bin/netstat')
| -rw-r--r-- | usr.bin/netstat/inet.c | 2 | ||||
| -rw-r--r-- | usr.bin/netstat/route.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c index 9d8c97e..8094e5b 100644 --- a/usr.bin/netstat/inet.c +++ b/usr.bin/netstat/inet.c @@ -699,7 +699,7 @@ tcp_stats(u_long off, const char *name, int af1 __unused, int proto __unused) p(tcps_sc_sendcookie, "\t%lu cookie%s sent\n"); p(tcps_sc_recvcookie, "\t%lu cookie%s received\n"); - p(tcps_hc_added, "\t%lu hostcache entrie%s added\n"); + p3(tcps_hc_added, "\t%lu hostcache entr%s added\n"); p1a(tcps_hc_bucketoverflow, "\t\t%lu bucket overflow\n"); p(tcps_sack_recovery_episode, "\t%lu SACK recovery episode%s\n"); diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c index 270f6bd..dd91330 100644 --- a/usr.bin/netstat/route.c +++ b/usr.bin/netstat/route.c @@ -637,6 +637,12 @@ fmt_sockaddr(struct sockaddr *sa, struct sockaddr *mask, int flags) { struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *)sa; + /* + * The sa6->sin6_scope_id must be filled here because + * this sockaddr is extracted from kmem(4) directly + * and has KAME-specific embedded scope id in + * sa6->sin6_addr.s6_addr[2]. + */ in6_fillscopeid(sa6); if (flags & RTF_HOST) |
