From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: multipart/mixed; boundary="===============1506665643584761211==" MIME-Version: 1.0 From: Peter Krystad To: mptcp at lists.01.org Subject: [MPTCP] [RFC v2 1/3] mptcp: Add path manager interface Date: Wed, 12 Jun 2019 16:21:25 -0700 Message-ID: <20190612232127.3647-2-peter.krystad@linux.intel.com> In-Reply-To: 20190612232127.3647-1-peter.krystad@linux.intel.com X-Status: X-Keywords: X-UID: 1351 --===============1506665643584761211== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Add enough of a path manager interface to allow sending of ADD_ADDR when an incoming MPTCP connection is created. Capable of sending only a single IPv4 ADD_ADDR option. The 'pm_data' element of the connection sock will need to be expanded to handle multiple interfaces and IPv6. This is a skeleton interface definition for events generated by MPTCP. Signed-off-by: Peter Krystad --- net/mptcp/Makefile | 2 +- net/mptcp/pm.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ net/mptcp/protocol.c | 4 ++++ net/mptcp/protocol.h | 23 +++++++++++++++++- 4 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 net/mptcp/pm.c diff --git a/net/mptcp/Makefile b/net/mptcp/Makefile index 178ae81d8b66..7fe7aa64eda0 100644 --- a/net/mptcp/Makefile +++ b/net/mptcp/Makefile @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_MPTCP) +=3D mptcp.o = -mptcp-y :=3D protocol.o subflow.o options.o token.o crypto.o +mptcp-y :=3D protocol.o subflow.o options.o token.o crypto.o pm.o diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c new file mode 100644 index 000000000000..954360a3af2f --- /dev/null +++ b/net/mptcp/pm.c @@ -0,0 +1,57 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Multipath TCP + * + * Copyright (c) 2019, Intel Corporation. + */ +#include +#include +#include +#include "protocol.h" + +void pm_new_connection(struct mptcp_sock *msk) +{ + pr_debug("msk=3D%p", msk); +} + +void pm_fully_established(struct mptcp_sock *msk) +{ + pr_debug("msk=3D%p", msk); +} + +void pm_connection_closed(struct mptcp_sock *msk) +{ + pr_debug("msk=3D%p", msk); +} + +void pm_subflow_established(struct mptcp_sock *msk, u8 id) +{ + pr_debug("msk=3D%p", msk); +} + +void pm_subflow_closed(struct mptcp_sock *msk, u8 id) +{ + pr_debug("msk=3D%p", msk); +} + +void pm_add_addr(struct mptcp_sock *msk, const struct in_addr *addr, u8 id) +{ + pr_debug("msk=3D%p", msk); +} + +void pm_add_addr6(struct mptcp_sock *msk, const struct in6_addr *addr, u8 = id) +{ + pr_debug("msk=3D%p", msk); +} + +void pm_rm_addr(struct mptcp_sock *msk, u8 id) +{ + pr_debug("msk=3D%p", msk); +} + +bool pm_addr_signal(struct mptcp_sock *msk, unsigned *size, + unsigned int remaining, struct mptcp_out_options *opts) +{ + pr_debug("msk=3D%p", msk); + + return false; +} diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 941988387ea0..a1a42ed7810a 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -632,6 +632,8 @@ static struct sock *mptcp_accept(struct sock *sk, int f= lags, int *err, token_update_accept(new_sock->sk, new_mptcp_sock); msk->subflow =3D NULL; = + pm_new_connection(msk); + crypto_key_sha1(msk->remote_key, NULL, &ack_seq); msk->write_seq =3D subflow->idsn + 1; ack_seq++; @@ -757,6 +759,8 @@ void mptcp_finish_connect(struct sock *sk, int mp_capab= le) msk->token =3D subflow->token; pr_debug("msk=3D%p, token=3D%u", msk, msk->token); = + pm_new_connection(msk); + crypto_key_sha1(msk->remote_key, NULL, &ack_seq); msk->write_seq =3D subflow->idsn + 1; ack_seq++; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index a4f0e7d3bd62..d0c2c280c8c3 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -15,7 +15,7 @@ #define MPTCPOPT_MP_JOIN 1 #define MPTCPOPT_DSS 2 #define MPTCPOPT_ADD_ADDR 3 -#define MPTCPOPT_REMOVE_ADDR 4 +#define MPTCPOPT_RM_ADDR 4 #define MPTCPOPT_MP_PRIO 5 #define MPTCPOPT_MP_FAIL 6 #define MPTCPOPT_MP_FASTCLOSE 7 @@ -36,6 +36,15 @@ #define MPTCP_DSS_HAS_ACK BIT(0) #define MPTCP_DSS_FLAG_MASK (0x1F) = +struct pm_data { + u8 addr_id; + sa_family_t family; + union { + struct in_addr addr; + struct in6_addr addr6; + }; +}; + /* MPTCP connection sock */ struct mptcp_sock { /* inet_connection_sock must be the first member */ @@ -47,6 +56,7 @@ struct mptcp_sock { u32 token; struct list_head conn_list; struct socket *subflow; /* outgoing connect/listener/!mp_capable */ + struct pm_data pm; }; = #define mptcp_for_each_subflow(__msk, __subflow) \ @@ -146,6 +156,17 @@ void crypto_key_sha1(u64 key, u32 *token, u64 *idsn); void crypto_hmac_sha1(u64 key1, u64 key2, u32 *hash_out, int arg_num, ...); = +void pm_new_connection(struct mptcp_sock *msk); +void pm_fully_established(struct mptcp_sock *msk); +void pm_connection_closed(struct mptcp_sock *msk); +void pm_subflow_established(struct mptcp_sock *msk, u8 id); +void pm_subflow_closed(struct mptcp_sock *msk, u8 id); +void pm_add_addr(struct mptcp_sock *msk, const struct in_addr *addr, u8 id= ); +void pm_add_addr6(struct mptcp_sock *msk, const struct in6_addr *addr, u8 = id); +void pm_rm_addr(struct mptcp_sock *msk, u8 id); +bool pm_addr_signal(struct mptcp_sock *msk, unsigned *size, + unsigned int remaining, struct mptcp_out_options *opts); + static inline struct mptcp_ext *mptcp_get_ext(struct sk_buff *skb) { return (struct mptcp_ext *)skb_ext_find(skb, SKB_EXT_MPTCP); -- = 2.17.2 --===============1506665643584761211==--