From 5ee61d861950b44ce011c9d9845ca1b38209ac3a Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 23 Sep 2018 19:47:27 +0200 Subject: [PATCH 1/1] device: Refactor check for device type There is now one implementation for various types of devices Signed-off-by: Michael Tremer --- src/functions/functions.device | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/src/functions/functions.device b/src/functions/functions.device index 10677716..d1f60c43 100644 --- a/src/functions/functions.device +++ b/src/functions/functions.device @@ -248,13 +248,25 @@ device_get_vlans() { done < ${PROC_NET_VLAN_CONFIG} } +__device_type_matches() { + local device="${1}" + local type="${2}" + + local _type="$(__device_get_file "${device}" "type")" + + if [ "${type}" = "${_type}" ]; then + return ${EXIT_TRUE} + fi + + return ${EXIT_FALSE} +} + # Check if the device is a ppp device device_is_ppp() { - local device=${1} - - local type=$(__device_get_file ${device} type) + local device="${1}" + assert isset device - [ "${type}" = "512" ] && return ${EXIT_OK} || return ${EXIT_ERROR} + __device_type_matches "${device}" 512 } # Check if the device is a pointopoint device. @@ -293,19 +305,17 @@ device_is_wireless() { } device_is_vti() { - local device=${1} - - local type=$(__device_get_file ${device} type) + local device="${1}" + assert isset device - [ "${type}" = "768" ] && return ${EXIT_OK} || return ${EXIT_ERROR} + __device_type_matches "${device}" 768 } device_is_vti6() { - local device=${1} - - local type=$(__device_get_file ${device} type) + local device="${1}" + assert isset device - [ "${type}" = "769" ] && return ${EXIT_OK} || return ${EXIT_ERROR} + __device_type_matches "${device}" 769 } device_get_phy() { -- 2.39.2