]> git.proxmox.com Git - mirror_iproute2.git/blobdiff - ip/iptunnel.c
Merge branch 'iproute2-master' into iproute2-next
[mirror_iproute2.git] / ip / iptunnel.c
index 3b466bfc07005d566166827b48094b2efbd89ec5..d597908fa209e63bb7928ab87fac2640fdd6e199 100644 (file)
@@ -8,12 +8,6 @@
  *
  * Authors:    Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
- *
- * Changes:
- *
- * Rani Assaf <rani@magic.metawire.com> 980929:        resolve addresses
- * Rani Assaf <rani@magic.metawire.com> 980930:        do not allow key for ipip/sit
- * Phil Karn <karn@ka9q.ampr.org>      990408: "pmtudisc" flag
  */
 
 #include <stdio.h>
@@ -24,8 +18,8 @@
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <sys/ioctl.h>
-#include <linux/if.h>
-#include <linux/if_arp.h>
+#include <net/if.h>
+#include <net/if_arp.h>
 #include <linux/ip.h>
 #include <linux/if_tunnel.h>
 
@@ -38,28 +32,38 @@ static void usage(void) __attribute__((noreturn));
 
 static void usage(void)
 {
-       fprintf(stderr, "Usage: ip tunnel { add | change | del | show } [ NAME ]\n");
-       fprintf(stderr, "          [ mode { ipip | gre | sit | isatap } ] [ remote ADDR ] [ local ADDR ]\n");
+       fprintf(stderr, "Usage: ip tunnel { add | change | del | show | prl | 6rd } [ NAME ]\n");
+       fprintf(stderr, "          [ mode { ipip | gre | sit | isatap | vti } ] [ remote ADDR ] [ local ADDR ]\n");
        fprintf(stderr, "          [ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n");
+       fprintf(stderr, "          [ prl-default ADDR ] [ prl-nodefault ADDR ] [ prl-delete ADDR ]\n");
+       fprintf(stderr, "          [ 6rd-prefix ADDR ] [ 6rd-relay_prefix ADDR ] [ 6rd-reset ]\n");
        fprintf(stderr, "          [ ttl TTL ] [ tos TOS ] [ [no]pmtudisc ] [ dev PHYS_DEV ]\n");
        fprintf(stderr, "\n");
        fprintf(stderr, "Where: NAME := STRING\n");
        fprintf(stderr, "       ADDR := { IP_ADDRESS | any }\n");
-       fprintf(stderr, "       TOS  := { NUMBER | inherit }\n");
+       fprintf(stderr, "       TOS  := { STRING | 00..ff | inherit | inherit/STRING | inherit/00..ff }\n");
        fprintf(stderr, "       TTL  := { 1..255 | inherit }\n");
        fprintf(stderr, "       KEY  := { DOTTED_QUAD | NUMBER }\n");
        exit(-1);
 }
 
