bridge: fdb: add support for src_vni option

[mirror_iproute2.git] / ip / iplink_ipvlan.c

diff --git a/ip/iplink_ipvlan.c b/ip/iplink_ipvlan.c
index e08fc397b3ddf13e043db2e0939fe2303feba888..baae767b82c1d186faab533c025cf3224c9e0ccb 100644 (file)
--- a/ip/iplink_ipvlan.c
+++ b/ip/iplink_ipvlan.c
@@ -1,4 +1,4 @@
-/* iplink_ipvlan.c     IPVLAN device support
+/* iplink_ipvlan.c     IPVLAN/IPVTAP device support
  *
  *              This program is free software; you can redistribute it and/or
  *              modify it under the terms of the GNU General Public License
@@ -18,50 +18,61 @@
 #include "utils.h"
 #include "ip_common.h"
 
-static void ipvlan_explain(FILE *f)
+static void print_explain(struct link_util *lu, FILE *f)
 {
-       fprintf(f, "Usage: ... ipvlan [ mode { l2 | l3 } ]\n");
-}
-
-static void explain(void)
-{
-       ipvlan_explain(stderr);
-}
-
-static int mode_arg(void)
-{
-       fprintf(stderr, "Error: argument of \"mode\" must be either \"l2\", "
-               "or \"l3\"\n");
-       return -1;
+       fprintf(f,
+               "Usage: ... %s [ mode MODE ] [ FLAGS ]\n"
+               "\n"
+               "MODE: l3 | l3s | l2\n"
+               "FLAGS: bridge | private | vepa\n"
+               "(first values are the defaults if nothing is specified).\n",
+               lu->id);
 }
 
 static int ipvlan_parse_opt(struct link_util *lu, int argc, char **argv,
                            struct nlmsghdr *n)
 {
+       __u16 flags = 0;
+       bool mflag_given = false;
+
        while (argc > 0) {
                if (matches(*argv, "mode") == 0) {
                        __u16 mode = 0;
+
                        NEXT_ARG();
 
                        if (strcmp(*argv, "l2") == 0)
                                mode = IPVLAN_MODE_L2;
                        else if (strcmp(*argv, "l3") == 0)
                                mode = IPVLAN_MODE_L3;
-                       else
-                               return mode_arg();
-
+                       else if (strcmp(*argv, "l3s") == 0)
+                               mode = IPVLAN_MODE_L3S;
+                       else {
+                               fprintf(stderr, "Error: argument of \"mode\" must be either \"l2\", \"l3\" or \"l3s\"\n");
+                               return -1;
+                       }
                        addattr16(n, 1024, IFLA_IPVLAN_MODE, mode);
+               } else if (matches(*argv, "private") == 0 && !mflag_given) {
+                       flags |= IPVLAN_F_PRIVATE;
+                       mflag_given = true;
+               } else if (matches(*argv, "vepa") == 0 && !mflag_given) {
+                       flags |= IPVLAN_F_VEPA;
+                       mflag_given = true;
+               } else if (matches(*argv, "bridge") == 0 && !mflag_given) {
+                       mflag_given = true;
                } else if (matches(*argv, "help") == 0) {
-                       explain();
+                       print_explain(lu, stderr);
                        return -1;
                } else {
-                       fprintf(stderr, "ipvlan: unknown option \"%s\"?\n",
-                               *argv);
-                       explain();
+                       fprintf(stderr, "%s: unknown option \"%s\"?\n",
+                               lu->id, *argv);
+                       print_explain(lu, stderr);
                        return -1;
                }
-               argc--, argv++;
+               argc--;
+               argv++;
        }
+       addattr16(n, 1024, IFLA_IPVLAN_FLAGS, flags);
 
        return 0;
 }
@@ -75,10 +86,26 @@ static void ipvlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
        if (tb[IFLA_IPVLAN_MODE]) {
                if (RTA_PAYLOAD(tb[IFLA_IPVLAN_MODE]) == sizeof(__u16)) {
                        __u16 mode = rta_getattr_u16(tb[IFLA_IPVLAN_MODE]);
+                       const char *mode_str = mode == IPVLAN_MODE_L2 ? "l2" :
+                               mode == IPVLAN_MODE_L3 ? "l3" :
+                               mode == IPVLAN_MODE_L3S ? "l3s" : "unknown";
 
-                       fprintf(f, " mode %s ",
-                               mode == IPVLAN_MODE_L2 ? "l2" :
-                               mode == IPVLAN_MODE_L3 ? "l3" : "unknown");
+                       print_string(PRINT_ANY, "mode", " mode %s ", mode_str);
+               }
+       }
+       if (tb[IFLA_IPVLAN_FLAGS]) {
+               if (RTA_PAYLOAD(tb[IFLA_IPVLAN_FLAGS]) == sizeof(__u16)) {
+                       __u16 flags = rta_getattr_u16(tb[IFLA_IPVLAN_FLAGS]);
+
+                       if (flags & IPVLAN_F_PRIVATE)
+                               print_bool(PRINT_ANY, "private", "private ",
+                                          true);
+                       else if (flags & IPVLAN_F_VEPA)
+                               print_bool(PRINT_ANY, "vepa", "vepa ",
+                                          true);
+                       else
+                               print_bool(PRINT_ANY, "bridge", "bridge ",
+                                          true);
                }
        }
 }
@@ -86,7 +113,7 @@ static void ipvlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
 static void ipvlan_print_help(struct link_util *lu, int argc, char **argv,
                              FILE *f)
 {
-       ipvlan_explain(f);
+       print_explain(lu, f);
 }
 
 struct link_util ipvlan_link_util = {
@@ -96,3 +123,11 @@ struct link_util ipvlan_link_util = {
        .print_opt      = ipvlan_print_opt,
        .print_help     = ipvlan_print_help,
 };
+
+struct link_util ipvtap_link_util = {
+       .id             = "ipvtap",
+       .maxattr        = IFLA_IPVLAN_MAX,
+       .parse_opt      = ipvlan_parse_opt,
+       .print_opt      = ipvlan_print_opt,
+       .print_help     = ipvlan_print_help,
+};