From d0a76b2d62a4393feedb1cc023f5ec7e1204d296 Mon Sep 17 00:00:00 2001
From: Konstantin Shemyak <konstantin@shemyak.com>
Date: Thu, 12 Nov 2015 20:52:02 +0200
Subject: [PATCH] Tunnel address family is determined from the tunnel mode
When the tunnel mode already tells the IP address family, "ip tunnel"
command determines it and does not require option "-4"/"-6" to be passed.
This makes possible creating both IPv4 and IPv6 tunnels in one batch.
Signed-off-by: Konstantin Shemyak <konstantin@shemyak.com>
---
ip/iptunnel.c | 26 ++++++++++++++++++++++++++
testsuite/tests/ip/tunnel/add_tunnel.t | 14 ++++++++++++++
2 files changed, 40 insertions(+)
create mode 100755 testsuite/tests/ip/tunnel/add_tunnel.t
@@ -629,8 +629,34 @@ static int do_6rd(int argc, char **argv)
return tnl_6rd_ioctl(cmd, medium, &ip6rd);
}
+static int tunnel_mode_is_ipv6(char *tunnel_mode) {
+ char *ipv6_modes[] = {
+ "ipv6/ipv6", "ip6ip6",
+ "vti6",
+ "ip/ipv6", "ipv4/ipv6", "ipip6", "ip4ip6",
+ "ip6gre", "gre/ipv6",
+ "any/ipv6", "any"
+ };
+ int i;
+
+ for (i = 0; i < sizeof(ipv6_modes) / sizeof(char *); 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;
new file mode 100755
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+source lib/generic.sh
+
+TUNNEL_NAME="tunnel_test_ip"
+
+ts_log "[Testing add/del tunnels]"
+
+ts_ip "$0" "Add GRE tunnel over IPv4" tunnel add name $TUNNEL_NAME mode gre local 1.1.1.1 remote 2.2.2.2
+ts_ip "$0" "Del GRE tunnel over IPv4" tunnel del $TUNNEL_NAME
+
+ts_ip "$0" "Add GRE tunnel over IPv6" tunnel add name $TUNNEL_NAME mode ip6gre local dead:beef::1 remote dead:beef::2
+ts_ip "$0" "Del GRE tunnel over IPv6" tunnel del $TUNNEL_NAME
+
--
1.9.1
When creating an IP tunnel over IPv6, the address family must be passed in the option, e.g. ip -6 tunnel add mode ip6gre local 1::1 remote 2::2 This makes it impossible to create both IPv4 and IPv6 tunnels in one batch. In fact the address family option is redundant here, as each tunnel mode is relevant for only one address family. The patch determines whether the applicable address family is AF_INET6 instead of the default AF_INET and makes the "-6" option unnecessary for "ip tunnel add". Signed-off-by: Konstantin Shemyak <konstantin@shemyak.com> --- ip/iptunnel.c | 26 ++++++++++++++++++++++++++ testsuite/tests/ip/tunnel/add_tunnel.t | 14 ++++++++++++++ 2 files changed, 40 insertions(+) create mode 100755 testsuite/tests/ip/tunnel/add_tunnel.t