mirror
/
openwrt-packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Releases Activity

isc-dhcp: adapt to new ipcalc paradigm 

With #12925, 'BROADCAST' will no longer be set if there is no local
broadcast address (rather than holding the global broadcast address).
Prepare for the merge but stay compatible with the old version of ipcalc.

Signed-off-by: Leon M. Busch-George <leon@georgemail.eu>
This commit is contained in:
Leon M. Busch-George 2023-10-15 21:33:15 -06:00 committed by Philip Prindeville
parent c8a84f65f1
commit 3ad482078b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/isc-dhcp/files/dhcpd.init
View File

@ -374,7 +374,9 @@ gen_dhcp_subnet() {
echo " range $START $END;"
fi
echo " option subnet-mask $netmask;"
if [ "$BROADCAST" != "0.0.0.0" ] ; then
# check for 0.0.0.0 until all active releases of ipcalc.sh omit it
# for small networks:
if [ -n "$BROADCAST" ] && [ "$BROADCAST" != "0.0.0.0" ] ; then
echo " option broadcast-address $BROADCAST;"
fi
if [ "$dynamicdhcp" -eq 0 ] ; then
@ -443,7 +445,7 @@ dhcpd_add() {
dhcp_ifs="$dhcp_ifs $ifname"
eval "$(ipcalc.sh $subnet $start $limit)"
ipcalc $subnet $start $limit
config_get netmask "$cfg" "netmask" "$NETMASK"
config_get leasetime "$cfg" "leasetime"