]> git.proxmox.com Git - mirror_iproute2.git/blobdiff - ip/link_gre6.c
man: tc-taprio.8: fix syntax error
[mirror_iproute2.git] / ip / link_gre6.c
index 50c1b804ceca784509d7ffc9b987827781d5b14e..6c4671e5a820693b5e22ad8722f41511a1c8eddd 100644 (file)
 
 #define DEFAULT_TNL_HOP_LIMIT  (64)
 
-static void print_usage(FILE *f)
+static void gre_print_help(struct link_util *lu, int argc, char **argv, FILE *f)
 {
        fprintf(f,
-               "Usage: ... { ip6gre | ip6gretap | ip6erspan} [ remote ADDR ]\n"
-               "                                  [ local ADDR ]\n"
-               "                                  [ [i|o]seq ]\n"
-               "                                  [ [i|o]key KEY ]\n"
-               "                                  [ [i|o]csum ]\n"
-               "                                  [ hoplimit TTL ]\n"
-               "                                  [ encaplimit ELIM ]\n"
-               "                                  [ tclass TCLASS ]\n"
-               "                                  [ flowlabel FLOWLABEL ]\n"
-               "                                  [ dscp inherit ]\n"
-               "                                  [ fwmark MARK ]\n"
-               "                                  [ dev PHYS_DEV ]\n"
-               "                                  [ noencap ]\n"
-               "                                  [ encap { fou | gue | none } ]\n"
-               "                                  [ encap-sport PORT ]\n"
-               "                                  [ encap-dport PORT ]\n"
-               "                                  [ [no]encap-csum ]\n"
-               "                                  [ [no]encap-csum6 ]\n"
-               "                                  [ [no]encap-remcsum ]\n"
-               "                                  [ erspan IDX ]\n"
+               "Usage: ... %-9s [ remote ADDR ]\n",
+               lu->id
+       );
+       fprintf(f,
+               "                     [ local ADDR ]\n"
+               "                     [ [no][i|o]seq ]\n"
+               "                     [ [i|o]key KEY | no[i|o]key ]\n"
+               "                     [ [no][i|o]csum ]\n"
+               "                     [ hoplimit TTL ]\n"
+               "                     [ encaplimit ELIM ]\n"
+               "                     [ tclass TCLASS ]\n"
+               "                     [ flowlabel FLOWLABEL ]\n"
+               "                     [ dscp inherit ]\n"
+               "                     [ dev PHYS_DEV ]\n"
+               "                     [ fwmark MARK ]\n"
+               "                     [ [no]allow-localremote ]\n"
+               "                     [ external ]\n"
+               "                     [ noencap ]\n"
+               "                     [ encap { fou | gue | none } ]\n"
+               "                     [ encap-sport PORT ]\n"
+               "                     [ encap-dport PORT ]\n"
+               "                     [ [no]encap-csum ]\n"
+               "                     [ [no]encap-csum6 ]\n"
+               "                     [ [no]encap-remcsum ]\n"
+               "                     [ erspan_ver version ]\n"
+               "                     [ erspan IDX ]\n"
+               "                     [ erspan_dir { ingress | egress } ]\n"
+               "                     [ erspan_hwid hwid ]\n"
                "\n"
+       );
+       fprintf(f,
                "Where: ADDR      := IPV6_ADDRESS\n"
                "       TTL       := { 0..255 } (default=%d)\n"
                "       KEY       := { DOTTED_QUAD | NUMBER }\n"
@@ -65,17 +75,10 @@ static void print_usage(FILE *f)
        );
 }
 
