* [PATCH 01/02] iproute2: VTI support for ip tunnel command.
@ 2012-06-28 1:01 Saurabh
0 siblings, 0 replies; 2+ messages in thread
From: Saurabh @ 2012-06-28 1:01 UTC (permalink / raw)
To: netdev
Configure VTI using 'ip tunnel'.
Signed-off-by: Saurabh Mohan <saurabh.mohan@vyatta.com>
---
diff --git a/ip/iptunnel.c b/ip/iptunnel.c
index 38ccd87..0cf6cf8 100644
--- a/ip/iptunnel.c
+++ b/ip/iptunnel.c
@@ -33,7 +33,7 @@ static void usage(void) __attribute__((noreturn));
static void usage(void)
{
fprintf(stderr, "Usage: ip tunnel { add | change | del | show | prl | 6rd } [ NAME ]\n");
- fprintf(stderr, " [ mode { ipip | gre | sit | isatap } ] [ remote ADDR ] [ local ADDR ]\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");
@@ -94,6 +94,13 @@ static int parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p)
}
p->iph.protocol = IPPROTO_IPV6;
isatap++;
+ } else if (strcmp(*argv, "vti") == 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;
+ p->i_flags |= VTI_ISVTI;
} else {
fprintf(stderr,"Cannot guess tunnel mode.\n");
exit(-1);
@@ -220,6 +227,9 @@ 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;
}
}
@@ -269,13 +279,16 @@ static int do_add(int cmd, int argc, char **argv)
switch (p.iph.protocol) {
case IPPROTO_IPIP:
- return tnl_add_ioctl(cmd, "tunl0", p.name, &p);
+ if (p.i_flags != VTI_ISVTI)
+ return tnl_add_ioctl(cmd, "tunl0", p.name, &p);
+ else
+ return tnl_add_ioctl(cmd, "ip_vti0", 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");
+ fprintf(stderr, "cannot determine tunnel mode (ipip, gre, vti or sit)\n");
return -1;
}
return -1;
@@ -290,7 +303,10 @@ static int do_del(int argc, char **argv)
switch (p.iph.protocol) {
case IPPROTO_IPIP:
- return tnl_del_ioctl("tunl0", p.name, &p);
+ if (p.i_flags != VTI_ISVTI)
+ return tnl_del_ioctl("tunl0", p.name, &p);
+ else
+ return tnl_del_ioctl("ip_vti0", p.name, &p);
case IPPROTO_GRE:
return tnl_del_ioctl("gre0", p.name, &p);
case IPPROTO_IPV6:
@@ -479,7 +495,10 @@ static int do_show(int argc, char **argv)
switch (p.iph.protocol) {
case IPPROTO_IPIP:
- err = tnl_get_ioctl(p.name[0] ? p.name : "tunl0", &p);
+ if (p.i_flags != VTI_ISVTI)
+ err = tnl_get_ioctl(p.name[0] ? p.name : "tunl0", &p);
+ else
+ err = tnl_get_ioctl(p.name[0] ? p.name : "ip_vti0", &p);
break;
case IPPROTO_GRE:
err = tnl_get_ioctl(p.name[0] ? p.name : "gre0", &p);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH 01/02] iproute2: VTI support for ip tunnel command.
@ 2012-06-08 17:33 Saurabh
0 siblings, 0 replies; 2+ messages in thread
From: Saurabh @ 2012-06-08 17:33 UTC (permalink / raw)
To: netdev
Configure VTI using 'ip tunnel'.
Signed-off-by: Saurabh Mohan <saurabh.mohan@vyatta.com>
---
diff --git a/ip/iptunnel.c b/ip/iptunnel.c
index 38ccd87..c054b7e 100644
--- a/ip/iptunnel.c
+++ b/ip/iptunnel.c
@@ -33,7 +33,7 @@ static void usage(void) __attribute__((noreturn));
static void usage(void)
{
fprintf(stderr, "Usage: ip tunnel { add | change | del | show | prl | 6rd } [ NAME ]\n");
- fprintf(stderr, " [ mode { ipip | gre | sit | isatap } ] [ remote ADDR ] [ local ADDR ]\n");
+ fprintf(stderr, " [ mode { ipip | gre | sit | isatap | esp } ] [ 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");
@@ -94,6 +94,12 @@ static int parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p)
}
p->iph.protocol = IPPROTO_IPV6;
isatap++;
+ } else if (strcmp(*argv, "esp") == 0) {
+ if (p->iph.protocol && p->iph.protocol != IPPROTO_ESP) {
+ fprintf(stderr, "You managed to ask for more than one tunnel mode.\n");
+ exit(-1);
+ }
+ p->iph.protocol = IPPROTO_ESP;
} else {
fprintf(stderr,"Cannot guess tunnel mode.\n");
exit(-1);
@@ -220,6 +226,8 @@ 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, "esp", 3) == 0) {
+ p->iph.protocol = IPPROTO_ESP;
}
}
@@ -274,8 +282,10 @@ static int do_add(int cmd, int argc, char **argv)
return tnl_add_ioctl(cmd, "gre0", p.name, &p);
case IPPROTO_IPV6:
return tnl_add_ioctl(cmd, "sit0", p.name, &p);
+ case IPPROTO_ESP:
+ return tnl_add_ioctl(cmd, "ip_vti0", p.name, &p);
default:
- fprintf(stderr, "cannot determine tunnel mode (ipip, gre or sit)\n");
+ fprintf(stderr, "cannot determine tunnel mode (ipip, gre, esp or sit)\n");
return -1;
}
return -1;
@@ -295,6 +305,8 @@ static int do_del(int argc, char **argv)
return tnl_del_ioctl("gre0", p.name, &p);
case IPPROTO_IPV6:
return tnl_del_ioctl("sit0", p.name, &p);
+ case IPPROTO_ESP:
+ return tnl_del_ioctl("ip_vti0", p.name, &p);
default:
return tnl_del_ioctl(p.name, p.name, &p);
}
@@ -487,6 +499,9 @@ static int do_show(int argc, char **argv)
case IPPROTO_IPV6:
err = tnl_get_ioctl(p.name[0] ? p.name : "sit0", &p);
break;
+ case IPPROTO_ESP:
+ err = tnl_get_ioctl(p.name[0] ? p.name : "ip_vti0", &p);
+ break;
default:
do_tunnels_list(&p);
return 0;
diff --git a/ip/tunnel.c b/ip/tunnel.c
index b176d3f..8544581 100644
--- a/ip/tunnel.c
+++ b/ip/tunnel.c
@@ -52,6 +52,9 @@ const char *tnl_strproto(__u8 proto)
case IPPROTO_IPV6:
strcpy(buf, "ipv6");
break;
+ case IPPROTO_ESP:
+ strcpy(buf, "esp");
+ break;
case 0:
strcpy(buf, "any");
break;
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-06-28 1:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-06-28 1:01 [PATCH 01/02] iproute2: VTI support for ip tunnel command Saurabh
-- strict thread matches above, loose matches on Subject: below --
2012-06-08 17:33 Saurabh
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.