From 885f6dfe74abec4f29fe48433b5ad9f899f2defd Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Petr=20=C5=A0abata?= <contyk@redhat.com>

Date: Tue, 25 Feb 2014 16:36:10 +0100

Subject: [PATCH 2/2] Add IPv6 support to VXLAN

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

Signed-off-by: Petr Šabata <contyk@redhat.com>

---

 include/utils.h   |  1 +

 ip/iplink_vxlan.c | 59 +++++++++++++++++++++++++++++++++++++++++++++----------

 lib/utils.c       |  8 ++++++++

 3 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/include/utils.h b/include/utils.h

index 24ff19f..a3e310e 100644

--- a/include/utils.h

+++ b/include/utils.h

@@ -151,6 +151,7 @@ int print_timestamp(FILE *fp);

 extern int cmdlineno;

 extern ssize_t getcmdline(char **line, size_t *len, FILE *in);

 extern int makeargs(char *line, char *argv[], int maxargs);

+extern int inet_get_addr(const char *src, __u32 *dst, struct in6_addr *dst6);

 struct iplink_req;

 int iplink_parse(int argc, char **argv, struct iplink_req *req,

diff --git a/ip/iplink_vxlan.c b/ip/iplink_vxlan.c

index fdae6b1..81b8706 100644

--- a/ip/iplink_vxlan.c

+++ b/ip/iplink_vxlan.c

@@ -43,6 +43,9 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,

 	__u32 saddr = 0;

 	__u32 gaddr = 0;

 	__u32 daddr = 0;

+	struct in6_addr saddr6 = IN6ADDR_ANY_INIT;

+	struct in6_addr gaddr6 = IN6ADDR_ANY_INIT;

+	struct in6_addr daddr6 = IN6ADDR_ANY_INIT;

 	unsigned link = 0;

 	__u8 tos = 0;

 	__u8 ttl = 0;

@@ -68,21 +71,30 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,

 			vni_set = 1;

 		} else if (!matches(*argv, "group")) {

 			NEXT_ARG();

-			gaddr = get_addr32(*argv);

-

-			if (!IN_MULTICAST(ntohl(gaddr)))

+			if (!inet_get_addr(*argv, &gaddr, &gaddr6)) {

+				fprintf(stderr, "Invalid address \"%s\"\n", *argv);

+				return -1;

+			}

+			if (!IN6_IS_ADDR_MULTICAST(&gaddr6) && !IN_MULTICAST(ntohl(gaddr)))

 				invarg("invalid group address", *argv);

 		} else if (!matches(*argv, "remote")) {

 			NEXT_ARG();

-			daddr = get_addr32(*argv);

-

-			if (IN_MULTICAST(ntohl(daddr)))

+			if (!inet_get_addr(*argv, &daddr, &daddr6)) {

+				fprintf(stderr, "Invalid address \"%s\"\n", *argv);

+				return -1;

+			}

+			if (IN6_IS_ADDR_MULTICAST(&daddr6) || IN_MULTICAST(ntohl(daddr)))

 				invarg("invalid remote address", *argv);

 		} else if (!matches(*argv, "local")) {

 			NEXT_ARG();

-			if (strcmp(*argv, "any"))

-				saddr = get_addr32(*argv);

-			if (IN_MULTICAST(ntohl(saddr)))

+			if (strcmp(*argv, "any")) {

+				if (!inet_get_addr(*argv, &saddr, &saddr6)) {

+					fprintf(stderr, "Invalid address \"%s\"\n", *argv);

+					return -1;

+				}

+			}

+

+			if (IN_MULTICAST(ntohl(saddr)) || IN6_IS_ADDR_MULTICAST(&saddr6))

 				invarg("invalid local address", *argv);

 		} else if (!matches(*argv, "dev")) {

 			NEXT_ARG();

@@ -183,7 +195,9 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,

 			"Use 'dstport 4789' to get the IANA assigned value\n"

 			"Use 'dstport 0' to get default and quiet this message\n");

 	}

