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

In tcp_callback_writer(), don't disable time-out when changing to read. #122

Merged
merged 1 commit into from
Dec 2, 2019

Conversation

he32
Copy link
Contributor

@he32 he32 commented Nov 25, 2019

I suspect this is the cause of the apparent non-working of the tcp-idle-timeout setting,
as observed in e.g.
https://nlnetlabs.nl/pipermail/unbound-users/2019-August/011748.html

Copy link
Member

@wcawijngaards wcawijngaards left a comment

Choose a reason for hiding this comment

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

Looks good. Must have been an oversight in the code changes for 1.9.0, I think.

@wcawijngaards
Copy link
Member

Thanks for the fix! That is some serious deep code inspection, and what looks like a good bugfix to me. I'll merge it in a bit and make a Changelog entry for it.

@wcawijngaards wcawijngaards merged commit b4a01d6 into NLnetLabs:master Dec 2, 2019
wcawijngaards added a commit that referenced this pull request Dec 2, 2019
- Merge pull request #122 from he32: In tcp_callback_writer(),
  don't disable time-out when changing to read.
netbsd-srcmastr pushed a commit to NetBSD/pkgsrc that referenced this pull request Dec 3, 2019
  NLnetLabs/unbound#122
which fixes
  NLnetLabs/unbound#125

Briefly: TCP socket timeouts would effectively be disabled after
the exchange of the initial DNS query/response.

Bump PKGREVISION.
netbsd-srcmastr pushed a commit to NetBSD/src that referenced this pull request Dec 3, 2019
  NLnetLabs/unbound#122
This should enable proper functioning of tcp-idle-timeout.
ryo pushed a commit to IIJ-NetBSD/netbsd-src that referenced this pull request Dec 3, 2019
  NLnetLabs/unbound#122
This should enable proper functioning of tcp-idle-timeout.
@he32 he32 deleted the timeout-fix branch December 9, 2019 10:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants