iplink_geneve: add tos configuration at link creation

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

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 2b5268531bef0561e57ed983a06a123d65835616..59b98740753353e84a1c9aa84918931d4a452e7c 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -394,6 +394,7 @@ enum {
        IFLA_GENEVE_ID,
        IFLA_GENEVE_REMOTE,
        IFLA_GENEVE_TTL,
+       IFLA_GENEVE_TOS,
        __IFLA_GENEVE_MAX
 };
 #define IFLA_GENEVE_MAX        (__IFLA_GENEVE_MAX - 1)

diff --git a/ip/iplink_geneve.c b/ip/iplink_geneve.c
index dff08a62d9a9f11620549fc0961127ebb07f885d..331240a6a3d90df56fe7de78796e2a8d2b8e40fd 100644 (file)
--- a/ip/iplink_geneve.c
+++ b/ip/iplink_geneve.c
@@ -11,16 +11,18 @@
 
 #include <stdio.h>
 
+#include "rt_names.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, "                 [ ttl TTL ]\n");
+       fprintf(f, "                 [ ttl TTL ] [ tos TOS ]\n");
        fprintf(f, "\n");
        fprintf(f, "Where: VNI  := 0-16777215\n");
        fprintf(f, "       ADDR := IP_ADDRESS\n");
+       fprintf(f, "       TOS  := { NUMBER | inherit }\n");
        fprintf(f, "       TTL  := { 1..255 | inherit }\n");
 }
 
@@ -37,6 +39,7 @@ static int geneve_parse_opt(struct link_util *lu, int argc, char **argv,
        __u32 daddr = 0;
        struct in6_addr daddr6 = IN6ADDR_ANY_INIT;
        __u8 ttl = 0;
+       __u8 tos = 0;
 
        while (argc > 0) {
                if (!matches(*argv, "id") ||
@@ -66,6 +69,17 @@ static int geneve_parse_opt(struct link_util *lu, int argc, char **argv,
                                        invarg("TTL must be <= 255", *argv);
                                ttl = uval;
                        }
+               } else if (!matches(*argv, "tos") ||
+                          !matches(*argv, "dsfield")) {
+                       __u32 uval;
+
+                       NEXT_ARG();
+                       if (strcmp(*argv, "inherit") != 0) {
+                               if (rtnl_dsfield_a2n(&uval, *argv))
+                                       invarg("bad TOS value", *argv);
+                               tos = uval;
+                       } else
+                               tos = 1;
                } else if (matches(*argv, "help") == 0) {
                        explain();
                        return -1;
@@ -95,6 +109,7 @@ static int geneve_parse_opt(struct link_util *lu, int argc, char **argv,
        if (daddr)
                addattr_l(n, 1024, IFLA_GENEVE_REMOTE, &daddr, 4);
        addattr8(n, 1024, IFLA_GENEVE_TTL, ttl);
+       addattr8(n, 1024, IFLA_GENEVE_TOS, tos);
 
        return 0;
 }
@@ -103,6 +118,7 @@ static void geneve_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
 {
        __u32 vni;
        char s1[1024];
+       __u8 tos;
 
        if (!tb)
                return;
@@ -126,6 +142,14 @@ static void geneve_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
                if (ttl)
                        fprintf(f, "ttl %d ", ttl);
        }
+
+       if (tb[IFLA_GENEVE_TOS] &&
+           (tos = rta_getattr_u8(tb[IFLA_GENEVE_TOS]))) {
+               if (tos == 1)
+                       fprintf(f, "tos inherit ");
+               else
+                       fprintf(f, "tos %#x ", tos);
+       }
 }
 
 static void geneve_print_help(struct link_util *lu, int argc, char **argv,

diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in
index 51d0c624a023db6aa137cb505d14b57d08fb1aa2..372e6c6faf294f8191a6e80424d44439dcade91b 100644 (file)
--- a/man/man8/ip-link.8.in
+++ b/man/man8/ip-link.8.in
@@ -608,6 +608,8 @@ the following additional arguments are supported:
 .BI type " geneve " id " ID " remote " IPADDR"
 .R " [ "
 .BI ttl " TTL "
+.R " ] [ "
+.BI tos " TOS "
 .R " ]"
 
 .in +8
@@ -623,6 +625,10 @@ the following additional arguments are supported:
 .BI ttl " TTL"
 - specifies the TTL value to use in outgoing packets.
 
+.sp
+.BI tos " TOS"
+- specifies the TOS value to use in outgoing packets.
+
 .in -8
 
 .SS ip link delete - delete virtual link