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

Detect 6rd kernel missing support / 6rd tunnel scope 

This patch fix two issues:

* If kernel is not supporting 6rd then ioctl() call
  will return EINVAL, if so just skip perror call.

* 6rd scope is ipv6/ip tunnels. Dont try to fetch
  6rd tunnel parms if tunnel protocol != IPPROTO_IPV6.

Signed-off-by: Alexandre Cassen <acassen@freebox.fr>
This commit is contained in:
Alexandre Cassen 2010-04-04 22:40:14 +02:00 committed by Stephen Hemminger
parent ab814d6355
commit 3979ef91de
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ip/iptunnel.c
View File

@ -365,7 +365,7 @@ static void print_tunnel(struct ip_tunnel_parm *p)
if (!(p->iph.frag_off&htons(IP_DF))) if (!(p->iph.frag_off&htons(IP_DF)))
printf(" nopmtudisc"); printf(" nopmtudisc");
if (!tnl_ioctl_get_6rd(p->name, &ip6rd) && ip6rd.prefixlen) { if (p->iph.protocol == IPPROTO_IPV6 && !tnl_ioctl_get_6rd(p->name, &ip6rd) && ip6rd.prefixlen) {
printf(" 6rd-prefix %s/%u ", printf(" 6rd-prefix %s/%u ",
inet_ntop(AF_INET6, &ip6rd.prefix, s1, sizeof(s1)), inet_ntop(AF_INET6, &ip6rd.prefix, s1, sizeof(s1)),
ip6rd.prefixlen); ip6rd.prefixlen);

11
ip/tunnel.c
View File

@ -26,6 +26,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <errno.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
@ -168,7 +169,7 @@ int tnl_del_ioctl(const char *basedev, const char *name, void *p)
return err; return err;
} }
static int tnl_gen_ioctl(int cmd, const char *name, void *p) static int tnl_gen_ioctl(int cmd, const char *name, void *p, int skiperr)
{ {
struct ifreq ifr; struct ifreq ifr;
int fd; int fd;
@ -178,7 +179,7 @@ static int tnl_gen_ioctl(int cmd, const char *name, void *p)
ifr.ifr_ifru.ifru_data = p; ifr.ifr_ifru.ifru_data = p;
fd = socket(preferred_family, SOCK_DGRAM, 0); fd = socket(preferred_family, SOCK_DGRAM, 0);
err = ioctl(fd, cmd, &ifr); err = ioctl(fd, cmd, &ifr);
if (err) if (err && errno != skiperr)
perror("ioctl"); perror("ioctl");
close(fd); close(fd);
return err; return err;
@ -186,15 +187,15 @@ static int tnl_gen_ioctl(int cmd, const char *name, void *p)
int tnl_prl_ioctl(int cmd, const char *name, void *p) int tnl_prl_ioctl(int cmd, const char *name, void *p)
{ {
return tnl_gen_ioctl(cmd, name, p); return tnl_gen_ioctl(cmd, name, p, -1);
} }
int tnl_6rd_ioctl(int cmd, const char *name, void *p) int tnl_6rd_ioctl(int cmd, const char *name, void *p)
{ {
return tnl_gen_ioctl(cmd, name, p); return tnl_gen_ioctl(cmd, name, p, -1);
} }
int tnl_ioctl_get_6rd(const char *name, void *p) int tnl_ioctl_get_6rd(const char *name, void *p)
{ {
return tnl_gen_ioctl(SIOCGET6RD, name, p); return tnl_gen_ioctl(SIOCGET6RD, name, p, EINVAL);
} }