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

tc: jsonify vlan action 

Add json output to vlan action.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
This commit is contained in:
Jiri Pirko 2017-11-25 15:48:35 +01:00 committed by Stephen Hemminger
parent 502c4adf19
commit b021ee40f6
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tc/m_vlan.c
View File

@ -195,39 +195,37 @@ static int print_vlan(struct action_util *au, FILE *f, struct rtattr *arg)
parse_rtattr_nested(tb, TCA_VLAN_MAX, arg); parse_rtattr_nested(tb, TCA_VLAN_MAX, arg);
if (!tb[TCA_VLAN_PARMS]) { if (!tb[TCA_VLAN_PARMS]) {
fprintf(f, "[NULL vlan parameters]"); print_string(PRINT_FP, NULL, "%s", "[NULL vlan parameters]");
return -1; return -1;
} }
parm = RTA_DATA(tb[TCA_VLAN_PARMS]); parm = RTA_DATA(tb[TCA_VLAN_PARMS]);
fprintf(f, " vlan"); print_string(PRINT_ANY, "kind", "%s ", "vlan");
print_string(PRINT_ANY, "vlan_action", " %s", action_names[parm->v_action]);
switch (parm->v_action) { switch (parm->v_action) {
case TCA_VLAN_ACT_POP:
fprintf(f, " pop");
break;
case TCA_VLAN_ACT_PUSH: case TCA_VLAN_ACT_PUSH:
case TCA_VLAN_ACT_MODIFY: case TCA_VLAN_ACT_MODIFY:
fprintf(f, " %s", action_names[parm->v_action]);
if (tb[TCA_VLAN_PUSH_VLAN_ID]) { if (tb[TCA_VLAN_PUSH_VLAN_ID]) {
val = rta_getattr_u16(tb[TCA_VLAN_PUSH_VLAN_ID]); val = rta_getattr_u16(tb[TCA_VLAN_PUSH_VLAN_ID]);
fprintf(f, " id %u", val); print_uint(PRINT_ANY, "id", " id %u", val);
} }
if (tb[TCA_VLAN_PUSH_VLAN_PROTOCOL]) { if (tb[TCA_VLAN_PUSH_VLAN_PROTOCOL]) {
fprintf(f, " protocol %s", print_string(PRINT_ANY, "protocol", " protocol %s",
ll_proto_n2a(rta_getattr_u16(tb[TCA_VLAN_PUSH_VLAN_PROTOCOL]), ll_proto_n2a(rta_getattr_u16(tb[TCA_VLAN_PUSH_VLAN_PROTOCOL]),
b1, sizeof(b1))); b1, sizeof(b1)));
} }
if (tb[TCA_VLAN_PUSH_VLAN_PRIORITY]) { if (tb[TCA_VLAN_PUSH_VLAN_PRIORITY]) {
val = rta_getattr_u8(tb[TCA_VLAN_PUSH_VLAN_PRIORITY]); val = rta_getattr_u8(tb[TCA_VLAN_PUSH_VLAN_PRIORITY]);
fprintf(f, " priority %u", val); print_uint(PRINT_ANY, "priority", " priority %u", val);
} }
break; break;
} }
print_action_control(f, " ", parm->action, ""); print_action_control(f, " ", parm->action, "");
fprintf(f, "\n\t index %u ref %d bind %d", parm->index, parm->refcnt, print_uint(PRINT_ANY, "index", "\n\t index %u", parm->index);
parm->bindcnt); print_int(PRINT_ANY, "ref", " ref %d", parm->refcnt);
print_int(PRINT_ANY, "bind", " bind %d", parm->bindcnt);
if (show_stats) { if (show_stats) {
if (tb[TCA_VLAN_TM]) { if (tb[TCA_VLAN_TM]) {
@ -237,7 +235,7 @@ static int print_vlan(struct action_util *au, FILE *f, struct rtattr *arg)
} }
} }
fprintf(f, "\n "); print_string(PRINT_FP, NULL, "%s", "\n");
return 0; return 0;
} }