-
Notifications
You must be signed in to change notification settings - Fork 334
Implement random resolver option #467
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
Open
dontcrash
wants to merge
5
commits into
AdguardTeam:master
Choose a base branch
from
dontcrash:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
1efa858
Implement random resolver option
dontcrash 98244d4
Typo
dontcrash 6aef237
Update proxy/exchange.go
dontcrash 7f68c25
Merge branch 'master' of https://github.com/dontcrash/dnsproxy
dontcrash 386aec3
Fixed switch case typo
dontcrash File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,6 +21,12 @@ func (p *Proxy) exchangeUpstreams( | |
| switch p.UpstreamMode { | ||
| case UpstreamModeParallel: | ||
| return upstream.ExchangeParallel(ups, req) | ||
| case UpstreamModeRandom: | ||
| // Simply set ups to a random entry in ups | ||
| // Falls back to default behaviour as if ups <= 1 it will run UpstreamModeLoadBalance as intended | ||
| if len(ups) > 1 { | ||
| ups = []upstream.Upstream{ups[p.randSrc.Intn(len(ups))]} | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This doesn't build: See |
||
| } | ||
| case UpstreamModeFastestAddr: | ||
| switch req.Question[0].Qtype { | ||
| case dns.TypeA, dns.TypeAAAA: | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,6 +23,9 @@ const ( | |
| // or AAAA requests only with the fastest IP address detected by ICMP | ||
| // response time or TCP connection time. | ||
| UpstreamModeFastestAddr UpstreamMode = "fastest_addr" | ||
|
|
||
| // UpstreamModeRandom makes server to a random upstream | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please, consider using
|
||
| UpstreamModeRandom UpstreamMode = "random" | ||
| ) | ||
|
|
||
| // type check | ||
|
|
@@ -35,6 +38,7 @@ func (m *UpstreamMode) UnmarshalText(b []byte) (err error) { | |
| case | ||
| UpstreamModeLoadBalance, | ||
| UpstreamModeParallel, | ||
| UpstreamModeRandom, | ||
| UpstreamModeFastestAddr: | ||
| *m = um | ||
| default: | ||
|
|
@@ -43,6 +47,7 @@ func (m *UpstreamMode) UnmarshalText(b []byte) (err error) { | |
| b, | ||
| UpstreamModeLoadBalance, | ||
| UpstreamModeParallel, | ||
| UpstreamModeRandom, | ||
| UpstreamModeFastestAddr, | ||
| ) | ||
| } | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please update
README.mdas well.