pbr: bugfix: fix is_domain()

* fixes https://github.com/openwrt/packages/issues/20352

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit e7e4a013be73253d68107971e470344deb918d96)

diff --git a/net/pbr/Makefile b/net/pbr/Makefile
index c8ef1bc3651814b968ef12a1e81de049eb88e3b8..10bb3fe53bededed02e3b1efda1191829d1ad344 100644 (file)
--- a/net/pbr/Makefile
+++ b/net/pbr/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pbr
 PKG_VERSION:=1.0.1
-PKG_RELEASE:=14
+PKG_RELEASE:=16
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
 

diff --git a/net/pbr/files/etc/config/pbr b/net/pbr/files/etc/config/pbr
index 355fac2052099abb292dbacef52c4f22ec746717..857ef1e33a8d4902cb2e9c2aea5f9a4754687ff9 100644 (file)
--- a/net/pbr/files/etc/config/pbr
+++ b/net/pbr/files/etc/config/pbr
@@ -35,11 +35,3 @@ config policy
        option interface 'wan'
        option dest_addr 'plex.tv my.plexapp.com emby.media app.emby.media tv.emby.media'
        option enabled '0'
-
-config policy
-       option name 'WireGuard Server'
-       option interface 'wan'
-       option src_port '51820'
-       option chain 'OUTPUT'
-       option proto 'udp'
-       option enabled '0'

diff --git a/net/pbr/files/etc/init.d/pbr.init b/net/pbr/files/etc/init.d/pbr.init
index 5149b03636248bd1b7e718b1440ddb3d10ee8e6a..02c77f1c8347dbeb7168f232995d53f5c582d6e0 100755 (executable)
--- a/net/pbr/files/etc/init.d/pbr.init
+++ b/net/pbr/files/etc/init.d/pbr.init
@@ -251,7 +251,7 @@ is_ipv6_global() { [ "${1:0:4}" = "2001" ]; }
 # is_ipv6_global() { is_ipv6 "$1" && ! is_ipv6_link_local "$1" && ! is_ipv6_link_local "$1"; }
 is_list() { str_contains "$1" "," || str_contains "$1" " "; }
 is_netmask() { local ip="${1%/*}"; [ "$ip" != "$1" ] && is_ipv4 "$ip"; }
-is_domain() { str_contains "$1" '[a-zA-Z]'; }
+is_domain() { ! is_ipv6 "$1" && str_contains "$1" '[a-zA-Z]'; }
 is_phys_dev() { [ "${1:0:1}" = "@" ] && ip l show | grep -E -q "^\\d+\\W+${1:1}"; }
 dnsmasq_kill() { killall -q -s HUP dnsmasq; }
 dnsmasq_restart() { output 3 'Restarting dnsmasq '; if /etc/init.d/dnsmasq restart >/dev/null 2>&1; then output_okn; else output_failn; fi; }
@@ -569,8 +569,12 @@ nftset() {
                                fi
                                [ -z "$param4" ] &&     param4="$(resolveip_to_nftset4 "$param")"
                                [ -z "$param6" ] &&     param6="$(resolveip_to_nftset6 "$param")"
-                               nft4 add element inet "$nftTable" "$nftset4" "{ $param4 }" && ipv4_error=0
-                               nft6 add element inet "$nftTable" "$nftset6" "{ $param6 }" && ipv6_error=0
+                               if [ -z "$param4" ] && [ -z "$param6" ]; then
+                                       state add 'errorSummary' 'errorFailedToResolve' "$param"
+                               else
+                                       nft4 add element inet "$nftTable" "$nftset4" "{ $param4 }" && ipv4_error=0
+                                       nft6 add element inet "$nftTable" "$nftset6" "{ $param6 }" && ipv6_error=0
+                               fi
                        fi
                ;;
                add_dnsmasq_element)