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

ipsr: add json support 

Add json flag to ip sr command outputs.

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:16 -08:00 committed by David Ahern
parent 74498126fd
commit 111f79ad38
1 changed files with 54 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
ip/ipseg6.c
View File

@ -26,6 +26,7 @@
#include "utils.h" #include "utils.h"
#include "ip_common.h" #include "ip_common.h"
#include "libgenl.h" #include "libgenl.h"
#include "json_print.h"
#define HMAC_KEY_PROMPT "Enter secret for HMAC key ID (blank to delete): " #define HMAC_KEY_PROMPT "Enter secret for HMAC key ID (blank to delete): "
@ -55,27 +56,7 @@ static struct {
__u8 alg_id; __u8 alg_id;
} opts; } opts;
static int process_msg(const struct sockaddr_nl *who, struct nlmsghdr *n, static void print_dumphmac(struct rtattr *attrs[])
void *arg)
{
struct rtattr *attrs[SEG6_ATTR_MAX + 1];
struct genlmsghdr *ghdr;
FILE *fp = (FILE *)arg;
int len = n->nlmsg_len;
if (n->nlmsg_type != genl_family)
return -1;
len -= NLMSG_LENGTH(GENL_HDRLEN);
if (len < 0)
return -1;
ghdr = NLMSG_DATA(n);
parse_rtattr(attrs, SEG6_ATTR_MAX, (void *)ghdr + GENL_HDRLEN, len);
switch (ghdr->cmd) {
case SEG6_CMD_DUMPHMAC:
{ {
char secret[64]; char secret[64];
char *algstr; char *algstr;
@ -85,10 +66,10 @@ static int process_msg(const struct sockaddr_nl *who, struct nlmsghdr *n,
memset(secret, 0, 64); memset(secret, 0, 64);
if (slen > 63) { if (slen > 63) {
fprintf(stderr, "HMAC secret length %d > 63, " fprintf(stderr, "HMAC secret length %d > 63, truncated\n", slen);
"truncated\n", slen);
slen = 63; slen = 63;
} }
memcpy(secret, RTA_DATA(attrs[SEG6_ATTR_SECRET]), slen); memcpy(secret, RTA_DATA(attrs[SEG6_ATTR_SECRET]), slen);
switch (alg_id) { switch (alg_id) {
@ -102,22 +83,51 @@ static int process_msg(const struct sockaddr_nl *who, struct nlmsghdr *n,
algstr = "<unknown>"; algstr = "<unknown>";
} }
fprintf(fp, "hmac %u ", print_uint(PRINT_ANY, "hmac", "hmac %u ",
rta_getattr_u32(attrs[SEG6_ATTR_HMACKEYID])); rta_getattr_u32(attrs[SEG6_ATTR_HMACKEYID]));
fprintf(fp, "algo %s ", algstr); print_string(PRINT_ANY, "algo", "algo %s ", algstr);
fprintf(fp, "secret \"%s\" ", secret); print_string(PRINT_ANY, "secret", "secret \"%s\"\n", secret);
}
fprintf(fp, "\n"); static void print_tunsrc(struct rtattr *attrs[])
break;
}
case SEG6_CMD_GET_TUNSRC:
{ {
fprintf(fp, "tunsrc addr %s\n", const char *dst
rt_addr_n2a(AF_INET6, 16, = rt_addr_n2a(AF_INET6, 16,
RTA_DATA(attrs[SEG6_ATTR_DST]))); RTA_DATA(attrs[SEG6_ATTR_DST]));
print_string(PRINT_ANY, "tunsrc",
"tunsrc addr %s\n", dst);
}
static int process_msg(const struct sockaddr_nl *who, struct nlmsghdr *n,
void *arg)
{
struct rtattr *attrs[SEG6_ATTR_MAX + 1];
struct genlmsghdr *ghdr;
int len = n->nlmsg_len;
if (n->nlmsg_type != genl_family)
return -1;
len -= NLMSG_LENGTH(GENL_HDRLEN);
if (len < 0)
return -1;
ghdr = NLMSG_DATA(n);
parse_rtattr(attrs, SEG6_ATTR_MAX, (void *)ghdr + GENL_HDRLEN, len);
open_json_object(NULL);
switch (ghdr->cmd) {
case SEG6_CMD_DUMPHMAC:
print_dumphmac(attrs);
break;
case SEG6_CMD_GET_TUNSRC:
print_tunsrc(attrs);
break; break;
} }
} close_json_object();
return 0; return 0;
} }
@ -169,10 +179,12 @@ static int seg6_do_cmd(void)
} else if (repl) { } else if (repl) {
if (rtnl_talk(&grth, &req.n, &answer) < 0) if (rtnl_talk(&grth, &req.n, &answer) < 0)
return -2; return -2;
new_json_obj(json);
if (process_msg(NULL, answer, stdout) < 0) { if (process_msg(NULL, answer, stdout) < 0) {
fprintf(stderr, "Error parsing reply\n"); fprintf(stderr, "Error parsing reply\n");
exit(1); exit(1);
} }
delete_json_obj();
free(answer); free(answer);
} else { } else {
req.n.nlmsg_flags |= NLM_F_DUMP; req.n.nlmsg_flags |= NLM_F_DUMP;
@ -182,10 +194,13 @@ static int seg6_do_cmd(void)
exit(1); exit(1);
} }
new_json_obj(json);
if (rtnl_dump_filter(&grth, process_msg, stdout) < 0) { if (rtnl_dump_filter(&grth, process_msg, stdout) < 0) {
fprintf(stderr, "Dump terminated\n"); fprintf(stderr, "Dump terminated\n");
exit(1); exit(1);
} }
delete_json_obj();
fflush(stdout);
} }
return 0; return 0;