mirror of
https://github.com/Ysurac/openmptcprouter-feeds.git
synced 2025-03-09 15:40:03 +00:00
Fix no ipv6 support
This commit is contained in:
parent
60833be89d
commit
6397e9aa44
1 changed files with 4 additions and 3 deletions
|
@ -87,7 +87,7 @@ _bypass_domains() {
|
||||||
[ "$enabled" = "0" ] && return
|
[ "$enabled" = "0" ] && return
|
||||||
[ -z "$domain" ] && return
|
[ -z "$domain" ] && return
|
||||||
[ -z "$family" ] && family="ipv4ipv6"
|
[ -z "$family" ] && family="ipv4ipv6"
|
||||||
[ -z "$noipv6" ] && noipv6="0"
|
[ -z "$noipv6" ] && noipv6="1"
|
||||||
if [ "$(echo $domain | grep '\.$')" != "" ] || [ "$(echo $domain | grep '\.\*$')" != "" ]; then
|
if [ "$(echo $domain | grep '\.$')" != "" ] || [ "$(echo $domain | grep '\.\*$')" != "" ]; then
|
||||||
tlds=`curl --max-time 4 -s -k https://data.iana.org/TLD/tlds-alpha-by-domain.txt`
|
tlds=`curl --max-time 4 -s -k https://data.iana.org/TLD/tlds-alpha-by-domain.txt`
|
||||||
domain="$(echo '"$domain"' | sed 's:*::')"
|
domain="$(echo '"$domain"' | sed 's:*::')"
|
||||||
|
@ -128,6 +128,7 @@ _bypass_domain() {
|
||||||
intf=$(echo $intf | sed -e 's/\./_/')
|
intf=$(echo $intf | sed -e 's/\./_/')
|
||||||
intf=$(echo $intf | sed -e 's/-/_/')
|
intf=$(echo $intf | sed -e 's/-/_/')
|
||||||
[ -z "$intf" ] && intf="all"
|
[ -z "$intf" ] && intf="all"
|
||||||
|
[ -z "$noipv6" ] && noipv6="1"
|
||||||
if [ -n "$domain" ]; then
|
if [ -n "$domain" ]; then
|
||||||
domain=$(echo $domain | sed 's:^\.::')
|
domain=$(echo $domain | sed 's:^\.::')
|
||||||
#logger -t "omr-bypass" "Get IPs of $domain..."
|
#logger -t "omr-bypass" "Get IPs of $domain..."
|
||||||
|
@ -319,7 +320,7 @@ _bypass_proto() {
|
||||||
[ "$vpn" = "1" ] && intf="srv_vpn1"
|
[ "$vpn" = "1" ] && intf="srv_vpn1"
|
||||||
|
|
||||||
[ "$enabled" = "0" ] && return
|
[ "$enabled" = "0" ] && return
|
||||||
[ -z "$noipv6" ] && noipv6="0"
|
[ -z "$noipv6" ] && noipv6="1"
|
||||||
[ -z "$family" ] && family="ipv4ipv6"
|
[ -z "$family" ] && family="ipv4ipv6"
|
||||||
intf=$(echo $intf | sed -e 's/\./_/')
|
intf=$(echo $intf | sed -e 's/\./_/')
|
||||||
intf=$(echo $intf | sed -e 's/-/_/')
|
intf=$(echo $intf | sed -e 's/-/_/')
|
||||||
|
@ -419,7 +420,7 @@ _bypass_proto_without_ndpi() {
|
||||||
[ "$vpn" = "1" ] && intf="srv_vpn1"
|
[ "$vpn" = "1" ] && intf="srv_vpn1"
|
||||||
|
|
||||||
[ "$enabled" = "0" ] && return
|
[ "$enabled" = "0" ] && return
|
||||||
[ -z "$noipv6" ] && noipv6="0"
|
[ -z "$noipv6" ] && noipv6="1"
|
||||||
[ -z "$family" ] && family="ipv4ipv6"
|
[ -z "$family" ] && family="ipv4ipv6"
|
||||||
intf=$(echo $intf | sed -e 's/\./_/')
|
intf=$(echo $intf | sed -e 's/\./_/')
|
||||||
intf=$(echo $intf | sed -e 's/-/_/')
|
intf=$(echo $intf | sed -e 's/-/_/')
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue