mirror of
https://git.openwrt.org/feed/packages.git
synced 2024-06-20 07:38:40 +02:00
Merge pull request #20372 from stangri/master-pbr
pbr: bugfix: fix is_domain()
This commit is contained in:
commit
23c7beb003
|
@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=pbr
|
PKG_NAME:=pbr
|
||||||
PKG_VERSION:=1.0.1
|
PKG_VERSION:=1.0.1
|
||||||
PKG_RELEASE:=14
|
PKG_RELEASE:=16
|
||||||
PKG_LICENSE:=GPL-3.0-or-later
|
PKG_LICENSE:=GPL-3.0-or-later
|
||||||
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
|
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
|
||||||
|
|
||||||
|
|
|
@ -35,11 +35,3 @@ config policy
|
||||||
option interface 'wan'
|
option interface 'wan'
|
||||||
option dest_addr 'plex.tv my.plexapp.com emby.media app.emby.media tv.emby.media'
|
option dest_addr 'plex.tv my.plexapp.com emby.media app.emby.media tv.emby.media'
|
||||||
option enabled '0'
|
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'
|
|
||||||
|
|
|
@ -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_ipv6_global() { is_ipv6 "$1" && ! is_ipv6_link_local "$1" && ! is_ipv6_link_local "$1"; }
|
||||||
is_list() { str_contains "$1" "," || str_contains "$1" " "; }
|
is_list() { str_contains "$1" "," || str_contains "$1" " "; }
|
||||||
is_netmask() { local ip="${1%/*}"; [ "$ip" != "$1" ] && is_ipv4 "$ip"; }
|
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}"; }
|
is_phys_dev() { [ "${1:0:1}" = "@" ] && ip l show | grep -E -q "^\\d+\\W+${1:1}"; }
|
||||||
dnsmasq_kill() { killall -q -s HUP dnsmasq; }
|
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; }
|
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
|
fi
|
||||||
[ -z "$param4" ] && param4="$(resolveip_to_nftset4 "$param")"
|
[ -z "$param4" ] && param4="$(resolveip_to_nftset4 "$param")"
|
||||||
[ -z "$param6" ] && param6="$(resolveip_to_nftset6 "$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"
|
state add 'errorSummary' 'errorFailedToResolve' "$param"
|
||||||
else
|
else
|
||||||
nft4 add element inet "$nftTable" "$nftset4" "{ $param4 }" && ipv4_error=0
|
nft4 add element inet "$nftTable" "$nftset4" "{ $param4 }" && ipv4_error=0
|
||||||
|
|
Loading…
Reference in New Issue
Block a user