From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2CFDE15800F for ; Sun, 15 Jan 2023 14:03:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44790E077C; Sun, 15 Jan 2023 14:03:36 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2F766E077C for ; Sun, 15 Jan 2023 14:03:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CF44D340EDB for ; Sun, 15 Jan 2023 14:03:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E574B62F for ; Sun, 15 Jan 2023 14:03:32 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1673791390.0b8b9b13146c1eba04f2bd8d0b2b049c03891010.sam@OpenRC> Subject: [gentoo-commits] proj/netifrc:master commit in: net/ X-VCS-Repository: proj/netifrc X-VCS-Files: net/l2tp.sh X-VCS-Directories: net/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0b8b9b13146c1eba04f2bd8d0b2b049c03891010 X-VCS-Branch: master Date: Sun, 15 Jan 2023 14:03:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 38f900cf-9216-4503-8bb0-57553171fdf4 X-Archives-Hash: b8808f81c527dcd742c1d712bf8631ef commit: 0b8b9b13146c1eba04f2bd8d0b2b049c03891010 Author: Kerin Millar plushkava net> AuthorDate: Sun Jan 15 05:41:10 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jan 15 14:03:10 2023 +0000 URL: https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=0b8b9b13 net/l2tp.sh: Slightly improve the structure of l2tp_pre_start() Restructure so as to avoid an unnecessary level of indentation. The behaviour of the function remains the same. Signed-off-by: Kerin Millar plushkava.net> Signed-off-by: Sam James gentoo.org> net/l2tp.sh | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/net/l2tp.sh b/net/l2tp.sh index 52b5733..ad459df 100644 --- a/net/l2tp.sh +++ b/net/l2tp.sh @@ -28,32 +28,30 @@ l2tp_pre_start() { eend 1 "${key} defines a \"name\" parameter, which is forbidden by netifrc" elif ! modprobe l2tp_eth; then eend 1 "Couldn't load the l2tp_eth module (perhaps the CONFIG_L2TP_ETH kernel option is disabled)" - elif key="l2tptunnel_${IFVAR}"; eval "[ \${${key}+set} ]"; then - if eval "l2tptunnel=\$${key}"; _is_blank "${l2tptunnel}"; then - eend 1 "${key} is defined but its value is blank" - elif ! declared_tunnel=$(_l2tp_parse_opts "${l2tptunnel}" "local peer_tunnel_id remote tunnel_id" "encap"); then - eend 1 "${key} is missing at least one required parameter" - elif set -- "${tunnel_id}"; eval "${declared_tunnel}"; [ "$1" != "${tunnel_id}" ]; then - eend 1 "${key} defines a \"tunnel_id\" parameter that contradicts l2tpsession_${IFVAR}" - elif _l2tp_should_add_tunnel "${tunnel_id}" "${declared_tunnel}"; set -- $?; [ "$1" -eq 2 ]; then - eend 1 "Tunnel #${tunnel_id} exists but its properties mismatch those defined by ${key}" - elif [ "$1" -eq 1 ]; then - # The config matches an existing tunnel. - true - elif [ "${encap}" = ip ] && ! modprobe l2tp_ip; then - eend 1 "Couldn't load the l2tp_ip module (perhaps the CONFIG_L2TP_IP kernel option is disabled)" - else - ebegin "Creating L2TPv3 tunnel (tunnel_id ${tunnel_id})" - printf %s "l2tp add tunnel ${l2tptunnel}" \ - | xargs -E '' ip - eend $? - fi - elif ! _l2tp_has_tunnel "${tunnel_id}"; then + elif key="l2tptunnel_${IFVAR}"; ! eval "[ \${${key}+set} ]" && ! _l2tp_has_tunnel "${tunnel_id}"; then # A tunnel may incorporate more than one session (link). This # module allows for the user not to define a tunnel for a given # session. In that case, it will be expected that the required # tunnel has already been created to satisfy some other session. eend 1 "Tunnel #${tunnel_id} not found (defining ${key} may be required)" + elif eval "l2tptunnel=\$${key}"; _is_blank "${l2tptunnel}"; then + eend 1 "${key} is defined but its value is blank" + elif ! declared_tunnel=$(_l2tp_parse_opts "${l2tptunnel}" "local peer_tunnel_id remote tunnel_id" "encap"); then + eend 1 "${key} is missing at least one required parameter" + elif set -- "${tunnel_id}"; eval "${declared_tunnel}"; [ "$1" != "${tunnel_id}" ]; then + eend 1 "${key} defines a \"tunnel_id\" parameter that contradicts l2tpsession_${IFVAR}" + elif _l2tp_should_add_tunnel "${tunnel_id}" "${declared_tunnel}"; set -- $?; [ "$1" -eq 2 ]; then + eend 1 "Tunnel #${tunnel_id} exists but its properties mismatch those defined by ${key}" + elif [ "$1" -eq 1 ]; then + # The config matches an existing tunnel. + true + elif [ "${encap}" = ip ] && ! modprobe l2tp_ip; then + eend 1 "Couldn't load the l2tp_ip module (perhaps the CONFIG_L2TP_IP kernel option is disabled)" + else + ebegin "Creating L2TPv3 tunnel (tunnel_id ${tunnel_id})" + printf %s "l2tp add tunnel ${l2tptunnel}" \ + | xargs -E '' ip + eend $? fi || return ebegin "Creating L2TPv3 session (session_id ${session_id} tunnel_id ${tunnel_id})"