+static void set_tunnel_proto(struct ip_tunnel_parm *p, int proto)
+{
+       if (p->iph.protocol && p->iph.protocol != proto) {
+               fprintf(stderr,
+                       "You managed to ask for more than one tunnel mode.\n");
+               exit(-1);
+       }
+       p->iph.protocol = proto;
+}
+
 static int parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p)
 {
        int count = 0;
-       char medium[IFNAMSIZ];
+       const char *medium = NULL;
        int isatap = 0;
 
        memset(p, 0, sizeof(*p));
-       memset(&medium, 0, sizeof(medium));
-
        p->iph.version = 4;
        p->iph.ihl = 5;
 #ifndef IP_DF
@@ -72,76 +76,37 @@ static int parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p)
                        NEXT_ARG();
                        if (strcmp(*argv, "ipip") == 0 ||
                            strcmp(*argv, "ip/ip") == 0) {
-                               if (p->iph.protocol && p->iph.protocol != IPPROTO_IPIP) {
-                                       fprintf(stderr,"You managed to ask for more than one tunnel mode.\n");
-                                       exit(-1);
-                               }
-                               p->iph.protocol = IPPROTO_IPIP;
+                               set_tunnel_proto(p, IPPROTO_IPIP);
                        } else if (strcmp(*argv, "gre") == 0 ||
                                   strcmp(*argv, "gre/ip") == 0) {
-                               if (p->iph.protocol && p->iph.protocol != IPPROTO_GRE) {
-                                       fprintf(stderr,"You managed to ask for more than one tunnel mode.\n");
-                                       exit(-1);
-                               }
-                               p->iph.protocol = IPPROTO_GRE;
+                               set_tunnel_proto(p, IPPROTO_GRE);
                        } else if (strcmp(*argv, "sit") == 0 ||
                                   strcmp(*argv, "ipv6/ip") == 0) {
-                               if (p->iph.protocol && p->iph.protocol != IPPROTO_IPV6) {
-                                       fprintf(stderr,"You managed to ask for more than one tunnel mode.\n");
-                                       exit(-1);
-                               }
-                               p->iph.protocol = IPPROTO_IPV6;
+                               set_tunnel_proto(p, IPPROTO_IPV6);
                        } else if (strcmp(*argv, "isatap") == 0) {
-                               if (p->iph.protocol && p->iph.protocol != IPPROTO_IPV6) {
-                                       fprintf(stderr, "You managed to ask for more than one tunnel mode.\n");
-                                       exit(-1);
-                               }
-                               p->iph.protocol = IPPROTO_IPV6;
+                               set_tunnel_proto(p, IPPROTO_IPV6);
                                isatap++;
+                       } else if (strcmp(*argv, "vti") == 0) {
+                               set_tunnel_proto(p, IPPROTO_IPIP);
+                               p->i_flags |= VTI_ISVTI;
                        } else {
-                               fprintf(stderr,"Cannot guess tunnel mode.\n");
+                               fprintf(stderr,
+                                       "Unknown tunnel mode \"%s\"\n", *argv);
                                exit(-1);
                        }
                } else if (strcmp(*argv, "key") == 0) {
-                       unsigned uval;
                        NEXT_ARG();
                        p->i_flags |= GRE_KEY;
                        p->o_flags |= GRE_KEY;
-                       if (strchr(*argv, '.'))
-                               p->i_key = p->o_key = get_addr32(*argv);
-                       else {
-                               if (get_unsigned(&uval, *argv, 0)<0) {
-                                       fprintf(stderr, "invalid value of \"key\"\n");
-                                       exit(-1);
-                               }
-                               p->i_key = p->o_key = htonl(uval);
-                       }
+                       p->i_key = p->o_key = tnl_parse_key("key", *argv);
                } else if (strcmp(*argv, "ikey") == 0) {
-                       unsigned uval;
                        NEXT_ARG();
                        p->i_flags |= GRE_KEY;
-                       if (strchr(*argv, '.'))
-                               p->i_key = get_addr32(*argv);
-                       else {
-                               if (get_unsigned(&uval, *argv, 0)<0) {
-                                       fprintf(stderr, "invalid value of \"ikey\"\n");
-                                       exit(-1);
-                               }
-                               p->i_key = htonl(uval);
-                       }
+                       p->i_key = tnl_parse_key("ikey", *argv);
                } else if (strcmp(*argv, "okey") == 0) {
-                       unsigned uval;
                        NEXT_ARG();
                        p->o_flags |= GRE_KEY;
-                       if (strchr(*argv, '.'))
-                               p->o_key = get_addr32(*argv);
-                       else {
-                               if (get_unsigned(&uval, *argv, 0)<0) {
-                                       fprintf(stderr, "invalid value of \"okey\"\n");
-                                       exit(-1);
-                               }
-                               p->o_key = htonl(uval);
-                       }
+                       p->o_key = tnl_parse_key("okey", *argv);
                } else if (strcmp(*argv, "seq") == 0) {
                        p->i_flags |= GRE_SEQ;
                        p->o_flags |= GRE_SEQ;
@@ -162,47 +127,56 @@ static int parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p)
                        p->iph.frag_off = htons(IP_DF);
                } else if (strcmp(*argv, "remote") == 0) {
                        NEXT_ARG();
-                       if (strcmp(*argv, "any"))
-                               p->iph.daddr = get_addr32(*argv);
+                       p->iph.daddr = get_addr32(*argv);
                } else if (strcmp(*argv, "local") == 0) {
                        NEXT_ARG();
-                       if (strcmp(*argv, "any"))
-                               p->iph.saddr = get_addr32(*argv);
+                       p->iph.saddr = get_addr32(*argv);
                } else if (strcmp(*argv, "dev") == 0) {
                        NEXT_ARG();
-                       strncpy(medium, *argv, IFNAMSIZ-1);
-               } else if (strcmp(*argv, "ttl") == 0) {
-                       unsigned uval;
+                       medium = *argv;
+               } else if (strcmp(*argv, "ttl") == 0 ||
+                          strcmp(*argv, "hoplimit") == 0 ||
+                          strcmp(*argv, "hlim") == 0) {
+                       __u8 uval;
+
                        NEXT_ARG();
                        if (strcmp(*argv, "inherit") != 0) {
-                               if (get_unsigned(&uval, *argv, 0))
+                               if (get_u8(&uval, *argv, 0))
                                        invarg("invalid TTL\n", *argv);
-                               if (uval > 255)
-                                       invarg("TTL must be <=255\n", *argv);
                                p->iph.ttl = uval;
                        }
                } else if (strcmp(*argv, "tos") == 0 ||
+                          strcmp(*argv, "tclass") == 0 ||
                           matches(*argv, "dsfield") == 0) {
+                       char *dsfield;
                        __u32 uval;
+
                        NEXT_ARG();
+                       dsfield = *argv;
+                       strsep(&dsfield, "/");
                        if (strcmp(*argv, "inherit") != 0) {
-                               if (rtnl_dsfield_a2n(&uval, *argv))
-                                       invarg("bad TOS value", *argv);
-                               p->iph.tos = uval;
+                               dsfield = *argv;
+                               p->iph.tos = 0;
                        } else
                                p->iph.tos = 1;
+                       if (dsfield) {
+                               if (rtnl_dsfield_a2n(&uval, dsfield))
+                                       invarg("bad TOS value", *argv);
+                               p->iph.tos |= uval;
+                       }
                } else {
-                       if (strcmp(*argv, "name") == 0) {
+                       if (strcmp(*argv, "name") == 0)
                                NEXT_ARG();
-                       }
-                       if (matches(*argv, "help") == 0)
+                       else if (matches(*argv, "help") == 0)
                                usage();
+
                        if (p->name[0])
                                duparg2("name", *argv);
-                       strncpy(p->name, *argv, IFNAMSIZ);
+                       if (get_ifname(p->name, *argv))
+                               invarg("\"name\" not a valid ifname", *argv);
                        if (cmd == SIOCCHGTUNNEL && count == 0) {
-                               struct ip_tunnel_parm old_p;
-                               memset(&old_p, 0, sizeof(old_p));
+                               struct ip_tunnel_parm old_p = {};
+
                                if (tnl_get_ioctl(*argv, &old_p))
                                        return -1;
                                *p = old_p;
@@ -223,20 +197,24 @@ static int parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p)
                else if (memcmp(p->name, "isatap", 6) == 0) {
                        p->iph.protocol = IPPROTO_IPV6;
                        isatap++;
+               } else if (memcmp(p->name, "vti", 3) == 0) {
+                       p->iph.protocol = IPPROTO_IPIP;
+                       p->i_flags |= VTI_ISVTI;
                }
        }
 
