mptcp/openmptcprouter
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter.git synced 2025-02-12 19:31:52 +00:00
Code Issues Releases Wiki Activity

Update MPTCP

Browse source
This commit is contained in:
Ycarus 2018-07-23 17:11:56 +02:00
parent 27b5c3853a
commit 2d02517701
1 changed files with 40 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
root/target/linux/generic/hack-4.14/690-mptcp_v0.94.patch
View file

@ -20342,3 +20342,43 @@ index e222841c61ea..e54c75c6837b 100644
}
int mptcp_create_master_sk(struct sock *meta_sk, __u64 remote_key,
diff --git a/net/mptcp/mptcp_ctrl.c b/net/mptcp/mptcp_ctrl.c
index 8afb3f8c0676..faf8a6cdbcc7 100644
--- a/net/mptcp/mptcp_ctrl.c
+++ b/net/mptcp/mptcp_ctrl.c
@@ -297,6 +297,7 @@ static void mptcp_reqsk_new_mptcp(struct request_sock *req,
const struct tcp_sock *tp = tcp_sk(sk);
inet_rsk(req)->saw_mpc = 1;
+
/* MPTCP version agreement */
if (mopt->mptcp_ver >= tp->mptcp_ver)
mtreq->mptcp_ver = tp->mptcp_ver;
@@ -316,11 +317,18 @@ static void mptcp_reqsk_new_mptcp(struct request_sock *req,
}
static int mptcp_reqsk_new_cookie(struct request_sock *req,
+ const struct sock *sk,
const struct mptcp_options_received *mopt,
const struct sk_buff *skb)
{
struct mptcp_request_sock *mtreq = mptcp_rsk(req);
+ /* MPTCP version agreement */
+ if (mopt->mptcp_ver >= tcp_sk(sk)->mptcp_ver)
+ mtreq->mptcp_ver = tcp_sk(sk)->mptcp_ver;
+ else
+ mtreq->mptcp_ver = mopt->mptcp_ver;
+
rcu_read_lock_bh();
spin_lock(&mptcp_tk_hashlock);
@@ -2338,7 +2346,7 @@ void mptcp_reqsk_init(struct request_sock *req, const struct sock *sk,
mtreq->dss_csum = mopt.dss_csum;
if (want_cookie) {
- if (!mptcp_reqsk_new_cookie(req, &mopt, skb))
+ if (!mptcp_reqsk_new_cookie(req, sk, &mopt, skb))
/* No key available - back to regular TCP */
inet_rsk(req)->mptcp_rqsk = 0;
return;