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

unbound: improve odhcpd rapid update robustness

Browse source 
cherry-pick: bce5f44f5af6510db484389b8cc0636f6de08877
Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>
This commit is contained in:
Eric Luehrsen 2020-09-05 10:00:32 -04:00
parent d17720f042
commit 54847cc7c1
2 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/unbound/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=unbound
PKG_VERSION:=1.11.0
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://nlnetlabs.nl/downloads/unbound

27
net/unbound/files/odhcpd.sh
View file

@ -23,12 +23,10 @@
#
##############################################################################
. /lib/functions.sh
. /usr/lib/unbound/defaults.sh
##############################################################################
odhcpd_zonedata() {
. /lib/functions.sh
. /usr/lib/unbound/defaults.sh
local dhcp_link=$( uci_get unbound.@unbound[0].dhcp_link )
local dhcp4_slaac6=$( uci_get unbound.@unbound[0].dhcp4_slaac6 )
local dhcp_domain=$( uci_get unbound.@unbound[0].domain )
@ -62,7 +60,7 @@ odhcpd_zonedata() {
sort $dhcp_origin > $dhcp_ls_new
longconf=longtime
elif [ $dateoldf -gt 3 ] ; then
elif [ $dateoldf -gt 1 ] ; then
touch $dns_ls_old
sort $dhcp_origin > $dhcp_ls_new
longconf=increment
@ -124,7 +122,22 @@ odhcpd_zonedata() {
##############################################################################
odhcpd_zonedata
UB_ODHPCD_LOCK=/tmp/unbound_odhcpd.lock
if [ ! -f $UB_ODHPCD_LOCK ] ; then
# imperfect but it should avoid collisions
touch $UB_ODHPCD_LOCK
odhcpd_zonedata
rm -f $UB_ODHPCD_LOCK
else
UB_ODHCPD_LOCK_AGE=$(( $( date +%s ) - $( date -r $UB_ODHPCD_LOCK +%s ) ))
if [ $UB_ODHCPD_LOCK_AGE -gt 100 ] ; then
# unlock because something likely broke but do not write this time through
rm -f $UB_ODHPCD_LOCK
fi
fi
##############################################################################