matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

iproute2: fix changing of ip6ip6 tunnel parameters 

When changing ip6ip6 parameters (ip -6 tun change), ip passes zeroed
struct ip6_tnl_parm to the kernel. The kernel then tries to change all of
the tunnel parameters to the passed values, including zeroing of local and
remote address. This fails (-EEXIST in net/ipv6/ip6_tunnel.c:ip6_tnl_ioctl).

For other tunnel types, ip fetches the current parameters first and applies
the required changes on top of them. This patch applies the same code as in
ip/iptunnel.c to ip/ip6tunnel.c.

See http://bugzilla.redhat.com/730627 for the original bug report.

Signed-off-by: Jiri Benc <jbenc@redhat.com>
This commit is contained in:
Jiri Benc 2011-09-19 05:14:10 +00:00 committed by Stephen Hemminger
parent 2bcc3c1629
commit 21a5a6b378
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ip/ip6tunnel.c
View File

@ -106,8 +106,9 @@ static void print_tunnel(struct ip6_tnl_parm *p)
printf(" dscp inherit"); printf(" dscp inherit");
} }
static int parse_args(int argc, char **argv, struct ip6_tnl_parm *p) static int parse_args(int argc, char **argv, int cmd, struct ip6_tnl_parm *p)
{ {
int count = 0;
char medium[IFNAMSIZ]; char medium[IFNAMSIZ];
memset(medium, 0, sizeof(medium)); memset(medium, 0, sizeof(medium));
@ -207,7 +208,15 @@ static int parse_args(int argc, char **argv, struct ip6_tnl_parm *p)
if (p->name[0]) if (p->name[0])
duparg2("name", *argv); duparg2("name", *argv);
strncpy(p->name, *argv, IFNAMSIZ - 1); strncpy(p->name, *argv, IFNAMSIZ - 1);
if (cmd == SIOCCHGTUNNEL && count == 0) {
struct ip6_tnl_parm old_p;
memset(&old_p, 0, sizeof(old_p));
if (tnl_get_ioctl(*argv, &old_p))
return -1;
*p = old_p;
}
} }
count++;
argc--; argv++; argc--; argv++;
} }
if (medium[0]) { if (medium[0]) {
@ -340,7 +349,7 @@ static int do_show(int argc, char **argv)
ip6_tnl_parm_init(&p, 0); ip6_tnl_parm_init(&p, 0);
p.proto = 0; /* default to any */ p.proto = 0; /* default to any */
if (parse_args(argc, argv, &p) < 0) if (parse_args(argc, argv, SIOCGETTUNNEL, &p) < 0)
return -1; return -1;
if (!p.name[0] || show_stats) if (!p.name[0] || show_stats)
@ -361,7 +370,7 @@ static int do_add(int cmd, int argc, char **argv)
ip6_tnl_parm_init(&p, 1); ip6_tnl_parm_init(&p, 1);
if (parse_args(argc, argv, &p) < 0) if (parse_args(argc, argv, cmd, &p) < 0)
return -1; return -1;
return tnl_add_ioctl(cmd, return tnl_add_ioctl(cmd,
@ -375,7 +384,7 @@ static int do_del(int argc, char **argv)
ip6_tnl_parm_init(&p, 1); ip6_tnl_parm_init(&p, 1);
if (parse_args(argc, argv, &p) < 0) if (parse_args(argc, argv, SIOCDELTUNNEL, &p) < 0)
return -1; return -1;
return tnl_del_ioctl(p.name[0] ? p.name : "ip6tnl0", p.name, &p); return tnl_del_ioctl(p.name[0] ? p.name : "ip6tnl0", p.name, &p);