From 7ec4881762b0eabb5fae881237760c999f3ce3f3 Mon Sep 17 00:00:00 2001 From: Aaron Goodman Date: Tue, 21 Jul 2020 02:13:56 -0400 Subject: [PATCH] openfortivpn: use functions/network.sh to access interface params Signed-off-by: Aaron Goodman --- net/openfortivpn/files/openfortivpn.sh | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/net/openfortivpn/files/openfortivpn.sh b/net/openfortivpn/files/openfortivpn.sh index 893510ce8..8f3f4b235 100755 --- a/net/openfortivpn/files/openfortivpn.sh +++ b/net/openfortivpn/files/openfortivpn.sh @@ -1,5 +1,6 @@ #!/bin/sh . /lib/functions.sh +. /lib/functions/network.sh . ../netifd-proto.sh init_proto "$@" @@ -36,17 +37,14 @@ proto_openfortivpn_setup() { [ -n "$iface_name" ] && { - json_load "$(ifstatus $iface_name)" - json_get_var iface_device_name l3_device - json_get_var iface_device_up up - } - - [ "$iface_device_up" -eq 1 ] || { - msg="$iface_name is not up $iface_device_up" - logger -t "openfortivpn" "$config: $msg" - proto_notify_error "$config" "$msg" - proto_block_restart "$config" - exit 1 + network_get_device iface_device_name "$iface_name" + network_is_up "$iface_name" ] || { + msg="$iface_name is not up $iface_device_up" + logger -t "openfortivpn" "$config: $msg" + proto_notify_error "$config" "$msg" + proto_block_restart "$config" + exit 1 + } } server_ip=$(resolveip -t 10 "$server")