From patchwork Fri Mar 24 02:51: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: 743033 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 3vq7H74b2nz9s7J for ; Fri, 24 Mar 2017 13:51:47 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="USh7eQBk"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934918AbdCXCvd (ORCPT ); Thu, 23 Mar 2017 22:51:33 -0400 Received: from mail-pf0-f171.google.com ([209.85.192.171]:36704 "EHLO mail-pf0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934798AbdCXCvb (ORCPT ); Thu, 23 Mar 2017 22:51:31 -0400 Received: by mail-pf0-f171.google.com with SMTP id o126so1186358pfb.3 for ; Thu, 23 Mar 2017 19:51: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=Lj/G85RCVm/bEy+ILbyOmi0pMlQn3ZocxT/9k7+V5ik=; b=USh7eQBk8Gqve/iTZ8NOREccTJM8gAzl+DcXmoGNCMrYItxR0nnCwBMarAYMAksXqx MdDRvVMNA0XX2URwK+zzM36W8kCilE3SxhDeyahRwIDKLITOhTMv5MYt/1rPm3z3JD8F oWSv/s+5DrjgAvdnJIww9uZ+Bb7nYAY7NocB0= 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=dP4NlZ3p2xXfjXands+Oo3lLEtG6STziBcF5K6ZkLIHf33AyM+xhW7fPXG9Q6H9x/v 0d537g+rRw3+Zouf1LzF6UAyg7vC1sT0GsPWyzDyTwAq0egtWojBucT/9DlZ3h2Thv7A 1LxCD8NqX/1K0Hh4r0W/f3tpZB2O5WaovKcTCusrQ+rpAqNDl/UlZWhQj9wXcSfQWTo/ AsICdjG+PI1X/Y68mqVozCKfWsSyL3Nd3PwJ46EHzQSXc1SkyIHCW/250N0vHzJ0BAcw cgcNSzB863A8zi3aj3EPacPbinJonP44Urp4bqZvbLwKX0HTeLVovpd4Ah5AWxu75TGr oYUA== X-Gm-Message-State: AFeK/H3oQhMwxRi/yAd+2NTvFH3Bl99REQdtmAgoS2Yw6G8bffqZRrjbOzpyDT15Pwx8HB0i X-Received: by 10.84.241.71 with SMTP id u7mr731306plm.104.1490323889424; Thu, 23 Mar 2017 19:51:29 -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.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 23 Mar 2017 19:51: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 v2 1/3] netlink: Add flag to suppress print of nlmsg error Date: Thu, 23 Mar 2017 19:51:20 -0700 Message-Id: <1490323882-11609-2-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 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"); } }