Skip to content

linux: Add definitions for Multipath TCP#1902

Merged
bors merged 2 commits into
rust-lang:masterfrom
george-hopkins:mptcp
Oct 25, 2020
Merged

linux: Add definitions for Multipath TCP#1902
bors merged 2 commits into
rust-lang:masterfrom
george-hopkins:mptcp

Conversation

@george-hopkins

@george-hopkins george-hopkins commented Sep 24, 2020

Copy link
Copy Markdown
Contributor

The Linux kernel recently gained support for Multipath TCP, a protocol which builds upon TCP. This patch adds IPPROTO_MPTCP to open new sockets and TCP_ULP to query the upper layer protocol of traditional TCP sockets (which is set to mptcp for all underlying connections)

Source: tcp: Define IPPROTO_MPTCP

cc #1896

@rust-highfive

Copy link
Copy Markdown

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @JohnTitor (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@JohnTitor

Copy link
Copy Markdown
Member

This is a breaking change and I think we should add a deprecation note to tell users that the value will be changed here.

@bors

bors commented Oct 1, 2020

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #1889) made this pull request unmergeable. Please resolve the merge conflicts.

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

@george-hopkins

Copy link
Copy Markdown
Contributor Author

Thank you for the review. I rebased the changes onto #1889 and added a deprecation notice. Is this what you had in mind or should the warning be placed more prominently?

@george-hopkins

Copy link
Copy Markdown
Contributor Author

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

@rustbot

rustbot commented Oct 8, 2020

Copy link
Copy Markdown
Collaborator

Error: The feature relabel is not enabled in this repository.
To enable it add its section in the triagebot.toml in the root of the repository.

Please let @rust-lang/release know if you're having trouble with this bot.

Comment thread src/unix/linux_like/linux/mod.rs Outdated
bors added a commit that referenced this pull request Oct 15, 2020
Allow contributors to label issues via rustbot

Now bors suggests contributors label PRs with the status labels, e.g.:

#1902 (comment)

This allows it, and for issues as well.
We leave IPPROTO_MAX as is for the time being. However, in recent
kernel releases IPPROTO_MAX is actually higher and reflects the
addition of IPPROTO_MPTCP.
@george-hopkins

Copy link
Copy Markdown
Contributor Author

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

@JohnTitor JohnTitor left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me once all comments are addressed.

Comment thread src/unix/linux_like/linux/mod.rs Outdated
Comment thread src/unix/linux_like/linux/mod.rs Outdated
Comment thread src/unix/linux_like/linux/mod.rs Outdated
Co-authored-by: Yuki Okushi <huyuumi.dev@gmail.com>
@JohnTitor

Copy link
Copy Markdown
Member

Thanks!
@bors r+

@bors

bors commented Oct 24, 2020

Copy link
Copy Markdown
Contributor

📌 Commit 7f2619f has been approved by JohnTitor

@bors

bors commented Oct 24, 2020

Copy link
Copy Markdown
Contributor

⌛ Testing commit 7f2619f with merge e0a4fb0...

@bors

bors commented Oct 25, 2020

Copy link
Copy Markdown
Contributor

☀️ Test successful - checks-actions, checks-cirrus-freebsd-11, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13
Approved by: JohnTitor
Pushing e0a4fb0 to master...

@bors bors merged commit e0a4fb0 into rust-lang:master Oct 25, 2020
@george-hopkins george-hopkins deleted the mptcp branch October 29, 2020 16:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants