Skip to contentSkip to conversation

IPv6 prerequisite patches

PATCH In review Peter Krystad 4 participants 16 messages Oct 15, 2019 – Oct 18, 2019

Subsystems (2)
lore
Share & tools
lore

Peter Krystad

author
#0 lore raw

cover IPv6 prerequisite patches

IPv6 changes to the path manager and option handling. May all be squashed as specified in each patch.

Peter Krystad (5):
mptcp: Update path manager interface for IPv6
mptcp: Add missing ADD_ADDR handling
mptcp: Make mptcp_subflow_connect() IPv4/6 agnostic
mptcp: Update path manager interface commands for IPv6
mptcp: Update basic path manager for IPv6

 net/mptcp/basic.c    |  40 ++++++++++------
 net/mptcp/options.c  |  24 ++++++----
 net/mptcp/pm.c       | 106 ++++++++++++++++++++++++++++++++++++-------
 net/mptcp/protocol.h |  15 +++---
 net/mptcp/subflow.c  |  16 ++++---
 5 files changed, 150 insertions(+), 51 deletions(-)
Signature · 1 line
2.17.2
author
#1 lore raw

PATCH 1/5 mptcp: Update path manager interface for IPv6

squashto: Add path manager interface

Signed-off-by Peter Krystad <peter.krystad(a)linux.intel.com>
---
 net/mptcp/pm.c       | 35 +++++++++++++++++++++++++++--------
 net/mptcp/protocol.h | 11 +++++++----
 2 files changed, 34 insertions(+), 12 deletions(-)
net/mptcp/pm.c +27 -8
index f20377c869ad..bc46a0ddd396 100644
@@ -10,8 +10,7 @@
 
 /* path manager command handlers */
 
