Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

linux: Add definitions for Multipath TCP #1902

Merged
merged 2 commits into from
Oct 25, 2020
Merged

Conversation

george-hopkins
Copy link
Contributor

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

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

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
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
Copy link
Contributor

bors commented Oct 1, 2020

☔ 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
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
Contributor Author

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

@rustbot
Copy link
Collaborator

rustbot commented Oct 8, 2020

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.

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
Contributor Author

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

Copy link
Member

@JohnTitor JohnTitor left a comment

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.

src/unix/linux_like/linux/mod.rs Outdated Show resolved Hide resolved
src/unix/linux_like/linux/mod.rs Outdated Show resolved Hide resolved
src/unix/linux_like/linux/mod.rs Outdated Show resolved Hide resolved
Co-authored-by: Yuki Okushi <huyuumi.dev@gmail.com>
@JohnTitor
Copy link
Member

Thanks!
@bors r+

@bors
Copy link
Contributor

bors commented Oct 24, 2020

📌 Commit 7f2619f has been approved by JohnTitor

@bors
Copy link
Contributor

bors commented Oct 24, 2020

⌛ Testing commit 7f2619f with merge e0a4fb0...

@bors
Copy link
Contributor

bors commented Oct 25, 2020

☀️ 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