From patchwork Wed Mar 22 21:59:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ahern X-Patchwork-Id: 742362 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 3vpNrX28Pbz9s7v for ; Thu, 23 Mar 2017 08:59:40 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="RIXSjF+Q"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751957AbdCVV7i (ORCPT ); Wed, 22 Mar 2017 17:59:38 -0400 Received: from mail-pg0-f42.google.com ([74.125.83.42]:35459 "EHLO mail-pg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751396AbdCVV7a (ORCPT ); Wed, 22 Mar 2017 17:59:30 -0400 Received: by mail-pg0-f42.google.com with SMTP id t143so47492201pgb.2 for ; Wed, 22 Mar 2017 14:59:29 -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=i8ADOdGK7CXd7E+3U1Nn0n19kFTcoC2aNsDtYUuUxlM=; b=RIXSjF+Q0zcsUslINDw4ty+IHQUews2tJbkEqK/N8CPl8Vu2+sML8VjREjZqVZB8U6 OJLIgMwdI0o0nmXIYUVFO+d9IhC+kRqwhThYdjW6DYr0AgjPgi/WSxhOzAaLQLcZk5nc Xkl+1U5917+Px6ZO5A4bkqgwqgSpSzeaYrHHE= 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=i8ADOdGK7CXd7E+3U1Nn0n19kFTcoC2aNsDtYUuUxlM=; b=W+yw8xM6BgzYOolNA+KWi8gAc/rZANJcNmtk/qZnSHXgZZu9FprP0S7zqKkmuENg63 LSIjPEDAqIrPnm/8Zqqx4ChI34qIWIK1msYFr9CkNMpKZn4+qpYhOKXRriaVgrh9IG9u 4mUihWs4yi4xKFD0QGe/YUC9TpEIruh5t4a2NdsK/wgWKzQ/FolsKVc+9+an0NMaObKk zkTLrkmeXmSbMXbmgK4NnF4qXArG8piGZ8Gh0B+x6cc24C3tDcLN+IAkVPiv3UKq5N8S qPBWvMNLT2+fkyF0t3D6zwnjBiPBYCPrbfoeqb1ohk+GjJBZwsz8Sbt/GkWoSAN3xH4m wO8A== X-Gm-Message-State: AFeK/H3Gr3qoFPhSK7R9m9TGFWgngnI6rnL6F6HzbTnCSnkTjvis8vOq088noJ2MTOslRkqe X-Received: by 10.98.18.66 with SMTP id a63mr48719539pfj.188.1490219968756; Wed, 22 Mar 2017 14:59:28 -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.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Mar 2017 14:59:28 -0700 (PDT) From: David Ahern To: netdev@vger.kernel.org, stephen@networkplumber.org Cc: nicolas.dichtel@6wind.com, David Ahern Subject: [iproute2 net-next 2/3] ip netconf: Show all address families by default in dumps Date: Wed, 22 Mar 2017 14:59:21 -0700 Message-Id: <1490219962-32587-3-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, 'ip netconf' only shows ipv4 and ipv6 netconf settings. If IPv6 is not enabled, the dump ends with RTNETLINK answers: Operation not supported when IPv6 request is attempted. Further, if the mpls_router module is also loaded a separate request is needed to get MPLS settings. To make this better going forward, use the new PF_UNSPEC dump all option if the kernel supports it. If the kernel does not, it sets NLMSG_ERROR and returns EOPNOTSUPP which is trapped and we fall back to the existing output to maintain compatibility with existing kernels. Signed-off-by: David Ahern --- ip/ipnetconf.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/ip/ipnetconf.c b/ip/ipnetconf.c index af539f5e945c..dc0851025223 100644 --- a/ip/ipnetconf.c +++ b/ip/ipnetconf.c @@ -19,6 +19,7 @@ #include #include #include +#include #include "rt_names.h" #include "utils.h" @@ -197,16 +198,26 @@ static int do_show(int argc, char **argv) } rtnl_listen(&rth, print_netconf, stdout); } else { + rth.flags = RTNL_HANDLE_F_SUPPRESS_NLERR; dump: if (rtnl_wilddump_request(&rth, filter.family, RTM_GETNETCONF) < 0) { perror("Cannot send dump request"); exit(1); } if (rtnl_dump_filter(&rth, print_netconf2, stdout) < 0) { + /* kernel does not support netconf dump on AF_UNSPEC; + * fall back to requesting by family + */ + if (errno == EOPNOTSUPP && + filter.family == AF_UNSPEC) { + filter.family = AF_INET; + goto dump; + } + perror("RTNETLINK answers"); fprintf(stderr, "Dump terminated\n"); exit(1); } - if (preferred_family == AF_UNSPEC) { + if (preferred_family == AF_UNSPEC && filter.family == AF_INET) { preferred_family = AF_INET6; filter.family = AF_INET6; goto dump;