iproute2: GENEVE support

Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/ip/Makefile b/ip/Makefile
index 2c742f305fefaa244d5c9d1657c8699d8dd8225c..77653ecc5785ec7dfdb2f6b9f11c100530f925f4 100644 (file)
--- a/ip/Makefile
+++ b/ip/Makefile
@@ -6,7 +6,8 @@ IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \
     iplink_macvlan.o iplink_macvtap.o ipl2tp.o link_vti.o link_vti6.o \
     iplink_vxlan.o tcp_metrics.o iplink_ipoib.o ipnetconf.o link_ip6tnl.o \
     link_iptnl.o link_gre6.o iplink_bond.o iplink_bond_slave.o iplink_hsr.o \
-    iplink_bridge.o iplink_bridge_slave.o ipfou.o iplink_ipvlan.o
+    iplink_bridge.o iplink_bridge_slave.o ipfou.o iplink_ipvlan.o \
+    iplink_geneve.o
 
 RTMONOBJ=rtmon.o
 

diff --git a/ip/iplink.c b/ip/iplink.c
index bb437b96239a76bc6a30b7e652b84ebf5123040a..39c76e778020f4e1f7a98ab6c06828c81d79017b 100644 (file)
--- a/ip/iplink.c
+++ b/ip/iplink.c
@@ -93,7 +93,7 @@ void iplink_usage(void)
                fprintf(stderr, "TYPE := { vlan | veth | vcan | dummy | ifb | macvlan | macvtap |\n");
                fprintf(stderr, "          bridge | bond | ipoib | ip6tnl | ipip | sit | vxlan |\n");
                fprintf(stderr, "          gre | gretap | ip6gre | ip6gretap | vti | nlmon |\n");
-               fprintf(stderr, "          bond_slave | ipvlan }\n");
+               fprintf(stderr, "          bond_slave | ipvlan | geneve }\n");
        }
        exit(-1);
 }

diff --git a/ip/iplink_geneve.c b/ip/iplink_geneve.c
new file mode 100644 (file)
index 0000000..74703e1
--- /dev/null
+++ b/ip/iplink_geneve.c
@@ -0,0 +1,122 @@
+/*
+ * iplink_geneve.c     GENEVE device support
+ *
+ *              This program is free software; you can redistribute it and/or
+ *              modify it under the terms of the GNU General Public License
+ *              as published by the Free Software Foundation; either version
+ *              2 of the License, or (at your option) any later version.
+ *
+ * Authors:     John W. Linville <linville@tuxdriver.com>
+ */
+
+#include <stdio.h>
+
+#include "utils.h"
+#include "ip_common.h"
+
+static void print_explain(FILE *f)
+{
+       fprintf(f, "Usage: ... geneve id VNI remote ADDR\n");
+       fprintf(f, "\n");
+       fprintf(f, "Where: VNI  := 0-16777215\n");
+       fprintf(f, "       ADDR := IP_ADDRESS\n");
+}
+
+static void explain(void)
+{
+       print_explain(stderr);
+}
+
+static int geneve_parse_opt(struct link_util *lu, int argc, char **argv,
+                         struct nlmsghdr *n)
+{
+       __u32 vni = 0;
+       int vni_set = 0;
+       __u32 daddr = 0;
+       struct in6_addr daddr6 = IN6ADDR_ANY_INIT;
+
+
+       while (argc > 0) {
+               if (!matches(*argv, "id") ||
+                   !matches(*argv, "vni")) {
+                       NEXT_ARG();
+                       if (get_u32(&vni, *argv, 0) ||
+                           vni >= 1u << 24)
+                               invarg("invalid id", *argv);
+                       vni_set = 1;
+               } else if (!matches(*argv, "remote")) {
+                       NEXT_ARG();
+                       if (!inet_get_addr(*argv, &daddr, &daddr6)) {
+                               fprintf(stderr, "Invalid address \"%s\"\n", *argv);
+                               return -1;
+                       }
+                       if (IN_MULTICAST(ntohl(daddr)))
+                               invarg("invalid remote address", *argv);
+               } else if (matches(*argv, "help") == 0) {
+                       explain();
+                       return -1;
+               } else {
+                       fprintf(stderr, "geneve: unknown command \"%s\"?\n", *argv);
+                       explain();
+                       return -1;
+               }
+               argc--, argv++;
+       }
+
+       if (!vni_set) {
+               fprintf(stderr, "geneve: missing virtual network identifier\n");
+               return -1;
+       }
+
+       if (!daddr) {
+               fprintf(stderr, "geneve: remove link partner not specified\n");
+               return -1;
+       }
+       if (memcmp(&daddr6, &in6addr_any, sizeof(daddr6)) != 0) {
+               fprintf(stderr, "geneve: remove link over IPv6 not supported\n");
+               return -1;
+       }
+
+       addattr32(n, 1024, IFLA_GENEVE_ID, vni);
+       if (daddr)
+               addattr_l(n, 1024, IFLA_GENEVE_REMOTE, &daddr, 4);
+
+       return 0;
+}
+
+static void geneve_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
+{
+       __u32 vni;
+       char s1[1024];
+
+       if (!tb)
+               return;
+
+       if (!tb[IFLA_GENEVE_ID] ||
+           RTA_PAYLOAD(tb[IFLA_GENEVE_ID]) < sizeof(__u32))
+               return;
+
+       vni = rta_getattr_u32(tb[IFLA_GENEVE_ID]);
+       fprintf(f, "id %u ", vni);
+
+       if (tb[IFLA_GENEVE_REMOTE]) {
+               __be32 addr = rta_getattr_u32(tb[IFLA_GENEVE_REMOTE]);
+               if (addr)
+                       fprintf(f, "remote %s ",
+                               format_host(AF_INET, 4, &addr, s1, sizeof(s1)));
+       }
+}
+
+static void geneve_print_help(struct link_util *lu, int argc, char **argv,
+       FILE *f)
+{
+       print_explain(f);
+}
+
+struct link_util geneve_link_util = {
+       .id             = "geneve",
+       .maxattr        = IFLA_GENEVE_MAX,
+       .parse_opt      = geneve_parse_opt,
+       .print_opt      = geneve_print_opt,
+       .print_help     = geneve_print_help,
+};