Page MenuHomeFreeBSD
Files F151137176

D26414.id76972.diff
No OneTemporary
Actions

D26414.id76972.diff
View Options

Index: head/usr.bin/netstat/inet.c
===================================================================
--- head/usr.bin/netstat/inet.c
+++ head/usr.bin/netstat/inet.c
@@ -341,6 +341,9 @@
xo_emit(" {T:/%8.8s} {T:/%5.5s}",
"flowid", "ftype");
}
+ if (Cflag)
+ xo_emit(" {T:/%-*.*s}", TCP_CA_NAME_MAX,
+ TCP_CA_NAME_MAX, "CC");
if (Pflag)
xo_emit(" {T:/%s}", "Log ID");
xo_emit("\n");
@@ -514,9 +517,15 @@
inp->inp_flowid,
inp->inp_flowtype);
}
- if (istcp && Pflag)
- xo_emit(" {:log-id/%s}", tp->xt_logid[0] == '\0' ?
- "-" : tp->xt_logid);
+ if (istcp) {
+ if (Cflag)
+ xo_emit(" {:cc/%-*.*s}", TCP_CA_NAME_MAX,
+ TCP_CA_NAME_MAX, tp->xt_cc);
+ if (Pflag)
+ xo_emit(" {:log-id/%s}",
+ tp->xt_logid[0] == '\0' ?
+ "-" : tp->xt_logid);
+ }
xo_emit("\n");
xo_close_instance("socket");
}
Index: head/usr.bin/netstat/main.c
===================================================================
--- head/usr.bin/netstat/main.c
+++ head/usr.bin/netstat/main.c
@@ -205,6 +205,7 @@
int aflag; /* show all sockets (including servers) */
static int Bflag; /* show information about bpf consumers */
int bflag; /* show i/f total bytes in/out */
+int Cflag; /* show congestion control */
int dflag; /* show i/f dropped packets */
int gflag; /* show group (multicast) routing or stats */
int hflag; /* show counters in human readable format */
@@ -249,7 +250,7 @@
if (argc < 0)
exit(EXIT_FAILURE);
- while ((ch = getopt(argc, argv, "46AaBbdF:f:ghI:iLlM:mN:noPp:Qq:RrSTsuWw:xz"))
+ while ((ch = getopt(argc, argv, "46AaBbCdF:f:ghI:iLlM:mN:noPp:Qq:RrSTsuWw:xz"))
!= -1)
switch(ch) {
case '4':
@@ -277,6 +278,9 @@
break;
case 'b':
bflag = 1;
+ break;
+ case 'C':
+ Cflag = 1;
break;
case 'd':
dflag = 1;
Index: head/usr.bin/netstat/netstat.h
===================================================================
--- head/usr.bin/netstat/netstat.h
+++ head/usr.bin/netstat/netstat.h
@@ -41,6 +41,7 @@
extern int Aflag; /* show addresses of protocol control block */
extern int aflag; /* show all sockets (including servers) */
extern int bflag; /* show i/f total bytes in/out */
+extern int Cflag; /* show congestion control */
extern int dflag; /* show i/f dropped packets */
extern int gflag; /* show group (multicast) routing or stats */
extern int hflag; /* show counters in human readable format */
Index: head/usr.bin/netstat/netstat.1
===================================================================
--- head/usr.bin/netstat/netstat.1
+++ head/usr.bin/netstat/netstat.1
@@ -28,7 +28,7 @@
.\" @(#)netstat.1 8.8 (Berkeley) 4/18/94
.\" $FreeBSD$
.\"
-.Dd July 21, 2020
+.Dd September 13, 2020
.Dt NETSTAT 1
.Os
.Sh NAME
@@ -39,7 +39,7 @@
.Bl -tag -width "netstat"
.It Nm
.Op Fl -libxo
-.Op Fl 46AaLnPRSTWx
+.Op Fl 46AaCLnPRSTWx
.Op Fl f Ar protocol_family | Fl p Ar protocol
.Op Fl M Ar core
.Op Fl N Ar system
@@ -111,7 +111,7 @@
.It Xo
.Bk -words
.Nm
-.Op Fl 46AaLnRSTWx
+.Op Fl 46AaCLnRSTWx
.Op Fl f Ar protocol_family | Fl p Ar protocol
.Op Fl M Ar core
.Op Fl N Ar system
@@ -172,6 +172,8 @@
.It Fl a
Show the state of all sockets;
normally sockets used by server processes are not shown.
+.It Fl C
+Show the congestion control of TCP sockets.
.It Fl L
Show the size of the various listen queues.
The first count shows the number of unaccepted connections,

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 7, 8:26 AM (12 m, 36 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31020835
Default Alt Text
D26414.id76972.diff (3 KB)

Event Timeline