From f25db3dede155ece91170c8101523fe481f26032 Mon Sep 17 00:00:00 2001 From: Ryan Shi Date: Thu, 2 Jul 2020 15:47:13 +0800 Subject: [PATCH] openfortivpn: Remove pingcheck and use l3_device instead Signed-off-by: Ryan Shi --- net/openfortivpn/files/openfortivpn.sh | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/net/openfortivpn/files/openfortivpn.sh b/net/openfortivpn/files/openfortivpn.sh index 292ffd4b2..64fd8ac99 100755 --- a/net/openfortivpn/files/openfortivpn.sh +++ b/net/openfortivpn/files/openfortivpn.sh @@ -36,7 +36,7 @@ proto_openfortivpn_setup() { [ -n "$iface_name" ] && { json_load "$(ifstatus $iface_name)" - json_get_var iface_device_name device + json_get_var iface_device_name l3_device json_get_var iface_device_up up } @@ -59,16 +59,6 @@ proto_openfortivpn_setup() { exit 1 } - [ -n $iface_name ] && { - ping -I $iface_device_name -c 1 -w 10 $server_ip > /dev/null 2>&1 || { - logger -t "openfortivpn" "$config: failed to ping $server_ip on $iface_device_name" - sleep 10 - proto_notify_error "$config" "failed to ping $server_ip on $iface_device_name" - proto_setup_failed "$config" - exit 1 - } - } - for ip in $(resolveip -t 10 "$server"); do logger -t "openfortivpn" "$config: adding host dependency for $ip on $iface_name at $config" proto_add_host_dependency "$config" "$ip" "$iface_name"