Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #21597 from pprindeville/isc-dhcp-fix-multiple-routes

Browse source 
isc-dhcp: fix handling multiple instances of 'routes' list
This commit is contained in:
Philip Prindeville 2023-07-30 22:45:12 -06:00 committed by GitHub
commit d42ad5cd9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/isc-dhcp/Makefile
View file

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=isc-dhcp PKG_NAME:=isc-dhcp
UPSTREAM_NAME:=dhcp UPSTREAM_NAME:=dhcp
PKG_VERSION:=4.4.3-P1 PKG_VERSION:=4.4.3-P1
PKG_RELEASE:=4 PKG_RELEASE:=5
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE

27
net/isc-dhcp/files/dhcpd.init
View file

@ -138,15 +138,9 @@ create_empty_zone() {
} }
append_routes() { append_routes() {
local tuple tuples="$1" local tuple tuple="$(trim "$1")"
local string=
local IFS=','
for tuple in $tuples; do
local network prefix router save octets compacted local network prefix router save octets compacted
tuple="$(trim "$tuple")"
save="${tuple% *}" save="${tuple% *}"
router="$(trim "${tuple#${save} }")" router="$(trim "${tuple#${save} }")"
@ -157,10 +151,7 @@ append_routes() {
octets=$((($prefix + 7) / 8)) octets=$((($prefix + 7) / 8))
compacted="$(echo "$network" | cut -d. -f1-$octets)" compacted="$(echo "$network" | cut -d. -f1-$octets)"
string="${string:+, }$(explode "$prefix${compacted:+.$compacted}.$router")" routes="$routes${routes:+, }$(explode "$prefix${compacted:+.$compacted}.$router")"
done
echo " option classless-ipv4-route $string;"
} }
append_dhcp_options() { append_dhcp_options() {
@ -306,8 +297,14 @@ static_host_add() {
extra_options="$extra_options${extra_options:+ }0c" ;; extra_options="$extra_options${extra_options:+ }0c" ;;
domain-name) domain-name)
extra_options="$extra_options${extra_options:+ }0f" ;; extra_options="$extra_options${extra_options:+ }0f" ;;
renewal-time)
extra_options="$extra_options${extra_options:+ }3a" ;;
rebinding-time)
extra_options="$extra_options${extra_options:+ }3b" ;;
fqdn) fqdn)
extra_options="$extra_options${extra_options:+ }51" ;; extra_options="$extra_options${extra_options:+ }51" ;;
routes)
extra_options="$extra_options${extra_options:+ }79" ;;
*) *)
echo "unknown option: $option" >&2 ;; echo "unknown option: $option" >&2 ;;
esac esac
@ -344,7 +341,11 @@ static_host_add() {
if [ -n "$gateway" ] ; then if [ -n "$gateway" ] ; then
echo " option routers $gateway;" echo " option routers $gateway;"
fi fi
local routes=
config_list_foreach "$cfg" "routes" append_routes config_list_foreach "$cfg" "routes" append_routes
[ -n "$routes" ] && echo " option classless-ipv4-route $routes;"
config_list_foreach "$cfg" "dhcp_option" append_dhcp_options config_list_foreach "$cfg" "dhcp_option" append_dhcp_options
if [ -n "$extra_options" ]; then if [ -n "$extra_options" ]; then
echo -e " if exists dhcp-parameter-request-list {\n option dhcp-parameter-request-list = concat(option dhcp-parameter-request-list, $extra_options);\n }" echo -e " if exists dhcp-parameter-request-list {\n option dhcp-parameter-request-list = concat(option dhcp-parameter-request-list, $extra_options);\n }"
@ -391,7 +392,11 @@ gen_dhcp_subnet() {
echo " option routers $gateway;" echo " option routers $gateway;"
fi fi
echo " option domain-name-servers $DNS;" echo " option domain-name-servers $DNS;"
local routes=
config_list_foreach "$cfg" "routes" append_routes config_list_foreach "$cfg" "routes" append_routes
[ -n "$routes" ] && echo " option classless-ipv4-route $routes;"
config_list_foreach "$cfg" "dhcp_option" append_dhcp_options config_list_foreach "$cfg" "dhcp_option" append_dhcp_options
echo "}" echo "}"
} }