From patchwork Mon Sep 23 17:18:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Crispin X-Patchwork-Id: 1988668 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=xNgRxGtf; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XC8s93rrMz1xsg for ; Tue, 24 Sep 2024 03:20:45 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=fjv8+YO8S+n/Cy5jzg69HgT74XMeFFLpb4TqxnDMizM=; b=xNgRxGtfcFLPP5 Z1dgtlzc6xaTQdI2ufWxkldT8krNAnBywCFDOnkYSJAHc13Ldr+1yWXebFd/WSa/Yy2dwuQBZ3H/X PV1YI1zBg0/TUO2pBAHaEiqqUzhLM43Ic1lnsufMH/VKzu8s8ap0gg3XTNwYeLVVTF98Y0KoNqH1L DDMRGXxPXop4ThvPdzcQXns/Tt1xvhL2MPH8/XgwxYfdrq+zcsUrPa5xz5/XBRbG2QzZf6DTNhTLa HtOKjORokh0vbKYINl9NI4mKEEjF/GnGHEQfX0Wtd9buuyrVl9A4dQPQnd8B5PD2/QDw86r7CJbOT bFYCePiH3IHIf3QWu4CA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1ssmhz-000000006w3-312v; Mon, 23 Sep 2024 17:18:47 +0000 Received: from nbd.name ([46.4.11.11]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1ssmhp-000000006rw-2uPV for openwrt-devel@lists.openwrt.org; Mon, 23 Sep 2024 17:18:40 +0000 Received: from [2a04:4540:1404:e800:43a1:93c8:f672:7397] (helo=bertha10..) by ds12 with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1ssmhm-00HS5P-1M for openwrt-devel@lists.openwrt.org; Mon, 23 Sep 2024 19:18:34 +0200 From: John Crispin To: openwrt-devel@lists.openwrt.org Subject: [PATCH 08/11] wifi-scripts: populate default wifi credentials and country code from board.json Date: Mon, 23 Sep 2024 19:18:22 +0200 Message-Id: <20240923171825.148902-9-john@phrozen.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240923171825.148902-1-john@phrozen.org> References: <20240923171825.148902-1-john@phrozen.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240923_101837_760870_9070BE17 X-CRM114-Status: UNSURE ( 7.01 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Signed-off-by: John Crispin --- .../wifi-scripts/files/lib/wifi/mac80211.uc | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/package/network/config/wifi-scripts/files/lib/wifi/mac80211.uc b/package/network/config/wifi-scripts/files/lib/wifi/mac80211.uc index b68167b754..9fd6c35e8b 100644 --- a/package/network/c [...] Content analysis details: (-1.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [46.4.11.11 listed in sa-accredit.habeas.com] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [46.4.11.11 listed in bl.score.senderscore.com] 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [46.4.11.11 listed in sa-trusted.bondedsender.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Signed-off-by: John Crispin --- .../wifi-scripts/files/lib/wifi/mac80211.uc | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/package/network/config/wifi-scripts/files/lib/wifi/mac80211.uc b/package/network/config/wifi-scripts/files/lib/wifi/mac80211.uc index b68167b754..9fd6c35e8b 100644 --- a/package/network/config/wifi-scripts/files/lib/wifi/mac80211.uc +++ b/package/network/config/wifi-scripts/files/lib/wifi/mac80211.uc @@ -71,20 +71,34 @@ for (let phy_name, phy in board.wlan) { if (match(phy_name, /^phy[0-9]/)) id = `path='${phy.path}'`; + band_name = lc(band_name); + + let country, defaults, num_global_macaddr; + if (board.wlan.defaults) { + defaults = board.wlan.defaults.ssids?.[band_name]?.ssid ? board.wlan.defaults.ssids?.[band_name] : board.wlan.defaults.ssids?.all; + country = board.wlan.defaults.country; + if (!country && band_name != '2g') + defaults = null; + num_global_macaddr = board.wlan.defaults.ssids?.[band_name]?.mac_count; + } + print(`set ${s}=wifi-device set ${s}.type='mac80211' set ${s}.${id} -set ${s}.band='${lc(band_name)}' +set ${s}.band='${band_name}' set ${s}.channel='${channel}' set ${s}.htmode='${htmode}' -set ${s}.disabled='1' +set ${s}.country='${country || ''}' +set ${s}.num_global_macaddr='${num_global_macaddr || ''}' +set ${s}.disabled='${defaults ? 0 : 1}' set ${si}=wifi-iface set ${si}.device='${name}' set ${si}.network='lan' set ${si}.mode='ap' -set ${si}.ssid='OpenWrt' -set ${si}.encryption='none' +set ${si}.ssid='${defaults?.ssid || "OpenWrt"}' +set ${si}.encryption='${defaults?.encryption || "none"}' +set ${si}.key='${defaults?.key || ""}' `); commit = true;