From patchwork Thu Jan 8 00:42:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vadym Kochan X-Patchwork-Id: 426433 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 DE1E9140077 for ; Thu, 8 Jan 2015 11:53:30 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755635AbbAHAxX (ORCPT ); Wed, 7 Jan 2015 19:53:23 -0500 Received: from mail-lb0-f178.google.com ([209.85.217.178]:49547 "EHLO mail-lb0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755499AbbAHAxS (ORCPT ); Wed, 7 Jan 2015 19:53:18 -0500 Received: by mail-lb0-f178.google.com with SMTP id u14so415889lbd.9 for ; Wed, 07 Jan 2015 16:53:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=QZuZ7dmndBBtPkbT3lPeBeoRVChJf2WesMCTr9S2x6E=; b=OF2sHBJoX1vACEm6BoRWqSnZSL13DinY0W+9NxQUk43X9fvJjkJPgzLS1sVt78HhLA 7rmYZSbKvjxDyA5qkoNfstNXaT6a3c7hdvsH9PGxWSbsMQv6q24vOsDg1odeBmztCF5O QgH2Nwn+24pyGoDcd8tM46//Rs6ynMZdabZq1BGx418lrDrQWknFZM9jvsmN2BnanJEb 5g4wy0VtP4RcJ8cOcZwEHS3V4XDMJ55HNzIoClRNRautyMI2qZ0hRbOM7zeWPXCUp+tI BoboQUsrRQwjF60uS/GxMXWu4lr+ZDvk+H1GN0CLYWuWdExZ75igOT8u6PkDWjqzE0t9 fUUQ== X-Received: by 10.152.21.228 with SMTP id y4mr9496280lae.72.1420678397243; Wed, 07 Jan 2015 16:53:17 -0800 (PST) Received: from localhost.localdomain (121-43-207-82.ip.ukrtel.net. [82.207.43.121]) by mx.google.com with ESMTPSA id h1sm774952lam.39.2015.01.07.16.53.16 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Jan 2015 16:53:16 -0800 (PST) From: Vadim Kochan To: netdev@vger.kernel.org Cc: Vadim Kochan Subject: [PATCH iproute2] ss: Fix case when UDP is printed as ipproto-xxx Date: Thu, 8 Jan 2015 02:42:54 +0200 Message-Id: <1420677774-10288-1-git-send-email-vadim4j@gmail.com> X-Mailer: git-send-email 2.1.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Vadim Kochan When 'ss' prints UDP sockets info together with RAW sockets e.g.: $ ss -a then UDP sockets are resolved as "ipproto-xxx". It was caused that dg_proto was set after printing UDP socket info from netlink. So fixed issue by moving setting dg_proto before printing info from Netlink. Signed-off-by: Vadim Kochan --- misc/ss.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/misc/ss.c b/misc/ss.c index 08d210a..7c94463 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -2287,12 +2287,12 @@ static int udp_show(struct filter *f) { FILE *fp = NULL; + dg_proto = UDP_PROTO; + 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<