From patchwork Wed Mar 22 21:59: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: 742363 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 3vpNrb3SKfz9s7v for ; Thu, 23 Mar 2017 08:59:43 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="DomPBCqQ"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751997AbdCVV7m (ORCPT ); Wed, 22 Mar 2017 17:59:42 -0400 Received: from mail-pf0-f170.google.com ([209.85.192.170]:33027 "EHLO mail-pf0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751588AbdCVV7a (ORCPT ); Wed, 22 Mar 2017 17:59:30 -0400 Received: by mail-pf0-f170.google.com with SMTP id o190so15220920pfo.0 for ; Wed, 22 Mar 2017 14:59:30 -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=GfLUdJr0C5oxxUj63WrAW6WCqiLLUbwLMYMDcQqJqc8=; b=DomPBCqQvJ9xu6d/yH7UyL4s/c2qsl9foeHkuSfCdR3S9U2728vgpAI5oE7eHn9X53 YFMSQwL48pFDyTO8CuYb48GWEKzpzIJ+5TzbJblHGl8RhTe4stiYTZk1/oaQKTOzBpIn yY8vxkBjjqHIzr1ZNGko+457/q21UZxO5N5SE= 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=GfLUdJr0C5oxxUj63WrAW6WCqiLLUbwLMYMDcQqJqc8=; b=TfVd++SUhMxzhacR2qW96PAxN0SaTS5BpFptqPj0O3iM4qll24CHiaS24kpeoAs6Y1 glZZDJpPByDgqbpK4dBEPRDm92ZAI4J+hvcEUAojqEPBXMzo0usBt+UIT1cJKdMBzWEK hnFcK/UmBodhNfTvZIJSouYRXkVaeXRKVvnq4HqhELkvMjw+0gKCzSEfLUj39kxeJaGJ 7nx8Q58B2FZY864BK7QqxZ8YgFkjR+G9vI2Hm9TA7ZWe86H6TH/UqM40Tlk9iO14Afh9 8nKYPcsCR8zy/L8SEM6uG1+d6ncmW9Q/1pqOOvIDkoywyKnEPgowt2r7Oe8eHOqnDDlO ScbA== X-Gm-Message-State: AFeK/H0I9MaeilDt/m/3RdsCiuV0ApsgHZBxrxwLCuFeYxeW43zY/j1Hy0OYlvG4XfTu0T2M X-Received: by 10.98.72.66 with SMTP id v63mr3630051pfa.8.1490219969634; Wed, 22 Mar 2017 14:59:29 -0700 (PDT) Received: from kenny.it.cumulusnetworks.com. ([216.129.126.126]) by smtp.googlemail.com with ESMTPSA id v17sm5841016pgc.20.2017.03.22.14.59.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Mar 2017 14:59:29 -0700 (PDT) From: David Ahern To: netdev@vger.kernel.org, stephen@networkplumber.org Cc: nicolas.dichtel@6wind.com, David Ahern Subject: [iproute2 net-next 3/3] ip netconf: Show all families on dev request Date: Wed, 22 Mar 2017 14:59:22 -0700 Message-Id: <1490219962-32587-4-git-send-email-dsa@cumulusnetworks.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1490219962-32587-1-git-send-email-dsa@cumulusnetworks.com> References: <1490219962-32587-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..ab4c1d9db7c8 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 = *((int *)rta_getattr_str(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");