From nobody Fri Jun 9 21:59:14 2023 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 4QdFNL6g7Nz4cZ90; Fri, 9 Jun 2023 21:59:14 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QdFNL6DNrz3PRf; Fri, 9 Jun 2023 21:59:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686347954; 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=7xznV9Rqpb1PLjcCKHL5AZ8IhxhZuL1kHFfIAvzpy6E=; b=DFZCIhNHp/I4+I1nCljDxqCe+/j3P0yzR2iPNivChBuWABIyRtMi1DIBQ7AaCrkQTeIXUs kX/xmWVX5E/85DSTGnD3ID4y0jODsGutKpyRPdFPnSGXb5IQYNdEFitzqkK389n4AKcrQQ i6M4LVppMf3XU3g93AbcUFwEDAxIlLDtStMJUk7oz8ecPaGWnLWZd8w25/E4Y4bPXHfEEi PJKd43yf+D09JeLJlnhPOS5JkBTI/KwNxaJhG3pXIzs3XsVcO/DQagj4ydaZfV/HwDlZ2F 8nUlU3p+cpdgLeP/45Q07HApRiNxymUGbhxJOR6JEuOYfVs1OPB9wyxLas9FvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686347954; 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=7xznV9Rqpb1PLjcCKHL5AZ8IhxhZuL1kHFfIAvzpy6E=; b=pXhU+frqCA0doa72E/KEIyHVrJBAgjVzbQDNOlrBno2h41M70ZfxSeIsz3DASjJIiSNNeG 9i6tNa3olWM9iFXkogCJxVTIYYpwUuvvY0CNi9OB3SICeGcoGtT3HLV64jF5x9R2IX9gb7 w8KnfPfIetT1XhHrNeavJyw85wxydnNLP1VmRG/Oo4K0q3FjlbmhJfBHfgu6Wlr8zdB+Tr SwdBsT0/45yRd3W0E4SCgEhM2oVLM1WGGUPdoitg8FOYChun+biFiktQyFZH+iRJ8dva5W ZpRl4qDALPRSh0ZhcdCIGdGH0amTtcgpK0OJLGO0XYYG/sGwI4j0xkdWmJqNPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686347954; a=rsa-sha256; cv=none; b=bQp6k5cVvKP6ARZui9J+ej3SbUf3gbBT/S8YtcB9HNj5YCeAmfCyELE9hqRs0URhOlQMP0 jXYAq/+Qi+pIfiDBXaUHQYa7QnddWTnB9f4LnQOM8D2xjahUqvsF0sIvFxp9XtCHffBxYL pgn9hHGGU8gQ0LKwnc6in91tMoJBCMI+KfSD40qEErVsIhnIg6/JEKAU+pSbW03f1TucTY GaNkRsTqeNIaWAGGZR5+w5wxEm9Sa2GBR1UZ4jd8RX0jUOpTIsL50yA8LiG98CGSG8mTc9 uW5hW/G91AszuNnw2+9qBOSJ0cbQr84ZHLcaJUBp9F5jho4B76lRRZNTfIcJ0A== 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 4QdFNL5BxTzrmW; Fri, 9 Jun 2023 21:59:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 359LxEk5070140; Fri, 9 Jun 2023 21:59:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 359LxEJK070139; Fri, 9 Jun 2023 21:59:14 GMT (envelope-from git) Date: Fri, 9 Jun 2023 21:59:14 GMT Message-Id: <202306092159.359LxEJK070139@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: 8e7c2e14cffa - main - netstat: display c and C flags properly 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e7c2e14cffaa33f1f1413f8a3e462611217b8e8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=8e7c2e14cffaa33f1f1413f8a3e462611217b8e8 commit 8e7c2e14cffaa33f1f1413f8a3e462611217b8e8 Author: Richard Scheffenegger AuthorDate: 2023-06-09 21:57:00 +0000 Commit: Richard Scheffenegger CommitDate: 2023-06-09 21:58:00 +0000 netstat: display c and C flags properly Restructure c and C flag checks for string length to work properly. Quickly bypass for non TCP protos too. Reviewed By: tuexen Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D40480 --- usr.bin/netstat/inet.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c index fd1a6ff20e42..691f9d9e912c 100644 --- a/usr.bin/netstat/inet.c +++ b/usr.bin/netstat/inet.c @@ -237,23 +237,20 @@ protopr(u_long off, const char *name, int af1, int proto) if (!pcblist_sysctl(proto, name, &buf)) return; - if (cflag || Cflag) { + if (istcp && (cflag || Cflag)) { fnamelen = strlen("Stack"); cnamelen = strlen("CC"); oxig = xig = (struct xinpgen *)buf; for (xig = (struct xinpgen*)((char *)xig + xig->xig_len); xig->xig_len > sizeof(struct xinpgen); xig = (struct xinpgen *)((char *)xig + xig->xig_len)) { - if (istcp) { - tp = (struct xtcpcb *)xig; - inp = &tp->xt_inp; - } else { + tp = (struct xtcpcb *)xig; + inp = &tp->xt_inp; + if (inp->inp_gencnt > oxig->xig_gen) continue; - } + so = &inp->xi_socket; if (so->xso_protocol != proto) continue; - if (inp->inp_gencnt > oxig->xig_gen) - continue; fnamelen = max(fnamelen, (int)strlen(tp->xt_stack)); cnamelen = max(cnamelen, (int)strlen(tp->xt_cc)); }