On 31/10/2019 17:55, Paolo Abeni wrote:
as per last mtg discussion, patch "mptcp: Write MPTCP DSS headers to
outgoing data packets", includes:
@@ -208,6 +303,14 @@ static struct sock *mptcp_accept(struct sock *sk, int flags, int
msk->subflow = NULL;
+ mptcp_crypto_key_sha1(msk->remote_key, NULL, &ack_seq);
+ msk->write_seq = subflow->idsn + 1;
+ msk->ack_seq = ack_seq;
+ msk->remote_key = subflow->remote_key;
'remote_key' is set a few lines above, and the 2nd ack_seq increment is
wrong, we just incr it once.
The 2 bottom lines are deleted by "mptcp: Implement MPTCP
path". We should avoid inserting them at all. @Matt, can you do that
with git surgery, or do you prefer a patch?
Thank you for this email!
I just did the fix:
- a40c05d7dc64: squashed in "mptcp: Write MPTCP DSS headers to outgoing
- 0530ee00fb46: conflict in t/mptcp-Implement-MPTCP-receive-path
- 3a4c8696fb26..0a282f50587a: no diff
Tests are in progress.
Matthieu Baerts | R&D Engineer
Tessares SA | Hybrid Access Solutions
1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium