Browse Source

isc-dhcpd: handle extra spaces in routes

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
lilik-openwrt-22.03
Philip Prindeville 3 years ago
parent
commit
b428e46355
2 changed files with 14 additions and 5 deletions
  1. +1
    -1
      net/isc-dhcp/Makefile
  2. +13
    -4
      net/isc-dhcp/files/dhcpd.init

+ 1
- 1
net/isc-dhcp/Makefile View File

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


+ 13
- 4
net/isc-dhcp/files/dhcpd.init View File

@ -48,6 +48,13 @@ time2seconds() {
echo $(( number * multiplier ))
}
trim()
{
local arg="$1"
echo "$arg" | sed -e 's/^ *//' -e 's/ *$//'
}
# duplicated from dnsmasq init script
hex_to_hostid() {
local var="$1"
@ -122,12 +129,14 @@ append_routes() {
for tuple in $tuples; do
local network prefix router save octets compacted
tuple="$(trim "$tuple")"
save="${tuple% *}"
router="${tuple#${save} }"
router="$(trim "${tuple#${save} }")"
network="$(trim "${save%/[0-9]*}")"
network="${save%/[0-9]*}"
prefix="${save##${network}}"
prefix="${prefix:1}"
prefix="$(trim "${save##${network}/}")"
octets=$((($prefix + 7) / 8))
compacted="$(echo "$network" | cut -d. -f1-$octets)"


Loading…
Cancel
Save