mirror of
				https://github.com/Ysurac/openmptcprouter-feeds.git
				synced 2025-03-09 15:40:03 +00:00 
			
		
		
		
	Doesn't add a disabled server to route
This commit is contained in:
		
							parent
							
								
									f921c081b9
								
							
						
					
					
						commit
						4a2afd6f87
					
				
					 1 changed files with 8 additions and 0 deletions
				
			
		| 
						 | 
				
			
			@ -34,6 +34,8 @@ set_server_default_route() {
 | 
			
		|||
	local server=$1
 | 
			
		||||
	local serverip
 | 
			
		||||
	config_get serverip $server ip
 | 
			
		||||
	config_get disabled $server disabled
 | 
			
		||||
	[ "$disabled" = "1" ] && return
 | 
			
		||||
	multipath_config_route=$(uci -q get network.$OMR_TRACKER_INTERFACE.multipath)
 | 
			
		||||
	[ -z "$multipath_config_route" ] && multipath_config_route=$(uci -q get network.$OMR_TRACKER_INTERFACE.multipath || echo "off")
 | 
			
		||||
	if [ "$serverip" != "" ] && [ "$OMR_TRACKER_DEVICE_GATEWAY" != "" ] && [ "$(ip route show dev $OMR_TRACKER_DEVICE metric 1 | grep $serverip | grep $OMR_TRACKER_DEVICE_GATEWAY)" = "" ] && [ "$multipath_config_route" != "off" ]; then
 | 
			
		||||
| 
						 | 
				
			
			@ -46,6 +48,8 @@ delete_server_default_route() {
 | 
			
		|||
	local server=$1
 | 
			
		||||
	local serverip
 | 
			
		||||
	config_get serverip $server ip
 | 
			
		||||
	config_get disabled $server disabled
 | 
			
		||||
	[ "$disabled" = "1" ] && return
 | 
			
		||||
	if [ "$serverip" != "" ] && [ "$(ip route show $serverip metric 1)" != "" ]; then
 | 
			
		||||
		_log "Delete server ($serverip) default route"
 | 
			
		||||
		ip route del $serverip metric 1 >/dev/null 2>&1
 | 
			
		||||
| 
						 | 
				
			
			@ -110,6 +114,8 @@ set_server_all_routes() {
 | 
			
		|||
	local server=$1
 | 
			
		||||
	local serverip
 | 
			
		||||
	config_get serverip $server ip
 | 
			
		||||
	config_get disabled $server disabled
 | 
			
		||||
	[ "$disabled" = "1" ] && return
 | 
			
		||||
	interface_if=$(uci -q get network.$OMR_TRACKER_INTERFACE.ifname)
 | 
			
		||||
	[ -z "$interface_if" ] && interface_if=$(ifstatus "$OMR_TRACKER_INTERFACE" 2>/dev/null | jsonfilter -q -e '@["l3_device"]')
 | 
			
		||||
	[ -z "$interface_if" ] && interface_if=$(ifstatus "${OMR_TRACKER_INTERFACE}_4" 2>/dev/null | jsonfilter -q -e '@["l3_device"]')
 | 
			
		||||
| 
						 | 
				
			
			@ -132,6 +138,8 @@ set_server_route() {
 | 
			
		|||
	local server=$1
 | 
			
		||||
	local serverip
 | 
			
		||||
	config_get serverip $server ip
 | 
			
		||||
	config_get disabled $server disabled
 | 
			
		||||
	[ "$disabled" = "1" ] && return
 | 
			
		||||
	local metric=$2
 | 
			
		||||
	[ -z "$metric" ] && metric=$(uci -q get network.$OMR_TRACKER_INTERFACE.metric)
 | 
			
		||||
	multipath_config_route=$(uci -q get network.$OMR_TRACKER_INTERFACE.multipath)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue