Differentiate upstream servers by address AND port #923
Conversation
This file contains 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
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
8 tasks
dschaper
approved these changes
Nov 13, 2020
dschaper
added
PR: Approved
|
This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there: https://discourse.pi-hole.net/t/pi-hole-core-web-v5-2-and-ftl-v5-3-released/40909/1 |
|
This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there: https://discourse.pi-hole.net/t/pi-hole-core-web-v5-2-and-ftl-v5-3-released/40909/20 |
|
This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there: |
|
This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there: https://discourse.pi-hole.net/t/new-gripes-w-latest-updates/41660/3 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
By submitting this pull request, I confirm the following:
How familiar are you with the codebase?:
10
So far, FTL keeps servers apart solely based on their IP addresses. This is typically sufficient, however, users may decide to run different DNS servers on the same IP address. A popular example is, for instance, running FTL on
127.0.0.1#53andunboundon127.0.0.1#5353where#is thednsmasq-style port separator.This PR extends the logic in FTL to identify upstream servers by both, address, and port. This also changes the format we store the server in the database. So far, the servers were saved without a port, in the future, they are stored like
127.0.0.1#53.There is one expected cosmetic issue: FTL cannot know the port of the server responsible for queries in the database. Hence, immediately after switching to this branch, you'll note the assumed server
127.0.0.1#53(even when the server may be sitting at#5353). This is merely a displaying issue as the content of the database will be correct at any time. I looked at providing simple solutions for this, however, it would make the code unreadable and - since the issue will be gone after 24 hours - it doesn't seem worth the effort.