matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tc: jsonify gact action 

Add json output to gact action.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
This commit is contained in:
Jiri Pirko 2017-11-25 15:48:33 +01:00 committed by Stephen Hemminger
parent 2704bd6255
commit 66fedb6df0
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tc/m_gact.c
View File

@ -175,12 +175,12 @@ print_gact(struct action_util *au, FILE * f, struct rtattr *arg)
parse_rtattr_nested(tb, TCA_GACT_MAX, arg); parse_rtattr_nested(tb, TCA_GACT_MAX, arg);
if (tb[TCA_GACT_PARMS] == NULL) { if (tb[TCA_GACT_PARMS] == NULL) {
fprintf(f, "[NULL gact parameters]"); print_string(PRINT_FP, NULL, "%s", "[NULL gact parameters]");
return -1; return -1;
} }
p = RTA_DATA(tb[TCA_GACT_PARMS]); p = RTA_DATA(tb[TCA_GACT_PARMS]);
fprintf(f, "gact "); print_string(PRINT_ANY, "kind", "%s ", "gact");
print_action_control(f, "action ", p->action, ""); print_action_control(f, "action ", p->action, "");
#ifdef CONFIG_GACT_PROB #ifdef CONFIG_GACT_PROB
if (tb[TCA_GACT_PROB] != NULL) { if (tb[TCA_GACT_PROB] != NULL) {
@ -190,12 +190,16 @@ print_gact(struct action_util *au, FILE * f, struct rtattr *arg)
memset(&pp_dummy, 0, sizeof(pp_dummy)); memset(&pp_dummy, 0, sizeof(pp_dummy));
pp = &pp_dummy; pp = &pp_dummy;
} }
fprintf(f, "\n\t random type %s", prob_n2a(pp->ptype)); open_json_object("prob");
print_string(PRINT_ANY, "random_type", "\n\t random type %s",
prob_n2a(pp->ptype));
print_action_control(f, " ", pp->paction, " "); print_action_control(f, " ", pp->paction, " ");
fprintf(f, "val %d", pp->pval); print_int(PRINT_ANY, "val", "val %d", pp->pval);
close_json_object();
#endif #endif
fprintf(f, "\n\t index %u ref %d bind %d", p->index, p->refcnt, print_uint(PRINT_ANY, "index", "\n\t index %u", p->index);
p->bindcnt); print_int(PRINT_ANY, "ref", " ref %d", p->refcnt);
print_int(PRINT_ANY, "bind", " bind %d", p->bindcnt);
if (show_stats) { if (show_stats) {
if (tb[TCA_GACT_TM]) { if (tb[TCA_GACT_TM]) {
struct tcf_t *tm = RTA_DATA(tb[TCA_GACT_TM]); struct tcf_t *tm = RTA_DATA(tb[TCA_GACT_TM]);
@ -203,7 +207,7 @@ print_gact(struct action_util *au, FILE * f, struct rtattr *arg)
print_tm(f, tm); print_tm(f, tm);
} }
} }
fprintf(f, "\n "); print_string(PRINT_FP, NULL, "%s", "\n");
return 0; return 0;
} }