-int mptcp_pm_announce_addr(u32 token, u8 local_id, sa_family_t family,
-			   struct in_addr *addr)
+int mptcp_pm_announce_addr(u32 token, u8 local_id, struct in_addr *addr)
 {
 	struct mptcp_sock *msk = mptcp_token_get_sock(token);
 	int err = 0;
@@ -36,6 +35,13 @@ int mptcp_pm_announce_addr(u32 token, u8 local_id, sa_family_t family,
 	return err;
 }
 
+#if IS_ENABLED(CONFIG_IPV6)
+int mptcp_pm_announce_addr6(u32 token, u8 local_id, struct in6_addr *addr)
+{
+	return -ENOTSUPP;
+}
+#endif
+
 int mptcp_pm_remove_addr(u32 token, u8 local_id)
 {
 	struct mptcp_sock *msk = mptcp_token_get_sock(token);
@@ -50,8 +56,7 @@ int mptcp_pm_remove_addr(u32 token, u8 local_id)
 	return 0;
 }
 
-int mptcp_pm_create_subflow(u32 token, u8 remote_id, sa_family_t family,
-			    struct in_addr *addr)
+int mptcp_pm_create_subflow(u32 token, u8 remote_id, struct in_addr *addr)
 {
 	struct mptcp_sock *msk = mptcp_token_get_sock(token);
 	struct sockaddr_in remote;
@@ -87,6 +92,13 @@ int mptcp_pm_create_subflow(u32 token, u8 remote_id, sa_family_t family,
 	return err;
 }
 
+#if IS_ENABLED(CONFIG_IPV6)
+int mptcp_pm_create_subflow6(u32 token, u8 remote_id, struct in6_addr *addr)
+{
+	return -ENOTSUPP;
+}
+#endif
+
 int mptcp_pm_remove_subflow(u32 token, u8 remote_id)
 {
 	return -ENOTSUPP;
@@ -160,16 +172,23 @@ int mptcp_pm_addr_signal(struct mptcp_sock *msk, u8 *id,
 			 struct sockaddr_storage *saddr)
 {
 	struct sockaddr_in *addr = (struct sockaddr_in *)saddr;
+	struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)saddr;
 
 	if (!msk->pm.local_valid)
 		return -1;
 
-	if (msk->pm.local_family != AF_INET)
+	if (msk->pm.local_family == AF_INET) {
+		addr->sin_family = msk->pm.local_family;
+		addr->sin_addr = msk->pm.local_addr;
+#if IS_ENABLED(CONFIG_IPV6)
+	} else if (msk->pm.local_family == AF_INET6) {
+		addr6->sin6_family = msk->pm.local_family;
+		addr6->sin6_addr = msk->pm.local_addr6;
+#endif
+	} else {
 		return -1;
-
+	}
 	*id = msk->pm.local_id;
-	addr->sin_family = msk->pm.local_family;
-	addr->sin_addr.s_addr = msk->pm.local_addr.s_addr;
 
 	return 0;
 }
net/mptcp/protocol.h +7 -4
index d81d6bf18a65..2bfcb65c7c0a 100644
@@ -297,10 +297,13 @@ void mptcp_pm_add_addr(struct mptcp_sock *msk, const struct in_addr *addr,
 		       u8 id);
 void mptcp_pm_add_addr6(struct mptcp_sock *msk, const struct in6_addr *addr,
 			u8 id);
-int mptcp_pm_announce_addr(u32 token, u8 local_id, sa_family_t family,
-			   struct in_addr *addr);
-int mptcp_pm_create_subflow(u32 token, u8 remote_id, sa_family_t family,
-			    struct in_addr *addr);
+
+int mptcp_pm_announce_addr(u32 token, u8 local_id, struct in_addr *addr);
+int mptcp_pm_create_subflow(u32 token, u8 remote_id, struct in_addr *addr);
+#if IS_ENABLED(CONFIG_IPV6)
+int mptcp_pm_announce_addr6(u32 token, u8 local_id, struct in6_addr *addr);
+int mptcp_pm_create_subflow6(u32 token, u8 remote_id, struct in6_addr *addr);
+#endif
 int mptcp_pm_remove_addr(u32 token, u8 local_id);
 int mptcp_pm_remove_subflow(u32 token, u8 remote_id);
 
Signature · 1 line
2.17.2
author
#2 lore raw

PATCH 2/5 mptcp: Add missing ADD_ADDR handling

In reply to Peter Krystad

Add missing piece that copies IPv6 address into TCP option

squashto: Add ADD_ADDR handling

Signed-off-by Peter Krystad <peter.krystad(a)linux.intel.com>
---
 net/mptcp/options.c | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)
net/mptcp/options.c +16 -8
index 4bb3766fce5e..a63137b73557 100644
@@ -463,14 +463,22 @@ static bool mptcp_established_options_addr(struct sock *sk,
 	if (mptcp_pm_addr_signal(msk, &id, &saddr))
 		return false;
 
-	if (saddr.ss_family == AF_INET && remaining < TCPOLEN_MPTCP_ADD_ADDR)
-		return false;
-
-	opts->suboptions |= OPTION_MPTCP_ADD_ADDR;
-	opts->addr_id = id;
-	opts->addr.s_addr = ((struct sockaddr_in *)&saddr)->sin_addr.s_addr;
-	*size = TCPOLEN_MPTCP_ADD_ADDR;
-
+	if (saddr.ss_family == AF_INET) {
+		if (remaining < TCPOLEN_MPTCP_ADD_ADDR)
+			return false;
+		opts->suboptions |= OPTION_MPTCP_ADD_ADDR;
+		opts->addr_id = id;
+		opts->addr = ((struct sockaddr_in *)&saddr)->sin_addr;
+		*size = TCPOLEN_MPTCP_ADD_ADDR;
+	}
+	if (saddr.ss_family == AF_INET6) {
+		if (remaining < TCPOLEN_MPTCP_ADD_ADDR6)
+			return false;
+		opts->suboptions |= OPTION_MPTCP_ADD_ADDR6;
+		opts->addr_id = id;
+		opts->addr6 = ((struct sockaddr_in6 *)&saddr)->sin6_addr;
+		*size = TCPOLEN_MPTCP_ADD_ADDR6;
+	}
 	msk->addr_signal = 0;
 
 	return true;
Signature · 1 line
2.17.2
#3 lore raw

[MPTCP] Re: [PATCH 2/5] mptcp: Add missing ADD_ADDR handling

Hi Peter,

Quoted 24 lines · Peter Krystad

Add missing piece that copies IPv6 address into TCP option

squashto: Add ADD_ADDR handling

Signed-off-by Peter Krystad <peter.krystad(a)linux.intel.com>
---
  net/mptcp/options.c | 24 ++++++++++++++++--------
  1 file changed, 16 insertions(+), 8 deletions(-)
net/mptcp/options.c +0 -7
index 4bb3766fce5e..a63137b73557 100644
@@ -463,14 +463,22 @@ static bool mptcp_established_options_addr(struct sock *sk,
  	if (mptcp_pm_addr_signal(msk, &id, &saddr))
  		return false;
 
-	if (saddr.ss_family == AF_INET && remaining < TCPOLEN_MPTCP_ADD_ADDR)
-		return false;
-
-	opts->suboptions |= OPTION_MPTCP_ADD_ADDR;
-	opts->addr_id = id;
-	opts->addr.s_addr = ((struct sockaddr_in *)&saddr)->sin_addr.s_addr;
-	*size = TCPOLEN_MPTCP_ADD_ADDR;

net/mptcp/options.c static bool mptcp_established_options_addr(struct sock *sk, · line 474

Quoted 10 lines
net/mptcp/options.c +9 -1
-
+	if (saddr.ss_family == AF_INET) {
+		if (remaining < TCPOLEN_MPTCP_ADD_ADDR)
+			return false;
+		opts->suboptions |= OPTION_MPTCP_ADD_ADDR;
+		opts->addr_id = id;
+		opts->addr = ((struct sockaddr_in *)&saddr)->sin_addr;
+		*size = TCPOLEN_MPTCP_ADD_ADDR;
+	}
+	if (saddr.ss_family == AF_INET6) {

I hope you don't mind if I use a "else if" here when applying the patch.

net/mptcp/options.c static bool mptcp_established_options_addr(struct sock *sk, · line 481

Quoted 7 lines
net/mptcp/options.c +7 -0
+		if (remaining < TCPOLEN_MPTCP_ADD_ADDR6)
+			return false;
+		opts->suboptions |= OPTION_MPTCP_ADD_ADDR6;
+		opts->addr_id = id;
+		opts->addr6 = ((struct sockaddr_in6 *)&saddr)->sin6_addr;
+		*size = TCPOLEN_MPTCP_ADD_ADDR6;
+	}

and if I add a new line here like before.

net/mptcp/options.c static bool mptcp_established_options_addr(struct sock *sk, · line 484

Quoted 3 lines
net/mptcp/options.c +0 -0
  	msk->addr_signal = 0;
 
  	return true;

Cheers,
Matt

Signature · 5 lines
Matthieu Baerts | R&D Engineer
matthieu.baerts(a)tessares.net
Tessares SA | Hybrid Access Solutions
www.tessares.net
1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium
author
#4 lore raw

PATCH 3/5 mptcp: Make mptcp_subflow_connect() IPv4/6 agnostic

In reply to Peter Krystad

This will make IPV6-ifying the path manager interface easier.

squashto: Add handling of outgoing MP_JOIN requests

Signed-off-by Peter Krystad <peter.krystad(a)linux.intel.com>
---
 net/mptcp/protocol.h |  4 ++--
 net/mptcp/subflow.c  | 16 ++++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)
net/mptcp/protocol.h +2 -2
index 2bfcb65c7c0a..06e330b3a0f0 100644
@@ -248,8 +248,8 @@ mptcp_subflow_tcp_socket(const struct mptcp_subflow_context *subflow)
 int mptcp_is_enabled(struct net *net);
 
 void mptcp_subflow_init(void);
-int mptcp_subflow_connect(struct sock *sk, struct sockaddr_in *local,
-			  struct sockaddr_in *remote, u8 remote_id);
+int mptcp_subflow_connect(struct sock *sk, struct sockaddr *local,
+			  struct sockaddr *remote, u8 remote_id);
 int mptcp_subflow_create_socket(struct sock *sk, struct socket **new_sock);
 
 extern const struct inet_connection_sock_af_ops ipv4_specific;
net/mptcp/subflow.c +10 -6
index b0cda95fbe20..aa94d2f74e89 100644
@@ -330,13 +330,14 @@ static void subflow_data_ready(struct sock *sk)
 	}
 }
 
-int mptcp_subflow_connect(struct sock *sk, struct sockaddr_in *local,
-			  struct sockaddr_in *remote, u8 remote_id)
+int mptcp_subflow_connect(struct sock *sk, struct sockaddr *local,
+			  struct sockaddr *remote, u8 remote_id)
 {
 	struct mptcp_sock *msk = mptcp_sk(sk);
 	struct mptcp_subflow_context *subflow;
 	struct socket *sf;
 	u32 remote_token;
+	int addrlen;
 	int err;
 
 	lock_sock(sk);
@@ -354,8 +355,12 @@ int mptcp_subflow_connect(struct sock *sk, struct sockaddr_in *local,
 	sock_hold(sf->sk);
 	release_sock(sk);
 
-	err = kernel_bind(sf, (struct sockaddr *)local,
-			  sizeof(struct sockaddr_in));
+	addrlen = sizeof(struct sockaddr_in);
+#if IS_ENABLED(CONFIG_IPV6)
+	if (local->sa_family == AF_INET6)
+		addrlen = sizeof(struct sockaddr_in6);
+#endif
+	err = kernel_bind(sf, local, addrlen);
 	if (err)
 		goto failed;
 
@@ -366,8 +371,7 @@ int mptcp_subflow_connect(struct sock *sk, struct sockaddr_in *local,
 	subflow->request_join = 1;
 	subflow->request_bkup = 1;
 
-	err = kernel_connect(sf, (struct sockaddr *)remote,
-			     sizeof(struct sockaddr_in), O_NONBLOCK);
+	err = kernel_connect(sf, remote, addrlen, O_NONBLOCK);
 	if (err && err != -EINPROGRESS)
 		goto failed;
 
Signature · 1 line
2.17.2
author
#5 lore raw

PATCH 4/5 mptcp: Update path manager interface commands for IPv6

In reply to Peter Krystad

squashto: Implement path manager interface commands

Signed-off-by Peter Krystad <peter.krystad(a)linux.intel.com>
---
 net/mptcp/pm.c | 75 ++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 64 insertions(+), 11 deletions(-)
net/mptcp/pm.c +64 -11
index bc46a0ddd396..b14308ad11a3 100644
@@ -23,11 +23,11 @@ int mptcp_pm_announce_addr(u32 token, u8 local_id, struct in_addr *addr)
 		goto announce_put;
 	}
 
-	pr_debug("msk=%p, local_id=%d, addr=%x", msk, local_id, addr->s_addr);
+	pr_debug("msk=%p, local_id=%d", msk, local_id);
 	msk->pm.local_valid = 1;
 	msk->pm.local_id = local_id;
-	msk->pm.local_family = family;
-	msk->pm.local_addr.s_addr = addr->s_addr;
+	msk->pm.local_family = AF_INET;
+	msk->pm.local_addr = *addr;
 	msk->addr_signal = 1;
 
 announce_put:
@@ -38,7 +38,27 @@ int mptcp_pm_announce_addr(u32 token, u8 local_id, struct in_addr *addr)
 #if IS_ENABLED(CONFIG_IPV6)
 int mptcp_pm_announce_addr6(u32 token, u8 local_id, struct in6_addr *addr)
 {
-	return -ENOTSUPP;
+	struct mptcp_sock *msk = mptcp_token_get_sock(token);
+	int err = 0;
+
+	if (!msk)
+		return -EINVAL;
+
+	if (msk->pm.local_valid) {
+		err = -EBADR;
+		goto announce_put;
+	}
+
+	pr_debug("msk=%p, local_id=%d", msk, local_id);
+	msk->pm.local_valid = 1;
+	msk->pm.local_id = local_id;
+	msk->pm.local_family = AF_INET6;
+	msk->pm.local_addr6 = *addr;
+	msk->addr_signal = 1;
+
+announce_put:
+	sock_put((struct sock *)msk);
+	return err;
 }
 #endif
 
@@ -75,17 +95,18 @@ int mptcp_pm_create_subflow(u32 token, u8 remote_id, struct in_addr *addr)
 
 	local.sin_family = AF_INET;
 	local.sin_port = 0;
-	if (family == AF_INET)
-		local.sin_addr.s_addr = addr->s_addr;
+	if (!addr)
+		local.sin_addr = *addr;
 	else
 		local.sin_addr.s_addr = htonl(INADDR_ANY);
 
 	remote.sin_family = msk->pm.remote_family;
 	remote.sin_port = htons(msk->dport);
-	remote.sin_addr.s_addr = msk->pm.remote_addr.s_addr;
+	remote.sin_addr = msk->pm.remote_addr;
 
-	err = mptcp_subflow_connect((struct sock *)msk, &local, &remote,
-				    remote_id);
+	err = mptcp_subflow_connect((struct sock *)msk,
+				    (struct sockaddr *)&local,
+				    (struct sockaddr *)&remote, remote_id);
 
 create_put:
 	sock_put((struct sock *)msk);
@@ -95,7 +116,39 @@ int mptcp_pm_create_subflow(u32 token, u8 remote_id, struct in_addr *addr)
 #if IS_ENABLED(CONFIG_IPV6)
 int mptcp_pm_create_subflow6(u32 token, u8 remote_id, struct in6_addr *addr)
 {
-	return -ENOTSUPP;
+	struct mptcp_sock *msk = mptcp_token_get_sock(token);
+	struct sockaddr_in6 remote;
+	struct sockaddr_in6 local;
+	int err;
+
+	if (!msk)
+		return -EINVAL;
+
+	pr_debug("msk=%p", msk);
+
+	if (!msk->pm.remote_valid || remote_id != msk->pm.remote_id) {
+		err = -EBADR;
+		goto create_put;
+	}
+
+	local.sin6_family = AF_INET6;
+	local.sin6_port = 0;
+	if (!addr)
+		local.sin6_addr = *addr;
+	else
+		local.sin6_addr = in6addr_any;
+
+	remote.sin6_family = msk->pm.remote_family;
+	remote.sin6_port = htons(msk->dport);
+	remote.sin6_addr = msk->pm.remote_addr6;
+
+	err = mptcp_subflow_connect((struct sock *)msk,
+				    (struct sockaddr *)&local,
+				    (struct sockaddr *)&remote, remote_id);
+
+create_put:
+	sock_put((struct sock *)msk);
+	return err;
 }
 #endif
 
@@ -151,7 +204,7 @@ void mptcp_pm_add_addr(struct mptcp_sock *msk, const struct in_addr *addr,
 
 	pr_debug("msk=%p, addr=%x, remote_id=%d", msk, addr->s_addr, id);
 
-	pm->remote_addr.s_addr = addr->s_addr;
+	pm->remote_addr = *addr;
 	pm->remote_id = id;
 	pm->remote_family = AF_INET;
 
Signature · 1 line
2.17.2
#6 lore raw

[MPTCP] Re: [PATCH 4/5] mptcp: Update path manager interface commands for IPv6

Hi,

Quoted 14 lines · Peter Krystad

squashto: Implement path manager interface commands

Signed-off-by Peter Krystad <peter.krystad(a)linux.intel.com>
---
 net/mptcp/pm.c | 75 ++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 64 insertions(+), 11 deletions(-)
net/mptcp/pm.c +0 -0
index bc46a0ddd396..b14308ad11a3 100644
@@ -23,11 +23,11 @@ int mptcp_pm_announce_addr(u32 token, u8 local_id, struct in_addr *addr)
 		goto announce_put;
 	}

net/mptcp/pm.c int mptcp_pm_announce_addr(u32 token, u8 local_id, struct in_addr *addr) · line 31

Quoted 10 lines
net/mptcp/pm.c +3 -3
 
-	pr_debug("msk=%p, local_id=%d, addr=%x", msk, local_id, addr->s_addr);
+	pr_debug("msk=%p, local_id=%d", msk, local_id);
 	msk->pm.local_valid = 1;
 	msk->pm.local_id = local_id;
-	msk->pm.local_family = family;
-	msk->pm.local_addr.s_addr = addr->s_addr;
+	msk->pm.local_family = AF_INET;
+	msk->pm.local_addr = *addr;
 	msk->addr_signal = 1;

I think a part of the above chunk belong to patch 1/5. Specifically:

- msk->pm.local_family = family;
+ msk->pm.local_family = AF_INET;

I think it should be squashed into "mptcp: Add path manager interface", otherwise the build will break, as mptcp_pm_announce_addr() lacks the 'family' argument after applying 1/5

Otherwise looks good to me, thanks!

Paolo

#7 lore raw

[MPTCP] Re: [PATCH 4/5] mptcp: Update path manager interface commands for IPv6

Hi Paolo,

Quoted 33 lines · Paolo Abeni

Hi,

Quoted 14 lines · Peter Krystad

squashto: Implement path manager interface commands

Signed-off-by Peter Krystad <peter.krystad(a)linux.intel.com>
---
  net/mptcp/pm.c | 75 ++++++++++++++++++++++++++++++++++++++++++--------
  1 file changed, 64 insertions(+), 11 deletions(-)
net/mptcp/pm.c +0 -0
index bc46a0ddd396..b14308ad11a3 100644
@@ -23,11 +23,11 @@ int mptcp_pm_announce_addr(u32 token, u8 local_id, struct in_addr *addr)
  		goto announce_put;
  	}

net/mptcp/pm.c int mptcp_pm_announce_addr(u32 token, u8 local_id, struct in_addr *addr) · line 31

Quoted 10 lines
net/mptcp/pm.c +3 -3
 
-	pr_debug("msk=%p, local_id=%d, addr=%x", msk, local_id, addr->s_addr);
+	pr_debug("msk=%p, local_id=%d", msk, local_id);
  	msk->pm.local_valid = 1;
  	msk->pm.local_id = local_id;
-	msk->pm.local_family = family;
-	msk->pm.local_addr.s_addr = addr->s_addr;
+	msk->pm.local_family = AF_INET;
+	msk->pm.local_addr = *addr;
  	msk->addr_signal = 1;

I think a part of the above chunk belong to patch 1/5. Specifically:

net/mptcp/pm.c +1 -1
-	msk->pm.local_family = family;
+	msk->pm.local_family = AF_INET;
Quoted 3 lines

I think it should be squashed into "mptcp: Add path manager interface", otherwise the build will break, as mptcp_pm_announce_addr() lacks the 'family' argument after applying 1/5

In "mptcp: Add path manager interface", mptcp_pm_announce_addr() is not implemented:

  int mptcp_pm_announce_addr(u32 token, u8 local_id, sa_family_t family,
                             struct in_addr *addr)
  {
         return -ENOTSUPP;
  }
Quoted 1 line

Otherwise looks good to me, thanks!

Is this patch OK for you or the whole series? :)

Cheers,
Matt

Signature · 5 lines
Matthieu Baerts | R&D Engineer
matthieu.baerts(a)tessares.net
Tessares SA | Hybrid Access Solutions
www.tessares.net
1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium
#8 lore raw

[MPTCP] Re: [PATCH 4/5] mptcp: Update path manager interface commands for IPv6

Quoted 43 lines · Matthieu Baerts

Hi Paolo,

Quoted 33 lines · Paolo Abeni

Hi,

Quoted 14 lines · Peter Krystad

squashto: Implement path manager interface commands

Signed-off-by Peter Krystad <peter.krystad(a)linux.intel.com>
---
  net/mptcp/pm.c | 75 ++++++++++++++++++++++++++++++++++++++++++--------
  1 file changed, 64 insertions(+), 11 deletions(-)
net/mptcp/pm.c +0 -0
index bc46a0ddd396..b14308ad11a3 100644
@@ -23,11 +23,11 @@ int mptcp_pm_announce_addr(u32 token, u8 local_id, struct in_addr *addr)
  		goto announce_put;
  	}

net/mptcp/pm.c int mptcp_pm_announce_addr(u32 token, u8 local_id, struct in_addr *addr) · line 31

Quoted 10 lines
net/mptcp/pm.c +3 -3
 
-	pr_debug("msk=%p, local_id=%d, addr=%x", msk, local_id, addr->s_addr);
+	pr_debug("msk=%p, local_id=%d", msk, local_id);
  	msk->pm.local_valid = 1;
  	msk->pm.local_id = local_id;
-	msk->pm.local_family = family;
-	msk->pm.local_addr.s_addr = addr->s_addr;
+	msk->pm.local_family = AF_INET;
+	msk->pm.local_addr = *addr;
  	msk->addr_signal = 1;

I think a part of the above chunk belong to patch 1/5. Specifically:

net/mptcp/pm.c +1 -1
-	msk->pm.local_family = family;
+	msk->pm.local_family = AF_INET;
Quoted 3 lines

I think it should be squashed into "mptcp: Add path manager interface", otherwise the build will break, as mptcp_pm_announce_addr() lacks the 'family' argument after applying 1/5

In "mptcp: Add path manager interface", mptcp_pm_announce_addr() is not implemented:

Quoted 5 lines
  int mptcp_pm_announce_addr(u32 token, u8 local_id, sa_family_t family,
                             struct in_addr *addr)
  {
         return -ENOTSUPP;
  }

whoops, I got lost in the series, sorry!

Quoted 3 lines
Quoted 1 line

Otherwise looks good to me, thanks!

Is this patch OK for you or the whole series? :)

With the whole series, actually!

Thanks,

Paolo

author
#9 lore raw

[MPTCP] Re: [PATCH 4/5] mptcp: Update path manager interface commands for IPv6

Hi Paolo, thanks for reviewing.

Quoted 44 lines · Paolo Abeni
Quoted 43 lines · Matthieu Baerts

Hi Paolo,

Quoted 33 lines · Paolo Abeni

Hi,

Quoted 14 lines · Peter Krystad

squashto: Implement path manager interface commands

Signed-off-by Peter Krystad <peter.krystad(a)linux.intel.com>
---
  net/mptcp/pm.c | 75 ++++++++++++++++++++++++++++++++++++++++++--------
  1 file changed, 64 insertions(+), 11 deletions(-)
net/mptcp/pm.c +0 -0
index bc46a0ddd396..b14308ad11a3 100644
@@ -23,11 +23,11 @@ int mptcp_pm_announce_addr(u32 token, u8 local_id, struct in_addr *addr)
  		goto announce_put;
  	}

