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

Honor the user-defined UpstreamMode for the internal DNS proxy #4403

Merged
merged 1 commit into from
Aug 29, 2022

Conversation

caribpa
Copy link
Contributor

@caribpa caribpa commented Mar 16, 2022

Hi there!

First, I'd like to thank the team for the amazing software! 🎉

I've been using AdGuardHome for over a year and it has never failed me 😃

This pull request addresses an issue I've noticed that happens whenever the first upstream resolver is down (admittedly I think it might only happen when using DNSCrypt): The blocklists won't update.

Normally, the old blocklists would be used again in such a case, but if there are no old lists then nothing is used.

Why isn't the next resolver retrieved? Well, I'm not sure, it does seem to happen with plain DNS resolvers, but it appears it doesn't with DNSCrypt (haven't tried other protocols though).
Maybe this 5 min delay to wait for the resolver's response is guilty (plain DNS don't wait 5 min, but DNSCrypt apparently does):
https://github.com/AdguardTeam/AdGuardHome/blob/master/internal/home/home.go#L852

Anyways, if the internal DNS proxy is also able to work in the same mode than the external one (by honoring the user-defined UpstreamMode) the issue is gone when using parallel mode, thus this is what this PR is about.

That said, I'm not sure it this should become a hard-coded behavior as updating the blocklists should be a priority, especially if there are no old ones 🤔

Let me know what you think 😊

@stale stale bot added the wontfix label Jul 10, 2022
@AdguardTeam AdguardTeam deleted a comment from stale bot Aug 29, 2022
@ainar-g ainar-g removed the wontfix label Aug 29, 2022
@ainar-g ainar-g self-assigned this Aug 29, 2022
@ainar-g ainar-g added this to the v0.107.12 milestone Aug 29, 2022
@ainar-g
Copy link
Contributor

ainar-g commented Aug 29, 2022

Good day and sincere apologies for not paying attention to this contribution for so long! We will review this change for the next patch release.

adguard pushed a commit that referenced this pull request Aug 29, 2022
Updates #4403.

* commit 'd519929988575439c2238924ae5b1d96091445f7':
  dnsforward: imp code, fmt
  Also honor the user-defined UpstreamMode for the internal DNS proxy
@adguard adguard merged commit cb83f8b into AdguardTeam:master Aug 29, 2022
adguard pushed a commit that referenced this pull request Aug 29, 2022
Updates #4403.

Squashed commit of the following:

commit b4d6cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Aug 29 16:39:13 2022 +0300

    all: imp chlog

commit f9ab827
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Aug 29 16:32:19 2022 +0300

    all: upd chlog
@ainar-g ainar-g mentioned this pull request Aug 29, 2022
3 tasks
heyxkhoa pushed a commit to heyxkhoa/AdGuardHome that referenced this pull request Mar 20, 2023
Updates AdguardTeam#4403.

Squashed commit of the following:

commit b4d6cb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Aug 29 16:39:13 2022 +0300

    all: imp chlog

commit f9ab827
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Aug 29 16:32:19 2022 +0300

    all: upd chlog
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.

3 participants