From patchwork Mon Oct 17 17:03:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Baerts X-Patchwork-Id: 13009050 X-Patchwork-Delegate: stephen@networkplumber.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94FC5C4332F for ; Mon, 17 Oct 2022 17:03:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230063AbiJQRDy (ORCPT ); Mon, 17 Oct 2022 13:03:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230041AbiJQRDo (ORCPT ); Mon, 17 Oct 2022 13:03:44 -0400 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E43A6FA2B for ; Mon, 17 Oct 2022 10:03:41 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id a10so19364474wrm.12 for ; Mon, 17 Oct 2022 10:03:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FfTCoR58idMg6WfKIzHQnE7Yg8ftI8rKIp7yG+lylFA=; b=QOAVf3HnzRDJZ5WcNKWFshzk1PdHzaqJyaLOWD4DRIo4pFE7sj1Fix2xyDxAopb1bh iTeKm6bFojgib2tI8ckv15E063Iu3yEuwkHQDy2MlibPZTjBDBfdO2KEUyGRECya1Y+l ZlpRvZDoDTou6x4kqxigIT3GW2700oAXIIJw853DRD+4GVIp9O82jJTpaMqnEnniHCx+ h8NdckPMWchneTa/gDahzqW5R2wAoZGBqE7MxlWF2mDfk/q9FSZg0oYKA2baEpAd5Z7c KncoJpLpl5cDqHYOmeQxA8TXKyL4XDAZgKB3cawy0vFeNcdksmC7P63QPq1IQpoy3K71 k2wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FfTCoR58idMg6WfKIzHQnE7Yg8ftI8rKIp7yG+lylFA=; b=M/OyG5imbSQit6A/AZWM+JcVVwqxur3lvMTgTXsimjYb5XbrKBvU7y6ddUcoTlY/3t SQKlA+fi4naM8SGEg2Lu44DpdKmpOVucgqzUJq3SqCz5tHID/vqW2SgfVUfq8kI9TNzc UWkOGzev739yvaU1lgnwhLo5c4ecQvWkaLuS/aBIy1VN0FeeYvY9au9xZ0KSv3lkYZ6X rtbAAzAbisMpwNR4XCCqPpCBlnRuELHUCTnr2EYtEaUn1dP5iGycaOmxl1z9KMxgFlQU joMc8TiBPlslHfi83O3fxUu5wWP6qT9ANVekLQILGKuOex0QWhybutMKl46MH6aVX4BS zX7A== X-Gm-Message-State: ACrzQf3y7qYa1ug3y09zawxkj0jeTioiWh74nZa3tXc43qJ4VNWxchsP SexbO6ocz1btmsDQ54mY0g9w3A== X-Google-Smtp-Source: AMsMyM7eAVFS47f4lwYbIcRY/fcxie+kMlY4llt3ZmEhSf6Cij4YkU0OPffxDrpBiSPQ7EGrUYisjQ== X-Received: by 2002:a5d:6e82:0:b0:22f:a27c:c964 with SMTP id k2-20020a5d6e82000000b0022fa27cc964mr6902053wrz.699.1666026219274; Mon, 17 Oct 2022 10:03:39 -0700 (PDT) Received: from vdi08.nix.tessares.net (static.219.156.76.144.clients.your-server.de. [144.76.156.219]) by smtp.gmail.com with ESMTPSA id w16-20020adf8bd0000000b0022f40a2d06esm9079196wra.35.2022.10.17.10.03.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Oct 2022 10:03:38 -0700 (PDT) From: Matthieu Baerts To: Stephen Hemminger Cc: netdev@vger.kernel.org, Matthieu Baerts Subject: [PATCH iproute2 1/4] ss: man: add missing entries for MPTCP Date: Mon, 17 Oct 2022 19:03:05 +0200 Message-Id: <20221017170308.1280537-2-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221017170308.1280537-1-matthieu.baerts@tessares.net> References: <20221017170308.1280537-1-matthieu.baerts@tessares.net> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: dsahern@gmail.com 'ss -h' was mentioning MPTCP but not the man page. While at it, also add the missing '.' at the end of the list, before the new sentence. Fixes: 9c3be2c0 ("ss: mptcp: add msk diag interface support") Signed-off-by: Matthieu Baerts --- man/man8/ss.8 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/man/man8/ss.8 b/man/man8/ss.8 index 12cb91b9..6489aa79 100644 --- a/man/man8/ss.8 +++ b/man/man8/ss.8 @@ -385,6 +385,9 @@ Display vsock sockets (alias for -f vsock). .B \-\-xdp Display XDP sockets (alias for -f xdp). .TP +.B \-M, \-\-mptcp +Display MPTCP sockets. +.TP .B \-\-inet-sockopt Display inet socket options. .TP @@ -396,7 +399,7 @@ supported: unix, inet, inet6, link, netlink, vsock, xdp. List of socket tables to dump, separated by commas. The following identifiers are understood: all, inet, tcp, udp, raw, unix, packet, netlink, unix_dgram, unix_stream, unix_seqpacket, packet_raw, packet_dgram, dccp, sctp, -vsock_stream, vsock_dgram, xdp Any item in the list may optionally be +vsock_stream, vsock_dgram, xdp, mptcp. Any item in the list may optionally be prefixed by an exclamation mark .RB ( ! ) to exclude that socket table from being dumped. From patchwork Mon Oct 17 17:03:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Baerts X-Patchwork-Id: 13009051 X-Patchwork-Delegate: stephen@networkplumber.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A11DDC43217 for ; Mon, 17 Oct 2022 17:03:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229904AbiJQRDz (ORCPT ); Mon, 17 Oct 2022 13:03:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230071AbiJQRDp (ORCPT ); Mon, 17 Oct 2022 13:03:45 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 43D2D70E5F for ; Mon, 17 Oct 2022 10:03:42 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id f11so19405086wrm.6 for ; Mon, 17 Oct 2022 10:03:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gEoJHvS66JIGsjoazI2M6OaOrNoEypplADfc8cnFGk4=; b=80u7DIzeK9daSMhraqqPUAUc3eDN1CAvX0uPF9/kBslaMm9BQ0Sy7m+zrClTNyLALV 3zeNQObxRSxhHJeoUvM1ez2WIzplGDQLjpFffzwZa3vcWGi0RqPbuck8yqAG8ftcFUXL NyMgT1hTPJhS9d2AcdSgHApQaXU/vkxoiWR+UBnq6NGgaqmEQEIS8u0l6q5wGqYdFP7K Sg8wduO5B2E0ZkkaYpam0seJoMgmE/mvLUWhhLih8epqL6/olN6lOrK4xcrSQHD3oaXZ khWbF3qxKD8NSlLPlFIOhZFzqIMAgfdg0xCK2NBMbyQpnaXiAT/tJqsYLa1yZgwhLAd0 0V2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gEoJHvS66JIGsjoazI2M6OaOrNoEypplADfc8cnFGk4=; b=Nn5cwnQ1qbt1BuS+E43fdK81kDy62/zhZG5OE+9nQt/QIMT4IDyJaQlsAoyc5EDF9J Ed0hJ9tQX9J1OYR9k4vO5uzdmxusIsN8gDaGdAW2cVl6ZUKG0ho16sLlPgqi2sMDZetU NhbZSh+D3QrgJKYa/bGEXz0fIdXust/fWp7nqgoN0Y+zAst37oqlsMqwFVmv5TMyO5EX DDifDTYZ/wBwQvSmlofexL1RpyiQZyZ7LxzuQyCT4vhyMYXejsc4wXCLT7Z4ue69EFqA O8I0DCpO/H4ZdvR9d9AJ+0zmB0HAEaYg8neFs6qrU8SnOE7VntHc5zKueJXPlWvP77dN SbCQ== X-Gm-Message-State: ACrzQf2Ww0B26KUEJuTLjlRDxIoza2qrylOA9ViC9pmUWP57Ti6huazF w8HiiBYF77bhQcNn89+aGCSkmw== X-Google-Smtp-Source: AMsMyM4qtvWrrG9HH1iyFhUPDwSvukheeXofFF5uiUmDrdzaPPoAAD9sUsfR+M5aag2SwYKzHHFqVg== X-Received: by 2002:adf:e711:0:b0:230:6e89:363e with SMTP id c17-20020adfe711000000b002306e89363emr7042415wrm.536.1666026220663; Mon, 17 Oct 2022 10:03:40 -0700 (PDT) Received: from vdi08.nix.tessares.net (static.219.156.76.144.clients.your-server.de. [144.76.156.219]) by smtp.gmail.com with ESMTPSA id w16-20020adf8bd0000000b0022f40a2d06esm9079196wra.35.2022.10.17.10.03.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Oct 2022 10:03:39 -0700 (PDT) From: Matthieu Baerts To: Stephen Hemminger Cc: netdev@vger.kernel.org, Matthieu Baerts Subject: [PATCH iproute2 2/4] ss: man: add missing entries for TIPC Date: Mon, 17 Oct 2022 19:03:06 +0200 Message-Id: <20221017170308.1280537-3-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221017170308.1280537-1-matthieu.baerts@tessares.net> References: <20221017170308.1280537-1-matthieu.baerts@tessares.net> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: dsahern@gmail.com 'ss -h' was mentioning TIPC but not the man page. Fixes: 5caf79a0 ("ss: Add support for TIPC socket diag in ss tool") Signed-off-by: Matthieu Baerts --- man/man8/ss.8 | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/man/man8/ss.8 b/man/man8/ss.8 index 6489aa79..996c80c9 100644 --- a/man/man8/ss.8 +++ b/man/man8/ss.8 @@ -299,6 +299,11 @@ Show cgroup information. Below fields may appear: Cgroup v2 pathname. This pathname is relative to the mount point of the hierarchy. .RE .TP +.B \-\-tipcinfo +Show internal tipc socket information. +.RS +.P +.TP .B \-K, \-\-kill Attempts to forcibly close sockets. This option displays sockets that are successfully closed and silently skips sockets that the kernel does not support @@ -379,6 +384,10 @@ Display Unix domain sockets (alias for -f unix). .B \-S, \-\-sctp Display SCTP sockets. .TP +.B \-\-tipc +Display tipc sockets (alias for -f tipc). +.TP +.TP .B \-\-vsock Display vsock sockets (alias for -f vsock). .TP @@ -393,12 +402,12 @@ Display inet socket options. .TP .B \-f FAMILY, \-\-family=FAMILY Display sockets of type FAMILY. Currently the following families are -supported: unix, inet, inet6, link, netlink, vsock, xdp. +supported: unix, inet, inet6, link, netlink, vsock, tipc, xdp. .TP .B \-A QUERY, \-\-query=QUERY, \-\-socket=QUERY List of socket tables to dump, separated by commas. The following identifiers are understood: all, inet, tcp, udp, raw, unix, packet, netlink, unix_dgram, -unix_stream, unix_seqpacket, packet_raw, packet_dgram, dccp, sctp, +unix_stream, unix_seqpacket, packet_raw, packet_dgram, dccp, sctp, tipc, vsock_stream, vsock_dgram, xdp, mptcp. Any item in the list may optionally be prefixed by an exclamation mark .RB ( ! ) From patchwork Mon Oct 17 17:03:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Baerts X-Patchwork-Id: 13009053 X-Patchwork-Delegate: stephen@networkplumber.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DF3B8C4167B for ; Mon, 17 Oct 2022 17:03:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229909AbiJQRD5 (ORCPT ); Mon, 17 Oct 2022 13:03:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230056AbiJQRDq (ORCPT ); Mon, 17 Oct 2022 13:03:46 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 654436FA1B for ; Mon, 17 Oct 2022 10:03:45 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id j16so19424543wrh.5 for ; Mon, 17 Oct 2022 10:03:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ItWaB1pUuIxheAsm0NyjIiuci7ngtIPPBIPfJeZ0vZg=; b=c+IyaSMQ5wpRgSj5Yj6NmMchM2uGEutJdgWEQ6/rjcpA4p5JH5TbSRvYKg0fNzV0nz 5bYyLu5UZGEXTgPc7o+bAmvorKUEEK7Fu+8CUDWENJTE6ZXmfZVJhADNW66EID91D+TP GOyUYVaTdqvyuk4J1hIQO4DD8xx62oSlDn/I5ODNOO17q6zz3wwe7TbuJjUG98ke1WwA kYVqReCWQamQHklpWuYiqCGymbgSCAQgmW9t2RoycCd3OO2qfkPdfZU5i47ahZ99E7Pt khjo3gMW3jLh5eq79rvui/WvPdB6djBWvZd4Z09en6BrafKW4OVXLXP6SxNvh6dJx6z1 nVhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ItWaB1pUuIxheAsm0NyjIiuci7ngtIPPBIPfJeZ0vZg=; b=2UEdMSnLKNLv3gFIcfRnuI9PIT/4zXIesr065h7ZQUEcrr9LTHPx5VN8b86dxAK6Sj vpudUrllCRnexzo/vGUTwuLDaf6539e58wz3e2fwyW7VfAMWlj1iSzQo/GyOpRCjxCxc dUT81WcfL3X1Zz3aLUInz4LZIl/J1Xf8LR2SaSCaJ+8cRE+QaCGnrjuiab4pW0snUOPU pCsaQYpZ5BeTBLN/5CYS+MuSKqWKXp42Y8Vl8rbJF7J8xqt27zNv2ae++bdwhPvPgbuj eSUF9ALcJ3+aUt30NRlqgZDHU3q+yhFh9wjsXdxQrQmeV+9O5piAR2TPaguo3MPa1CVF RPVA== X-Gm-Message-State: ACrzQf29Kpt1bfEGrv/+DB7B18HDl+2b6ttFhcpgsxBSxWLiGgffYtFg zDYEijkM2qIZA7DkRC7uSDngcw== X-Google-Smtp-Source: AMsMyM7w09pEDQMVhaALfvXqydMqk4dsKcEvNSmYBLBzbBNqtGI5UxxlIpfwhGrNuJgogK/4bsAYjA== X-Received: by 2002:adf:f40e:0:b0:22e:2ce4:e6a2 with SMTP id g14-20020adff40e000000b0022e2ce4e6a2mr7307838wro.30.1666026223537; Mon, 17 Oct 2022 10:03:43 -0700 (PDT) Received: from vdi08.nix.tessares.net (static.219.156.76.144.clients.your-server.de. [144.76.156.219]) by smtp.gmail.com with ESMTPSA id w16-20020adf8bd0000000b0022f40a2d06esm9079196wra.35.2022.10.17.10.03.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Oct 2022 10:03:41 -0700 (PDT) From: Matthieu Baerts To: Stephen Hemminger Cc: netdev@vger.kernel.org, Matthieu Baerts Subject: [PATCH iproute2 3/4] ss: usage: add missing parameters Date: Mon, 17 Oct 2022 19:03:07 +0200 Message-Id: <20221017170308.1280537-4-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221017170308.1280537-1-matthieu.baerts@tessares.net> References: <20221017170308.1280537-1-matthieu.baerts@tessares.net> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: dsahern@gmail.com These query entries were in the man page but not in 'ss -h': - packet_raw - packet_dgram - dccp - sctp - xdp (+ the --xdp option) I only created one commit with all: this fixes multiple commits but all on the same line. The only exception is with '--xdp' parameter which is linked to commit 2abc3d76 ("ss: add AF_XDP support"). Fixes: aba5acdf ("(Logical change 1.3)") # packet raw/dgram Fixes: 351efcde ("Update header files to 2.6.14") # dccp Fixes: f89d46ad ("ss: Add support for SCTP protocol") # sctp Fixes: 2abc3d76 ("ss: add AF_XDP support") # xdp Signed-off-by: Matthieu Baerts --- I can also split this in 4 small patches if you prefer. misc/ss.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/misc/ss.c b/misc/ss.c index 1c82352d..bf891a58 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -5373,6 +5373,7 @@ static void _usage(FILE *dest) " -x, --unix display only Unix domain sockets\n" " --tipc display only TIPC sockets\n" " --vsock display only vsock sockets\n" +" --xdp display only XDP sockets\n" " -f, --family=FAMILY display sockets of type FAMILY\n" " FAMILY := {inet|inet6|link|unix|netlink|vsock|tipc|xdp|help}\n" "\n" @@ -5382,7 +5383,7 @@ static void _usage(FILE *dest) " --inet-sockopt show various inet socket options\n" "\n" " -A, --query=QUERY, --socket=QUERY\n" -" QUERY := {all|inet|tcp|mptcp|udp|raw|unix|unix_dgram|unix_stream|unix_seqpacket|packet|netlink|vsock_stream|vsock_dgram|tipc}[,QUERY]\n" +" QUERY := {all|inet|tcp|mptcp|udp|raw|unix|unix_dgram|unix_stream|unix_seqpacket|packet|packet_raw|packet_dgram|netlink|dccp|sctp|vsock_stream|vsock_dgram|tipc|xdp}[,QUERY]\n" "\n" " -D, --diag=FILE Dump raw information about TCP sockets to FILE\n" " -F, --filter=FILE read filter information from FILE\n" From patchwork Mon Oct 17 17:03:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Baerts X-Patchwork-Id: 13009052 X-Patchwork-Delegate: stephen@networkplumber.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC490C433FE for ; Mon, 17 Oct 2022 17:03:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229898AbiJQRD4 (ORCPT ); Mon, 17 Oct 2022 13:03:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230090AbiJQRDq (ORCPT ); Mon, 17 Oct 2022 13:03:46 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 238686FA1A for ; Mon, 17 Oct 2022 10:03:45 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id a10so19364877wrm.12 for ; Mon, 17 Oct 2022 10:03:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ulr0pv0RSk8i+OHflqNwbgKxTewZenJOsVk21xY+qK8=; b=uw20U2BSBs9eDfSNTFWIfrPc5iSJOXxf9AVWnmVZWKXNnp47zqMRklSKYe57yP2eB3 bNUwXOipJ9Nrrju9TVCzO/1BdWv5VxRDvQWi2WWwsRxsbAhx85YCmeYemdUh7xiAtQlh drsShEuJH9dIYqxx06w+cX/TPy1jkRJrvIjRbD2H8qWbvsfJpS7qnt0QbII/aANvNT+a sDRg14HCY0uhjHbcgcTHCHlbfMTj88TFEnZJDBdX+OLI/cqdOpFvQz+ByZbvX/FJEcEf g2pCoC/l0HHKBPREmzwg9pGXiAjNT1zG/YOGZLeiXmuVViBYx0Z2QwVIKyVyDqOfFnn5 DcZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ulr0pv0RSk8i+OHflqNwbgKxTewZenJOsVk21xY+qK8=; b=RmcVvAbNfo1og7ht8TM8Mw3jpf2iCPsX9O0rqPYhH4ewEBclGdAm2ZBUqvBs5dPwyv VFFU1FvrXyX4e2Zp+gStsRlXE7X8DxXsp/bNwDg1s8o3AThVYpWKkkUvmGy1fjUOKvFa y0r1+CT2kLGkpXcTrxdylhXAUSCIK0zsZr0Wra2OKRQ8JcTr8VsnBF7qQs+6vYFA2MVw ykgaR/nzLmxKb/1Erm5KkjlSVfIxPcyXojfh44tP7xPm7FvOmjcdKqpobR3lh2MAJANs azxRB17DuXbmT4AtGwDKrq/zTNe2Z1c1cCIinfW7E9TZ2+Shi2uBS5+BhyXMRodV8jNA /JIw== X-Gm-Message-State: ACrzQf2Ip3huBw4bVAIPqfVdA9lozUGZQWn1PJmqXyHHX4l42QezzzjF lW4TiZJhbPzk2Za4IZF7LUOlNQ== X-Google-Smtp-Source: AMsMyM4g8YAQul5Mlho3iC4FP6XPAhCE+2n00e3t4axDfcMEDbXb/7IXC3+CseCL2pDLyjN9qAzjKA== X-Received: by 2002:a5d:648b:0:b0:22e:ee60:db37 with SMTP id o11-20020a5d648b000000b0022eee60db37mr7207185wri.116.1666026224651; Mon, 17 Oct 2022 10:03:44 -0700 (PDT) Received: from vdi08.nix.tessares.net (static.219.156.76.144.clients.your-server.de. [144.76.156.219]) by smtp.gmail.com with ESMTPSA id w16-20020adf8bd0000000b0022f40a2d06esm9079196wra.35.2022.10.17.10.03.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Oct 2022 10:03:44 -0700 (PDT) From: Matthieu Baerts To: Stephen Hemminger Cc: netdev@vger.kernel.org, Matthieu Baerts Subject: [PATCH iproute2 4/4] ss: re-add TIPC query support Date: Mon, 17 Oct 2022 19:03:08 +0200 Message-Id: <20221017170308.1280537-5-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221017170308.1280537-1-matthieu.baerts@tessares.net> References: <20221017170308.1280537-1-matthieu.baerts@tessares.net> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: dsahern@gmail.com TIPC support has been introduced in 'iproute-master' (not -next) in commit 5caf79a0 ("ss: Add support for TIPC socket diag in ss tool"), at the same time a refactoring introducing filter_db_parse() was done, see commit 67d5fd55 ("ss: Put filter DB parsing into a separate function") from iproute2-next. When the two commits got merged, the support for TIPC has been apparently accidentally dropped. This simply adds the missing entry for TIPC. Fixes: 2c62a64d ("Merge branch 'iproute2-master' into iproute2-next") Signed-off-by: Matthieu Baerts --- misc/ss.c | 1 + 1 file changed, 1 insertion(+) diff --git a/misc/ss.c b/misc/ss.c index bf891a58..ccfa9fa9 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -424,6 +424,7 @@ static int filter_db_parse(struct filter *f, const char *s) ENTRY(packet_dgram, PACKET_DG_DB), ENTRY(p_dgr, PACKET_DG_DB), /* alias for packet_dgram */ ENTRY(netlink, NETLINK_DB), + ENTRY(tipc, TIPC_DB), ENTRY(vsock, VSOCK_ST_DB, VSOCK_DG_DB), ENTRY(vsock_stream, VSOCK_ST_DB), ENTRY(v_str, VSOCK_ST_DB), /* alias for vsock_stream */