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

ip: Add support for MPLS netconf 

Add support for MPLS netconf to ip monitor and ip netconf commands.
Changes to header files not included as those are typically pulled
in my a header sync with the kernel.

Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
This commit is contained in:
David Ahern 2017-02-21 09:23:31 -08:00 committed by Stephen Hemminger
parent 3f34574d0f
commit 76f7d89d4d
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ip/ipmonitor.c
View File

@ -176,6 +176,7 @@ int do_ipmonitor(int argc, char **argv)
groups |= nl_mgrp(RTNLGRP_IPV4_RULE); groups |= nl_mgrp(RTNLGRP_IPV4_RULE);
groups |= nl_mgrp(RTNLGRP_IPV6_RULE); groups |= nl_mgrp(RTNLGRP_IPV6_RULE);
groups |= nl_mgrp(RTNLGRP_NSID); groups |= nl_mgrp(RTNLGRP_NSID);
groups |= nl_mgrp(RTNLGRP_MPLS_NETCONF);
rtnl_close(&rth); rtnl_close(&rth);
@ -271,6 +272,8 @@ int do_ipmonitor(int argc, char **argv)
groups |= nl_mgrp(RTNLGRP_IPV4_NETCONF); groups |= nl_mgrp(RTNLGRP_IPV4_NETCONF);
if (!preferred_family || preferred_family == AF_INET6) if (!preferred_family || preferred_family == AF_INET6)
groups |= nl_mgrp(RTNLGRP_IPV6_NETCONF); groups |= nl_mgrp(RTNLGRP_IPV6_NETCONF);
if (!preferred_family || preferred_family == AF_MPLS)
groups |= nl_mgrp(RTNLGRP_MPLS_NETCONF);
} }
if (lrule) { if (lrule) {
if (!preferred_family || preferred_family == AF_INET) if (!preferred_family || preferred_family == AF_INET)

6
ip/ipnetconf.c
View File

@ -83,6 +83,9 @@ int print_netconf(const struct sockaddr_nl *who, struct rtnl_ctrl_data *ctrl,
case AF_INET6: case AF_INET6:
fprintf(fp, "ipv6 "); fprintf(fp, "ipv6 ");
break; break;
case AF_MPLS:
fprintf(fp, "mpls ");
break;
default: default:
fprintf(fp, "unknown "); fprintf(fp, "unknown ");
break; break;
@ -131,6 +134,9 @@ int print_netconf(const struct sockaddr_nl *who, struct rtnl_ctrl_data *ctrl,
print_onoff(fp, "ignore_routes_with_linkdown", print_onoff(fp, "ignore_routes_with_linkdown",
rta_getattr_u32(tb[NETCONFA_IGNORE_ROUTES_WITH_LINKDOWN])); rta_getattr_u32(tb[NETCONFA_IGNORE_ROUTES_WITH_LINKDOWN]));
if (tb[NETCONFA_INPUT])
print_onoff(fp, "input", rta_getattr_u32(tb[NETCONFA_INPUT]));
fprintf(fp, "\n"); fprintf(fp, "\n");
fflush(fp); fflush(fp);
return 0; return 0;