openfortivpn: Remove pingcheck and use l3_device instead
authorRyan Shi <qweaszxcdfsh@gmail.com>
Thu, 2 Jul 2020 07:47:13 +0000 (15:47 +0800)
committerRyan Shi <qweaszxcdfsh@gmail.com>
Thu, 2 Jul 2020 07:47:13 +0000 (15:47 +0800)
Signed-off-by: Ryan Shi <qweaszxcdfsh@gmail.com>
net/openfortivpn/files/openfortivpn.sh

index 292ffd4b23741f92af258a6f5dee400e593c8955..64fd8ac9946a4dd0b18ee753bed1904d77ebfb81 100755 (executable)
@@ -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"