From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonatan Schlag To: network@lists.ipfire.org Subject: [network] [PATCH 2/4] ip: restructure ip_net_is_valid Date: Sat, 03 Jun 2017 13:25:08 +0200 Message-ID: <1496489110-10134-2-git-send-email-jonatan.schlag@ipfire.org> In-Reply-To: <1496489110-10134-1-git-send-email-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7238302551498320909==" List-Id: --===============7238302551498320909== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Insted of checking the network manually we now just calö ipv4_net_is_valid or ipv6_net_is_valid Signed-off-by: Jonatan Schlag --- src/functions/functions.ip | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/src/functions/functions.ip b/src/functions/functions.ip index 97750e3..0a07fd0 100644 --- a/src/functions/functions.ip +++ b/src/functions/functions.ip @@ -83,23 +83,14 @@ ip_is_network() { local network=${1} assert isset network - # Get the address part. - local address=$(ip_split_prefix ${network}) - isset address || return ${EXIT_FALSE} - - # Get the prefix. - local prefix=$(ip_get_prefix ${network}) - isset prefix || return ${EXIT_FALSE} - - # Detect the protocol (if this fails, the - # address part is invalid) - local proto=$(ip_detect_protocol ${address}) - isset proto || return ${EXIT_FALSE} - - # Check if the prefix is correct. - ip_prefix_is_valid ${proto} ${prefix} || return ${EXIT_FALSE} + local protocol + for protocol in ${IP_SUPPORTED_PROTOCOLS}; do + if ${protocol}_net_is_valid "${network}"; then + return ${EXIT_TRUE} + fi + done - return ${EXIT_TRUE} + return ${EXIT_FALSE} } ip_prefix_is_valid() { -- 2.6.3 --===============7238302551498320909==--