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

tc: jsonify tunnel_key action 

Signed-off-by: Roman Mashak <mrv@mojatatu.com>
Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
Roman Mashak 2018-04-04 13:21:18 -04:00 committed by David Ahern
parent 1d3c91a7c4
commit 8feb516bfc
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tc/m_tunnel_key.c
View File

@ -221,7 +221,13 @@ static void tunnel_key_print_ip_addr(FILE *f, const char *name,
else else
return; return;
fprintf(f, "\n\t%s %s", name, rt_addr_n2a_rta(family, attr)); print_string(PRINT_FP, NULL, "%s", _SL_);
if (matches(name, "src_ip") == 0)
print_string(PRINT_ANY, "src_ip", "\tsrc_ip %s",
rt_addr_n2a_rta(family, attr));
else if (matches(name, "dst_ip") == 0)
print_string(PRINT_ANY, "dst_ip", "\tdst_ip %s",
rt_addr_n2a_rta(family, attr));
} }
static void tunnel_key_print_key_id(FILE *f, const char *name, static void tunnel_key_print_key_id(FILE *f, const char *name,
@ -229,7 +235,8 @@ static void tunnel_key_print_key_id(FILE *f, const char *name,
{ {
if (!attr) if (!attr)
return; return;
fprintf(f, "\n\t%s %d", name, rta_getattr_be32(attr)); print_string(PRINT_FP, NULL, "%s", _SL_);
print_uint(PRINT_ANY, "key_id", "\tkey_id %u", rta_getattr_be32(attr));
} }
static void tunnel_key_print_dst_port(FILE *f, char *name, static void tunnel_key_print_dst_port(FILE *f, char *name,
@ -237,7 +244,9 @@ static void tunnel_key_print_dst_port(FILE *f, char *name,
{ {
if (!attr) if (!attr)
return; return;
fprintf(f, "\n\t%s %d", name, rta_getattr_be16(attr)); print_string(PRINT_FP, NULL, "%s", _SL_);
print_uint(PRINT_ANY, "dst_port", "\tdst_port %u",
rta_getattr_be16(attr));
} }
static void tunnel_key_print_flag(FILE *f, const char *name_on, static void tunnel_key_print_flag(FILE *f, const char *name_on,
@ -246,7 +255,9 @@ static void tunnel_key_print_flag(FILE *f, const char *name_on,
{ {
if (!attr) if (!attr)
return; return;
fprintf(f, "\n\t%s", rta_getattr_u8(attr) ? name_on : name_off); print_string(PRINT_FP, NULL, "%s", _SL_);
print_string(PRINT_ANY, "flag", "\t%s",
rta_getattr_u8(attr) ? name_on : name_off);
} }
static int print_tunnel_key(struct action_util *au, FILE *f, struct rtattr *arg) static int print_tunnel_key(struct action_util *au, FILE *f, struct rtattr *arg)
@ -260,19 +271,20 @@ static int print_tunnel_key(struct action_util *au, FILE *f, struct rtattr *arg)
parse_rtattr_nested(tb, TCA_TUNNEL_KEY_MAX, arg); parse_rtattr_nested(tb, TCA_TUNNEL_KEY_MAX, arg);
if (!tb[TCA_TUNNEL_KEY_PARMS]) { if (!tb[TCA_TUNNEL_KEY_PARMS]) {
fprintf(f, "[NULL tunnel_key parameters]"); print_string(PRINT_FP, NULL, "%s",
"[NULL tunnel_key parameters]");
return -1; return -1;
} }
parm = RTA_DATA(tb[TCA_TUNNEL_KEY_PARMS]); parm = RTA_DATA(tb[TCA_TUNNEL_KEY_PARMS]);
fprintf(f, "tunnel_key"); print_string(PRINT_ANY, "kind", "%s ", "tunnel_key");
switch (parm->t_action) { switch (parm->t_action) {
case TCA_TUNNEL_KEY_ACT_RELEASE: case TCA_TUNNEL_KEY_ACT_RELEASE:
fprintf(f, " unset"); print_string(PRINT_ANY, "mode", " %s", "unset");
break; break;
case TCA_TUNNEL_KEY_ACT_SET: case TCA_TUNNEL_KEY_ACT_SET:
fprintf(f, " set"); print_string(PRINT_ANY, "mode", " %s", "set");
tunnel_key_print_ip_addr(f, "src_ip", tunnel_key_print_ip_addr(f, "src_ip",
tb[TCA_TUNNEL_KEY_ENC_IPV4_SRC]); tb[TCA_TUNNEL_KEY_ENC_IPV4_SRC]);
tunnel_key_print_ip_addr(f, "dst_ip", tunnel_key_print_ip_addr(f, "dst_ip",
@ -291,8 +303,10 @@ static int print_tunnel_key(struct action_util *au, FILE *f, struct rtattr *arg)
} }
print_action_control(f, " ", parm->action, ""); print_action_control(f, " ", parm->action, "");
fprintf(f, "\n\tindex %d ref %d bind %d", parm->index, parm->refcnt, print_string(PRINT_FP, NULL, "%s", _SL_);
parm->bindcnt); print_uint(PRINT_ANY, "index", "\t index %u", parm->index);
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_TUNNEL_KEY_TM]) { if (tb[TCA_TUNNEL_KEY_TM]) {
@ -302,7 +316,7 @@ static int print_tunnel_key(struct action_util *au, FILE *f, struct rtattr *arg)
} }
} }
fprintf(f, "\n "); print_string(PRINT_FP, NULL, "%s", _SL_);
return 0; return 0;
} }