openfortivpn: use functions/network.sh to access interface params

Signed-off-by: Aaron Goodman <aaronjg@stanford.edu>
This commit is contained in:
Aaron Goodman 2020-07-21 02:13:56 -04:00
parent a541f0be8a
commit 7ec4881762
1 changed files with 9 additions and 11 deletions

View File

@ -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")