Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-25 06:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reduce handholding when trying to foresee the intentions of the user. The code does now preserve legacy behavior and users can open up the subnet manually if they like.

Browse source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2020-06-21 21:47:30 +02:00
parent 6160eb6894
commit 9bf0f2a161
No known key found for this signature in database
GPG key ID: 00135ACBD90B28DD
1 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
advanced/Scripts/webpage.sh
View file

@ -226,19 +226,10 @@ trust-anchor=.,20326,8,2,E06D44B80B8F1D39A95C0B0D7C65D08458E880409BBC68345710423
delete_setting "CONDITIONAL_FORWARDING_DOMAIN" delete_setting "CONDITIONAL_FORWARDING_DOMAIN"
delete_setting "CONDITIONAL_FORWARDING_IP" delete_setting "CONDITIONAL_FORWARDING_IP"
# Try to detect intended CIDR by analyzing the target # Convert existing input to /24 subnet (preserves legacy behavior)
if [[ "${REV_SERVER_TARGET}" =~ 10\..* ]]; then
# Private network, Class A (RFC 1597 + RFC 1918)
REV_SERVER_CIDR="10.0.0.0/8"
elif [[ "${REV_SERVER_TARGET}" =~ 192\.168\..* ]]; then
# Private network, Class B (RFC 1597 + RFC 1918)
REV_SERVER_CIDR="192.168.0.0/16"
else
# Something else, convert to /24 subnet (preserves legacy behavior)
# This sed converts "192.168.1.2" to "192.168.1.0/24" # This sed converts "192.168.1.2" to "192.168.1.0/24"
# shellcheck disable=2001 # shellcheck disable=2001
REV_SERVER_CIDR="$(sed "s+\\.[0-9]*$+\\.0/24+" <<< "${REV_SERVER_TARGET}")" REV_SERVER_CIDR="$(sed "s+\\.[0-9]*$+\\.0/24+" <<< "${REV_SERVER_TARGET}")"
fi
add_setting "REV_SERVER_CIDR" "${REV_SERVER_CIDR}" add_setting "REV_SERVER_CIDR" "${REV_SERVER_CIDR}"
fi fi