| Message ID | 20140926071056.GB6390@secunet.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | stephen hemminger |
| Headers | show |
Fri, Sep 26, 2014 at 09:10:56AM CEST, steffen.klassert@secunet.com wrote: > >Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com> >--- > ip/ip6tunnel.c | 15 ++++++++++++--- > 1 file changed, 12 insertions(+), 3 deletions(-) > >diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c >index 66f9f2a..4b73ec6 100644 >--- a/ip/ip6tunnel.c >+++ b/ip/ip6tunnel.c >@@ -47,7 +47,7 @@ static void usage(void) __attribute__((noreturn)); > static void usage(void) > { > fprintf(stderr, "Usage: ip -f inet6 tunnel { add | change | del | show } [ NAME ]\n"); >- fprintf(stderr, " [ mode { ip6ip6 | ipip6 | ip6gre | any } ]\n"); >+ fprintf(stderr, " [ mode { ip6ip6 | ipip6 | ip6gre | vti6 | any } ]\n"); > fprintf(stderr, " [ remote ADDR local ADDR ] [ dev PHYS_DEV ]\n"); > fprintf(stderr, " [ encaplimit ELIM ]\n"); > fprintf(stderr ," [ hoplimit TTL ] [ tclass TCLASS ] [ flowlabel FLOWLABEL ]\n"); >@@ -140,7 +140,10 @@ static int parse_args(int argc, char **argv, int cmd, struct ip6_tnl_parm2 *p) > if (strcmp(*argv, "ipv6/ipv6") == 0 || > strcmp(*argv, "ip6ip6") == 0) > p->proto = IPPROTO_IPV6; >- else if (strcmp(*argv, "ip/ipv6") == 0 || >+ else if (strcmp(*argv, "vti6") == 0) { >+ p->proto = IPPROTO_IPV6; >+ p->i_flags |= VTI_ISVTI; >+ } else if (strcmp(*argv, "ip/ipv6") == 0 || > strcmp(*argv, "ipv4/ipv6") == 0 || > strcmp(*argv, "ipip6") == 0 || > strcmp(*argv, "ip4ip6") == 0) >@@ -459,11 +462,14 @@ static int do_add(int cmd, int argc, char **argv) > switch (p.proto) { > case IPPROTO_IPIP: > case IPPROTO_IPV6: >+ if (p.i_flags != VTI_ISVTI) >+ return tnl_add_ioctl(cmd, "ip6_vti0", p.name, &p); ^ Wouldn't it be more consistent to not to use the underscore? >+ else > return tnl_add_ioctl(cmd, "ip6tnl0", p.name, &p); > case IPPROTO_GRE: > return tnl_add_ioctl(cmd, "ip6gre0", p.name, &p); > default: >- fprintf(stderr, "cannot determine tunnel mode (ip6ip6, ipip6 or gre)\n"); >+ fprintf(stderr, "cannot determine tunnel mode (ip6ip6, ipip6, vti6 or gre)\n"); > } > return -1; > } >@@ -480,6 +486,9 @@ static int do_del(int argc, char **argv) > switch (p.proto) { > case IPPROTO_IPIP: > case IPPROTO_IPV6: >+ if (p.i_flags != VTI_ISVTI) >+ return tnl_del_ioctl("ip6_vti0", p.name, &p); >+ else > return tnl_del_ioctl("ip6tnl0", p.name, &p); > case IPPROTO_GRE: > return tnl_del_ioctl("ip6gre0", p.name, &p); >-- >1.9.1 > >-- >To unsubscribe from this list: send the line "unsubscribe netdev" in >the body of a message to majordomo@vger.kernel.org >More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Oct 02, 2014 at 10:41:09AM +0200, Jiri Pirko wrote: > Fri, Sep 26, 2014 at 09:10:56AM CEST, steffen.klassert@secunet.com wrote: > > > >@@ -459,11 +462,14 @@ static int do_add(int cmd, int argc, char **argv) > > switch (p.proto) { > > case IPPROTO_IPIP: > > case IPPROTO_IPV6: > >+ if (p.i_flags != VTI_ISVTI) > >+ return tnl_add_ioctl(cmd, "ip6_vti0", p.name, &p); > ^ Wouldn't it be more > consistent to not to use > the underscore? The ipv4 version of vti uses ip_vti0, so I tried to be consistent with that. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Thu, Oct 02, 2014 at 10:48:20AM CEST, steffen.klassert@secunet.com wrote: >On Thu, Oct 02, 2014 at 10:41:09AM +0200, Jiri Pirko wrote: >> Fri, Sep 26, 2014 at 09:10:56AM CEST, steffen.klassert@secunet.com wrote: >> > >> >@@ -459,11 +462,14 @@ static int do_add(int cmd, int argc, char **argv) >> > switch (p.proto) { >> > case IPPROTO_IPIP: >> > case IPPROTO_IPV6: >> >+ if (p.i_flags != VTI_ISVTI) >> >+ return tnl_add_ioctl(cmd, "ip6_vti0", p.name, &p); >> ^ Wouldn't it be more >> consistent to not to use >> the underscore? > >The ipv4 version of vti uses ip_vti0, so I tried to be consistent >with that. Okay, fine with me. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, 2 Oct 2014 11:11:40 +0200 Jiri Pirko <jiri@resnulli.us> wrote: > Thu, Oct 02, 2014 at 10:48:20AM CEST, steffen.klassert@secunet.com wrote: > >On Thu, Oct 02, 2014 at 10:41:09AM +0200, Jiri Pirko wrote: > >> Fri, Sep 26, 2014 at 09:10:56AM CEST, steffen.klassert@secunet.com wrote: > >> > > >> >@@ -459,11 +462,14 @@ static int do_add(int cmd, int argc, char **argv) > >> > switch (p.proto) { > >> > case IPPROTO_IPIP: > >> > case IPPROTO_IPV6: > >> >+ if (p.i_flags != VTI_ISVTI) > >> >+ return tnl_add_ioctl(cmd, "ip6_vti0", p.name, &p); > >> ^ Wouldn't it be more > >> consistent to not to use > >> the underscore? > > > >The ipv4 version of vti uses ip_vti0, so I tried to be consistent > >with that. > > Okay, fine with me. Sure, applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c index 66f9f2a..4b73ec6 100644 --- a/ip/ip6tunnel.c +++ b/ip/ip6tunnel.c @@ -47,7 +47,7 @@ static void usage(void) __attribute__((noreturn)); static void usage(void) { fprintf(stderr, "Usage: ip -f inet6 tunnel { add | change | del | show } [ NAME ]\n"); - fprintf(stderr, " [ mode { ip6ip6 | ipip6 | ip6gre | any } ]\n"); + fprintf(stderr, " [ mode { ip6ip6 | ipip6 | ip6gre | vti6 | any } ]\n"); fprintf(stderr, " [ remote ADDR local ADDR ] [ dev PHYS_DEV ]\n"); fprintf(stderr, " [ encaplimit ELIM ]\n"); fprintf(stderr ," [ hoplimit TTL ] [ tclass TCLASS ] [ flowlabel FLOWLABEL ]\n"); @@ -140,7 +140,10 @@ static int parse_args(int argc, char **argv, int cmd, struct ip6_tnl_parm2 *p) if (strcmp(*argv, "ipv6/ipv6") == 0 || strcmp(*argv, "ip6ip6") == 0) p->proto = IPPROTO_IPV6; - else if (strcmp(*argv, "ip/ipv6") == 0 || + else if (strcmp(*argv, "vti6") == 0) { + p->proto = IPPROTO_IPV6; + p->i_flags |= VTI_ISVTI; + } else if (strcmp(*argv, "ip/ipv6") == 0 || strcmp(*argv, "ipv4/ipv6") == 0 || strcmp(*argv, "ipip6") == 0 || strcmp(*argv, "ip4ip6") == 0) @@ -459,11 +462,14 @@ static int do_add(int cmd, int argc, char **argv) switch (p.proto) { case IPPROTO_IPIP: case IPPROTO_IPV6: + if (p.i_flags != VTI_ISVTI) + return tnl_add_ioctl(cmd, "ip6_vti0", p.name, &p); + else return tnl_add_ioctl(cmd, "ip6tnl0", p.name, &p); case IPPROTO_GRE: return tnl_add_ioctl(cmd, "ip6gre0", p.name, &p); default: - fprintf(stderr, "cannot determine tunnel mode (ip6ip6, ipip6 or gre)\n"); + fprintf(stderr, "cannot determine tunnel mode (ip6ip6, ipip6, vti6 or gre)\n"); } return -1; } @@ -480,6 +486,9 @@ static int do_del(int argc, char **argv) switch (p.proto) { case IPPROTO_IPIP: case IPPROTO_IPV6: + if (p.i_flags != VTI_ISVTI) + return tnl_del_ioctl("ip6_vti0", p.name, &p); + else return tnl_del_ioctl("ip6tnl0", p.name, &p); case IPPROTO_GRE: return tnl_del_ioctl("ip6gre0", p.name, &p);
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com> --- ip/ip6tunnel.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)