diff options
| author | Daniel Borkmann <daniel@iogearbox.net> | 2016-03-24 16:49:56 +0100 |
|---|---|---|
| committer | Stephen Hemminger <stephen@networkplumber.org> | 2016-03-27 10:58:48 -0700 |
| commit | 29bb2373a8777d0c8b8c68450a872c19bc7f245c (patch) | |
| tree | cb12d419f4f002987b94b32b089c59d4fe0680de /ip | |
| parent | f8eb79a6244349d0f987e98b14b222fbf706bdb8 (diff) | |
geneve: add support to set flow label
Follow-up for kernel commit 8eb3b99554b8 ("geneve: support setting
IPv6 flow label") to allow setting the label for the device config.
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'ip')
| -rw-r--r-- | ip/iplink_geneve.c | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/ip/iplink_geneve.c b/ip/iplink_geneve.c index 1c6879e7..84d948fc 100644 --- a/ip/iplink_geneve.c +++ b/ip/iplink_geneve.c @@ -18,14 +18,15 @@ static void print_explain(FILE *f) { fprintf(f, "Usage: ... geneve id VNI remote ADDR\n"); - fprintf(f, " [ ttl TTL ] [ tos TOS ]\n"); + fprintf(f, " [ ttl TTL ] [ tos TOS ] [ flowlabel LABEL ]\n"); fprintf(f, " [ dstport PORT ] [ [no]external ]\n"); fprintf(f, " [ [no]udpcsum ] [ [no]udp6zerocsumtx ] [ [no]udp6zerocsumrx ]\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"); + 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"); + fprintf(f, " LABEL := 0-1048575\n"); } static void explain(void) @@ -40,6 +41,7 @@ static int geneve_parse_opt(struct link_util *lu, int argc, char **argv, int vni_set = 0; __u32 daddr = 0; struct in6_addr daddr6 = IN6ADDR_ANY_INIT; + __u32 label = 0; __u8 ttl = 0; __u8 tos = 0; __u16 dstport = 0; @@ -90,6 +92,15 @@ static int geneve_parse_opt(struct link_util *lu, int argc, char **argv, tos = uval; } else tos = 1; + } else if (!matches(*argv, "label") || + !matches(*argv, "flowlabel")) { + __u32 uval; + + NEXT_ARG(); + if (get_u32(&uval, *argv, 0) || + (uval & ~LABEL_MAX_MASK)) + invarg("invalid flowlabel", *argv); + label = htonl(uval); } else if (!matches(*argv, "dstport")) { NEXT_ARG(); if (get_u16(&dstport, *argv, 0)) @@ -150,6 +161,7 @@ static int geneve_parse_opt(struct link_util *lu, int argc, char **argv, addattr_l(n, 1024, IFLA_GENEVE_REMOTE, &daddr, 4); if (memcmp(&daddr6, &in6addr_any, sizeof(daddr6)) != 0) addattr_l(n, 1024, IFLA_GENEVE_REMOTE6, &daddr6, sizeof(struct in6_addr)); + addattr32(n, 1024, IFLA_GENEVE_LABEL, label); addattr8(n, 1024, IFLA_GENEVE_TTL, ttl); addattr8(n, 1024, IFLA_GENEVE_TOS, tos); if (dstport) @@ -213,6 +225,13 @@ static void geneve_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) fprintf(f, "tos %#x ", tos); } + if (tb[IFLA_GENEVE_LABEL]) { + __u32 label = rta_getattr_u32(tb[IFLA_GENEVE_LABEL]); + + if (label) + fprintf(f, "flowlabel %#x ", ntohl(label)); + } + if (tb[IFLA_GENEVE_PORT]) fprintf(f, "dstport %u ", ntohs(rta_getattr_u16(tb[IFLA_GENEVE_PORT]))); |