mpls: always set type RTN_UNICAST and scope RT_SCOPE_UNIVERSE for

This patch fixes incorrect -EINVAL errors due to invalid
scope and type during mpls route deletes.

$ip -f mpls route add 100 as 200 via inet 10.1.1.2 dev swp1

$ip -f mpls route show
100 as to 200 via inet 10.1.1.2 dev swp1

$ip -f mpls route del 100 as 200 via inet 10.1.1.2 dev swp1
RTNETLINK answers: Invalid argument

$ip -f mpls route del 100
RTNETLINK answers: Invalid argument

After patch:

$ip -f mpls route show
100 as to 200 via inet 10.1.1.2 dev swp1

$ip -f mpls route del 100 as 200 via inet 10.1.1.2 dev swp1

$ip -f mpls route show

Always set type to RTN_UNICAST for mpls route add/deletes.
Also to keep things consistent with kernel set scope to
RT_SCOPE_UNIVERSE for both mpls and ipv6 routes. Both mpls and ipv6 route
deletes ignore scope.

Suggested-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: Vivek Venkataraman <vivek@cumulusnetworks.com>
Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
(cherry picked from commit f638e9f7c8718cd5f94bd1f6041319e7d65a91cd)

diff --git a/ip/iproute.c b/ip/iproute.c
index fba475f6531443bdde3d46ecd898ef372c25d984..b7e73b51a40b71320ad0e4c515a6a6e3a771e27d 100644 (file)
--- a/ip/iproute.c
+++ b/ip/iproute.c
@@ -803,6 +803,7 @@ static int iproute_modify(int cmd, unsigned flags, int argc, char **argv)
        int scope_ok = 0;
        int table_ok = 0;
        int raw = 0;
+       int type_ok = 0;
 
        memset(&req, 0, sizeof(req));
 
@@ -1095,6 +1096,7 @@ static int iproute_modify(int cmd, unsigned flags, int argc, char **argv)
                            rtnl_rtntype_a2n(&type, *argv) == 0) {
                                NEXT_ARG();
                                req.r.rtm_type = type;
+                               type_ok = 1;
                        }
 
                        if (matches(*argv, "help") == 0)
@@ -1136,6 +1138,9 @@ static int iproute_modify(int cmd, unsigned flags, int argc, char **argv)
        if (nhs_ok)
                parse_nexthops(&req.n, &req.r, argc, argv);
 
+       if (req.r.rtm_family == AF_UNSPEC)
+               req.r.rtm_family = AF_INET;
+
        if (!table_ok) {
                if (req.r.rtm_type == RTN_LOCAL ||
                    req.r.rtm_type == RTN_BROADCAST ||
@@ -1144,8 +1149,11 @@ static int iproute_modify(int cmd, unsigned flags, int argc, char **argv)
                        req.r.rtm_table = RT_TABLE_LOCAL;
        }
        if (!scope_ok) {
-               if (req.r.rtm_type == RTN_LOCAL ||
-                   req.r.rtm_type == RTN_NAT)
+               if (req.r.rtm_family == AF_INET6 ||
+                   req.r.rtm_family == AF_MPLS)
+                       req.r.rtm_scope = RT_SCOPE_UNIVERSE;
+               else if (req.r.rtm_type == RTN_LOCAL ||
+                        req.r.rtm_type == RTN_NAT)
                        req.r.rtm_scope = RT_SCOPE_HOST;
                else if (req.r.rtm_type == RTN_BROADCAST ||
                         req.r.rtm_type == RTN_MULTICAST ||
@@ -1160,8 +1168,8 @@ static int iproute_modify(int cmd, unsigned flags, int argc, char **argv)
                }
        }
 
-       if (req.r.rtm_family == AF_UNSPEC)
-               req.r.rtm_family = AF_INET;
+       if (!type_ok && req.r.rtm_family == AF_MPLS)
+               req.r.rtm_type = RTN_UNICAST;
 
        if (rtnl_talk(&rth, &req.n, NULL, 0) < 0)
                return -2;