proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-08-14 23:32:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tc: jsonify actions core

Browse Source 
Add json output to actions core.

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

18
tc/m_action.c
View File

@ -301,15 +301,17 @@ static int tc_print_one_action(FILE *f, struct rtattr *arg)
return err; return err;
if (show_stats && tb[TCA_ACT_STATS]) { if (show_stats && tb[TCA_ACT_STATS]) {
fprintf(f, "\tAction statistics:\n"); print_string(PRINT_FP, NULL, "\tAction statistics:\n", NULL);
open_json_object("stats");
print_tcstats2_attr(f, tb[TCA_ACT_STATS], "\t", NULL); print_tcstats2_attr(f, tb[TCA_ACT_STATS], "\t", NULL);
fprintf(f, "\n"); close_json_object();
print_string(PRINT_FP, NULL, "\n", NULL);
} }
if (tb[TCA_ACT_COOKIE]) { if (tb[TCA_ACT_COOKIE]) {
int strsz = RTA_PAYLOAD(tb[TCA_ACT_COOKIE]); int strsz = RTA_PAYLOAD(tb[TCA_ACT_COOKIE]);
char b1[strsz * 2 + 1]; char b1[strsz * 2 + 1];
fprintf(f, "\tcookie %s\n", print_string(PRINT_ANY, "cookie", "\tcookie %s\n",
hexstring_n2a(RTA_DATA(tb[TCA_ACT_COOKIE]), hexstring_n2a(RTA_DATA(tb[TCA_ACT_COOKIE]),
strsz, b1, sizeof(b1))); strsz, b1, sizeof(b1)));
} }
@ -362,15 +364,21 @@ tc_print_action(FILE *f, const struct rtattr *arg, unsigned short tot_acts)
if (tab_flush && NULL != tb[0] && NULL == tb[1]) if (tab_flush && NULL != tb[0] && NULL == tb[1])
return tc_print_action_flush(f, tb[0]); return tc_print_action_flush(f, tb[0]);
open_json_array(PRINT_JSON, "actions");
for (i = 0; i < tot_acts; i++) { for (i = 0; i < tot_acts; i++) {
if (tb[i]) { if (tb[i]) {
fprintf(f, "\n\taction order %d: ", i); open_json_object(NULL);
print_uint(PRINT_ANY, "order",
"\n\taction order %u: ", i);
if (tc_print_one_action(f, tb[i]) < 0) { if (tc_print_one_action(f, tb[i]) < 0) {
fprintf(f, "Error printing action\n"); print_string(PRINT_FP, NULL,
"Error printing action\n", NULL);
} }
close_json_object();
} }
} }
close_json_object();
return 0; return 0;
} }

34
tc/tc_util.c
View File

@ -709,12 +709,17 @@ int parse_action_control_slash(int *argc_p, char ***argv_p,
void print_action_control(FILE *f, const char *prefix, void print_action_control(FILE *f, const char *prefix,
int action, const char *suffix) int action, const char *suffix)
{ {
fprintf(f, "%s%s", prefix, action_n2a(action)); print_string(PRINT_FP, NULL, "%s", prefix);
open_json_object("control_action");
print_string(PRINT_ANY, "type", "%s", action_n2a(action));
if (TC_ACT_EXT_CMP(action, TC_ACT_GOTO_CHAIN)) if (TC_ACT_EXT_CMP(action, TC_ACT_GOTO_CHAIN))
fprintf(f, " chain %u", action & TC_ACT_EXT_VAL_MASK); print_uint(PRINT_ANY, "chain", " chain %u",
action & TC_ACT_EXT_VAL_MASK);
if (TC_ACT_EXT_CMP(action, TC_ACT_JUMP)) if (TC_ACT_EXT_CMP(action, TC_ACT_JUMP))
fprintf(f, " %u", action & TC_ACT_EXT_VAL_MASK); print_uint(PRINT_ANY, "jump", " %u",
fprintf(f, "%s", suffix); action & TC_ACT_EXT_VAL_MASK);
close_json_object();
print_string(PRINT_FP, NULL, "%s", suffix);
} }
int get_linklayer(unsigned int *val, const char *arg) int get_linklayer(unsigned int *val, const char *arg)
@ -762,12 +767,21 @@ void print_tm(FILE *f, const struct tcf_t *tm)
{ {
int hz = get_user_hz(); int hz = get_user_hz();
if (tm->install != 0) if (tm->install != 0) {
fprintf(f, " installed %u sec", (unsigned int)(tm->install/hz)); print_uint(PRINT_JSON, "installed", NULL, tm->install);
if (tm->lastuse != 0) print_uint(PRINT_FP, NULL, " installed %u sec",
fprintf(f, " used %u sec", (unsigned int)(tm->lastuse/hz)); (unsigned int)(tm->install/hz));
if (tm->expires != 0) }
fprintf(f, " expires %u sec", (unsigned int)(tm->expires/hz)); if (tm->lastuse != 0) {
print_uint(PRINT_JSON, "last_used", NULL, tm->lastuse);
print_uint(PRINT_FP, NULL, " used %u sec",
(unsigned int)(tm->lastuse/hz));
}
if (tm->expires != 0) {
print_uint(PRINT_JSON, "expires", NULL, tm->expires);
print_uint(PRINT_FP, NULL, " expires %u sec",
(unsigned int)(tm->expires/hz));
}
} }
void print_tcstats2_attr(FILE *fp, struct rtattr *rta, char *prefix, struct rtattr **xstats) void print_tcstats2_attr(FILE *fp, struct rtattr *rta, char *prefix, struct rtattr **xstats)