tc: Correct json output for actions

Commit 9fd3f0b255d9 ("tc: enable json output for actions") added JSON
support for tc-actions at the expense of breaking other use cases that
reach tc_print_action(), as the latter don't expect the 'actions' array
to be a new object.

Consider the following taken duringrun of tc_chain.sh selftest,
and see the latter command output is broken:

$ ./tc/tc -j -p actions list action gact | grep -C 3 actions
[ {
        "total acts": 1
    },{
        "actions": [ {
                "order": 0,

$ ./tc/tc -p -j -s filter show dev enp3s0np2 ingress | grep -C 3 actions
            },
            "skip_hw": true,
            "not_in_hw": true,{
                "actions": [ {
                        "order": 1,
                        "kind": "gact",
                        "control_action": {

Relocate the open/close of the JSON object to declare the object only
for the case that needs it.

Signed-off-by: Yuval Mintz <yuvalm@mellanox.com>
Tested-by: Roman Mashak <mrv@mojatatu.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/tc/m_action.c b/tc/m_action.c
index 2f85d353279a5cecf3d9840b66705b8c955ef25e..8993b93a5c4b59c0c0e0eff56d57991b14269e7d 100644 (file)
--- a/tc/m_action.c
+++ b/tc/m_action.c
@@ -366,7 +366,6 @@ tc_print_action(FILE *f, const struct rtattr *arg, unsigned short tot_acts)
        if (tab_flush && NULL != tb[0]  && NULL == tb[1])
                return tc_print_action_flush(f, tb[0]);
 
-       open_json_object(NULL);
        open_json_array(PRINT_JSON, "actions");
        for (i = 0; i <= tot_acts; i++) {
                if (tb[i]) {
@@ -383,7 +382,6 @@ tc_print_action(FILE *f, const struct rtattr *arg, unsigned short tot_acts)
 
        }
        close_json_array(PRINT_JSON, NULL);
-       close_json_object();
 
        return 0;
 }
@@ -439,8 +437,9 @@ int print_action(const struct sockaddr_nl *who,
                }
        }
 
-
+       open_json_object(NULL);
        tc_print_action(fp, tb[TCA_ACT_TAB], tot_acts ? *tot_acts:0);
+       close_json_object();
 
        return 0;
 }