Deprecate REPLY_ADDR4/6 in favor of more fine-grained setting #1293
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>
…its for deciding if the address is unspecified. Signed-off-by: DL6ER <dl6er@dl6er.de>
… and BLOCK_IPV4/6. If REPLY_ADDR4/6 is set and neither LOCAL_IPV4/6 nor BLOCK_IPV4/6, we use the value for both to preserve current behavior. Signed-off-by: DL6ER <dl6er@dl6er.de>
…o replace the blocking IP address but not the local one and need to determine the latter. Signed-off-by: DL6ER <dl6er@dl6er.de>
yubiuser
reviewed
Feb 1, 2022
Co-authored-by: yubiuser <ckoenig@posteo.de> Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
Tests added |
yubiuser
approved these changes
Feb 1, 2022
There was a problem hiding this comment.
Locally tested.
[2022-02-01 20:49:58.946 32148M] LOCAL_IPV4: Using IPv4 address 4.3.2.1 for pi.hole and hostname
[2022-02-01 20:49:58.946 32148M] LOCAL_IPV6: Automatic interface-dependent detection of address
[2022-02-01 20:49:58.946 32148M] BLOCK_IPV4: Using IPv4 address 1.2.3.4 in IP blocking mode
[2022-02-01 20:49:58.946 32148M] BLOCK_IPV6: Automatic interface-dependent detection of address
rockpi@rockpi-4b:~$ dig flurry.com @127.0.0.1 +short
1.2.3.4
rockpi@rockpi-4b:~$ dig pi.hole @127.0.0.1 +short
4.3.2.1
PromoFaux
approved these changes
Feb 3, 2022
8 tasks
|
This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there: https://discourse.pi-hole.net/t/pi-hole-ftl-v5-14-web-v5-11-and-core-v5-9-released/53529/1 |
This was referenced Feb 12, 2022
Closed
1 task
1 task
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
This PR addresses #1291 by replacing the multi-purpose config setting
REPLY_ADDR4andREPLY_ADDR6with more fine-grained settings.This allows for fine-grained setting of the IP to hand out for blocked queries in
IPblocking mode (usingBLOCK_IPV4/6) independently of the IP address returned for lookups ofpi.holeand the device's hostname (LOCAL_IPV4/6).If neither
BLOCK_IPV4/6norLOCAL_IPV4/6is set butREPLY_ADDR4/6is found, we use its value for both settings to preserve existing behavior.This PR also contains a bug fix ensuring overwriting also works for IPv6 over the loopback device (e5f69e1).