From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 607C8C43331 for ; Wed, 13 Nov 2019 10:14:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 39FEB204EC for ; Wed, 13 Nov 2019 10:14:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727419AbfKMKOG (ORCPT ); Wed, 13 Nov 2019 05:14:06 -0500 Received: from mail-il-dmz.mellanox.com ([193.47.165.129]:53667 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727321AbfKMKOG (ORCPT ); Wed, 13 Nov 2019 05:14:06 -0500 Received: from Internal Mail-Server by MTLPINE1 (envelope-from roid@mellanox.com) with ESMTPS (AES256-SHA encrypted); 13 Nov 2019 12:13:59 +0200 Received: from mtr-vdi-191.wap.labs.mlnx. (mtr-vdi-191.wap.labs.mlnx [10.209.100.28]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id xADADwQQ009511; Wed, 13 Nov 2019 12:13:59 +0200 From: Roi Dayan To: netdev@vger.kernel.org Cc: David Ahern , Stephen Hemminger , Jiri Pirko , Eli Britstein , Roi Dayan Subject: [PATCH iproute2 5/5] tc: flower: fix output for ip tos and ttl Date: Wed, 13 Nov 2019 12:12:45 +0200 Message-Id: <20191113101245.182025-6-roid@mellanox.com> X-Mailer: git-send-email 2.8.4 In-Reply-To: <20191113101245.182025-1-roid@mellanox.com> References: <20191113101245.182025-1-roid@mellanox.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Eli Britstein Fix the output for ip tos and ttl to be numbers in JSON format. Example: $ tc qdisc add dev eth0 ingress $ tc filter add dev eth0 protocol ip parent ffff: prio 1 flower skip_hw \ ip_tos 5/0xf action drop Non JSON format remains the same: $ tc filter show dev eth0 parent ffff: filter protocol ip pref 1 flower chain 0 filter protocol ip pref 1 flower chain 0 handle 0x1 eth_type ipv4 ip_tos 5/0xf skip_hw not_in_hw action order 1: gact action drop random type none pass val 0 index 1 ref 1 bind 1 JSON format is changed (partial output): $ tc -p -j filter show dev eth0 parent ffff: Before: "options": { "keys": { "ip_tos": "0x5/f", ... After: "options": { "keys": { "ip_tos": 5, "ip_tos_mask": 15, ... Fixes: 6ea2c2b1cff6 ("tc: flower: add support for matching on ip tos and ttl") Signed-off-by: Eli Britstein Reviewed-by: Roi Dayan Acked-by: Jiri Pirko --- tc/f_flower.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/tc/f_flower.c b/tc/f_flower.c index 724577563c27..1b518ef30583 100644 --- a/tc/f_flower.c +++ b/tc/f_flower.c @@ -1617,20 +1617,7 @@ static void flower_print_ip_proto(__u8 *p_ip_proto, static void flower_print_ip_attr(const char *name, struct rtattr *key_attr, struct rtattr *mask_attr) { - SPRINT_BUF(namefrm); - SPRINT_BUF(out); - size_t done; - - if (!key_attr) - return; - - done = sprintf(out, "0x%x", rta_getattr_u8(key_attr)); - if (mask_attr) - sprintf(out + done, "/%x", rta_getattr_u8(mask_attr)); - - print_string(PRINT_FP, NULL, "%s ", _SL_); - sprintf(namefrm, "%s %%s", name); - print_string(PRINT_ANY, name, namefrm, out); + print_masked_u8(name, key_attr, mask_attr, true); } static void flower_print_matching_flags(char *name, -- 2.8.4