mirror of
https://github.com/Ysurac/openmptcprouter-feeds.git
synced 2025-02-15 03:51:51 +00:00
Fix typo on glorytun udp check and don't create route to server via omr6in4/omrvpn
This commit is contained in:
parent
7fc99ca3bd
commit
643b87ec63
1 changed files with 7 additions and 1 deletions
|
@ -195,6 +195,7 @@ set_routes_intf() {
|
||||||
local multipath_config_route
|
local multipath_config_route
|
||||||
local INTERFACE=$1
|
local INTERFACE=$1
|
||||||
[ -z "$INTERFACE" ] && return
|
[ -z "$INTERFACE" ] && return
|
||||||
|
[ "$INTERFACE" = "omrvpn" ] && continue
|
||||||
multipath_config_route=$(uci -q get openmptcprouter.$INTERFACE.multipath)
|
multipath_config_route=$(uci -q get openmptcprouter.$INTERFACE.multipath)
|
||||||
[ -z "$multipath_config_route" ] && multipath_config_route=$(uci -q get network.$INTERFACE.multipath || echo "off")
|
[ -z "$multipath_config_route" ] && multipath_config_route=$(uci -q get network.$INTERFACE.multipath || echo "off")
|
||||||
[ "$(uci -q get openmptcprouter.$INTERFACE.multipathvpn)" = "1" ] && {
|
[ "$(uci -q get openmptcprouter.$INTERFACE.multipathvpn)" = "1" ] && {
|
||||||
|
@ -252,6 +253,8 @@ set_routes_intf6() {
|
||||||
local multipath_config_route
|
local multipath_config_route
|
||||||
local INTERFACE=$1
|
local INTERFACE=$1
|
||||||
[ -z "$INTERFACE" ] && return
|
[ -z "$INTERFACE" ] && return
|
||||||
|
[ "$INTERFACE" = "omr6in4" ] && continue
|
||||||
|
[ "$INTERFACE" = "omrvpn" ] && continue
|
||||||
multipath_config_route=$(uci -q get openmptcprouter.$INTERFACE.multipath)
|
multipath_config_route=$(uci -q get openmptcprouter.$INTERFACE.multipath)
|
||||||
[ -z "$multipath_config_route" ] && multipath_config_route=$(uci -q get network.$INTERFACE.multipath || echo "off")
|
[ -z "$multipath_config_route" ] && multipath_config_route=$(uci -q get network.$INTERFACE.multipath || echo "off")
|
||||||
[ "$(uci -q get openmptcprouter.$INTERFACE.multipathvpn)" = "1" ] && {
|
[ "$(uci -q get openmptcprouter.$INTERFACE.multipathvpn)" = "1" ] && {
|
||||||
|
@ -325,6 +328,7 @@ set_route_balancing() {
|
||||||
local multipath_config_route interface_gw interface_if
|
local multipath_config_route interface_gw interface_if
|
||||||
INTERFACE=$1
|
INTERFACE=$1
|
||||||
[ -z "$INTERFACE" ] && return
|
[ -z "$INTERFACE" ] && return
|
||||||
|
[ "$INTERFACE" = "omrvpn" ] && continue
|
||||||
multipath_config_route=$(uci -q get openmptcprouter.$INTERFACE.multipath)
|
multipath_config_route=$(uci -q get openmptcprouter.$INTERFACE.multipath)
|
||||||
[ -z "$multipath_config_route" ] && multipath_config_route=$(uci -q get network.$INTERFACE.multipath || echo "off")
|
[ -z "$multipath_config_route" ] && multipath_config_route=$(uci -q get network.$INTERFACE.multipath || echo "off")
|
||||||
[ "$(uci -q get openmptcprouter.$INTERFACE.multipathvpn)" = "1" ] && {
|
[ "$(uci -q get openmptcprouter.$INTERFACE.multipathvpn)" = "1" ] && {
|
||||||
|
@ -384,6 +388,8 @@ set_route_balancing6() {
|
||||||
local multipath_config_route interface_gw interface_if
|
local multipath_config_route interface_gw interface_if
|
||||||
INTERFACE=$1
|
INTERFACE=$1
|
||||||
[ -z "$INTERFACE" ] && return
|
[ -z "$INTERFACE" ] && return
|
||||||
|
[ "$INTERFACE" = "omr6in4" ] && continue
|
||||||
|
[ "$INTERFACE" = "omrvpn" ] && continue
|
||||||
multipath_config_route=$(uci -q get openmptcprouter.$INTERFACE.multipath)
|
multipath_config_route=$(uci -q get openmptcprouter.$INTERFACE.multipath)
|
||||||
[ -z "$multipath_config_route" ] && multipath_config_route=$(uci -q get network.$INTERFACE.multipath || echo "off")
|
[ -z "$multipath_config_route" ] && multipath_config_route=$(uci -q get network.$INTERFACE.multipath || echo "off")
|
||||||
[ "$(uci -q get openmptcprouter.$INTERFACE.multipathvpn)" = "1" ] && {
|
[ "$(uci -q get openmptcprouter.$INTERFACE.multipathvpn)" = "1" ] && {
|
||||||
|
@ -1036,7 +1042,7 @@ if [ -n "$OMR_TRACKER_INTERFACE" ] && { [ "$multipath_config" = "on" ] || [ "$mu
|
||||||
}
|
}
|
||||||
config_list_foreach $1 ip addpath
|
config_list_foreach $1 ip addpath
|
||||||
}
|
}
|
||||||
if [ "$(uci -q get glorytun-udp.vpn.enable)" = "1"]; then
|
if [ "$(uci -q get glorytun-udp.vpn.enable)" = "1" ]; then
|
||||||
config_load openmptcprouter
|
config_load openmptcprouter
|
||||||
config_foreach glorytunudppath server
|
config_foreach glorytunudppath server
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue