svn commit: r366320 - stable/12/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Thu Oct  1 16:11:08 2020
New Revision: 366320
URL: https://svnweb.freebsd.org/changeset/base/366320

Log:
  MFC r365686:
  Export the name of the congestion control. This will be used by sockstat
  and netstat.

Modified:
  stable/12/sys/netinet/tcp_subr.c
  stable/12/sys/netinet/tcp_var.h
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/netinet/tcp_subr.c
==============================================================================
--- stable/12/sys/netinet/tcp_subr.c	Thu Oct  1 16:09:23 2020	(r366319)
+++ stable/12/sys/netinet/tcp_subr.c	Thu Oct  1 16:11:08 2020	(r366320)
@@ -3268,6 +3268,8 @@ tcp_inptoxtp(const struct inpcb *inp, struct xtcpcb *x
 
 		bcopy(tp->t_fb->tfb_tcp_block_name, xt->xt_stack,
 		    TCP_FUNCTION_NAME_LEN_MAX);
+		bcopy(CC_ALGO(tp)->name, xt->xt_cc,
+		    TCP_CA_NAME_MAX);
 #ifdef TCP_BLACKBOX
 		(void)tcp_log_get_id(tp, xt->xt_logid);
 #endif

Modified: stable/12/sys/netinet/tcp_var.h
==============================================================================
--- stable/12/sys/netinet/tcp_var.h	Thu Oct  1 16:09:23 2020	(r366319)
+++ stable/12/sys/netinet/tcp_var.h	Thu Oct  1 16:11:08 2020	(r366320)
@@ -696,7 +696,8 @@ struct xtcpcb {
 	struct xinpcb	xt_inp;
 	char		xt_stack[TCP_FUNCTION_NAME_LEN_MAX];	/* (s) */
 	char		xt_logid[TCP_LOG_ID_LEN];	/* (s) */
-	int64_t		spare64[8];
+	char		xt_cc[TCP_CA_NAME_MAX];	/* (s) */
+	int64_t		spare64[6];
 	int32_t		t_state;		/* (s,p) */
 	uint32_t	t_flags;		/* (s,p) */
 	int32_t		t_sndzerowin;		/* (s) */