init ssn_offset for incoming/outgoing join requests
Subsystems (2)
Florian Westphal
PATCH 1/1 init ssn_offset for incoming/outgoing join requests
squashto: mptcp: Add handling of outgoing MP_JOIN requests
Signed-off-by Florian Westphal <fw(a)strlen.de>
--- net/mptcp/subflow.c | 4 ++++ 1 file changed, 4 insertions(+)
net/mptcp/subflow.c +4 -0
@@ -139,6 +139,7 @@ static void subflow_init_req(struct request_sock *req, subflow_req->remote_key = rx_opt.mptcp.sndr_key; subflow_req->ssn_offset =TCP_SKB_CB (skb)->seq; }else if (rx_opt.mptcp.mp_join && listener->request_mptcp) { + subflow_req->ssn_offset =TCP_SKB_CB (skb)->seq; subflow_req->mp_join =1 ; subflow_req->backup = rx_opt.mptcp.backup; subflow_req->remote_id = rx_opt.mptcp.join_id;
@@ -231,6 +232,8 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb) subflow->remote_nonce, (u32 *)subflow->hmac); +if (skb) + subflow->ssn_offset =TCP_SKB_CB (skb)->seq;mptcp_finish_join (sk); subflow->conn_finished =1 ; }
@@ -885,6 +888,7 @@ static void subflow_ulp_clone(const struct request_sock *req, new_ctx->ssn_offset = subflow_req->ssn_offset; new_ctx->idsn = subflow_req->idsn; }else if (subflow_req->mp_join) { + new_ctx->ssn_offset = subflow_req->ssn_offset; new_ctx->mp_join =1 ; new_ctx->fourth_ack =1 ; new_ctx->backup = subflow_req->backup;
Signature · 1 line
2.23.0
Paolo Abeni
Quoted 29 lines · Florian Westphal
squashto: mptcp: Add handling of outgoing
MP_JOINrequestsSigned-off-by Florian Westphal <fw(a)strlen.de>--- net/mptcp/subflow.c | 4 ++++ 1 file changed, 4 insertions(+)net/mptcp/subflow.c +3
-0@@ -139,6 +139,7 @@ static void subflow_init_req(struct request_sock *req, subflow_req->remote_key = rx_opt.mptcp.sndr_key; subflow_req->ssn_offset =TCP_SKB_CB (skb)->seq; }else if (rx_opt.mptcp.mp_join && listener->request_mptcp) { + subflow_req->ssn_offset =TCP_SKB_CB (skb)->seq; subflow_req->mp_join =1 ; subflow_req->backup = rx_opt.mptcp.backup; subflow_req->remote_id = rx_opt.mptcp.join_id;@@ -231,6 +232,8 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb) subflow->remote_nonce, (u32 *)subflow->hmac); +if (skb) + subflow->ssn_offset =TCP_SKB_CB (skb)->seq;mptcp_finish_join (sk); subflow->conn_finished =1 ; }
net/mptcp/subflow.c static void subflow_ulp_clone(const struct request_sock *req, · line 894
Quoted 7 lines
net/mptcp/subflow.c +1
-0@@ -885,6 +888,7 @@ static void subflow_ulp_clone(const struct request_sock *req, new_ctx->ssn_offset = subflow_req->ssn_offset; new_ctx->idsn = subflow_req->idsn; }else if (subflow_req->mp_join) { + new_ctx->ssn_offset = subflow_req->ssn_offset; new_ctx->mp_join =1 ; new_ctx->fourth_ack =1 ; new_ctx->backup = subflow_req->backup;
LGTM!
Thanks,
Paolo
Matthieu Baerts
Hi Florian, Paolo,
Quoted 24 lines · Paolo Abeni
Quoted 23 lines · Florian Westphal
squashto: mptcp: Add handling of outgoing
MP_JOINrequestsSigned-off-by Florian Westphal <fw(a)strlen.de>--- net/mptcp/subflow.c | 4 ++++ 1 file changed, 4 insertions(+)net/mptcp/subflow.c +1
-0@@ -139,6 +139,7 @@ static void subflow_init_req(struct request_sock *req, subflow_req->remote_key = rx_opt.mptcp.sndr_key; subflow_req->ssn_offset =TCP_SKB_CB (skb)->seq; }else if (rx_opt.mptcp.mp_join && listener->request_mptcp) { + subflow_req->ssn_offset =TCP_SKB_CB (skb)->seq; subflow_req->mp_join =1 ; subflow_req->backup = rx_opt.mptcp.backup; subflow_req->remote_id = rx_opt.mptcp.join_id;@@ -231,6 +232,8 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb) subflow->remote_nonce, (u32 *)subflow->hmac);
Quoted 15 lines
net/mptcp/subflow.c static void subflow_ulp_clone(const struct request_sock *req, · line 894
Quoted 13 lines
net/mptcp/subflow.c +3
-0+if (skb) + subflow->ssn_offset =TCP_SKB_CB (skb)->seq;mptcp_finish_join (sk); subflow->conn_finished =1 ; }@@ -885,6 +888,7 @@ static void subflow_ulp_clone(const struct request_sock *req, new_ctx->ssn_offset = subflow_req->ssn_offset; new_ctx->idsn = subflow_req->idsn; }else if (subflow_req->mp_join) { + new_ctx->ssn_offset = subflow_req->ssn_offset; new_ctx->mp_join =1 ; new_ctx->fourth_ack =1 ; new_ctx->backup = subflow_req->backup;LGTM!
Thank you for the patch and the review!
- d950276fff5d: "squashed" in "mptcp: Add handling of outgoing MP_JOIN requests"
- 9503bde4eead..4bd50dcab84a: result
Tests are still OK!
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