diff options
| author | Stan Grishin <stangri@melmac.ca> | 2023-01-22 23:13:18 +0000 |
|---|---|---|
| committer | Stan Grishin <stangri@melmac.ca> | 2023-01-22 23:13:24 +0000 |
| commit | e7e4a013be73253d68107971e470344deb918d96 (patch) | |
| tree | fdb8531d9f2507235bbb510e5dd21df15c2c12e5 /net/pbr | |
| parent | 36a45c4ce709c025fb309ca52c256d0d3a55e00c (diff) | |
pbr: bugfix: fix is_domain()
* fixes https://github.com/openwrt/packages/issues/20352
Signed-off-by: Stan Grishin <stangri@melmac.ca>
Diffstat (limited to 'net/pbr')
| -rw-r--r-- | net/pbr/Makefile | 2 | ||||
| -rw-r--r-- | net/pbr/files/etc/config/pbr | 8 | ||||
| -rwxr-xr-x | net/pbr/files/etc/init.d/pbr.init | 4 |
3 files changed, 3 insertions, 11 deletions
diff --git a/net/pbr/Makefile b/net/pbr/Makefile index ab931e7cd..3d8438d9e 100644 --- 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 355fac205..857ef1e33 100644 --- 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 e612072c3..848dd2e9e 100755 --- a/net/pbr/files/etc/init.d/pbr.init +++ b/net/pbr/files/etc/init.d/pbr.init @@ -254,7 +254,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; } @@ -579,7 +579,7 @@ nftset() { fi [ -z "$param4" ] && param4="$(resolveip_to_nftset4 "$param")" [ -z "$param6" ] && param6="$(resolveip_to_nftset6 "$param")" - if [ -z "$param4" ] && [ -z "$param6" ]; then + if [ -z "$param4" ] && [ -z "$param6" ]; then state add 'errorSummary' 'errorFailedToResolve' "$param" else nft4 add element inet "$nftTable" "$nftset4" "{ $param4 }" && ipv4_error=0 |