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

token: support JSON 

Add JSON output to ip token command.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
Stephen Hemminger 2018-03-06 13:07:17 -08:00 committed by David Ahern
parent 111f79ad38
commit b62ec792a9
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ip/iptoken.c
View File

@ -25,6 +25,7 @@
#include "rt_names.h"
#include "utils.h"
#include "ip_common.h"
#include "json_print.h"
extern struct rtnl_handle rth;
@ -77,9 +78,17 @@ static int print_token(const struct sockaddr_nl *who, struct nlmsghdr *n, void *
return -1;
}
fprintf(fp, "token %s dev %s\n",
format_host_rta(ifi->ifi_family, ltb[IFLA_INET6_TOKEN]),
ll_index_to_name(ifi->ifi_index));
open_json_object(NULL);
print_string(PRINT_FP, NULL, "token ", NULL);
print_color_string(PRINT_ANY,
ifa_family_color(ifi->ifi_family),
"token", "%s",
format_host_rta(ifi->ifi_family, ltb[IFLA_INET6_TOKEN]));
print_string(PRINT_FP, NULL, " dev ", NULL);
print_color_string(PRINT_ANY, COLOR_IFNAME,
"ifname", "%s\n",
ll_index_to_name(ifi->ifi_index));
close_json_object();
fflush(fp);
return 0;
@ -105,10 +114,13 @@ static int iptoken_list(int argc, char **argv)
return -1;
}
new_json_obj(json);
if (rtnl_dump_filter(&rth, print_token, &da) < 0) {
delete_json_obj();
fprintf(stderr, "Dump terminated\n");
return -1;
}
delete_json_obj();
return 0;
}