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

ipnetconf: add JSON support 

Basic JSON support for ip netconf command.
Also cleanup some checkpatch warnings about long lines.

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:13 -08:00 committed by David Ahern
parent 3c1e087b05
commit 96032aaf7d
1 changed files with 39 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
ip/ipnetconf.c
View File

@ -29,6 +29,10 @@ static struct {
int ifindex; int ifindex;
} filter; } filter;
static const char * const rp_filter_names[] = {
"off", "strict", "loose"
};
static void usage(void) __attribute__((noreturn)); static void usage(void) __attribute__((noreturn));
static void usage(void) static void usage(void)
@ -37,9 +41,12 @@ static void usage(void)
exit(-1); exit(-1);
} }
static void print_onoff(FILE *f, const char *flag, __u32 val) static void print_onoff(FILE *fp, const char *flag, __u32 val)
{ {
fprintf(f, "%s %s ", flag, val ? "on" : "off"); if (is_json_context())
print_bool(PRINT_JSON, flag, NULL, val);
else
fprintf(fp, "%s %s ", flag, val ? "on" : "off");
} }
static struct rtattr *netconf_rta(struct netconfmsg *ncm) static struct rtattr *netconf_rta(struct netconfmsg *ncm)
@ -83,50 +90,44 @@ int print_netconf(const struct sockaddr_nl *who, struct rtnl_ctrl_data *ctrl,
if (filter.ifindex && filter.ifindex != ifindex) if (filter.ifindex && filter.ifindex != ifindex)
return 0; return 0;
switch (ncm->ncm_family) { open_json_object(NULL);
case AF_INET: print_string(PRINT_ANY, "family",
fprintf(fp, "ipv4 "); "%s ", family_name(ncm->ncm_family));
break;
case AF_INET6:
fprintf(fp, "ipv6 ");
break;
case AF_MPLS:
fprintf(fp, "mpls ");
break;
default:
fprintf(fp, "unknown ");
break;
}
if (tb[NETCONFA_IFINDEX]) { if (tb[NETCONFA_IFINDEX]) {
const char *dev;
switch (ifindex) { switch (ifindex) {
case NETCONFA_IFINDEX_ALL: case NETCONFA_IFINDEX_ALL:
fprintf(fp, "all "); dev = "all";
break; break;
case NETCONFA_IFINDEX_DEFAULT: case NETCONFA_IFINDEX_DEFAULT:
fprintf(fp, "default "); dev = "default";
break; break;
default: default:
fprintf(fp, "dev %s ", ll_index_to_name(ifindex)); dev = ll_index_to_name(ifindex);
break; break;
} }
print_color_string(PRINT_ANY, COLOR_IFNAME,
"interface", "%s ", dev);
} }
if (tb[NETCONFA_FORWARDING]) if (tb[NETCONFA_FORWARDING])
print_onoff(fp, "forwarding", print_onoff(fp, "forwarding",
rta_getattr_u32(tb[NETCONFA_FORWARDING])); rta_getattr_u32(tb[NETCONFA_FORWARDING]));
if (tb[NETCONFA_RP_FILTER]) { if (tb[NETCONFA_RP_FILTER]) {
__u32 rp_filter = rta_getattr_u32(tb[NETCONFA_RP_FILTER]); __u32 rp_filter = rta_getattr_u32(tb[NETCONFA_RP_FILTER]);
if (rp_filter == 0) if (rp_filter < ARRAY_SIZE(rp_filter_names))
fprintf(fp, "rp_filter off "); print_string(PRINT_ANY, "rp_filter",
else if (rp_filter == 1) "rp_filter %s ",
fprintf(fp, "rp_filter strict "); rp_filter_names[rp_filter]);
else if (rp_filter == 2)
fprintf(fp, "rp_filter loose ");
else else
fprintf(fp, "rp_filter unknown mode "); print_uint(PRINT_ANY, "rp_filter",
"rp_filter %u ", rp_filter);
} }
if (tb[NETCONFA_MC_FORWARDING]) if (tb[NETCONFA_MC_FORWARDING])
print_onoff(fp, "mc_forwarding", print_onoff(fp, "mc_forwarding",
rta_getattr_u32(tb[NETCONFA_MC_FORWARDING])); rta_getattr_u32(tb[NETCONFA_MC_FORWARDING]));
@ -142,7 +143,8 @@ int print_netconf(const struct sockaddr_nl *who, struct rtnl_ctrl_data *ctrl,
if (tb[NETCONFA_INPUT]) if (tb[NETCONFA_INPUT])
print_onoff(fp, "input", rta_getattr_u32(tb[NETCONFA_INPUT])); print_onoff(fp, "input", rta_getattr_u32(tb[NETCONFA_INPUT]));
fprintf(fp, "\n"); close_json_object();
print_string(PRINT_FP, NULL, "\n", NULL);
fflush(fp); fflush(fp);
return 0; return 0;
} }
@ -179,7 +181,8 @@ static int do_show(int argc, char **argv)
NEXT_ARG(); NEXT_ARG();
filter.ifindex = ll_name_to_index(*argv); filter.ifindex = ll_name_to_index(*argv);
if (filter.ifindex <= 0) { if (filter.ifindex <= 0) {
fprintf(stderr, "Device \"%s\" does not exist.\n", fprintf(stderr,
"Device \"%s\" does not exist.\n",
*argv); *argv);
return -1; return -1;
} }
@ -202,10 +205,13 @@ static int do_show(int argc, char **argv)
} else { } else {
rth.flags = RTNL_HANDLE_F_SUPPRESS_NLERR; rth.flags = RTNL_HANDLE_F_SUPPRESS_NLERR;
dump: dump:
if (rtnl_wilddump_request(&rth, filter.family, RTM_GETNETCONF) < 0) { if (rtnl_wilddump_request(&rth, filter.family,
RTM_GETNETCONF) < 0) {
perror("Cannot send dump request"); perror("Cannot send dump request");
exit(1); exit(1);
} }
new_json_obj(json);
if (rtnl_dump_filter(&rth, print_netconf2, stdout) < 0) { if (rtnl_dump_filter(&rth, print_netconf2, stdout) < 0) {
/* kernel does not support netconf dump on AF_UNSPEC; /* kernel does not support netconf dump on AF_UNSPEC;
* fall back to requesting by family * fall back to requesting by family
@ -219,6 +225,7 @@ dump:
fprintf(stderr, "Dump terminated\n"); fprintf(stderr, "Dump terminated\n");
exit(1); exit(1);
} }
delete_json_obj();
if (preferred_family == AF_UNSPEC && filter.family == AF_INET) { if (preferred_family == AF_UNSPEC && filter.family == AF_INET) {
preferred_family = AF_INET6; preferred_family = AF_INET6;
filter.family = AF_INET6; filter.family = AF_INET6;
@ -240,6 +247,8 @@ int do_ipnetconf(int argc, char **argv)
} else } else
return do_show(0, NULL); return do_show(0, NULL);
fprintf(stderr, "Command \"%s\" is unknown, try \"ip netconf help\".\n", *argv); fprintf(stderr,
"Command \"%s\" is unknown, try \"ip netconf help\".\n",
*argv);
exit(-1); exit(-1);
} }