net/mptcp/pm.c int mptcp_pm_announce_addr(u32 token, u8 local_id, struct in_addr *addr) · line 31

Quoted 10 lines
net/mptcp/pm.c +3 -3
 
-	pr_debug("msk=%p, local_id=%d, addr=%x", msk, local_id, addr->s_addr);
+	pr_debug("msk=%p, local_id=%d", msk, local_id);
  	msk->pm.local_valid = 1;
  	msk->pm.local_id = local_id;
-	msk->pm.local_family = family;
-	msk->pm.local_addr.s_addr = addr->s_addr;
+	msk->pm.local_family = AF_INET;
+	msk->pm.local_addr = *addr;
  	msk->addr_signal = 1;

I think a part of the above chunk belong to patch 1/5. Specifically:

net/mptcp/pm.c +1 -1
-	msk->pm.local_family = family;
+	msk->pm.local_family = AF_INET;
Quoted 3 lines

I think it should be squashed into "mptcp: Add path manager interface", otherwise the build will break, as mptcp_pm_announce_addr() lacks the 'family' argument after applying 1/5

In "mptcp: Add path manager interface", mptcp_pm_announce_addr() is not implemented:

Quoted 7 lines
Quoted 5 lines
  int mptcp_pm_announce_addr(u32 token, u8 local_id, sa_family_t family,
                             struct in_addr *addr)
  {
         return -ENOTSUPP;
  }

