git: cade9a8e371d - main - dtrace: update siftr probe

The branch main has been updated by tuexen:

URL: https://cgit.FreeBSD.org/src/commit/?id=cade9a8e371d3a95334149aa362bde3a36f13257

commit cade9a8e371d3a95334149aa362bde3a36f13257
Author:     Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2023-07-01 00:26:52 +0000
Commit:     Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2023-07-01 00:26:52 +0000

    dtrace: update siftr probe
    
    This adds the changes corresponding to
    https://cgit.freebsd.org/src/commit/?id=1241e8e7aed5d709a6cf62024e9ae750981c03ae
    to the siftr probe.
    
    Reviewed by:            rscheff
    Sponsored by:           Netflix, Inc.
    Differential Revision:  https://reviews.freebsd.org/D40823
---
 cddl/lib/libdtrace/siftr.d  | 12 ++++++------
 share/man/man4/dtrace_tcp.4 | 13 ++++++-------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/cddl/lib/libdtrace/siftr.d b/cddl/lib/libdtrace/siftr.d
index e75d41534268..7fbe4ded384b 100644
--- a/cddl/lib/libdtrace/siftr.d
+++ b/cddl/lib/libdtrace/siftr.d
@@ -47,11 +47,11 @@ typedef struct siftrinfo {
 	uint32_t		hash;
 	uint16_t		tcp_localport;
 	uint16_t		tcp_foreignport;
-	uint64_t		snd_cwnd;
-	u_long			snd_wnd;
-	u_long			rcv_wnd;
-	u_long			snd_bwnd;
-	u_long			snd_ssthresh;
+	uint32_t		snd_cwnd;
+	uint32_t		snd_wnd;
+	uint32_t		rcv_wnd;
+	uint32_t		t_flags2;
+	uint32_t		snd_ssthresh;
 	int			conn_state;
 	u_int			max_seg_size;
 	int			smoothed_rtt;
@@ -80,7 +80,7 @@ translator siftrinfo_t < struct pkt_node *p > {
 	snd_cwnd =		p == NULL ? 0 : p->snd_cwnd;
 	snd_wnd =		p == NULL ? 0 : p->snd_wnd;
 	rcv_wnd =		p == NULL ? 0 : p->rcv_wnd;
-	snd_bwnd =		p == NULL ? 0 : p->snd_bwnd;
+	t_flags2 =		p == NULL ? 0 : p->t_flags2;
 	snd_ssthresh =		p == NULL ? 0 : p->snd_ssthresh;
 	conn_state =		p == NULL ? 0 : p->conn_state;
 	max_seg_size = 		p == NULL ? 0 : p->max_seg_size;
diff --git a/share/man/man4/dtrace_tcp.4 b/share/man/man4/dtrace_tcp.4
index 205317819c56..507be10fbfca 100644
--- a/share/man/man4/dtrace_tcp.4
+++ b/share/man/man4/dtrace_tcp.4
@@ -325,19 +325,18 @@ Hash of the packet that triggered the log message.
 The TCP port that the local host is communicating via.
 .It Vt uint16_t tcp_foreignport
 The TCP port that the foreign host is communicating via.
-.It Vt uint64_t snd_cwnd
+.It Vt uint32_t snd_cwnd
 The current congestion window (CWND) for the flow, in bytes.
-.It Vt u_long snd_wnd
+.It Vt uint32_t snd_wnd
 The current sending window for the flow, in bytes.
 The post scaled value is reported, except during the initial handshake (first
 few packets), during which time the unscaled value is reported.
-.It Vt u_long rcv_wnd
+.It Vt uint32_t rcv_wnd
 The current receive window for the flow, in bytes.
 The post scaled value is always reported.
-.It Vt u_long snd_bwnd
-The current bandwidth-controlled window for the flow, in bytes.
-This field is currently unused and reported as zero.
-.It Vt u_long snd_ssthresh
+.It Vt uint32_t t_flags2
+The current value of the t_flags2 for the flow.
+.It Vt uint32_t snd_ssthresh
 The slow start threshold (SSTHRESH) for the flow, in bytes.
 .It Vt int conn_state
 A TCP state.