From nobody Tue Aug 30 23:43:02 2022 X-Original-To: dev-commits-src-main@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 4MHP4l1kGCz4bZtJ; Tue, 30 Aug 2022 23:43:03 +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 4MHP4l0xyJz3s5N; Tue, 30 Aug 2022 23:43:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661902983; 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=mc8ovJ2Vdf1dQBu8S+YgZUvFLiwsa3FRuNfxdEo2oeM=; b=fv+ZuV36Eqi0RvST9qOSvtL5sW+7qQP/H3wCzqMvinAXU43Tv9GfleNINLe8rouvePbBE1 eoW4zrjhQT0O8a3Vm/zE4ieMFpmySkCJwGdclh5BxW5gAtK7VjELeBp3oLEF9gmYfyGz9N pRvD+wbzUtXuwQpyAV3UbEIjO9OH4x+cPR6Njm9N+VlTJHwWDiLOg/U0b8KFqEZXQ1x4ZA BCiS/mtnef96dw3FaTe1XbhWhymvhyCQ3KAg+q/TY74d8Z07Vm8ejkLHqS9F1mVCvqXPNr wdD6WGHniTVLVK5C4KFsSrauN+wCdj4/2vXh+nOdmV4qKG1v4pRMtdtT3+IGwA== 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 4MHP4l01t5zwvW; Tue, 30 Aug 2022 23:43:03 +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 27UNh2nn097124; Tue, 30 Aug 2022 23:43:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27UNh2Oe097123; Tue, 30 Aug 2022 23:43:02 GMT (envelope-from git) Date: Tue, 30 Aug 2022 23:43:02 GMT Message-Id: <202208302343.27UNh2Oe097123@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 1f3d8c09be67 - main - procstat: fix printing divert(4) sockets List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f3d8c09be67f9b01f60b3e6434780c193228567 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661902983; 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=mc8ovJ2Vdf1dQBu8S+YgZUvFLiwsa3FRuNfxdEo2oeM=; b=WZXcY8QUrmxep+pBYszfsfQ8vCm5N8jVvOl/M25WWdHlDHeY6xK8wqR+N7A9767w8cAgjW UdEARkzSj/qFmDbVDhQlmvm1KMkjQldHUWU7Ej8wqKZ3bsxw1lAKyaBykyyFlaBN6Ws4LR ID0ZZXbgOVhEwUD7cJtpo0dgCvnCdiY+uuIfWfsDjjTeusJ8I/D9ZPu6v0SOvYUa93IEsN UBi+fKHit3qDXkKzrZpj453f4E8YGq2PFaS1OABaq4FJyjf7q4tlQI3sXdC02edUWzLD0B 36bKz/Vi0tlouiKcfBrXfAfbkTAryRaCyKoyJkMJS24UqVxoixPGVfVztii1PQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661902983; a=rsa-sha256; cv=none; b=MGQW8l/4+/o8FHlfeJXiGk73AOBVccRtm6+sozgEqp54pj4rOeAQtPcicaCVpfu00BCVzJ fL6HJ2TZdAfS6sjqGB7Gql/L+vhlceYhLiaeA0Es/GZtbTko/bAU1AoN0CLs3wI8dCUxe5 8gwl/8qZ6nquM811l3/khISH9TULjqSPj0+4yogDPbQwklMsfQl0BOUm1d5aPu9KuGamNL tBq5/T5H5M9OoQNFtr+T4jY7uT5iZBolZJQ7QiMoUtGr2fxvA6pqFrtwwkv8s/rx8XhVs6 n0zd2y01LFqgzXwxvrSYfQDQOe1qrO/haEq8Pl5tFSXS8kme2kFyMp6sc+0mYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=1f3d8c09be67f9b01f60b3e6434780c193228567 commit 1f3d8c09be67f9b01f60b3e6434780c193228567 Author: Gleb Smirnoff AuthorDate: 2022-08-30 23:26:21 +0000 Commit: Gleb Smirnoff CommitDate: 2022-08-30 23:26:21 +0000 procstat: fix printing divert(4) sockets --- usr.bin/procstat/procstat.1 | 12 ++++++++---- usr.bin/procstat/procstat_files.c | 5 +++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/usr.bin/procstat/procstat.1 b/usr.bin/procstat/procstat.1 index 65299c7f07e9..b24ac3957f8f 100644 --- a/usr.bin/procstat/procstat.1 +++ b/usr.bin/procstat/procstat.1 @@ -414,10 +414,6 @@ The following network protocols may be displayed (grouped by address family): .Dv IPPROTO_ICMP ; see .Xr icmp 4 . -.It IPD -.Dv IPPROTO_DIVERT ; -see -.Xr divert 4 . .It IP? unknown protocol. .It RAW @@ -453,6 +449,14 @@ see unknown protocol. .El .Pp +.Dv AF_DIVERT +.Pp +.Bl -tag -width indent -compact +.It IPD +.Dv Divert socket; see +.Xr divert 4 . +.El +.Pp .Bl -tag -width indent -compact .It ? unknown address family. diff --git a/usr.bin/procstat/procstat_files.c b/usr.bin/procstat/procstat_files.c index 1d7b419b3f4a..c7306b6a2a1d 100644 --- a/usr.bin/procstat/procstat_files.c +++ b/usr.bin/procstat/procstat_files.c @@ -68,8 +68,6 @@ protocol_to_string(int domain, int type, int protocol) return ("RAW"); case IPPROTO_SCTP: return ("SCT"); - case IPPROTO_DIVERT: - return ("IPD"); default: return ("IP?"); } @@ -83,6 +81,9 @@ protocol_to_string(int domain, int type, int protocol) default: return ("UD?"); } + case AF_DIVERT: + return ("IPD"); + break; default: return ("?"); }