-static void usage(void) __attribute__((noreturn));
-static void usage(void)
-{
-       print_usage(stderr);
-       exit(-1);
-}
-
 static int gre_parse_opt(struct link_util *lu, int argc, char **argv,
                         struct nlmsghdr *n)
 {
-       struct ifinfomsg *ifi = (struct ifinfomsg *)(n + 1);
+       struct ifinfomsg *ifi = NLMSG_DATA(n);
        struct {
                struct nlmsghdr n;
                struct ifinfomsg i;
@@ -86,35 +89,42 @@ static int gre_parse_opt(struct link_util *lu, int argc, char **argv,
                .i.ifi_family = preferred_family,
                .i.ifi_index = ifi->ifi_index,
        };
-       struct nlmsghdr *answer = NULL;
+       struct nlmsghdr *answer;
        struct rtattr *tb[IFLA_MAX + 1];
        struct rtattr *linkinfo[IFLA_INFO_MAX+1];
        struct rtattr *greinfo[IFLA_GRE_MAX + 1];
+       int len;
        __u16 iflags = 0;
        __u16 oflags = 0;
-       unsigned int ikey = 0;
-       unsigned int okey = 0;
-       struct in6_addr raddr = IN6ADDR_ANY_INIT;
-       struct in6_addr laddr = IN6ADDR_ANY_INIT;
-       unsigned int link = 0;
-       unsigned int flowinfo = 0;
-       unsigned int flags = 0;
+       __be32 ikey = 0;
+       __be32 okey = 0;
+       inet_prefix saddr, daddr;
        __u8 hop_limit = DEFAULT_TNL_HOP_LIMIT;
        __u8 encap_limit = IPV6_DEFAULT_TNL_ENCAP_LIMIT;
+       __u32 flowinfo = 0;
+       __u32 flags = 0;
+       __u32 link = 0;
        __u16 encaptype = 0;
        __u16 encapflags = TUNNEL_ENCAP_FLAG_CSUM6;
        __u16 encapsport = 0;
        __u16 encapdport = 0;
-       int len;
+       __u8 metadata = 0;
        __u32 fwmark = 0;
        __u32 erspan_idx = 0;
+       __u8 erspan_ver = 0;
+       __u8 erspan_dir = 0;
+       __u16 erspan_hwid = 0;
+
+       inet_prefix_reset(&saddr);
+       inet_prefix_reset(&daddr);
 
        if (!(n->nlmsg_flags & NLM_F_CREATE)) {
+               const struct rtattr *rta;
+
                if (rtnl_talk(&rth, &req.n, &answer) < 0) {
 get_failed:
                        fprintf(stderr,
                                "Failed to get existing tunnel info.\n");
-                       free(answer);
                        return -1;
                }
 
@@ -136,6 +146,14 @@ get_failed:
                parse_rtattr_nested(greinfo, IFLA_GRE_MAX,
                                    linkinfo[IFLA_INFO_DATA]);
 
+               rta = greinfo[IFLA_GRE_LOCAL];
+               if (rta && get_addr_rta(&saddr, rta, AF_INET6))
+                       goto get_failed;
+
+               rta = greinfo[IFLA_GRE_REMOTE];
+               if (rta && get_addr_rta(&daddr, rta, AF_INET6))
+                       goto get_failed;
+
                if (greinfo[IFLA_GRE_IKEY])
                        ikey = rta_getattr_u32(greinfo[IFLA_GRE_IKEY]);
 
@@ -148,12 +166,6 @@ get_failed:
                if (greinfo[IFLA_GRE_OFLAGS])
                        oflags = rta_getattr_u16(greinfo[IFLA_GRE_OFLAGS]);
 
-               if (greinfo[IFLA_GRE_LOCAL])
-                       memcpy(&laddr, RTA_DATA(greinfo[IFLA_GRE_LOCAL]), sizeof(laddr));
-
-               if (greinfo[IFLA_GRE_REMOTE])
-                       memcpy(&raddr, RTA_DATA(greinfo[IFLA_GRE_REMOTE]), sizeof(raddr));
-
                if (greinfo[IFLA_GRE_TTL])
                        hop_limit = rta_getattr_u8(greinfo[IFLA_GRE_TTL]);
 
@@ -181,122 +193,111 @@ get_failed:
                if (greinfo[IFLA_GRE_ENCAP_DPORT])
                        encapdport = rta_getattr_u16(greinfo[IFLA_GRE_ENCAP_DPORT]);
 
+               if (greinfo[IFLA_GRE_COLLECT_METADATA])
+                       metadata = 1;
+
                if (greinfo[IFLA_GRE_FWMARK])
                        fwmark = rta_getattr_u32(greinfo[IFLA_GRE_FWMARK]);
 
                if (greinfo[IFLA_GRE_ERSPAN_INDEX])
                        erspan_idx = rta_getattr_u32(greinfo[IFLA_GRE_ERSPAN_INDEX]);
 
+               if (greinfo[IFLA_GRE_ERSPAN_VER])
+                       erspan_ver = rta_getattr_u8(greinfo[IFLA_GRE_ERSPAN_VER]);
+
+               if (greinfo[IFLA_GRE_ERSPAN_DIR])
+                       erspan_dir = rta_getattr_u8(greinfo[IFLA_GRE_ERSPAN_DIR]);
+
+               if (greinfo[IFLA_GRE_ERSPAN_HWID])
+                       erspan_hwid = rta_getattr_u16(greinfo[IFLA_GRE_ERSPAN_HWID]);
+
                free(answer);
        }
 
        while (argc > 0) {
                if (!matches(*argv, "key")) {
-                       unsigned int uval;
-
                        NEXT_ARG();
                        iflags |= GRE_KEY;
                        oflags |= GRE_KEY;
-                       if (strchr(*argv, '.'))
-                               uval = get_addr32(*argv);
-                       else {
-                               if (get_unsigned(&uval, *argv, 0) < 0) {
-                                       fprintf(stderr,
-                                               "Invalid value for \"key\"\n");
-                                       exit(-1);
-                               }
-                               uval = htonl(uval);
-                       }
-
-                       ikey = okey = uval;
+                       ikey = okey = tnl_parse_key("key", *argv);
+               } else if (!matches(*argv, "nokey")) {
+                       iflags &= ~GRE_KEY;
+                       oflags &= ~GRE_KEY;
+                       ikey = okey = 0;
                } else if (!matches(*argv, "ikey")) {
-                       unsigned int uval;
-
                        NEXT_ARG();
                        iflags |= GRE_KEY;
-                       if (strchr(*argv, '.'))
-                               uval = get_addr32(*argv);
-                       else {
-                               if (get_unsigned(&uval, *argv, 0) < 0) {
-                                       fprintf(stderr, "invalid value of \"ikey\"\n");
-                                       exit(-1);
-                               }
-                               uval = htonl(uval);
-                       }
-                       ikey = uval;
+                       ikey = tnl_parse_key("ikey", *argv);
+               } else if (!matches(*argv, "noikey")) {
+                       iflags &= ~GRE_KEY;
+                       ikey = 0;
                } else if (!matches(*argv, "okey")) {
-                       unsigned int uval;
-
                        NEXT_ARG();
                        oflags |= GRE_KEY;
-                       if (strchr(*argv, '.'))
-                               uval = get_addr32(*argv);
-                       else {
-                               if (get_unsigned(&uval, *argv, 0) < 0) {
-                                       fprintf(stderr, "invalid value of \"okey\"\n");
-                                       exit(-1);
-                               }
-                               uval = htonl(uval);
-                       }
-                       okey = uval;
+                       okey = tnl_parse_key("okey", *argv);
+               } else if (!matches(*argv, "nookey")) {
+                       oflags &= ~GRE_KEY;
+                       okey = 0;
                } else if (!matches(*argv, "seq")) {
                        iflags |= GRE_SEQ;
                        oflags |= GRE_SEQ;
+               } else if (!matches(*argv, "noseq")) {
+                       iflags &= ~GRE_SEQ;
+                       oflags &= ~GRE_SEQ;
                } else if (!matches(*argv, "iseq")) {
                        iflags |= GRE_SEQ;
+               } else if (!matches(*argv, "noiseq")) {
+                       iflags &= ~GRE_SEQ;
                } else if (!matches(*argv, "oseq")) {
                        oflags |= GRE_SEQ;
+               } else if (!matches(*argv, "nooseq")) {
+                       oflags &= ~GRE_SEQ;
                } else if (!matches(*argv, "csum")) {
                        iflags |= GRE_CSUM;
                        oflags |= GRE_CSUM;
+               } else if (!matches(*argv, "nocsum")) {
+                       iflags &= ~GRE_CSUM;
+                       oflags &= ~GRE_CSUM;
                } else if (!matches(*argv, "icsum")) {
                        iflags |= GRE_CSUM;
+               } else if (!matches(*argv, "noicsum")) {
+                       iflags &= ~GRE_CSUM;
                } else if (!matches(*argv, "ocsum")) {
                        oflags |= GRE_CSUM;
+               } else if (!matches(*argv, "noocsum")) {
+                       oflags &= ~GRE_CSUM;
                } else if (!matches(*argv, "remote")) {
-                       inet_prefix addr;
-
                        NEXT_ARG();
-                       get_prefix(&addr, *argv, preferred_family);
-                       if (addr.family == AF_UNSPEC)
-                               invarg("\"remote\" address family is AF_UNSPEC", *argv);
-                       memcpy(&raddr, &addr.data, sizeof(raddr));
+                       get_addr(&daddr, *argv, AF_INET6);
                } else if (!matches(*argv, "local")) {
-                       inet_prefix addr;
-
                        NEXT_ARG();
-                       get_prefix(&addr, *argv, preferred_family);
-                       if (addr.family == AF_UNSPEC)
-                               invarg("\"local\" address family is AF_UNSPEC", *argv);
-                       memcpy(&laddr, &addr.data, sizeof(laddr));
+                       get_addr(&saddr, *argv, AF_INET6);
                } else if (!matches(*argv, "dev")) {
                        NEXT_ARG();
-                       link = if_nametoindex(*argv);
-                       if (link == 0) {
-                               fprintf(stderr, "Cannot find device \"%s\"\n",
-                                       *argv);
-                               exit(-1);
-                       }
+                       link = ll_name_to_index(*argv);
+                       if (!link)
+                               exit(nodev(*argv));
                } else if (!matches(*argv, "ttl") ||
-                          !matches(*argv, "hoplimit")) {
-                       __u8 uval;
-
+                          !matches(*argv, "hoplimit") ||
+                          !matches(*argv, "hlim")) {
                        NEXT_ARG();
-                       if (get_u8(&uval, *argv, 0))
-                               invarg("invalid TTL", *argv);
-                       hop_limit = uval;
+                       if (strcmp(*argv, "inherit") != 0) {
+                               if (get_u8(&hop_limit, *argv, 0))
+                                       invarg("invalid HLIM\n", *argv);
+                       } else
+                               hop_limit = 0;
                } else if (!matches(*argv, "tos") ||
                           !matches(*argv, "tclass") ||
                           !matches(*argv, "dsfield")) {
                        __u8 uval;
 
                        NEXT_ARG();
+                       flowinfo &= ~IP6_FLOWINFO_TCLASS;
                        if (strcmp(*argv, "inherit") == 0)
                                flags |= IP6_TNL_F_USE_ORIG_TCLASS;
                        else {
                                if (get_u8(&uval, *argv, 16))
                                        invarg("invalid TClass", *argv);
-                               flowinfo &= ~IP6_FLOWINFO_TCLASS;
                                flowinfo |= htonl((__u32)uval << 20) & IP6_FLOWINFO_TCLASS;
                                flags &= ~IP6_TNL_F_USE_ORIG_TCLASS;
                        }
@@ -305,6 +306,7 @@ get_failed:
                        __u32 uval;
 
                        NEXT_ARG();
+                       flowinfo &= ~IP6_FLOWINFO_FLOWLABEL;
                        if (strcmp(*argv, "inherit") == 0)
                                flags |= IP6_TNL_F_USE_ORIG_FLOWLABEL;
                        else {
@@ -312,7 +314,6 @@ get_failed:
                                        invarg("invalid Flowlabel", *argv);
                                if (uval > 0xFFFFF)
                                        invarg("invalid Flowlabel", *argv);
-                               flowinfo &= ~IP6_FLOWINFO_FLOWLABEL;
                                flowinfo |= htonl(uval) & IP6_FLOWINFO_FLOWLABEL;
                                flags &= ~IP6_TNL_F_USE_ORIG_FLOWLABEL;
                        }
@@ -355,6 +356,8 @@ get_failed:
                        encapflags |= TUNNEL_ENCAP_FLAG_REMCSUM;
                } else if (strcmp(*argv, "noencap-remcsum") == 0) {
                        encapflags &= ~TUNNEL_ENCAP_FLAG_REMCSUM;
+               } else if (strcmp(*argv, "external") == 0) {
+                       metadata = 1;
                } else if (strcmp(*argv, "fwmark") == 0) {
                        NEXT_ARG();
                        if (strcmp(*argv, "inherit") == 0) {
@@ -365,6 +368,10 @@ get_failed:
                                        invarg("invalid fwmark\n", *argv);
                                flags &= ~IP6_TNL_F_USE_ORIG_FWMARK;
                        }
+               } else if (strcmp(*argv, "allow-localremote") == 0) {
+                       flags |= IP6_TNL_F_ALLOW_LOCAL_REMOTE;
+               } else if (strcmp(*argv, "noallow-localremote") == 0) {
+                       flags &= ~IP6_TNL_F_ALLOW_LOCAL_REMOTE;
                } else if (strcmp(*argv, "encaplimit") == 0) {
                        NEXT_ARG();
                        if (strcmp(*argv, "none") == 0) {
@@ -372,7 +379,7 @@ get_failed:
                        } else {
                                __u8 uval;
 
-                               if (get_u8(&uval, *argv, 0) < -1)
+                               if (get_u8(&uval, *argv, 0))
                                        invarg("invalid ELIM", *argv);
                                encap_limit = uval;
                                flags &= ~IP6_TNL_F_IGN_ENCAP_LIMIT;
@@ -383,17 +390,44 @@ get_failed:
                                invarg("invalid erspan index\n", *argv);
                        if (erspan_idx & ~((1<<20) - 1) || erspan_idx == 0)
                                invarg("erspan index must be > 0 and <= 20-bit\n", *argv);
-               } else
-                       usage();
+               } else if (strcmp(*argv, "erspan_ver") == 0) {
+                       NEXT_ARG();
+                       if (get_u8(&erspan_ver, *argv, 0))
+                               invarg("invalid erspan version\n", *argv);
+                       if (erspan_ver != 1 && erspan_ver != 2)
+                               invarg("erspan version must be 1 or 2\n", *argv);
+               } else if (strcmp(*argv, "erspan_dir") == 0) {
+                       NEXT_ARG();
+                       if (matches(*argv, "ingress") == 0)
+                               erspan_dir = 0;
+                       else if (matches(*argv, "egress") == 0)
+                               erspan_dir = 1;
+                       else
+                               invarg("Invalid erspan direction.", *argv);
+               } else if (strcmp(*argv, "erspan_hwid") == 0) {
+                       NEXT_ARG();
+                       if (get_u16(&erspan_hwid, *argv, 0))
+                               invarg("invalid erspan hwid\n", *argv);
+               } else {
+                       gre_print_help(lu, argc, argv, stderr);
+                       return -1;
+               }
                argc--; argv++;
        }
 
+       if (metadata) {
+               addattr_l(n, 1024, IFLA_GRE_COLLECT_METADATA, NULL, 0);
+               return 0;
+       }
+
        addattr32(n, 1024, IFLA_GRE_IKEY, ikey);
        addattr32(n, 1024, IFLA_GRE_OKEY, okey);
        addattr_l(n, 1024, IFLA_GRE_IFLAGS, &iflags, 2);
        addattr_l(n, 1024, IFLA_GRE_OFLAGS, &oflags, 2);
-       addattr_l(n, 1024, IFLA_GRE_LOCAL, &laddr, sizeof(laddr));
-       addattr_l(n, 1024, IFLA_GRE_REMOTE, &raddr, sizeof(raddr));
+       if (is_addrtype_inet_not_unspec(&saddr))
+               addattr_l(n, 1024, IFLA_GRE_LOCAL, saddr.data, saddr.bytelen);
+       if (is_addrtype_inet_not_unspec(&daddr))
+               addattr_l(n, 1024, IFLA_GRE_REMOTE, daddr.data, daddr.bytelen);
        if (link)
                addattr32(n, 1024, IFLA_GRE_LINK, link);
        addattr_l(n, 1024, IFLA_GRE_TTL, &hop_limit, 1);
@@ -401,9 +435,15 @@ get_failed:
        addattr_l(n, 1024, IFLA_GRE_FLOWINFO, &flowinfo, 4);
        addattr32(n, 1024, IFLA_GRE_FLAGS, flags);
        addattr32(n, 1024, IFLA_GRE_FWMARK, fwmark);
-       if (erspan_idx != 0)
-               addattr32(n, 1024, IFLA_GRE_ERSPAN_INDEX, erspan_idx);
-
+       if (erspan_ver) {
+               addattr8(n, 1024, IFLA_GRE_ERSPAN_VER, erspan_ver);
+               if (erspan_ver == 1 && erspan_idx != 0) {
+                       addattr32(n, 1024, IFLA_GRE_ERSPAN_INDEX, erspan_idx);
+               } else if (erspan_ver == 2) {
+                       addattr8(n, 1024, IFLA_GRE_ERSPAN_DIR, erspan_dir);
+                       addattr16(n, 1024, IFLA_GRE_ERSPAN_HWID, erspan_hwid);
+               }
+       }
        addattr16(n, 1024, IFLA_GRE_ENCAP_TYPE, encaptype);
        addattr16(n, 1024, IFLA_GRE_ENCAP_FLAGS, encapflags);
        addattr16(n, 1024, IFLA_GRE_ENCAP_SPORT, htons(encapsport));
@@ -415,113 +455,78 @@ get_failed:
 static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
 {
        char s2[64];
-       const char *local = "any";
-       const char *remote = "any";
-       unsigned int iflags = 0;
-       unsigned int oflags = 0;
-       unsigned int flags = 0;
-       unsigned int flowinfo = 0;
-       struct in6_addr in6_addr_any = IN6ADDR_ANY_INIT;
+       __u16 iflags = 0;
+       __u16 oflags = 0;
+       __u32 flags = 0;
+       __u32 flowinfo = 0;
+       __u8 ttl = 0;
 
        if (!tb)
                return;
 
+       if (tb[IFLA_GRE_COLLECT_METADATA]) {
+               print_bool(PRINT_ANY, "external", "external", true);
+               return;
+       }
+
        if (tb[IFLA_GRE_FLAGS])
                flags = rta_getattr_u32(tb[IFLA_GRE_FLAGS]);
 
        if (tb[IFLA_GRE_FLOWINFO])
                flowinfo = rta_getattr_u32(tb[IFLA_GRE_FLOWINFO]);
 
-       if (tb[IFLA_GRE_REMOTE]) {
-               struct in6_addr addr;
-
-               memcpy(&addr, RTA_DATA(tb[IFLA_GRE_REMOTE]), sizeof(addr));
-
-               if (memcmp(&addr, &in6_addr_any, sizeof(addr)))
-                       remote = format_host(AF_INET6, sizeof(addr), &addr);
-       }
-
-       print_string(PRINT_ANY, "remote", "remote %s ", remote);
-
-       if (tb[IFLA_GRE_LOCAL]) {
-               struct in6_addr addr;
+       tnl_print_endpoint("remote", tb[IFLA_GRE_REMOTE], AF_INET6);
+       tnl_print_endpoint("local", tb[IFLA_GRE_LOCAL], AF_INET6);
 
-               memcpy(&addr, RTA_DATA(tb[IFLA_GRE_LOCAL]), sizeof(addr));
+       if (tb[IFLA_GRE_LINK]) {
+               __u32 link = rta_getattr_u32(tb[IFLA_GRE_LINK]);
 
-               if (memcmp(&addr, &in6_addr_any, sizeof(addr)))
-                       local = format_host(AF_INET6, sizeof(addr), &addr);
-       }
-
-       print_string(PRINT_ANY, "local", "local %s ", local);
-
-       if (tb[IFLA_GRE_LINK] && rta_getattr_u32(tb[IFLA_GRE_LINK])) {
-               unsigned int link = rta_getattr_u32(tb[IFLA_GRE_LINK]);
-               const char *n = if_indextoname(link, s2);
-
-               if (n)
-                       print_string(PRINT_ANY, "link", "dev %s ", n);
-               else
-                       print_uint(PRINT_ANY, "link_index", "dev %u ", link);
+               if (link) {
+                       print_string(PRINT_ANY, "link", "dev %s ",
+                                    ll_index_to_name(link));
+               }
        }
 
-       if (tb[IFLA_GRE_TTL]) {
-               __u8 ttl = rta_getattr_u8(tb[IFLA_GRE_TTL]);
+       if (tb[IFLA_GRE_TTL])
+               ttl = rta_getattr_u8(tb[IFLA_GRE_TTL]);
+       if (is_json_context() || ttl)
+               print_uint(PRINT_ANY, "ttl", "hoplimit %u ", ttl);
+       else
+               print_string(PRINT_FP, NULL, "hoplimit %s ", "inherit");
 
-               if (ttl)
-                       print_int(PRINT_ANY, "ttl", "hoplimit %d ", ttl);
-               else
-                       print_int(PRINT_JSON, "ttl", NULL, ttl);
-       }
-
-       if (flags & IP6_TNL_F_IGN_ENCAP_LIMIT)
+       if (flags & IP6_TNL_F_IGN_ENCAP_LIMIT) {
                print_bool(PRINT_ANY,
                           "ip6_tnl_f_ign_encap_limit",
                           "encaplimit none ",
                           true);
-       else if (tb[IFLA_GRE_ENCAP_LIMIT]) {
-               int encap_limit = rta_getattr_u8(tb[IFLA_GRE_ENCAP_LIMIT]);
+       else if (tb[IFLA_GRE_ENCAP_LIMIT]) {
+               __u8 val = rta_getattr_u8(tb[IFLA_GRE_ENCAP_LIMIT]);
 
-               print_int(PRINT_ANY,
-                         "encap_limit",
-                         "encaplimit %d ",
-                         encap_limit);
+               print_uint(PRINT_ANY, "encap_limit", "encaplimit %u ", val);
        }
 
-       if (flags & IP6_TNL_F_USE_ORIG_FLOWLABEL) {
+       if (flags & IP6_TNL_F_USE_ORIG_TCLASS) {
                print_bool(PRINT_ANY,
-                          "ip6_tnl_f_use_orig_flowlabel",
-                          "flowlabel inherit ",
+                          "ip6_tnl_f_use_orig_tclass",
+                          "tclass inherit ",
                           true);
-       } else {
-               if (is_json_context()) {
-                       SPRINT_BUF(b1);
+       } else if (tb[IFLA_GRE_FLOWINFO]) {
+               __u32 val = ntohl(flowinfo & IP6_FLOWINFO_TCLASS) >> 20;
 
-                       snprintf(b1, sizeof(b1), "0x%05x",
-                                ntohl(flowinfo & IP6_FLOWINFO_FLOWLABEL));
-                       print_string(PRINT_JSON, "flowlabel", NULL, b1);
-
-               } else {
-                       fprintf(f, "flowlabel 0x%05x ",
-                               ntohl(flowinfo & IP6_FLOWINFO_FLOWLABEL));
-               }
+               snprintf(s2, sizeof(s2), "0x%02x", val);
+               print_string(PRINT_ANY, "tclass", "tclass %s ", s2);
        }
 
-       if (flags & IP6_TNL_F_USE_ORIG_TCLASS) {
+       if (flags & IP6_TNL_F_USE_ORIG_FLOWLABEL) {
                print_bool(PRINT_ANY,
-                          "ip6_tnl_f_use_orig_tclass",
-                          "tclass inherit ",
+                          "ip6_tnl_f_use_orig_flowlabel",
+                          "flowlabel inherit ",
                           true);
-       } else {
-               if (is_json_context()) {
-                       SPRINT_BUF(b1);
+       } else if (tb[IFLA_GRE_FLOWINFO]) {
+               __u32 val = ntohl(flowinfo & IP6_FLOWINFO_FLOWLABEL);
 
-                       snprintf(b1, sizeof(b1), "0x%05x",
-                                ntohl(flowinfo & IP6_FLOWINFO_TCLASS) >> 20);
-                       print_string(PRINT_JSON, "tclass", NULL, b1);
-               } else {
-                       fprintf(f, "tclass 0x%02x ",
-                                ntohl(flowinfo & IP6_FLOWINFO_TCLASS) >> 20);
-               }
+               snprintf(s2, sizeof(s2), "0x%05x", val);
+               print_string(PRINT_ANY, "flowlabel", "flowlabel %s ", s2);
        }
 
        if (flags & IP6_TNL_F_RCV_DSCP_COPY)
@@ -555,91 +560,63 @@ static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
        if (oflags & GRE_CSUM)
                print_bool(PRINT_ANY, "ocsum", "ocsum ", true);
 
-       if (flags & IP6_TNL_F_USE_ORIG_FWMARK)
+       if (flags & IP6_TNL_F_ALLOW_LOCAL_REMOTE)
+               print_bool(PRINT_ANY,
+                          "ip6_tnl_f_allow_local_remote",
+                          "allow-localremote ",
+                          true);
+
+       if (flags & IP6_TNL_F_USE_ORIG_FWMARK) {
                print_bool(PRINT_ANY,
                           "ip6_tnl_f_use_orig_fwmark",
                           "fwmark inherit ",
                           true);
-       else if (tb[IFLA_GRE_FWMARK]) {
+       else if (tb[IFLA_GRE_FWMARK]) {
                __u32 fwmark = rta_getattr_u32(tb[IFLA_GRE_FWMARK]);
 
                if (fwmark) {
-                       snprintf(s2, sizeof(s2), "0x%x", fwmark);
-
-                       print_string(PRINT_ANY, "fwmark", "fwmark %s ", s2);
+                       print_0xhex(PRINT_ANY,
+                                   "fwmark", "fwmark %#llx ", fwmark);
                }
        }
 
        if (tb[IFLA_GRE_ERSPAN_INDEX]) {
                __u32 erspan_idx = rta_getattr_u32(tb[IFLA_GRE_ERSPAN_INDEX]);
-               fprintf(f, "erspan_index %u ", erspan_idx);
+
+               print_uint(PRINT_ANY,
+                          "erspan_index", "erspan_index %u ", erspan_idx);
        }
 
-       if (tb[IFLA_GRE_ENCAP_TYPE] &&
-           rta_getattr_u16(tb[IFLA_GRE_ENCAP_TYPE]) != TUNNEL_ENCAP_NONE) {
-               __u16 type = rta_getattr_u16(tb[IFLA_GRE_ENCAP_TYPE]);
-               __u16 flags = rta_getattr_u16(tb[IFLA_GRE_ENCAP_FLAGS]);
-               __u16 sport = rta_getattr_u16(tb[IFLA_GRE_ENCAP_SPORT]);
-               __u16 dport = rta_getattr_u16(tb[IFLA_GRE_ENCAP_DPORT]);
-
-               open_json_object("encap");
-
-               print_string(PRINT_FP, NULL, "encap ", NULL);
-               switch (type) {
-               case TUNNEL_ENCAP_FOU:
-                       print_string(PRINT_ANY, "type", "%s ", "fou");
-                       break;
-               case TUNNEL_ENCAP_GUE:
-                       print_string(PRINT_ANY, "type", "%s ", "gue");
-                       break;
-               default:
-                       print_null(PRINT_ANY, "type", "unknown ", NULL);
-                       break;
-               }
+       if (tb[IFLA_GRE_ERSPAN_VER]) {
+               __u8 erspan_ver = rta_getattr_u8(tb[IFLA_GRE_ERSPAN_VER]);
 
-               if (is_json_context()) {
-                       print_uint(PRINT_JSON,
-                                  "sport",
-                                  NULL,
-                                  sport ? ntohs(sport) : 0);
-                       print_uint(PRINT_JSON, "dport", NULL, ntohs(dport));
-                       print_bool(PRINT_JSON, "csum", NULL,
-                                          flags & TUNNEL_ENCAP_FLAG_CSUM);
-                       print_bool(PRINT_JSON, "csum6", NULL,
-                                          flags & TUNNEL_ENCAP_FLAG_CSUM6);
-                       print_bool(PRINT_JSON, "remcsum", NULL,
-                                          flags & TUNNEL_ENCAP_FLAG_REMCSUM);
-                       close_json_object();
-               } else {
-                       if (sport == 0)
-                               fputs("encap-sport auto ", f);
-                       else
-                               fprintf(f, "encap-sport %u", ntohs(sport));
+               print_uint(PRINT_ANY,
+                          "erspan_ver", "erspan_ver %u ", erspan_ver);
+       }
 
-                       fprintf(f, "encap-dport %u ", ntohs(dport));
+       if (tb[IFLA_GRE_ERSPAN_DIR]) {
+               __u8 erspan_dir = rta_getattr_u8(tb[IFLA_GRE_ERSPAN_DIR]);
 
-                       if (flags & TUNNEL_ENCAP_FLAG_CSUM)
-                               fputs("encap-csum ", f);
-                       else
-                               fputs("noencap-csum ", f);
+               if (erspan_dir == 0)
+                       print_string(PRINT_ANY, "erspan_dir",
+                                    "erspan_dir ingress ", NULL);
+               else
+                       print_string(PRINT_ANY, "erspan_dir",
+                                    "erspan_dir egress ", NULL);
+       }
 
-                       if (flags & TUNNEL_ENCAP_FLAG_CSUM6)
-                               fputs("encap-csum6 ", f);
-                       else
-                               fputs("noencap-csum6 ", f);
+       if (tb[IFLA_GRE_ERSPAN_HWID]) {
+               __u16 erspan_hwid = rta_getattr_u16(tb[IFLA_GRE_ERSPAN_HWID]);
 
-                       if (flags & TUNNEL_ENCAP_FLAG_REMCSUM)
-                               fputs("encap-remcsum ", f);
-                       else
-                               fputs("noencap-remcsum ", f);
-               }
+               print_0xhex(PRINT_ANY,
+                           "erspan_hwid", "erspan_hwid %#llx ", erspan_hwid);
        }
-}
 
-static void gre_print_help(struct link_util *lu, int argc, char **argv,
-       FILE *f)
-{
-       print_usage(f);
+       tnl_print_encap(tb,
+                       IFLA_GRE_ENCAP_TYPE,
+                       IFLA_GRE_ENCAP_FLAGS,
+                       IFLA_GRE_ENCAP_SPORT,
+                       IFLA_GRE_ENCAP_DPORT);
 }
 
 struct link_util ip6gre_link_util = {