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

ip netconf: show all families on dev request 

Currently specifying a device to ip netconf and it dumps only values
for IPv4. Change this to dump data for all families unless a specific
family is given.

Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
This commit is contained in:
David Ahern 2017-03-23 19:51:22 -07:00 committed by Stephen Hemminger
parent f052f5dfe0
commit c6858ef431
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ip/ipnetconf.c
View File

@ -56,6 +56,7 @@ int print_netconf(const struct sockaddr_nl *who, struct rtnl_ctrl_data *ctrl,
struct netconfmsg *ncm = NLMSG_DATA(n); struct netconfmsg *ncm = NLMSG_DATA(n);
int len = n->nlmsg_len; int len = n->nlmsg_len;
struct rtattr *tb[NETCONFA_MAX+1]; struct rtattr *tb[NETCONFA_MAX+1];
int ifindex = 0;
if (n->nlmsg_type == NLMSG_ERROR) if (n->nlmsg_type == NLMSG_ERROR)
return -1; return -1;
@ -77,6 +78,12 @@ int print_netconf(const struct sockaddr_nl *who, struct rtnl_ctrl_data *ctrl,
parse_rtattr(tb, NETCONFA_MAX, netconf_rta(ncm), parse_rtattr(tb, NETCONFA_MAX, netconf_rta(ncm),
NLMSG_PAYLOAD(n, sizeof(*ncm))); NLMSG_PAYLOAD(n, sizeof(*ncm)));
if (tb[NETCONFA_IFINDEX])
ifindex = rta_getattr_u32(tb[NETCONFA_IFINDEX]);
if (filter.ifindex && filter.ifindex != ifindex)
return 0;
switch (ncm->ncm_family) { switch (ncm->ncm_family) {
case AF_INET: case AF_INET:
fprintf(fp, "ipv4 "); fprintf(fp, "ipv4 ");
@ -93,9 +100,7 @@ int print_netconf(const struct sockaddr_nl *who, struct rtnl_ctrl_data *ctrl,
} }
if (tb[NETCONFA_IFINDEX]) { if (tb[NETCONFA_IFINDEX]) {
int *ifindex = (int *)rta_getattr_str(tb[NETCONFA_IFINDEX]); switch (ifindex) {
switch (*ifindex) {
case NETCONFA_IFINDEX_ALL: case NETCONFA_IFINDEX_ALL:
fprintf(fp, "all "); fprintf(fp, "all ");
break; break;
@ -103,7 +108,7 @@ int print_netconf(const struct sockaddr_nl *who, struct rtnl_ctrl_data *ctrl,
fprintf(fp, "default "); fprintf(fp, "default ");
break; break;
default: default:
fprintf(fp, "dev %s ", ll_index_to_name(*ifindex)); fprintf(fp, "dev %s ", ll_index_to_name(ifindex));
break; break;
} }
} }
@ -169,8 +174,6 @@ static int do_show(int argc, char **argv)
ipnetconf_reset_filter(0); ipnetconf_reset_filter(0);
filter.family = preferred_family; filter.family = preferred_family;
if (filter.family == AF_UNSPEC)
filter.family = AF_INET;
while (argc > 0) { while (argc > 0) {
if (strcmp(*argv, "dev") == 0) { if (strcmp(*argv, "dev") == 0) {
@ -186,11 +189,11 @@ static int do_show(int argc, char **argv)
} }
ll_init_map(&rth); ll_init_map(&rth);
if (filter.ifindex) {
if (filter.ifindex && filter.family != AF_UNSPEC) {
req.ncm.ncm_family = filter.family; req.ncm.ncm_family = filter.family;
if (filter.ifindex) addattr_l(&req.n, sizeof(req), NETCONFA_IFINDEX,
addattr_l(&req.n, sizeof(req), NETCONFA_IFINDEX, &filter.ifindex, sizeof(filter.ifindex));
&filter.ifindex, sizeof(filter.ifindex));
if (rtnl_send(&rth, &req.n, req.n.nlmsg_len) < 0) { if (rtnl_send(&rth, &req.n, req.n.nlmsg_len) < 0) {
perror("Can not send request"); perror("Can not send request");