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

rec: Respect the AXFR timeout while connecting to the RPZ server #6469

Merged
merged 2 commits into from Apr 11, 2018

Conversation

Projects
None yet
3 participants
@rgacogne
Member

rgacogne commented Apr 11, 2018

Short description

The initial AXFR query to a RPZ server was using a hard-coded ten seconds timeout regardless of the axfrTimeout setting.
We also messed up error reporting in waitForRWData() when poll returns -1.

Checklist

I have:

  • read the CONTRIBUTING.md document
  • compiled and tested this code
  • included documentation (including possible behaviour changes)
  • documented the code
  • added or modified regression test(s)
  • added or modified unit test(s)

rgacogne added some commits Apr 11, 2018

@rgacogne rgacogne added this to the rec-4.1.x milestone Apr 11, 2018

@pieterlexis pieterlexis merged commit bee1a3d into PowerDNS:master Apr 11, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@rgacogne rgacogne deleted the rgacogne:rec-axfr-timeout branch Apr 11, 2018

@Habbie

This comment has been minimized.

Member

Habbie commented Apr 30, 2018

Does the waitForRWData thing affect auth?

@rgacogne

This comment has been minimized.

Member

rgacogne commented Apr 30, 2018

The only thing backporting this PR would change for the auth is make error reporting better when the poll() call in waitForRWData() fails, which at a quick glance might happen in the TCP handling code, in DNSProxy, Carbon, and while doing an outgoing AXFR.

rgacogne added a commit to rgacogne/pdns that referenced this pull request May 16, 2018

@rgacogne rgacogne referenced this pull request May 16, 2018

Merged

rec: backport #6562, #6566, #6567 and #6588 to 4.1.x #6612

2 of 8 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment