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

ip netconf: Show all address families by default in dumps 

Currently, 'ip netconf' only shows ipv4 and ipv6 netconf settings. If IPv6
is not enabled, the dump ends with
    RTNETLINK answers: Operation not supported

when IPv6 request is attempted. Further, if the mpls_router module is also
loaded a separate request is needed to get MPLS settings.

To make this better going forward, use the new PF_UNSPEC dump all option
if the kernel supports it. If the kernel does not, it sets NLMSG_ERROR and
returns EOPNOTSUPP which is trapped and we fall back to the existing output
to maintain compatibility with existing kernels.

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

13
ip/ipnetconf.c
View File

@ -19,6 +19,7 @@
#include <sys/time.h> #include <sys/time.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <errno.h>
#include "rt_names.h" #include "rt_names.h"
#include "utils.h" #include "utils.h"
@ -197,16 +198,26 @@ static int do_show(int argc, char **argv)
} }
rtnl_listen(&rth, print_netconf, stdout); rtnl_listen(&rth, print_netconf, stdout);
} else { } else {
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);
} }
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;
* fall back to requesting by family
*/
if (errno == EOPNOTSUPP &&
filter.family == AF_UNSPEC) {
filter.family = AF_INET;
goto dump;
}
perror("RTNETLINK answers");
fprintf(stderr, "Dump terminated\n"); fprintf(stderr, "Dump terminated\n");
exit(1); exit(1);
} }
if (preferred_family == AF_UNSPEC) { 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;
goto dump; goto dump;