From patchwork Thu Oct 25 13:24:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Emelyanov X-Patchwork-Id: 194155 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0C84F2C00B2 for ; Fri, 26 Oct 2012 00:25:04 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935661Ab2JYNZA (ORCPT ); Thu, 25 Oct 2012 09:25:00 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:28655 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935157Ab2JYNY7 (ORCPT ); Thu, 25 Oct 2012 09:24:59 -0400 Received: from [10.24.37.185] ([10.24.37.185]) (authenticated bits=0) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id q9PDOwN1007024 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 25 Oct 2012 17:24:58 +0400 (MSK) Message-ID: <50893DAA.3010909@parallels.com> Date: Thu, 25 Oct 2012 17:24:58 +0400 From: Pavel Emelyanov User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:13.0) Gecko/20120605 Thunderbird/13.0 MIME-Version: 1.0 To: Stephen Hemminger , Linux Netdev List Subject: [PATCH 4/5] ss: Get udp sockets info via sock-diag References: <50893BAF.7030500@parallels.com> In-Reply-To: <50893BAF.7030500@parallels.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Now everything is prepared for it, so the patch is straightforward. Signed-off-by: Pavel Emelyanov --- misc/ss.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/misc/ss.c b/misc/ss.c index 1ceb026..a0ab2e9 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -1508,6 +1508,9 @@ static int tcpdiag_send(int fd, int protocol, struct filter *f) struct rtattr rta; struct iovec iov[3]; + if (protocol == IPPROTO_UDP) + return -1; + memset(&nladdr, 0, sizeof(nladdr)); nladdr.nl_family = AF_NETLINK; @@ -1976,6 +1979,10 @@ int udp_show(struct filter *f) { FILE *fp = NULL; + if (!getenv("PROC_NET_UDP") && !getenv("PROC_ROOT") + && inet_show_netlink(f, NULL, IPPROTO_UDP) == 0) + return 0; + dg_proto = UDP_PROTO; if (f->families&(1<