From nobody Fri Oct 31 19:04:34 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyr4z2cyrz6DncC; Fri, 31 Oct 2025 19:04:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyr4z1kJJz4DWq; Fri, 31 Oct 2025 19:04:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761937475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Avr/PWR2vPYlXoU2eMU+Ya+7Tnj3KzuK+Bv8RT4N1c=; b=xIPsrik1lbxzuIhq3PI229Wfp+9dCQnAwEDhyHHJbcq73qeW/nUMeyVQEiSCK8EdEg4KmN EMj/pNSEWTczkbEIA5eSvJNff8UKO6pxh+NetAaD7cQl67+i27g9+IZg9tO5tPn28w6W+B v/4wOioW0JMI4lNe92sX+XQHdbE8MqFWn5R3RJk5kUaDTghJ1EFaY4ikqFO6aId+bUpH7E /1/ndUXd/oD1XQrF+eXbqrK2y0BvKQ+lqCSQq7R3V2qW41sEFvY6vzbUN8v6LgduKwSkXn +qd2oP0MCc/tEErXbmtYXve1GTTto2Y3QDqp6jgkmfC5drpDSMnWfBcb2Iy1Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761937475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Avr/PWR2vPYlXoU2eMU+Ya+7Tnj3KzuK+Bv8RT4N1c=; b=IbuHobIj7bOd1Qvb7436KSyCAG51dfp43omOocxA9Knn17m3ppZQwFDeMCM5vdyMx0+Geb BawvPQtvOcvLngQ7kogwIWVOtbTgIYyyQ9hmoe85LPNy6IqL/44C7s6OP57Wg/yQMQyIz6 Hj033hCt9rF/Hfm50UC0HJspRUKvM5VpvPNm1ptBOqXJ74E6kddj1VqJcDgujOAxqddWGe mndbXfxB6yjQGATl1+Z2CyaBuY8anEI3+4WlZ8A23NnnUjdoIIjogKJjMk7pnrQmc+vPD4 fi8/o/FYNS2U944Yq9zRuCY/xoxud+mFN0S6ut+OiqghSqFnTRSMBl8eDDQgKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761937475; a=rsa-sha256; cv=none; b=oB3JkdGaWb6CbPUvls2UW0eVpSpcqkqznzOOfI2Dvqpam+i8Zlk9BGYNVR/vw1iNtLSd8F T5XJmuI9Hqf60ztY2BXL813WqglUdn8wVym8gwUBiKVyqctx4Lg7JMNdfsUCmHXfqsHPvf JZqIrpsnIfiGi6Qo27oovj5lGXAokz8YnCBNJsv4MM4xbw9idM3Y7PA+MQRi9ywOhjNWyd QgP4VGuJrKM/An6D37H6pcZrEwnlitlNbQMym0bM3OhuVHmOf7ZUlSqEh55ABY873HepN0 5Cs8PzPgAOIRqhG3mmK0EJQR/YzsxATR/lOvH8YUHHhOWpX5JICo5LdURpX5fQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyr4z10xsz1Kb6; Fri, 31 Oct 2025 19:04:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59VJ4YP5061234; Fri, 31 Oct 2025 19:04:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59VJ4YtD061231; Fri, 31 Oct 2025 19:04:34 GMT (envelope-from git) Date: Fri, 31 Oct 2025 19:04:34 GMT Message-Id: <202510311904.59VJ4YtD061231@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 23cda744e4da - stable/14 - sockstat: add support for UDP-Lite endpoints List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 23cda744e4dae48ee3857f33158e30d241868d2a Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=23cda744e4dae48ee3857f33158e30d241868d2a commit 23cda744e4dae48ee3857f33158e30d241868d2a Author: Michael Tuexen AuthorDate: 2025-10-23 07:12:32 +0000 Commit: Michael Tuexen CommitDate: 2025-10-31 14:04:01 +0000 sockstat: add support for UDP-Lite endpoints With this patch UDP-Lite endpoints are also show per default. Reviewed by: Peter Lei, Nick Banks Relnotes: yes Differential Revision: https://reviews.freebsd.org/D53230 (cherry picked from commit f48c6390dd5a01ab2b33f26ee50f4e8cbe8ae737) --- usr.bin/sockstat/sockstat.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/usr.bin/sockstat/sockstat.c b/usr.bin/sockstat/sockstat.c index afb635179d82..587647e5950f 100644 --- a/usr.bin/sockstat/sockstat.c +++ b/usr.bin/sockstat/sockstat.c @@ -104,7 +104,8 @@ static bool show_path_state = false; /* * Default protocols to use if no -P was defined. */ -static const char *default_protos[] = {"sctp", "tcp", "udp", "divert" }; +static const char *default_protos[] = {"sctp", "tcp", "udp", "udplite", + "divert" }; static size_t default_numprotos = nitems(default_protos); static int *protos; /* protocols to use */ @@ -686,6 +687,10 @@ gather_inet(int proto) varname = "net.inet.udp.pcblist"; protoname = "udp"; break; + case IPPROTO_UDPLITE: + varname = "net.inet.udplite.pcblist"; + protoname = "udplite"; + break; case IPPROTO_DIVERT: varname = "net.inet.divert.pcblist"; protoname = "div"; @@ -734,6 +739,7 @@ gather_inet(int proto) protoname = xtp->t_flags & TF_TOE ? "toe" : "tcp"; break; case IPPROTO_UDP: + case IPPROTO_UDPLITE: case IPPROTO_DIVERT: xip = (struct xinpcb *)xig; if (!check_ksize(xip->xi_len, struct xinpcb)) @@ -1161,7 +1167,7 @@ displaysock(struct sock *s, int pos) faddr = s->faddr; first = 1; while (laddr != NULL || faddr != NULL) { - offset = 37; + offset = 40; while (pos < offset) pos += xprintf(" "); switch (s->family) { @@ -1389,7 +1395,7 @@ display(void) int n, pos; if (opt_q != 1) { - printf("%-8s %-10s %-5s %-3s %-6s %-*s %-*s", + printf("%-8s %-10s %-5s %-3s %-9s %-*s %-*s", "USER", "COMMAND", "PID", "FD", "PROTO", opt_w ? 45 : 21, "LOCAL ADDRESS", opt_w ? 45 : 21, "FOREIGN ADDRESS");