openwrt/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2026-05-31 06:51:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

pbr: update to 1.2.2-r14

Browse Source 
fix: avoid unnecessary dnsmasq restarts (thanks @egc112)
fix: insert, not add dns policies to ensure higher priority than the DNS
     hijack rules (thanks @egc112)

Signed-off-by: Stan Grishin <stangri@melmac.ca>
This commit is contained in:
Stan Grishin
2026-04-21 19:11:41 +00:00
parent a3082e3069
commit 7c106734e8
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/pbr/Makefile
+1 -1
View File
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=pbr PKG_NAME:=pbr
PKG_VERSION:=1.2.2 PKG_VERSION:=1.2.2
PKG_RELEASE:=12 PKG_RELEASE:=14
PKG_LICENSE:=AGPL-3.0-or-later PKG_LICENSE:=AGPL-3.0-or-later
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca> PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
net/pbr/files/etc/init.d/pbr
+5 -3
View File
@@ -198,6 +198,7 @@ nft_fw4_dump=
loadEnvironmentFlag= loadEnvironmentFlag=
loadPackageConfigFlag= loadPackageConfigFlag=
resolverWorkingFlag= resolverWorkingFlag=
resolverStoredHash=
# shellcheck disable=SC1091 # shellcheck disable=SC1091
. "${IPKG_INSTROOT}/lib/functions.sh" . "${IPKG_INSTROOT}/lib/functions.sh"
@@ -979,7 +980,7 @@ nft_file() {
done done
echo "" >> "$nftTempFile" echo "" >> "$nftTempFile"
# Add jump rules from fw4 chains to pbr chains # Add jump rules from fw4 chains to pbr chains
echo "add rule inet $nftTable dstnat jump ${nftPrefix}_dstnat" >> "$nftTempFile" echo "insert rule inet $nftTable dstnat jump ${nftPrefix}_dstnat" >> "$nftTempFile"
echo "add rule inet $nftTable mangle_prerouting jump ${nftPrefix}_prerouting" >> "$nftTempFile" echo "add rule inet $nftTable mangle_prerouting jump ${nftPrefix}_prerouting" >> "$nftTempFile"
echo "add rule inet $nftTable mangle_output jump ${nftPrefix}_output" >> "$nftTempFile" echo "add rule inet $nftTable mangle_output jump ${nftPrefix}_output" >> "$nftTempFile"
echo "add rule inet $nftTable mangle_forward jump ${nftPrefix}_forward" >> "$nftTempFile" echo "add rule inet $nftTable mangle_forward jump ${nftPrefix}_forward" >> "$nftTempFile"
@@ -1446,7 +1447,7 @@ resolver() {
[ "$resolverNewHash" != "$resolverStoredHash" ] [ "$resolverNewHash" != "$resolverStoredHash" ]
;; ;;
store_hash) store_hash)
[ -s "$packageDnsmasqFile" ] && resolverStoredHash="$(md5sum "$packageDnsmasqFile" | awk '{ print $1; }')" [ -s "$packageDnsmasqFile" ] && resolverStoredHash="$(md5sum "$packageDnsmasqFile" | awk '{ print $1; }')" || resolverStoredHash=
return 0 return 0
;; ;;
wait) wait)
@@ -2801,7 +2802,7 @@ on_interface_reload() {
start_service() { start_service() {
local param="$1" local param="$1"
local resolverStoredHash resolverNewHash reloadedIface local reloadedIface
local i k local i k
[ "$param" = 'on_boot' ] && pbrBootFlag=1 && return 0 [ "$param" = 'on_boot' ] && pbrBootFlag=1 && return 0
@@ -2880,6 +2881,7 @@ start_service() {
case $serviceStartTrigger in case $serviceStartTrigger in
on_interface_reload) on_interface_reload)
resolver 'store_hash'
output_okn output_okn
output 1 "Reloading Interface: $reloadedIface " output 1 "Reloading Interface: $reloadedIface "
json_add_array 'gateways' json_add_array 'gateways'