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.

Sign up for GitHub

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

Jump to bottom

Add support for TCP_KEEPCNT and TCP_KEEPINTVL TCP keepalive options. #1283

Merged
merged 1 commit into from
Oct 10, 2020
Merged

Add support for TCP_KEEPCNT and TCP_KEEPINTVL TCP keepalive options. #1283

merged 1 commit into from
Oct 10, 2020

Conversation

yoav-steinberg
Copy link
Contributor

No description provided.

asomers
asomers requested changes Aug 17, 2020
View reviewed changes
Copy link
Member

@asomers asomers left a comment

Choose a reason for hiding this comment

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

At a minimum, this requires a CHANGELOG entry. Tests would also be welcome, if they make sense for these options.

@yoav-steinberg yoav-steinberg force-pushed the more_tcp_keepalive_options branch from 0337fab to 8ce6950 Compare August 18, 2020 12:22
@yoav-steinberg
Copy link
Contributor Author

At a minimum, this requires a CHANGELOG entry. Tests would also be welcome, if they make sense for these options.

Added CHANGELOG and simple tests.

@yoav-steinberg yoav-steinberg requested a review from asomers August 18, 2020 13:55
asomers
asomers requested changes Aug 22, 2020
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
@yoav-steinberg yoav-steinberg requested a review from asomers August 22, 2020 22:13
asomers
asomers requested changes Sep 6, 2020
View reviewed changes
Copy link
Member

@asomers asomers left a comment

Choose a reason for hiding this comment

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

Better. Sadly, there's a merge conflict. You'll have to rebase.

@yoav-steinberg yoav-steinberg force-pushed the more_tcp_keepalive_options branch from 97d2b7d to 5415d57 Compare September 7, 2020 09:55
@yoav-steinberg
Copy link
Contributor Author

Better. Sadly, there's a merge conflict. You'll have to rebase.

Rebased. Please review.

@gavrie
Copy link

gavrie commented Sep 14, 2020

@asomers It would be great to see this merged. Is anything additional required?

@asomers
Copy link
Member

asomers commented Sep 27, 2020

I think it looks good. Just squash, please!

@yoav-steinberg yoav-steinberg force-pushed the more_tcp_keepalive_options branch from 5415d57 to 5dcc717 Compare September 28, 2020 08:04
@yoav-steinberg
Copy link
Contributor Author

Squashed.

@yoav-steinberg yoav-steinberg force-pushed the more_tcp_keepalive_options branch 2 times, most recently from c0c9338 to a51072a Compare October 4, 2020 07:00
asomers
asomers requested changes Oct 10, 2020
View reviewed changes
Copy link
Member

@asomers asomers left a comment

Choose a reason for hiding this comment

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

Somehow you lost the CHANGELOG when you squashed.

@yoav-steinberg yoav-steinberg force-pushed the more_tcp_keepalive_options branch from a51072a to fde7181 Compare October 10, 2020 20:52
@yoav-steinberg
Copy link
Contributor Author

Somehow you lost the CHANGELOG when you squashed.

Squashed again.

asomers
asomers approved these changes Oct 10, 2020
View reviewed changes
Copy link
Member

@asomers asomers left a comment

Choose a reason for hiding this comment

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

bors r+

@bors
Copy link
Contributor

bors bot commented Oct 10, 2020

Build succeeded:

@bors bors bot merged commit 89b029b into nix-rust:master Oct 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@asomers asomers asomers approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@yoav-steinberg @gavrie @asomers