]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
ip-rule: fix json key "to_tbl" for unspecific rule action
authorThomas Haller <thaller@redhat.com>
Tue, 19 Feb 2019 20:50:19 +0000 (21:50 +0100)
committerStephen Hemminger <stephen@networkplumber.org>
Tue, 19 Feb 2019 23:21:06 +0000 (15:21 -0800)
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 <thaller@redhat.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
ip/iprule.c

index 2f58d8c2acd8744839dcf103018362db1352159f..4e9437de343780df8c56c68a8d8792ec4ece5a7a 100644 (file)
@@ -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)));
        }