-	if (gaddr && daddr) {

+	if ((gaddr && daddr) ||

+		(memcmp(&gaddr6, &in6addr_any, sizeof(gaddr6)) &&

+		 memcmp(&daddr6, &in6addr_any, sizeof(daddr6)))) {

 		fprintf(stderr, "vxlan: both group and remote cannot be specified\n");

 		return -1;

 	}

@@ -192,8 +206,16 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,

 		addattr_l(n, 1024, IFLA_VXLAN_GROUP, &gaddr, 4);

 	else if (daddr)

 		addattr_l(n, 1024, IFLA_VXLAN_GROUP, &daddr, 4);

+	if (memcmp(&gaddr6, &in6addr_any, sizeof(gaddr6)) != 0)

+		addattr_l(n, 1024, IFLA_VXLAN_GROUP6, &gaddr6, sizeof(struct in6_addr));

+	else if (memcmp(&daddr6, &in6addr_any, sizeof(daddr6)) != 0)

+		addattr_l(n, 1024, IFLA_VXLAN_GROUP6, &daddr6, sizeof(struct in6_addr));

+

 	if (saddr)

 		addattr_l(n, 1024, IFLA_VXLAN_LOCAL, &saddr, 4);

+	else if (memcmp(&saddr6, &in6addr_any, sizeof(saddr6)) != 0)

+		addattr_l(n, 1024, IFLA_VXLAN_LOCAL6, &saddr6, sizeof(struct in6_addr));

+

 	if (link)

 		addattr32(n, 1024, IFLA_VXLAN_LINK, link);

 	addattr8(n, 1024, IFLA_VXLAN_TTL, ttl);

@@ -248,6 +270,17 @@ static void vxlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])

 				fprintf(f, "remote %s ",

 					format_host(AF_INET, 4, &addr, s1, sizeof(s1)));

 		}

+	} else if (tb[IFLA_VXLAN_GROUP6]) {

+		struct in6_addr addr;

+		memcpy(&addr, RTA_DATA(tb[IFLA_VXLAN_GROUP6]), sizeof(struct in6_addr));

+		if (memcmp(&addr, &in6addr_any, sizeof(addr)) != 0) {

+			if (IN6_IS_ADDR_MULTICAST(&addr))

+				fprintf(f, "group %s ",

+					format_host(AF_INET6, sizeof(struct in6_addr), &addr, s1, sizeof(s1)));

+			else

+				fprintf(f, "remote %s ",

+					format_host(AF_INET6, sizeof(struct in6_addr), &addr, s1, sizeof(s1)));

+		}

 	}

 	if (tb[IFLA_VXLAN_LOCAL]) {

@@ -255,6 +288,12 @@ static void vxlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])

 		if (addr)

 			fprintf(f, "local %s ",

 				format_host(AF_INET, 4, &addr, s1, sizeof(s1)));

+	} else if (tb[IFLA_VXLAN_LOCAL6]) {

+		struct in6_addr addr;

+		memcpy(&addr, RTA_DATA(tb[IFLA_VXLAN_LOCAL6]), sizeof(struct in6_addr));

+		if (memcmp(&addr, &in6addr_any, sizeof(addr)) != 0)

+			fprintf(f, "local %s ",

+				format_host(AF_INET6, sizeof(struct in6_addr), &addr, s1, sizeof(s1)));

 	}

 	if (tb[IFLA_VXLAN_LINK] &&

diff --git a/lib/utils.c b/lib/utils.c

index 55fea18..1e12f85 100644

--- a/lib/utils.c

+++ b/lib/utils.c

@@ -864,3 +864,11 @@ int makeargs(char *line, char *argv[], int maxargs)

 	return argc;

 }

+

+int inet_get_addr(const char *src, __u32 *dst, struct in6_addr *dst6)

+{

+	if (strchr(src, ':'))

+		return inet_pton(AF_INET6, src, dst6);

+	else

+		return inet_pton(AF_INET, src, dst);

+}

-- 

1.8.5.3

diff --git a/include/linux/if_link.h b/include/linux/if_link.h

index 965dc9f..b352b73 100644

--- a/include/linux/if_link.h

+++ b/include/linux/if_link.h

@@ -309,6 +309,8 @@ enum {

 	IFLA_VXLAN_L2MISS,

 	IFLA_VXLAN_L3MISS,

 	IFLA_VXLAN_PORT,	/* destination port */

+	IFLA_VXLAN_GROUP6,

+	IFLA_VXLAN_LOCAL6,

 	__IFLA_VXLAN_MAX

 };

 #define IFLA_VXLAN_MAX	(__IFLA_VXLAN_MAX - 1)