From patchwork Sun Jan 22 13:55:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Mashak X-Patchwork-Id: 718180 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 3v5wwj1rgGz9s2s for ; Mon, 23 Jan 2017 00:56:52 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=mojatatu-com.20150623.gappssmtp.com header.i=@mojatatu-com.20150623.gappssmtp.com header.b="U0AJYS1I"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751291AbdAVN4o (ORCPT ); Sun, 22 Jan 2017 08:56:44 -0500 Received: from mail-it0-f66.google.com ([209.85.214.66]:35186 "EHLO mail-it0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750886AbdAVN4l (ORCPT ); Sun, 22 Jan 2017 08:56:41 -0500 Received: by mail-it0-f66.google.com with SMTP id 203so7572339ith.2 for ; Sun, 22 Jan 2017 05:56:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mojatatu-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=8dNj6TVEPCNa533n4Myn7KrLMPf7NQDxS+T8Y3VACCM=; b=U0AJYS1I4CxVucPzcKfyLExzOu2Yq8+rRHtCvkgLxUgXkCC5Wbns/x1MBuNWAba+dz v4CVMo6uCnKK712Yz+XUeGZtq+Tk1DSuQghsMGejWMA69/A2izdI/C8Aj6/LVAcrHQGL FSa22dqrFmuVkczzD9f1oqCMoZV0OKqzBwneYXajtnNuWvq9IEKRKx7PZOlrYlAm9EQ2 /y4y5mVHe6bTCyTjSnC/RuLsjbDhpXcAIqMw9JHLufjSo0mjSzI6gyMaKZWuYER53koZ WYRb2c0EY3Nfouvoi12c+euaLefA6t//nCXBsH3KgWx2bWApd1CUrgA5mrprLWA/fwOE vwOw== 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; bh=8dNj6TVEPCNa533n4Myn7KrLMPf7NQDxS+T8Y3VACCM=; b=sIIl7LTCO8pmh+LmIYY3LNBKDrRfGVUyS7D0W36SfHl2IXKJD//fDmdMlEFbzDdde5 m/8Ippw6ow8jvu6KwRtP8D0ieHES8WkC9oaW9+6Zoo+AsDA2VBEvkx6IUO4AyDBiEkpO qAqKXAopkXzkVKXyzwruOOIrpzsufntEPxiLdB+u7S2gRhRDEcP5LvqZgUtFUTC31H4q bUuxacsfUOe+5PZghAZoeSd/u5KMZ/P+Jjfn6vzW/s3lBMzzOVGdqJDJpqx2JRAKuFNV bSaGN5t53GgsJvbeOoi53AAArktuhimHnLgxdeBTDheCFQFdGmJAbzwMCFEsqCs4oBWl Lbsg== X-Gm-Message-State: AIkVDXJdpLb4dpDZ62fDYFbHxXmbtpZqiYkwQVYgLH2aIqsyJ02PCcm2QjUsFCn0I7yttQ== X-Received: by 10.36.252.65 with SMTP id b62mr10813907ith.38.1485093366320; Sun, 22 Jan 2017 05:56:06 -0800 (PST) Received: from mojatatu.com (23-233-26-181.cpe.pppoe.ca. [23.233.26.181]) by smtp.gmail.com with ESMTPSA id a99sm7934692ioj.7.2017.01.22.05.56.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 22 Jan 2017 05:56:05 -0800 (PST) From: Roman Mashak To: stephen@networkplumber.org Cc: netdev@vger.kernel.org, Roman Mashak , Jamal Hadi Salim Subject: [PATCH iproute2 1/1] tc: distinguish Add/Replace action operations. Date: Sun, 22 Jan 2017 08:55:33 -0500 Message-Id: <1485093333-18317-1-git-send-email-mrv@mojatatu.com> X-Mailer: git-send-email 1.9.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Roman Mashak Signed-off-by: Jamal Hadi Salim Acked-by: Phil Sutter --- tc/m_action.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tc/m_action.c b/tc/m_action.c index bb19df8..05ef07e 100644 --- a/tc/m_action.c +++ b/tc/m_action.c @@ -365,12 +365,18 @@ int print_action(const struct sockaddr_nl *who, fprintf(fp, "Flushed table "); tab_flush = 1; } else { - fprintf(fp, "deleted action "); + fprintf(fp, "Deleted action "); } } - if (n->nlmsg_type == RTM_NEWACTION) - fprintf(fp, "Added action "); + if (n->nlmsg_type == RTM_NEWACTION) { + if ((n->nlmsg_flags & NLM_F_CREATE) && + !(n->nlmsg_flags & NLM_F_REPLACE)) { + fprintf(fp, "Added action "); + } else if (n->nlmsg_flags & NLM_F_REPLACE) { + fprintf(fp, "Replaced action "); + } + } tc_print_action(fp, tb[TCA_ACT_TAB]); return 0;