-       if (p->iph.protocol == IPPROTO_IPIP || p->iph.protocol == IPPROTO_IPV6) {
-               if ((p->i_flags & GRE_KEY) || (p->o_flags & GRE_KEY)) {
-                       fprintf(stderr, "Keys are not allowed with ipip and sit.\n");
+       if ((p->i_flags & GRE_KEY) || (p->o_flags & GRE_KEY)) {
+               if (!(p->i_flags & VTI_ISVTI) &&
+                   (p->iph.protocol != IPPROTO_GRE)) {
+                       fprintf(stderr, "Keys are not allowed with ipip and sit tunnels\n");
                        return -1;
                }
        }
 
-       if (medium[0]) {
-               p->link = tnl_ioctl_get_ifindex(medium);
-               if (p->link == 0)
-                       return -1;
+       if (medium) {
+               p->link = ll_name_to_index(medium);
+               if (!p->link)
+                       return nodev(medium);
        }
 
        if (p->i_key == 0 && IN_MULTICAST(ntohl(p->iph.daddr))) {
@@ -248,45 +226,52 @@ static int parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p)
                p->o_flags |= GRE_KEY;
        }
        if (IN_MULTICAST(ntohl(p->iph.daddr)) && !p->iph.saddr) {
-               fprintf(stderr, "Broadcast tunnel requires a source address.\n");
+               fprintf(stderr, "A broadcast tunnel requires a source address\n");
                return -1;
        }
-       if (isatap) {
-               if (p->iph.daddr) {
-                       fprintf(stderr, "no remote with isatap.\n");
-                       return -1;
-               }
+       if (isatap)
                p->i_flags |= SIT_ISATAP;
-       }
 
        return 0;
 }
 
+static const char *tnl_defname(const struct ip_tunnel_parm *p)
+{
+       switch (p->iph.protocol) {
+       case IPPROTO_IPIP:
+               if (p->i_flags & VTI_ISVTI)
+                       return "ip_vti0";
+               else
+                       return "tunl0";
+       case IPPROTO_GRE:
+               return "gre0";
+       case IPPROTO_IPV6:
+               return "sit0";
+       }
+       return NULL;
+}
 
 static int do_add(int cmd, int argc, char **argv)
 {
        struct ip_tunnel_parm p;
+       const char *basedev;
 
        if (parse_args(argc, argv, cmd, &p) < 0)
                return -1;
 
        if (p.iph.ttl && p.iph.frag_off == 0) {
-               fprintf(stderr, "ttl != 0 and noptmudisc are incompatible\n");
+               fprintf(stderr, "ttl != 0 and nopmtudisc are incompatible\n");
                return -1;
        }
 
-       switch (p.iph.protocol) {
-       case IPPROTO_IPIP:
-               return tnl_add_ioctl(cmd, "tunl0", p.name, &p);
-       case IPPROTO_GRE:
-               return tnl_add_ioctl(cmd, "gre0", p.name, &p);
-       case IPPROTO_IPV6:
-               return tnl_add_ioctl(cmd, "sit0", p.name, &p);
-       default:
-               fprintf(stderr, "cannot determine tunnel mode (ipip, gre or sit)\n");
+       basedev = tnl_defname(&p);
+       if (!basedev) {
+               fprintf(stderr,
+                       "cannot determine tunnel mode (ipip, gre, vti or sit)\n");
                return -1;
        }
-       return -1;
+
+       return tnl_add_ioctl(cmd, basedev, p.name, &p);
 }
 
 static int do_del(int argc, char **argv)
@@ -296,180 +281,268 @@ static int do_del(int argc, char **argv)
        if (parse_args(argc, argv, SIOCDELTUNNEL, &p) < 0)
                return -1;
 
-       switch (p.iph.protocol) {
-       case IPPROTO_IPIP:
-               return tnl_del_ioctl("tunl0", p.name, &p);
-       case IPPROTO_GRE:
-               return tnl_del_ioctl("gre0", p.name, &p);
-       case IPPROTO_IPV6:
-               return tnl_del_ioctl("sit0", p.name, &p);
-       default:
-               return tnl_del_ioctl(p.name, p.name, &p);
-       }
-       return -1;
+       return tnl_del_ioctl(tnl_defname(&p) ? : p.name, p.name, &p);
 }
 
-static void print_tunnel(struct ip_tunnel_parm *p)
+static void print_tunnel(const void *t)
 {
+       const struct ip_tunnel_parm *p = t;
+       struct ip_tunnel_6rd ip6rd = {};
        char s1[1024];
        char s2[1024];
-       char s3[64];
-       char s4[64];
-
-       inet_ntop(AF_INET, &p->i_key, s3, sizeof(s3));
-       inet_ntop(AF_INET, &p->o_key, s4, sizeof(s4));
 
        /* Do not use format_host() for local addr,
         * symbolic name will not be useful.
         */
-       printf("%s: %s/ip  remote %s  local %s ",
+       printf("%s: %s/ip remote %s local %s",
               p->name,
               tnl_strproto(p->iph.protocol),
-              p->iph.daddr ? format_host(AF_INET, 4, &p->iph.daddr, s1, sizeof(s1))  : "any",
-              p->iph.saddr ? rt_addr_n2a(AF_INET, 4, &p->iph.saddr, s2, sizeof(s2)) : "any");
+              p->iph.daddr ? format_host_r(AF_INET, 4, &p->iph.daddr, s1, sizeof(s1)) : "any",
+              p->iph.saddr ? rt_addr_n2a_r(AF_INET, 4, &p->iph.saddr, s2, sizeof(s2)) : "any");
+
+       if (p->iph.protocol == IPPROTO_IPV6 && (p->i_flags & SIT_ISATAP)) {
+               struct ip_tunnel_prl prl[16] = {};
+               int i;
+
+               prl[0].datalen = sizeof(prl) - sizeof(prl[0]);
+               prl[0].addr = htonl(INADDR_ANY);
+
+               if (!tnl_prl_ioctl(SIOCGETPRL, p->name, prl))
+                       for (i = 1; i < ARRAY_SIZE(prl); i++) {
+                               if (prl[i].addr != htonl(INADDR_ANY)) {
+                                       printf(" %s %s ",
+                                              (prl[i].flags & PRL_DEFAULT) ? "pdr" : "pr",
+                                              format_host(AF_INET, 4, &prl[i].addr));
+                               }
+                       }
+       }
 
        if (p->link) {
-               char *n = tnl_ioctl_get_ifname(p->link);
+               const char *n = ll_index_to_name(p->link);
+
                if (n)
-                       printf(" dev %s ", n);
+                       printf(" dev %s", n);
        }
 
        if (p->iph.ttl)
-               printf(" ttl %", p->iph.ttl);
+               printf(" ttl %u", p->iph.ttl);
        else
-               printf(" ttl inherit ");
+               printf(" ttl inherit");
 
        if (p->iph.tos) {
                SPRINT_BUF(b1);
                printf(" tos");
-               if (p->iph.tos&1)
+               if (p->iph.tos & 1)
                        printf(" inherit");
-               if (p->iph.tos&~1)
-                       printf("%c%s ", p->iph.tos&1 ? '/' : ' ',
-                              rtnl_dsfield_n2a(p->iph.tos&~1, b1, sizeof(b1)));
+               if (p->iph.tos & ~1)
+                       printf("%c%s ", p->iph.tos & 1 ? '/' : ' ',
+                              rtnl_dsfield_n2a(p->iph.tos & ~1, b1, sizeof(b1)));
        }
 
-       if (!(p->iph.frag_off&htons(IP_DF)))
+       if (!(p->iph.frag_off & htons(IP_DF)))
                printf(" nopmtudisc");
 
-       if ((p->i_flags&GRE_KEY) && (p->o_flags&GRE_KEY) && p->o_key == p->i_key)
-               printf(" key %s", s3);
-       else if ((p->i_flags|p->o_flags)&GRE_KEY) {
-               if (p->i_flags&GRE_KEY)
-                       printf(" ikey %s ", s3);
-               if (p->o_flags&GRE_KEY)
-                       printf(" okey %s ", s4);
+       if (p->iph.protocol == IPPROTO_IPV6 && !tnl_ioctl_get_6rd(p->name, &ip6rd) && ip6rd.prefixlen) {
+               printf(" 6rd-prefix %s/%u",
+                      inet_ntop(AF_INET6, &ip6rd.prefix, s1, sizeof(s1)),
+                      ip6rd.prefixlen);
+               if (ip6rd.relay_prefix) {
+                       printf(" 6rd-relay_prefix %s/%u",
+                              format_host(AF_INET, 4, &ip6rd.relay_prefix),
+                              ip6rd.relay_prefixlen);
+               }
+       }
+
+       if ((p->i_flags & GRE_KEY) && (p->o_flags & GRE_KEY) && p->o_key == p->i_key)
+               printf(" key %u", ntohl(p->i_key));
+       else if ((p->i_flags | p->o_flags) & GRE_KEY) {
+               if (p->i_flags & GRE_KEY)
+                       printf(" ikey %u", ntohl(p->i_key));
+               if (p->o_flags & GRE_KEY)
+                       printf(" okey %u", ntohl(p->o_key));
        }
 
-       if (p->i_flags&GRE_SEQ)
-               printf("%s  Drop packets out of sequence.\n", _SL_);
-       if (p->i_flags&GRE_CSUM)
+       if (p->i_flags & GRE_SEQ)
+               printf("%s  Drop packets out of sequence.", _SL_);
+       if (p->i_flags & GRE_CSUM)
                printf("%s  Checksum in received packet is required.", _SL_);
-       if (p->o_flags&GRE_SEQ)
+       if (p->o_flags & GRE_SEQ)
                printf("%s  Sequence packets on output.", _SL_);
-       if (p->o_flags&GRE_CSUM)
+       if (p->o_flags & GRE_CSUM)
                printf("%s  Checksum output packets.", _SL_);
 }
 
-static int do_tunnels_list(struct ip_tunnel_parm *p)
+
+static void ip_tunnel_parm_initialize(const struct tnl_print_nlmsg_info *info)
 {
-       char name[IFNAMSIZ];
-       unsigned long  rx_bytes, rx_packets, rx_errs, rx_drops,
-       rx_fifo, rx_frame,
-       tx_bytes, tx_packets, tx_errs, tx_drops,
-       tx_fifo, tx_colls, tx_carrier, rx_multi;
-       int type;
-       struct ip_tunnel_parm p1;
-
-       char buf[512];
-       FILE *fp = fopen("/proc/net/dev", "r");
-       if (fp == NULL) {
-               perror("fopen");
-               return -1;
-       }
+       struct ip_tunnel_parm *p2 = info->p2;
 
-       fgets(buf, sizeof(buf), fp);
-       fgets(buf, sizeof(buf), fp);
+       memset(p2, 0, sizeof(*p2));
+}
 
-       while (fgets(buf, sizeof(buf), fp) != NULL) {
-               char *ptr;
-               buf[sizeof(buf) - 1] = 0;
-               if ((ptr = strchr(buf, ':')) == NULL ||
-                   (*ptr++ = 0, sscanf(buf, "%s", name) != 1)) {
-                       fprintf(stderr, "Wrong format of /proc/net/dev. Sorry.\n");
-                       return -1;
-               }
-               if (sscanf(ptr, "%ld%ld%ld%ld%ld%ld%ld%*d%ld%ld%ld%ld%ld%ld%ld",
-                          &rx_bytes, &rx_packets, &rx_errs, &rx_drops,
-                          &rx_fifo, &rx_frame, &rx_multi,
-                          &tx_bytes, &tx_packets, &tx_errs, &tx_drops,
-                          &tx_fifo, &tx_colls, &tx_carrier) != 14)
-                       continue;
-               if (p->name[0] && strcmp(p->name, name))
-                       continue;
-               type = tnl_ioctl_get_iftype(name);
-               if (type == -1) {
-                       fprintf(stderr, "Failed to get type of [%s]\n", name);
-                       continue;
-               }
-               if (type != ARPHRD_TUNNEL && type != ARPHRD_IPGRE && type != ARPHRD_SIT)
-                       continue;
-               memset(&p1, 0, sizeof(p1));
-               if (tnl_get_ioctl(name, &p1))
-                       continue;
-               if ((p->link && p1.link != p->link) ||
-                   (p->name[0] && strcmp(p1.name, p->name)) ||
-                   (p->iph.daddr && p1.iph.daddr != p->iph.daddr) ||
-                   (p->iph.saddr && p1.iph.saddr != p->iph.saddr) ||
-                   (p->i_key && p1.i_key != p->i_key))
-                       continue;
-               print_tunnel(&p1);
-               if (show_stats) {
-                       printf("%s", _SL_);
-                       printf("RX: Packets    Bytes        Errors CsumErrs OutOfSeq Mcasts%s", _SL_);
-                       printf("    %-10ld %-12ld %-6ld %-8ld %-8ld %-8ld%s",
-                              rx_packets, rx_bytes, rx_errs, rx_frame, rx_fifo, rx_multi, _SL_);
-                       printf("TX: Packets    Bytes        Errors DeadLoop NoRoute  NoBufs%s", _SL_);
-                       printf("    %-10ld %-12ld %-6ld %-8ld %-8ld %-6ld",
-                              tx_packets, tx_bytes, tx_errs, tx_colls, tx_carrier, tx_drops);
-               }
-               printf("\n");
-       }
-       return 0;
+static bool ip_tunnel_parm_match(const struct tnl_print_nlmsg_info *info)
+{
+       const struct ip_tunnel_parm *p1 = info->p1;
+       const struct ip_tunnel_parm *p2 = info->p2;
+
+       return ((!p1->link || p1->link == p2->link) &&
+               (!p1->name[0] || strcmp(p1->name, p2->name) == 0) &&
+               (!p1->iph.daddr || p1->iph.daddr == p2->iph.daddr) &&
+               (!p1->iph.saddr || p1->iph.saddr == p2->iph.saddr) &&
+               (!p1->i_key || p1->i_key == p2->i_key));
 }
 
 static int do_show(int argc, char **argv)
 {
-       int err;
-       struct ip_tunnel_parm p;
+       struct ip_tunnel_parm p, p1;
+       const char *basedev;
 
        if (parse_args(argc, argv, SIOCGETTUNNEL, &p) < 0)
                return -1;
 
-       switch (p.iph.protocol) {
-       case IPPROTO_IPIP:
-               err = tnl_get_ioctl(p.name[0] ? p.name : "tunl0", &p);
-               break;
-       case IPPROTO_GRE:
-               err = tnl_get_ioctl(p.name[0] ? p.name : "gre0", &p);
-               break;
-       case IPPROTO_IPV6:
-               err = tnl_get_ioctl(p.name[0] ? p.name : "sit0", &p);
-               break;
-       default:
-               do_tunnels_list(&p);
-               return 0;
+       basedev = tnl_defname(&p);
+       if (!basedev) {
+               struct tnl_print_nlmsg_info info = {
+                       .p1    = &p,
+                       .p2    = &p1,
+                       .init  = ip_tunnel_parm_initialize,
+                       .match = ip_tunnel_parm_match,
+                       .print = print_tunnel,
+               };
+
+               return do_tunnels_list(&info);
        }
-       if (err)
+
+       if (tnl_get_ioctl(p.name[0] ? p.name : basedev, &p))
                return -1;
 
        print_tunnel(&p);
-       printf("\n");
+       fputc('\n', stdout);
+       return 0;
+}
+
+static int do_prl(int argc, char **argv)
+{
+       struct ip_tunnel_prl p = {};
+       int count = 0;
+       int cmd = 0;
+       const char *medium = NULL;
+
+       while (argc > 0) {
+               if (strcmp(*argv, "prl-default") == 0) {
+                       NEXT_ARG();
+                       cmd = SIOCADDPRL;
+                       p.addr = get_addr32(*argv);
+                       p.flags |= PRL_DEFAULT;
+                       count++;
+               } else if (strcmp(*argv, "prl-nodefault") == 0) {
+                       NEXT_ARG();
+                       cmd = SIOCADDPRL;
+                       p.addr = get_addr32(*argv);
+                       count++;
+               } else if (strcmp(*argv, "prl-delete") == 0) {
+                       NEXT_ARG();
+                       cmd = SIOCDELPRL;
+                       p.addr = get_addr32(*argv);
+                       count++;
+               } else if (strcmp(*argv, "dev") == 0) {
+                       NEXT_ARG();
+                       if (check_ifname(*argv))
+                               invarg("\"dev\" not a valid ifname", *argv);
+                       medium = *argv;
+               } else {
+                       fprintf(stderr,
+                               "Invalid PRL parameter \"%s\"\n", *argv);
+                       exit(-1);
+               }
+               if (count > 1) {
+                       fprintf(stderr,
+                               "One PRL entry at a time\n");
+                       exit(-1);
+               }
+               argc--; argv++;
+       }
+       if (!medium) {
+               fprintf(stderr, "Must specify device\n");
+               exit(-1);
+       }
+
+       return tnl_prl_ioctl(cmd, medium, &p);
+}
+
+static int do_6rd(int argc, char **argv)
+{
+       struct ip_tunnel_6rd ip6rd = {};
+       int cmd = 0;
+       const char *medium = NULL;
+       inet_prefix prefix;
+
+       while (argc > 0) {
+               if (strcmp(*argv, "6rd-prefix") == 0) {
+                       NEXT_ARG();
+                       if (get_prefix(&prefix, *argv, AF_INET6))
+                               invarg("invalid 6rd_prefix\n", *argv);
+                       cmd = SIOCADD6RD;
+                       memcpy(&ip6rd.prefix, prefix.data, 16);
+                       ip6rd.prefixlen = prefix.bitlen;
+               } else if (strcmp(*argv, "6rd-relay_prefix") == 0) {
+                       NEXT_ARG();
+                       if (get_prefix(&prefix, *argv, AF_INET))
+                               invarg("invalid 6rd-relay_prefix\n", *argv);
+                       cmd = SIOCADD6RD;
+                       memcpy(&ip6rd.relay_prefix, prefix.data, 4);
+                       ip6rd.relay_prefixlen = prefix.bitlen;
+               } else if (strcmp(*argv, "6rd-reset") == 0) {
+                       cmd = SIOCDEL6RD;
+               } else if (strcmp(*argv, "dev") == 0) {
+                       NEXT_ARG();
+                       if (check_ifname(*argv))
+                               invarg("\"dev\" not a valid ifname", *argv);
+                       medium = *argv;
+               } else {
+                       fprintf(stderr,
+                               "Invalid 6RD parameter \"%s\"\n", *argv);
+                       exit(-1);
+               }
+               argc--; argv++;
+       }
+       if (!medium) {
+               fprintf(stderr, "Must specify device\n");
+               exit(-1);
+       }
+
+       return tnl_6rd_ioctl(cmd, medium, &ip6rd);
+}
+
+static int tunnel_mode_is_ipv6(char *tunnel_mode)
+{
+       static const char * const ipv6_modes[] = {
+               "ipv6/ipv6", "ip6ip6",
+               "vti6",
+               "ip/ipv6", "ipv4/ipv6", "ipip6", "ip4ip6",
+               "ip6gre", "gre/ipv6",
+               "any/ipv6", "any"
+       };
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(ipv6_modes); i++) {
+               if (strcmp(ipv6_modes[i], tunnel_mode) == 0)
+                       return 1;
+       }
        return 0;
 }
 
 int do_iptunnel(int argc, char **argv)
 {
+       int i;
+
+       for (i = 0; i < argc - 1; i++) {
+               if (strcmp(argv[i], "mode") == 0) {
+                       if (tunnel_mode_is_ipv6(argv[i + 1]))
+                               preferred_family = AF_INET6;
+                       break;
+               }
+       }
        switch (preferred_family) {
        case AF_UNSPEC:
                preferred_family = AF_INET;
@@ -484,26 +557,30 @@ int do_iptunnel(int argc, char **argv)
        case AF_INET6:
                return do_ip6tunnel(argc, argv);
        default:
-               fprintf(stderr, "Unsupported family:%d\n", preferred_family);
+               fprintf(stderr, "Unsupported protocol family: %d\n", preferred_family);
                exit(-1);
        }
 
        if (argc > 0) {
                if (matches(*argv, "add") == 0)
-                       return do_add(SIOCADDTUNNEL, argc-1, argv+1);
+                       return do_add(SIOCADDTUNNEL, argc - 1, argv + 1);
                if (matches(*argv, "change") == 0)
-                       return do_add(SIOCCHGTUNNEL, argc-1, argv+1);
-               if (matches(*argv, "del") == 0)
-                       return do_del(argc-1, argv+1);
+                       return do_add(SIOCCHGTUNNEL, argc - 1, argv + 1);
+               if (matches(*argv, "delete") == 0)
+                       return do_del(argc - 1, argv + 1);
                if (matches(*argv, "show") == 0 ||
                    matches(*argv, "lst") == 0 ||
                    matches(*argv, "list") == 0)
-                       return do_show(argc-1, argv+1);
+                       return do_show(argc - 1, argv + 1);
+               if (matches(*argv, "prl") == 0)
+                       return do_prl(argc - 1, argv + 1);
+               if (matches(*argv, "6rd") == 0)
+                       return do_6rd(argc - 1, argv + 1);
                if (matches(*argv, "help") == 0)
                        usage();
        } else
                return do_show(0, NULL);
 
-       fprintf(stderr, "Command \"%s\" is unknown, try \"ip tunnel help\".\n", *argv);
+       fprintf(stderr, "Command \"%s\" is unknown, try \"ip tunnel help\"\n", *argv);
        exit(-1);
 }