From patchwork Tue Feb 19 20:50:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Haller X-Patchwork-Id: 1044891 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 443tD16Qhfz9s1l for ; Wed, 20 Feb 2019 07:50:25 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729130AbfBSUuY (ORCPT ); Tue, 19 Feb 2019 15:50:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43288 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726321AbfBSUuX (ORCPT ); Tue, 19 Feb 2019 15:50:23 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BBE1E7C82F; Tue, 19 Feb 2019 20:50:23 +0000 (UTC) Received: from localhost.localdomain (ovpn-116-48.ams2.redhat.com [10.36.116.48]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AC5C95D6AA; Tue, 19 Feb 2019 20:50:22 +0000 (UTC) From: Thomas Haller To: netdev@vger.kernel.org Cc: stephen@networkplumber.org, Thomas Haller Subject: [PATCH iproute2, v2] ip-rule: fix json key "to_tbl" for unspecific rule action Date: Tue, 19 Feb 2019 21:50:19 +0100 Message-Id: <20190219205019.30757-1-thaller@redhat.com> In-Reply-To: <20190219101958.5c4bbd0d@shemminger-XPS-13-9360> References: <20190219101958.5c4bbd0d@shemminger-XPS-13-9360> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 19 Feb 2019 20:50:23 +0000 (UTC) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The key should not be called "to_tbl" because it is exactly not a FR_ACT_TO_TBL action. Change it to "action". # ip rule add blackhole # ip -j rule | python -m json.tool ... { "priority": 0, "src": "all", "to_tbl": "blackhole" }, This is an API break of JSON output as it was added in v4.17.0. Still change it as the API is relatively new and unstable. Fixes: 0dd4ccc56c0e ("iprule: add json support") Signed-off-by: Thomas Haller --- ip/iprule.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ip/iprule.c b/ip/iprule.c index 2f58d8c2..4e9437de 100644 --- a/ip/iprule.c +++ b/ip/iprule.c @@ -459,7 +459,7 @@ int print_rule(struct nlmsghdr *n, void *arg) } else if (frh->action == FR_ACT_NOP) { print_null(PRINT_ANY, "nop", "nop", NULL); } else if (frh->action != FR_ACT_TO_TBL) { - print_string(PRINT_ANY, "to_tbl", "%s", + print_string(PRINT_ANY, "action", "%s", rtnl_rtntype_n2a(frh->action, b1, sizeof(b1))); }