whoops, I got lost in the series, sorry!

Yes, there are two patches with very similar titles, I got confused many times rebasing this set.

Peter.

Quoted 10 lines
Quoted 3 lines
Quoted 1 line

Otherwise looks good to me, thanks!

Is this patch OK for you or the whole series? :)

With the whole series, actually!

Thanks,

Paolo

#10 lore raw

[MPTCP] Re: [PATCH 4/5] mptcp: Update path manager interface commands for IPv6

In reply to Peter Krystad

Hi Peter,

Quoted 11 lines · Peter Krystad

squashto: Implement path manager interface commands

Signed-off-by Peter Krystad <peter.krystad(a)linux.intel.com>
---
  net/mptcp/pm.c | 75 ++++++++++++++++++++++++++++++++++++++++++--------
  1 file changed, 64 insertions(+), 11 deletions(-)
net/mptcp/pm.c +0 -0
index bc46a0ddd396..b14308ad11a3 100644

[...]

net/mptcp/pm.c void mptcp_pm_add_addr(struct mptcp_sock *msk, const struct in_addr *addr, · line 209

Quoted 8 lines
net/mptcp/pm.c +1 -1
@@ -151,7 +204,7 @@ void mptcp_pm_add_addr(struct mptcp_sock *msk, const struct in_addr *addr,
 
  	pr_debug("msk=%p, addr=%x, remote_id=%d", msk, addr->s_addr, id);
 
-	pm->remote_addr.s_addr = addr->s_addr;
+	pm->remote_addr = *addr;
  	pm->remote_id = id;
  	pm->remote_family = AF_INET;

I guess this chunk should go in "mptcp: Add path manager interface".

I can do that if there is no objections.

Cheers,
Matt

Signature · 5 lines
Matthieu Baerts | R&D Engineer
matthieu.baerts(a)tessares.net
Tessares SA | Hybrid Access Solutions
www.tessares.net
1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium
#11 lore raw

[MPTCP] Re: [PATCH 4/5] mptcp: Update path manager interface commands for IPv6

In reply to Peter Krystad
Quoted 93 lines · Peter Krystad

squashto: Implement path manager interface commands

Signed-off-by Peter Krystad <peter.krystad(a)linux.intel.com>

---
net/mptcp/pm.c | 75 ++++++++++++++++++++++++++++++++++++++++++--------

1 file changed, 64 insertions(+), 11 deletions(-)
net/mptcp/pm.c +3 -3
index bc46a0ddd396..b14308ad11a3 100644
@@ -23,11 +23,11 @@ int mptcp_pm_announce_addr(u32 token, u8 local_id, struct in_addr *addr)
 		goto announce_put;
 	}
 
-	pr_debug("msk=%p, local_id=%d, addr=%x", msk, local_id, addr->s_addr);
+	pr_debug("msk=%p, local_id=%d", msk, local_id);
 	msk->pm.local_valid = 1;
 	msk->pm.local_id = local_id;
-	msk->pm.local_family = family;
-	msk->pm.local_addr.s_addr = addr->s_addr;
+	msk->pm.local_family = AF_INET;
+	msk->pm.local_addr = *addr;
 	msk->addr_signal = 1;
 

announce_put:

net/mptcp/pm.c +27 -6
@@ -38,7 +38,27 @@ int mptcp_pm_announce_addr(u32 token, u8 local_id, struct in_addr *addr)
 #if IS_ENABLED(CONFIG_IPV6)
 int mptcp_pm_announce_addr6(u32 token, u8 local_id, struct in6_addr *addr)
 {
-	return -ENOTSUPP;
+	struct mptcp_sock *msk = mptcp_token_get_sock(token);
+	int err = 0;
+
+	if (!msk)
+		return -EINVAL;
+
+	if (msk->pm.local_valid) {
+		err = -EBADR;
+		goto announce_put;
+	}
+
+	pr_debug("msk=%p, local_id=%d", msk, local_id);
+	msk->pm.local_valid = 1;
+	msk->pm.local_id = local_id;
+	msk->pm.local_family = AF_INET6;
+	msk->pm.local_addr6 = *addr;
+	msk->addr_signal = 1;
+
+announce_put:
+	sock_put((struct sock *)msk);
+	return err;
 }
 #endif
 
@@ -75,17 +95,18 @@ int mptcp_pm_create_subflow(u32 token, u8 remote_id, struct in_addr *addr)
 
 	local.sin_family = AF_INET;
 	local.sin_port = 0;
-	if (family == AF_INET)
-		local.sin_addr.s_addr = addr->s_addr;
+	if (!addr)
+		local.sin_addr = *addr;
 	else
 		local.sin_addr.s_addr = htonl(INADDR_ANY);
 
 	remote.sin_family = msk->pm.remote_family;
 	remote.sin_port = htons(msk->dport);
-	remote.sin_addr.s_addr = msk->pm.remote_addr.s_addr;
+	remote.sin_addr = msk->pm.remote_addr;
 
-	err = mptcp_subflow_connect((struct sock *)msk, &local, &remote,
-				    remote_id);
+	err = mptcp_subflow_connect((struct sock *)msk,
+				    (struct sockaddr *)&local,
+				    (struct sockaddr *)&remote, remote_id);
 

create_put:

	sock_put((struct sock *)msk);
net/mptcp/pm.c +9 -1
@@ -95,7 +116,39 @@ int mptcp_pm_create_subflow(u32 token, u8 remote_id, struct in_addr *addr)
 #if IS_ENABLED(CONFIG_IPV6)
 int mptcp_pm_create_subflow6(u32 token, u8 remote_id, struct in6_addr *addr)
 {
-	return -ENOTSUPP;
+	struct mptcp_sock *msk = mptcp_token_get_sock(token);
+	struct sockaddr_in6 remote;
+	struct sockaddr_in6 local;
+	int err;
+
+	if (!msk)
+		return -EINVAL;
+
+	pr_debug("msk=%p", msk);

net/mptcp/pm.c int mptcp_pm_create_subflow(u32 token, u8 remote_id, struct in_addr *addr) · line 137

Quoted 10 lines
net/mptcp/pm.c +10 -0
+
+	if (!msk->pm.remote_valid || remote_id != msk->pm.remote_id) {
+		err = -EBADR;
+		goto create_put;
+	}
+
+	local.sin6_family = AF_INET6;
+	local.sin6_port = 0;
+	if (!addr)
+		local.sin6_addr = *addr;

I'm seeing a NULL dereference crash here when testing with multipath-tcp.org v0.95 - addr was just confirmed to be NULL on the line above!

Mat

Quoted 32 lines
net/mptcp/pm.c +15 -1
+	else
+		local.sin6_addr = in6addr_any;
+
+	remote.sin6_family = msk->pm.remote_family;
+	remote.sin6_port = htons(msk->dport);
+	remote.sin6_addr = msk->pm.remote_addr6;
+
+	err = mptcp_subflow_connect((struct sock *)msk,
+				    (struct sockaddr *)&local,
+				    (struct sockaddr *)&remote, remote_id);
+
+create_put:
+	sock_put((struct sock *)msk);
+	return err;
 }
 #endif
 
@@ -151,7 +204,7 @@ void mptcp_pm_add_addr(struct mptcp_sock *msk, const struct in_addr *addr,
 
 	pr_debug("msk=%p, addr=%x, remote_id=%d", msk, addr->s_addr, id);
 
-	pm->remote_addr.s_addr = addr->s_addr;
+	pm->remote_addr = *addr;
 	pm->remote_id = id;
 	pm->remote_family = AF_INET;
 
Signature · 4 lines
2.17.2
_______________________________________________
mptcp mailing list -- mptcp(a)lists.01.org
To unsubscribe send an email to mptcp-leave(a)lists.01.org

--
Mat Martineau
Intel

author
#12 lore raw

[MPTCP] Re: [PATCH 4/5] mptcp: Update path manager interface commands for IPv6

Quoted 110 lines · Mat Martineau
Quoted 93 lines · Peter Krystad

squashto: Implement path manager interface commands

Signed-off-by Peter Krystad <peter.krystad(a)linux.intel.com>

---
net/mptcp/pm.c | 75 ++++++++++++++++++++++++++++++++++++++++++--------

1 file changed, 64 insertions(+), 11 deletions(-)
net/mptcp/pm.c +3 -3
index bc46a0ddd396..b14308ad11a3 100644
@@ -23,11 +23,11 @@ int mptcp_pm_announce_addr(u32 token, u8 local_id, struct in_addr *addr)
 		goto announce_put;
 	}
 
-	pr_debug("msk=%p, local_id=%d, addr=%x", msk, local_id, addr->s_addr);
+	pr_debug("msk=%p, local_id=%d", msk, local_id);
 	msk->pm.local_valid = 1;
 	msk->pm.local_id = local_id;
-	msk->pm.local_family = family;
-	msk->pm.local_addr.s_addr = addr->s_addr;
+	msk->pm.local_family = AF_INET;
+	msk->pm.local_addr = *addr;
 	msk->addr_signal = 1;
 

announce_put:

net/mptcp/pm.c +27 -6
@@ -38,7 +38,27 @@ int mptcp_pm_announce_addr(u32 token, u8 local_id, struct in_addr *addr)
 #if IS_ENABLED(CONFIG_IPV6)
 int mptcp_pm_announce_addr6(u32 token, u8 local_id, struct in6_addr *addr)
 {
-	return -ENOTSUPP;
+	struct mptcp_sock *msk = mptcp_token_get_sock(token);
+	int err = 0;
+
+	if (!msk)
+		return -EINVAL;
+
+	if (msk->pm.local_valid) {
+		err = -EBADR;
+		goto announce_put;
+	}
+
+	pr_debug("msk=%p, local_id=%d", msk, local_id);
+	msk->pm.local_valid = 1;
+	msk->pm.local_id = local_id;
+	msk->pm.local_family = AF_INET6;
+	msk->pm.local_addr6 = *addr;
+	msk->addr_signal = 1;
+
+announce_put:
+	sock_put((struct sock *)msk);
+	return err;
 }
 #endif
 
@@ -75,17 +95,18 @@ int mptcp_pm_create_subflow(u32 token, u8 remote_id, struct in_addr *addr)
 
 	local.sin_family = AF_INET;
 	local.sin_port = 0;
-	if (family == AF_INET)
-		local.sin_addr.s_addr = addr->s_addr;
+	if (!addr)
+		local.sin_addr = *addr;
 	else
 		local.sin_addr.s_addr = htonl(INADDR_ANY);
 
 	remote.sin_family = msk->pm.remote_family;
 	remote.sin_port = htons(msk->dport);
-	remote.sin_addr.s_addr = msk->pm.remote_addr.s_addr;
+	remote.sin_addr = msk->pm.remote_addr;
 
-	err = mptcp_subflow_connect((struct sock *)msk, &local, &remote,
-				    remote_id);
+	err = mptcp_subflow_connect((struct sock *)msk,
+				    (struct sockaddr *)&local,
+				    (struct sockaddr *)&remote, remote_id);
 

create_put:

	sock_put((struct sock *)msk);
net/mptcp/pm.c +9 -1
@@ -95,7 +116,39 @@ int mptcp_pm_create_subflow(u32 token, u8 remote_id, struct in_addr *addr)
 #if IS_ENABLED(CONFIG_IPV6)
 int mptcp_pm_create_subflow6(u32 token, u8 remote_id, struct in6_addr *addr)
 {
-	return -ENOTSUPP;
+	struct mptcp_sock *msk = mptcp_token_get_sock(token);
+	struct sockaddr_in6 remote;
+	struct sockaddr_in6 local;
+	int err;
+
+	if (!msk)
+		return -EINVAL;
+
+	pr_debug("msk=%p", msk);

net/mptcp/pm.c int mptcp_pm_create_subflow(u32 token, u8 remote_id, struct in_addr *addr) · line 137

Quoted 10 lines
net/mptcp/pm.c +10 -0
+
+	if (!msk->pm.remote_valid || remote_id != msk->pm.remote_id) {
+		err = -EBADR;
+		goto create_put;
+	}
+
+	local.sin6_family = AF_INET6;
+	local.sin6_port = 0;
+	if (!addr)
+		local.sin6_addr = *addr;

I'm seeing a NULL dereference crash here when testing with multipath-tcp.org v0.95 - addr was just confirmed to be NULL on the line above!

Quoted 2 lines

Mat

Whoops. Will fix in RFCv2.

Peter.

Quoted 37 lines
Quoted 33 lines
net/mptcp/pm.c +15 -1
+	else
+		local.sin6_addr = in6addr_any;
+
+	remote.sin6_family = msk->pm.remote_family;
+	remote.sin6_port = htons(msk->dport);
+	remote.sin6_addr = msk->pm.remote_addr6;
+
+	err = mptcp_subflow_connect((struct sock *)msk,
+				    (struct sockaddr *)&local,
+				    (struct sockaddr *)&remote, remote_id);
+
+create_put:
+	sock_put((struct sock *)msk);
+	return err;
 }
 #endif
 
@@ -151,7 +204,7 @@ void mptcp_pm_add_addr(struct mptcp_sock *msk, const struct in_addr *addr,
 
 	pr_debug("msk=%p, addr=%x, remote_id=%d", msk, addr->s_addr, id);
 
-	pm->remote_addr.s_addr = addr->s_addr;
+	pm->remote_addr = *addr;
 	pm->remote_id = id;
 	pm->remote_family = AF_INET;
 
Signature · 4 lines
2.17.2
_______________________________________________
mptcp mailing list -- mptcp(a)lists.01.org
To unsubscribe send an email to mptcp-leave(a)lists.01.org

--
Mat Martineau
Intel

author
#13 lore raw

PATCH 5/5 mptcp: Update basic path manager for IPv6

In reply to Peter Krystad

squashto: Implement basic path manager

Signed-off-by Peter Krystad <peter.krystad(a)linux.intel.com>
---
 net/mptcp/basic.c | 40 ++++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 14 deletions(-)
net/mptcp/basic.c +26 -14
index 193d6a01f51a..5520aae3a6e7 100644
@@ -31,6 +31,12 @@ static void create_subflow_worker(struct work_struct *work);
 
 static int parse_addr(struct basic_pernet *pernet, const char *addr)
 {
+	if (in4_pton(addr, -1, (u8 *)&pernet->announce_v4_addr.s_addr, '\0',
+		     NULL) > 0) {
+		pernet->has_announce_v4 = 1;
+		pernet->has_announce_v6 = 0;
+		return 0;
+	}
 #if IS_ENABLED(CONFIG_IPV6)
 	if (in6_pton(addr, -1, (u8 *)&pernet->announce_v6_addr.s6_addr, '\0',
 		     NULL) > 0) {
@@ -39,14 +45,6 @@ static int parse_addr(struct basic_pernet *pernet, const char *addr)
 		return 0;
 	}
 #endif
-
-	if (in4_pton(addr, -1, (u8 *)&pernet->announce_v4_addr.s_addr, '\0',
-		     NULL) > 0) {
-		pernet->has_announce_v4 = 1;
-		pernet->has_announce_v6 = 0;
-		return 0;
-	}
-
 	pernet->has_announce_v4 = 0;
 	pernet->has_announce_v6 = 0;
 
@@ -190,8 +188,13 @@ static void announce_addr_worker(struct work_struct *work)
 	pernet = net_generic(sock_net((struct sock *)msk), basic_pernet_id);
 
 	if (pernet->has_announce_v4)
-		mptcp_pm_announce_addr(pm->token, 1, AF_INET,
+		mptcp_pm_announce_addr(pm->token, 1,
 				       &pernet->announce_v4_addr);
+#if IS_ENABLED(CONFIG_IPV6)
+	if (pernet->has_announce_v6)
+		mptcp_pm_announce_addr6(pm->token, 1,
+					&pernet->announce_v6_addr);
+#endif
 	sock_put((struct sock *)msk);
 }
 
@@ -204,12 +207,21 @@ static void create_subflow_worker(struct work_struct *work)
 
 	pernet = net_generic(sock_net((struct sock *)msk), basic_pernet_id);
 
-	if (pernet->has_announce_v4) {
-		mptcp_pm_create_subflow(pm->token, pm->remote_id, AF_INET,
+	if (pernet->has_announce_v4)
+		mptcp_pm_create_subflow(pm->token, pm->remote_id,
 					&pernet->announce_v4_addr);
-	} else {
-		mptcp_pm_create_subflow(pm->token, pm->remote_id, 0, NULL);
-	}
+#if IS_ENABLED(CONFIG_IPV6)
+	else if (pernet->has_announce_v6)
+		mptcp_pm_create_subflow6(pm->token, pm->remote_id,
+					 &pernet->announce_v6_addr);
+#endif
+	else if (pm->local_family == AF_INET)
+		mptcp_pm_create_subflow(pm->token, pm->remote_id, NULL);
+#if IS_ENABLED(CONFIG_IPV6)
+	else
+		mptcp_pm_create_subflow6(pm->token, pm->remote_id, NULL);
+#endif
+
 	sock_put((struct sock *)msk);
 }
 
Signature · 1 line
2.17.2
#14 lore raw

[MPTCP] Re: [PATCH 5/5] mptcp: Update basic path manager for IPv6

Hi Peter,

Quoted 11 lines · Peter Krystad

squashto: Implement basic path manager

Signed-off-by Peter Krystad <peter.krystad(a)linux.intel.com>
---
  net/mptcp/basic.c | 40 ++++++++++++++++++++++++++--------------
  1 file changed, 26 insertions(+), 14 deletions(-)
net/mptcp/basic.c +0 -0
index 193d6a01f51a..5520aae3a6e7 100644

[...]

Quoted 11 lines
net/mptcp/basic.c +2 -4
@@ -204,12 +207,21 @@ static void create_subflow_worker(struct work_struct *work)
 
  	pernet = net_generic(sock_net((struct sock *)msk), basic_pernet_id);
 
-	if (pernet->has_announce_v4) {
-		mptcp_pm_create_subflow(pm->token, pm->remote_id, AF_INET,
+	if (pernet->has_announce_v4)
+		mptcp_pm_create_subflow(pm->token, pm->remote_id,
  					&pernet->announce_v4_addr);
-	} else {
-		mptcp_pm_create_subflow(pm->token, pm->remote_id, 0, NULL);

net/mptcp/basic.c static void create_subflow_worker(struct work_struct *work) · line 221

Quoted 10 lines
net/mptcp/basic.c +9 -1
-	}
+#if IS_ENABLED(CONFIG_IPV6)
+	else if (pernet->has_announce_v6)
+		mptcp_pm_create_subflow6(pm->token, pm->remote_id,
+					 &pernet->announce_v6_addr);
+#endif
+	else if (pm->local_family == AF_INET)
+		mptcp_pm_create_subflow(pm->token, pm->remote_id, NULL);
+#if IS_ENABLED(CONFIG_IPV6)
+	else

Small detail here: I don't know what are the recommendations on the subject but is it not better to have another if statement here for IPv6:

     else if (pm->local_family == AF_INET6)

instead of:

else

net/mptcp/basic.c static void create_subflow_worker(struct work_struct *work) · line 227

Quoted 6 lines
net/mptcp/basic.c +3 -0
+		mptcp_pm_create_subflow6(pm->token, pm->remote_id, NULL);
+#endif
+
  	sock_put((struct sock *)msk);
  }
 

Cheers,
Matt

Signature · 5 lines
Matthieu Baerts | R&D Engineer
matthieu.baerts(a)tessares.net
Tessares SA | Hybrid Access Solutions
www.tessares.net
1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium
#15 lore raw
In reply to Peter Krystad

Hi Peter, Paolo,

Quoted 10 lines · Peter Krystad

IPv6 changes to the path manager and option handling. May all be squashed as specified in each patch.

Peter Krystad (5):
mptcp: Update path manager interface for IPv6
mptcp: Add missing ADD_ADDR handling
mptcp: Make mptcp_subflow_connect() IPv4/6 agnostic
mptcp: Update path manager interface commands for IPv6
mptcp: Update basic path manager for IPv6

Quoted 6 lines
  net/mptcp/basic.c    |  40 ++++++++++------
  net/mptcp/options.c  |  24 ++++++----
  net/mptcp/pm.c       | 106 ++++++++++++++++++++++++++++++++++++-------
  net/mptcp/protocol.h |  15 +++---
  net/mptcp/subflow.c  |  16 ++++---
  5 files changed, 150 insertions(+), 51 deletions(-)

Thank you for the patches and the reviews!

patch 1:
- 783161cb589b: "squashed" in "mptcp: Add path manager interface"
- signed-off already there
- 9fd478f3331c..eea26159d20e: result

patch 2:
- 9dfbbd1eedec: "squashed" in "mptcp: Add ADD_ADDR handling"
- signed-off already there
- 0b515fa5e27a: avoid IPv6 check if already IPv4: see ML.
- eea26159d20e..2dca0ad11f4b: result

patch 3:
- 2be980b466cf: "squashed" patch3 in "mptcp: Add handling of outgoing MP_JOIN requests"
- signed-off already there
- 2dca0ad11f4b..095657af2a52: result

patch 4:
- b0cdad25c90a: "squashed" in "mptcp: Implement path manager interface commands"
- signed-off already there
- 095657af2a52..74a2252d510a: result
- e3c234a79105: move code from "mptcp: Implement path manager interface commands" ...
- d1e0874d331c: ... to "mptcp: Add path manager interface"
- 74a2252d510a..c30aad35ee54: result

patch 5:
- 01af9af62437: "squashed" in "mptcp: Implement basic path manager"
- signed-off already there
- c30aad35ee54..9ed47f1c5595: result

Tests seems OK (if we omit the warning previously mentioned in the ML).

Just some compilation errors with IPv6, I sent follow-up patches for that ;-)

Cheers,
Matt

Signature · 5 lines
Matthieu Baerts | R&D Engineer
matthieu.baerts(a)tessares.net
Tessares SA | Hybrid Access Solutions
www.tessares.net
1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium