]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
vrf: Add support for table names
authorDavid Ahern <dsa@cumulusnetworks.com>
Tue, 8 Dec 2015 20:24:44 +0000 (12:24 -0800)
committerStephen Hemminger <shemming@brocade.com>
Thu, 10 Dec 2015 16:45:30 +0000 (08:45 -0800)
Currently, the table id for VRF devices requires an integer. Convert
it to use rtnl_rttable_a2n which handles table names from the iproute2
directory.

This also fixes a bug in the original commit where table name are not
properly handled.

Fixes: 15faa0a30bed ("add support for VRF device")
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
ip/iplink_vrf.c

index 913a2892c95b0683f0813fca438141bb70c4d106..9b4b7728cf6f146ccd5ddfc2daca20a68f79a87a 100644 (file)
@@ -28,12 +28,6 @@ static void explain(void)
        vrf_explain(stderr);
 }
 
-static int table_arg(void)
-{
-       fprintf(stderr,"Error: argument of \"table\" must be 0-32767 and currently unused\n");
-       return -1;
-}
-
 static int vrf_parse_opt(struct link_util *lu, int argc, char **argv,
                            struct nlmsghdr *n)
 {
@@ -43,9 +37,8 @@ static int vrf_parse_opt(struct link_util *lu, int argc, char **argv,
 
                        NEXT_ARG();
 
-                       table = atoi(*argv);
-                       if (table > 32767)
-                               return table_arg();
+                       if (rtnl_rttable_a2n(&table, *argv))
+                               invarg("invalid table ID\n", *argv);
                        addattr32(n, 1024, IFLA_VRF_TABLE, table);
                } else if (matches(*argv, "help") == 0) {
                        explain();