From patchwork Fri Mar 24 02:51:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ahern X-Patchwork-Id: 743035 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 3vq7H86Qqwz9s7J for ; Fri, 24 Mar 2017 13:51:48 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="R8XQdhAq"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934973AbdCXCvm (ORCPT ); Thu, 23 Mar 2017 22:51:42 -0400 Received: from mail-pf0-f172.google.com ([209.85.192.172]:36709 "EHLO mail-pf0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934882AbdCXCvc (ORCPT ); Thu, 23 Mar 2017 22:51:32 -0400 Received: by mail-pf0-f172.google.com with SMTP id o126so1186603pfb.3 for ; Thu, 23 Mar 2017 19:51:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QkgrCncobPctWqOZJ+4nMhusuSbM2nMmK4D87j2ZViY=; b=R8XQdhAqtf1TKs6sGykWOhWIvJP1o5alol1xy9as2LoSO8SnUux9vlVukFPPE0/7sy I1GVz6tuTVjyif+8k/miYW8ez+45W7dBhwBXmp8+2Xdz6Soh0YqJulYH+s4UhlOYiQEs xYXDMOzjY2OtR3wdSh4NGfjHSOfjwHQMPtZXc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QkgrCncobPctWqOZJ+4nMhusuSbM2nMmK4D87j2ZViY=; b=E8yRlBFYaHC6HXzb6h+6teMO1rZ9sx+00tCoPS+Yo5w0AiWbNVKZmTHeYzqpr4PNyk bxARmkZdYjfWcZMz/D7a+/gSomIg0VCSz2DXd1ZuLhm0jFi01cgKKYAAwjOdKIPT03Zx 59AjtUgO6YiFZGeAA2SFc1jf0zcZAJViKAPaLJuvJS5/DMNGnX5F8qD69Ceb64BLu0DQ aXorZ21YcJ3bV7Ct5Hv/6GjZv5oxjo5XfsAjeL6V5S9Kgb3q4lmMzVu14IhtEVVVLFDD bKwlTI79qqQ66TCdqtupFsJbxU7lWgxZaxZGOFbX5u4C/JQtViJmLSNUbFEUaFT9Fynb Jr9w== X-Gm-Message-State: AFeK/H2fXUWJixmEwrq0cyLcFz6FNfuxZyAPEvP8p35lLGQDAapnFz46Jdi0ipl93WfrxlTO X-Received: by 10.99.161.17 with SMTP id b17mr6350698pgf.72.1490323891282; Thu, 23 Mar 2017 19:51:31 -0700 (PDT) Received: from kenny.it.cumulusnetworks.com. ([216.129.126.126]) by smtp.googlemail.com with ESMTPSA id t12sm845510pfg.14.2017.03.23.19.51.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 23 Mar 2017 19:51:30 -0700 (PDT) From: David Ahern To: netdev@vger.kernel.org, stephen@networkplumber.org Cc: nicolas.dichtel@6wind.com, David Ahern Subject: [iproute2 net-next v2 3/3] ip netconf: show all families on dev request Date: Thu, 23 Mar 2017 19:51:22 -0700 Message-Id: <1490323882-11609-4-git-send-email-dsa@cumulusnetworks.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1490323882-11609-1-git-send-email-dsa@cumulusnetworks.com> References: <1490323882-11609-1-git-send-email-dsa@cumulusnetworks.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Currently specifying a device to ip netconf and it dumps only values for IPv4. Change this to dump data for all families unless a specific family is given. Signed-off-by: David Ahern --- ip/ipnetconf.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/ip/ipnetconf.c b/ip/ipnetconf.c index dc0851025223..696e3dd51a1c 100644 --- a/ip/ipnetconf.c +++ b/ip/ipnetconf.c @@ -56,6 +56,7 @@ int print_netconf(const struct sockaddr_nl *who, struct rtnl_ctrl_data *ctrl, struct netconfmsg *ncm = NLMSG_DATA(n); int len = n->nlmsg_len; struct rtattr *tb[NETCONFA_MAX+1]; + int ifindex = 0; if (n->nlmsg_type == NLMSG_ERROR) return -1; @@ -77,6 +78,12 @@ int print_netconf(const struct sockaddr_nl *who, struct rtnl_ctrl_data *ctrl, parse_rtattr(tb, NETCONFA_MAX, netconf_rta(ncm), NLMSG_PAYLOAD(n, sizeof(*ncm))); + if (tb[NETCONFA_IFINDEX]) + ifindex = rta_getattr_u32(tb[NETCONFA_IFINDEX]); + + if (filter.ifindex && filter.ifindex != ifindex) + return 0; + switch (ncm->ncm_family) { case AF_INET: fprintf(fp, "ipv4 "); @@ -93,9 +100,7 @@ int print_netconf(const struct sockaddr_nl *who, struct rtnl_ctrl_data *ctrl, } if (tb[NETCONFA_IFINDEX]) { - int *ifindex = (int *)rta_getattr_str(tb[NETCONFA_IFINDEX]); - - switch (*ifindex) { + switch (ifindex) { case NETCONFA_IFINDEX_ALL: fprintf(fp, "all "); break; @@ -103,7 +108,7 @@ int print_netconf(const struct sockaddr_nl *who, struct rtnl_ctrl_data *ctrl, fprintf(fp, "default "); break; default: - fprintf(fp, "dev %s ", ll_index_to_name(*ifindex)); + fprintf(fp, "dev %s ", ll_index_to_name(ifindex)); break; } } @@ -169,8 +174,6 @@ static int do_show(int argc, char **argv) ipnetconf_reset_filter(0); filter.family = preferred_family; - if (filter.family == AF_UNSPEC) - filter.family = AF_INET; while (argc > 0) { if (strcmp(*argv, "dev") == 0) { @@ -186,11 +189,11 @@ static int do_show(int argc, char **argv) } ll_init_map(&rth); - if (filter.ifindex) { + + if (filter.ifindex && filter.family != AF_UNSPEC) { req.ncm.ncm_family = filter.family; - if (filter.ifindex) - addattr_l(&req.n, sizeof(req), NETCONFA_IFINDEX, - &filter.ifindex, sizeof(filter.ifindex)); + addattr_l(&req.n, sizeof(req), NETCONFA_IFINDEX, + &filter.ifindex, sizeof(filter.ifindex)); if (rtnl_send(&rth, &req.n, req.n.nlmsg_len) < 0) { perror("Can not send request");