From patchwork Wed Mar 22 21:59:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ahern X-Patchwork-Id: 742361 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 3vpNrT3brhz9s7v for ; Thu, 23 Mar 2017 08:59:37 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="Owl9Nuqr"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751744AbdCVV7f (ORCPT ); Wed, 22 Mar 2017 17:59:35 -0400 Received: from mail-pg0-f43.google.com ([74.125.83.43]:34320 "EHLO mail-pg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751355AbdCVV73 (ORCPT ); Wed, 22 Mar 2017 17:59:29 -0400 Received: by mail-pg0-f43.google.com with SMTP id 21so80096181pgg.1 for ; Wed, 22 Mar 2017 14:59:28 -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=Lj/G85RCVm/bEy+ILbyOmi0pMlQn3ZocxT/9k7+V5ik=; b=Owl9NuqraS8uSIpLtea0YO05F3nmbIdce/UCqRGwAvEQXWDhghVcH+hI9eUcVQXdP0 wTHoLVhHdDznQP2e1Y9HFi275TehaHiRK4JYVDkJeTOQZM+jB351tW1F4t6leJWYfw7p lx+hjft4sn0Q/z01EyOax8AVjVO0LDEP9Hlhs= 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=Lj/G85RCVm/bEy+ILbyOmi0pMlQn3ZocxT/9k7+V5ik=; b=cLgEFzq1mrTjE1xpQlAcJ6A2U0r1CQLP03iNnoBSnHKbftdDqjHhCaF1H7o4/RhoEE LzUjm3GyKmr957tCSGCOCAIWlRqbbLvWssT5rG7t2FmbrgPRNf8kUqDae1Y9cLta9SNz OO3t3H881fvvVpGBFO9BpMcFobsT4u3aM6lFlKnpRzEQcfcwcAEP2ezlDoC0pkn9F5dT TLFUTZmoHbe2KS247y4yX0K59kmrkkH533H5AR0h9OUDj2N+JLW+Oq1ww2dnuMsvy1qs aDjDGzZHkLf/O4Iu7QPrmQfPdthb/fgnhbUllkCmKFcq31pMKa8uLIH1UA9AARwyq6o5 NPbg== X-Gm-Message-State: AFeK/H1+b8gfB6+ySdlC4Ii7S+sq4XYjlrA+eUcmp90EdCrahZK5tAKCp8GVDX9fCxgPJSBT X-Received: by 10.98.166.132 with SMTP id r4mr47638905pfl.191.1490219967787; Wed, 22 Mar 2017 14:59:27 -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.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Mar 2017 14:59:27 -0700 (PDT) From: David Ahern To: netdev@vger.kernel.org, stephen@networkplumber.org Cc: nicolas.dichtel@6wind.com, David Ahern Subject: [iproute2 net-next 1/3] netlink: Add flag to suppress print of nlmsg error Date: Wed, 22 Mar 2017 14:59:20 -0700 Message-Id: <1490219962-32587-2-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 Allow callers of the dump API to handle nlmsg errors (e.g., an unsupported feature). Setting RTNL_HANDLE_F_SUPPRESS_NLERR in the rtnl_handle avoids unnecessary messages to the users in some case. For example, RTNETLINK answers: Operation not supported when probing for support of a new feature. Signed-off-by: David Ahern --- include/libnetlink.h | 1 + lib/libnetlink.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/libnetlink.h b/include/libnetlink.h index bd0267dfcc02..c43ab0a2d9d9 100644 --- a/include/libnetlink.h +++ b/include/libnetlink.h @@ -21,6 +21,7 @@ struct rtnl_handle { int proto; FILE *dump_fp; #define RTNL_HANDLE_F_LISTEN_ALL_NSID 0x01 +#define RTNL_HANDLE_F_SUPPRESS_NLERR 0x02 int flags; }; diff --git a/lib/libnetlink.c b/lib/libnetlink.c index 9303b6686e2c..5b75b2db4e0b 100644 --- a/lib/libnetlink.c +++ b/lib/libnetlink.c @@ -299,7 +299,8 @@ static void rtnl_dump_error(const struct rtnl_handle *rth, errno == EOPNOTSUPP)) return; - perror("RTNETLINK answers"); + if (!(rth->flags & RTNL_HANDLE_F_SUPPRESS_NLERR)) + perror("RTNETLINK answers"); } }