Author: ume
Date: Tue Nov 24 14:25:40 2015
New Revision: 291259
URL: https://svnweb.freebsd.org/changeset/base/291259
Log:
Correct alignment of the addresses in the `netstat -aW' output.
Modified:
head/usr.bin/netstat/inet.c
Modified: head/usr.bin/netstat/inet.c
==============================================================================
--- head/usr.bin/netstat/inet.c Tue Nov 24 13:57:41 2015 (r291258)
+++ head/usr.bin/netstat/inet.c Tue Nov 24 14:25:40 2015 (r291259)
@@ -84,7 +84,8 @@ __FBSDID("$FreeBSD$");
#include "netstat.h"
char *inetname(struct in_addr *);
-void inetprint(const char *, struct in_addr *, int, const char *, int);
+void inetprint(const char *, struct in_addr *, int, const char *, int,
+ const int);
#ifdef INET6
static int udp_done, tcp_done, sdp_done;
#endif /* INET6 */
@@ -417,18 +418,24 @@ protopr(u_long off, const char *name, in
if (Lflag)
xo_emit((Aflag && !Wflag) ?
"{T:/%-5.5s} {T:/%-14.14s} {T:/%-18.18s}" :
- "{T:/%-5.5s} {T:/%-14.14s} {T:/%-22.22s}",
+ ((!Wflag || af1 == AF_INET) ?
+ "{T:/%-5.5s} {T:/%-14.14s} {T:/%-22.22s}" :
+ "{T:/%-5.5s} {T:/%-14.14s} {T:/%-45.45s}"),
"Proto", "Listen", "Local Address");
else if (Tflag)
xo_emit((Aflag && !Wflag) ?
"{T:/%-5.5s} {T:/%-6.6s} {T:/%-6.6s} {T:/%-6.6s} {T:/%-18.18s} {T:/%s}" :
- "{T:/%-5.5s} {T:/%-6.6s} {T:/%-6.6s} {T:/%-6.6s} {T:/%-22.22s} {T:/%s}",
+ ((!Wflag || af1 == AF_INET) ?
+ "{T:/%-5.5s} {T:/%-6.6s} {T:/%-6.6s} {T:/%-6.6s} {T:/%-22.22s} {T:/%s}" :
+ "{T:/%-5.5s} {T:/%-6.6s} {T:/%-6.6s} {T:/%-6.6s} {T:/%-45.45s} {T:/%s}"),
"Proto", "Rexmit", "OOORcv", "0-win",
"Local Address", "Foreign Address");
else {
xo_emit((Aflag && !Wflag) ?
"{T:/%-5.5s} {T:/%-6.6s} {T:/%-6.6s} {T:/%-18.18s} {T:/%-18.18s}" :
- "{T:/%-5.5s} {T:/%-6.6s} {T:/%-6.6s} {T:/%-22.22s} {T:/%-22.22s}",
+ ((!Wflag || af1 == AF_INET) ?
+ "{T:/%-5.5s} {T:/%-6.6s} {T:/%-6.6s} {T:/%-22.22s} {T:/%-22.22s}" :
+ "{T:/%-5.5s} {T:/%-6.6s} {T:/%-6.6s} {T:/%-45.45s} {T:/%-45.45s}"),
"Proto", "Recv-Q", "Send-Q",
"Local Address", "Foreign Address");
if (!xflag && !Rflag)
@@ -499,10 +506,10 @@ protopr(u_long off, const char *name, in
if (numeric_port) {
if (inp->inp_vflag & INP_IPV4) {
inetprint("local", &inp->inp_laddr,
- (int)inp->inp_lport, name, 1);
+ (int)inp->inp_lport, name, 1, af1);
if (!Lflag)
inetprint("remote", &inp->inp_faddr,
- (int)inp->inp_fport, name, 1);
+ (int)inp->inp_fport, name, 1, af1);
}
#ifdef INET6
else if (inp->inp_vflag & INP_IPV6) {
@@ -516,10 +523,10 @@ protopr(u_long off, const char *name, in
} else if (inp->inp_flags & INP_ANONPORT) {
if (inp->inp_vflag & INP_IPV4) {
inetprint("local", &inp->inp_laddr,
- (int)inp->inp_lport, name, 1);
+ (int)inp->inp_lport, name, 1, af1);
if (!Lflag)
inetprint("remote", &inp->inp_faddr,
- (int)inp->inp_fport, name, 0);
+ (int)inp->inp_fport, name, 0, af1);
}
#ifdef INET6
else if (inp->inp_vflag & INP_IPV6) {
@@ -533,11 +540,12 @@ protopr(u_long off, const char *name, in
} else {
if (inp->inp_vflag & INP_IPV4) {
inetprint("local", &inp->inp_laddr,
- (int)inp->inp_lport, name, 0);
+ (int)inp->inp_lport, name, 0, af1);
if (!Lflag)
inetprint("remote", &inp->inp_faddr,
(int)inp->inp_fport, name,
- inp->inp_lport != inp->inp_fport);
+ inp->inp_lport != inp->inp_fport,
+ af1);
}
#ifdef INET6
else if (inp->inp_vflag & INP_IPV6) {
@@ -1364,7 +1372,7 @@ pim_stats(u_long off __unused, const cha
*/
void
inetprint(const char *container, struct in_addr *in, int port,
- const char *proto, int num_port)
+ const char *proto, int num_port, const int af1)
{
struct servent *sp = 0;
char line[80], *cp;
@@ -1384,7 +1392,8 @@ inetprint(const char *container, struct
sprintf(cp, "%.15s ", sp ? sp->s_name : "*");
else
sprintf(cp, "%d ", ntohs((u_short)port));
- width = (Aflag && !Wflag) ? 18 : 22;
+ width = (Aflag && !Wflag) ? 18 :
+ ((!Wflag || af1 == AF_INET) ? 22 : 45);
if (Wflag)
xo_emit("{d:target/%-*s} ", width, line);
else
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
