From patchwork Wed Mar 29 13:44:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?UmFwaGHDq2wgTcOpbG90dGU=?= X-Patchwork-Id: 1762766 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) 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=2kckxybC; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mind.be header.i=@mind.be header.a=rsa-sha256 header.s=google header.b=HHRPzQ3M; dkim-atps=neutral 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 (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pmnrm6y23z1yYw for ; Thu, 30 Mar 2023 00:46:16 +1100 (AEDT) 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:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2r0wihlqZC4v+ZEf8uVxxuq4eWIAWRVL4biRabq6hP8=; b=2kckxybCkBDEEa F46AFwZjgH76/5LkaQfGlBdFfQlgPwlUb9dg/oWXV5hsWTLytrrktHiWXVrjWjPLTmGiYsrtqWXix qvPm5XaxJPNNSdkFDWDPaei8pzt/oUegCEdOYtQIP9vTLpXZQgN3EwtpRp24MlFUk5qjQheE/6SjD Pu9j24bh9Hl4eboYsZK+vqXNS4Dm86UzsBg98ZiJWRXZZoezVQBJ2e/CaYvJfg2UA/ATEtRH5pslx fz5oVzMv5c5ybwoB+vlzX6ugcOZnmmbwUa1D+ecvTR33J7T8SOm9WL02gyJ2Yt0uZbhH7HMxfaK1p +rR/fsioUPIVl4e0JMCg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1phW70-000SBw-2C; Wed, 29 Mar 2023 13:45:14 +0000 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1phW6v-000SAG-2d for hostap@lists.infradead.org; Wed, 29 Mar 2023 13:45:11 +0000 Received: by mail-ed1-x529.google.com with SMTP id eg48so63433999edb.13 for ; Wed, 29 Mar 2023 06:45:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mind.be; s=google; t=1680097508; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mARBmdZe+XOIXLYKh4yy06kG1qU8tY3ZPgH39qsZ5nc=; b=HHRPzQ3MqwFohEOnZjHHRk7Vell1UlFmLep5SZckuWZVcYuPkTiZo+Jzvh5O+7gRwJ cuZZMgnXngYQmcHXvOzIJa9FHLF1bXiGUGMVJQxUV/U3zVxwGQKVYZJ1KV+FcNdh/eZ6 zCotVAyQsWj8z0s2Gt0TZ0mVWpApsjDkYFhE9jfaUOjgWR/WOqB/VinUiD7N06cS7LC2 cBdCO+dA+U815F0RHcGr7S8g4v2VYX6Gueie5pffx1vB3eH8PBB6oM5j5C00n+fiSNnc OMtVnEEhg6pYBRbAx65jiVFK8aOzZSV8DPm03h8jwbMYOqC9uo6j0QrncwxhfEnuWAk5 sa4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680097508; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mARBmdZe+XOIXLYKh4yy06kG1qU8tY3ZPgH39qsZ5nc=; b=pXB6+HfhoUuga9MqsyiRzXP7oZwgo5/zWlhaiaQLmuOGbWQHydic5o4yIbyBdFKtaK kWEcoqUHo2U+MiYSKBr0RtDAVtSRIPL/JCkuz50F94L+41jwHGLHFCFyEPg4OEtV/mkU TJ71ipPehXtnSuqzqGFiU1ZD0DcCkz5z3HmUGv/urlFi+NScWJ/wzOTtjuZvCRkJxDkD S3QDBALlysmPg6nrzs6fsf9xqZh5Z9CV7WyVfQ1BuyY5sSt5qo1ZRhqeN8s5d4nHNMgF a6nvjPP5smfBwbJZb4dxDf1DT9eN57WqAYxnJEivI7WU910rqi1W+7ds3wdqXnpy6m3Y ng1A== X-Gm-Message-State: AAQBX9fvKaIZIdnx+NTE1A8U/W2UHJjwGlN8+xAeVituR4uOr/cyQfYb KHSNbIetz1/u0wmKLvW30/y+fow7d+H6MNZIA84uBw== X-Google-Smtp-Source: AKy350ab7k2Uw7yxjX+zW7Y3vX/Ar3TN3ZT55W3a+eh1cZyjThD/UOA75fwGi8CHtF59vjjpbzN/zQ== X-Received: by 2002:a05:6402:50c6:b0:502:1d1b:5bef with SMTP id h6-20020a05640250c600b005021d1b5befmr2134822edb.14.1680097508268; Wed, 29 Mar 2023 06:45:08 -0700 (PDT) Received: from localhost.localdomain (ip-188-118-3-185.reverse.destiny.be. [188.118.3.185]) by smtp.gmail.com with ESMTPSA id y94-20020a50bb67000000b004be11e97ca2sm17057389ede.90.2023.03.29.06.45.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Mar 2023 06:45:07 -0700 (PDT) From: =?utf-8?b?UmFwaGHDq2wgTcOpbG90dGU=?= To: hostap@lists.infradead.org Cc: nbd@nbd.name, arnout@mind.be, raphael.melotte@mind.be, Abhilash.Tuse@imgtec.com Subject: [PATCH 1/4] hostapd: ctrl_iface: add UPDATE command Date: Wed, 29 Mar 2023 15:44:52 +0200 Message-Id: <20230329134455.4019868-2-raphael.melotte@mind.be> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230329134455.4019868-1-raphael.melotte@mind.be> References: <20230329134455.4019868-1-raphael.melotte@mind.be> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230329_064509_852192_56B470EE X-CRM114-Status: GOOD ( 17.96 ) X-Spam-Score: 0.1 (/) 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: From: Felix Fietkau The UPDATE command reloads the configuration file, re-creating VAPs as needed. Simultaneously, it allows to override the channel/bandwidth settings. Signed-off-by: Felix Fietkau Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- hostapd/ctrl_iface.c | 61 ++++++++++++++++++++++++++++++++++++++++++ src/ap/ctrl_i [...] Content analysis details: (0.1 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:529 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Felix Fietkau The UPDATE command reloads the configuration file, re-creating VAPs as needed. Simultaneously, it allows to override the channel/bandwidth settings. Signed-off-by: Felix Fietkau Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- hostapd/ctrl_iface.c | 61 ++++++++++++++++++++++++++++++++++++++++++ src/ap/ctrl_iface_ap.c | 8 +++++- 2 files changed, 68 insertions(+), 1 deletion(-) diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c index ca8c705ea..f76028cd5 100644 --- a/hostapd/ctrl_iface.c +++ b/hostapd/ctrl_iface.c @@ -68,6 +68,7 @@ #include "fst/fst_ctrl_iface.h" #include "config_file.h" #include "ctrl_iface.h" +#include "config_file.h" #define HOSTAPD_CLI_DUP_VALUE_MAX_LEN 256 @@ -83,6 +84,7 @@ static void hostapd_ctrl_iface_send(struct hostapd_data *hapd, int level, enum wpa_msg_type type, const char *buf, size_t len); +static char *reload_opts = NULL; static int hostapd_ctrl_iface_attach(struct hostapd_data *hapd, struct sockaddr_storage *from, @@ -134,6 +136,63 @@ static int hostapd_ctrl_iface_new_sta(struct hostapd_data *hapd, return 0; } +static char *get_option(char *opt, char *str) +{ + int len = strlen(str); + + if (!strncmp(opt, str, len)) + return opt + len; + else + return NULL; +} + +static struct hostapd_config *hostapd_ctrl_iface_config_read(const char *fname) +{ + struct hostapd_config *conf; + char *opt, *val; + + conf = hostapd_config_read(fname); + if (!conf) + return NULL; + + for (opt = strtok(reload_opts, " "); + opt; + opt = strtok(NULL, " ")) { + + if ((val = get_option(opt, "channel="))) + conf->channel = atoi(val); + else if ((val = get_option(opt, "ht_capab="))) + conf->ht_capab = atoi(val); + else if ((val = get_option(opt, "ht_capab_mask="))) + conf->ht_capab &= atoi(val); + else if ((val = get_option(opt, "sec_chan="))) + conf->secondary_channel = atoi(val); + else if ((val = get_option(opt, "hw_mode="))) + conf->hw_mode = atoi(val); + else if ((val = get_option(opt, "ieee80211n="))) + conf->ieee80211n = atoi(val); + else + break; + } + + return conf; +} + +static int hostapd_ctrl_iface_update(struct hostapd_data *hapd, char *txt) +{ + struct hostapd_config * (*config_read_cb)(const char *config_fname); + struct hostapd_iface *iface = hapd->iface; + int ret; + + config_read_cb = iface->interfaces->config_read_cb; + iface->interfaces->config_read_cb = hostapd_ctrl_iface_config_read; + reload_opts = txt; + + ret = hostapd_reload_config(iface); + + iface->interfaces->config_read_cb = config_read_cb; + return ret; +} #ifdef NEED_AP_MLME static int hostapd_ctrl_iface_sa_query(struct hostapd_data *hapd, @@ -3509,6 +3568,8 @@ static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd, } else if (os_strncmp(buf, "VENDOR ", 7) == 0) { reply_len = hostapd_ctrl_iface_vendor(hapd, buf + 7, reply, reply_size); + } else if (os_strncmp(buf, "UPDATE ", 7) == 0) { + hostapd_ctrl_iface_update(hapd, buf + 7); } else if (os_strcmp(buf, "ERP_FLUSH") == 0) { ieee802_1x_erp_flush(hapd); #ifdef RADIUS_SERVER diff --git a/src/ap/ctrl_iface_ap.c b/src/ap/ctrl_iface_ap.c index 6934a732a..776afcf88 100644 --- a/src/ap/ctrl_iface_ap.c +++ b/src/ap/ctrl_iface_ap.c @@ -1008,7 +1008,13 @@ int hostapd_parse_csa_settings(const char *pos, int hostapd_ctrl_iface_stop_ap(struct hostapd_data *hapd) { - return hostapd_drv_stop_ap(hapd); + struct hostapd_iface *iface = hapd->iface; + int i; + + for (i = 0; i < iface->num_bss; i++) + hostapd_drv_stop_ap(iface->bss[i]); + + return 0; } From patchwork Wed Mar 29 13:44:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFwaGHDq2wgTcOpbG90dGU=?= X-Patchwork-Id: 1762767 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) 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=Tm0zbS57; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mind.be header.i=@mind.be header.a=rsa-sha256 header.s=google header.b=Qajt9maW; dkim-atps=neutral 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 (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pmnrm6Tf6z1yYt for ; Thu, 30 Mar 2023 00:46:16 +1100 (AEDT) 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:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=8ipixAjol3V7j3ygKHe7s1yO+IwPvNN3I94/oHNNqM0=; b=Tm0zbS578wzzrY zolbMku7F/xnlbNqXSD5INrfPFq0eljlE7W0kEmnAitoE2IxrmQtpZaFZBh+qFz0vDmp3HseaFuxx xVfAr36GsmuySMXzwg3IsBBcgC6u+71QBdw6Bm+eO9tqtJ9ivjygz61Z1urMz0VFW6KAZkRPFd7CB JDwbFuTvHLgOvRaBMXB2/zmzkKzO1qqwrXkRE1DMkOHDJXllPmJEUvKZmfR3+XeNXguwiX1TofA60 hPU2h4KxBgei6VEUn++gG8joFNKR33ki5KAH4SY/bTWPe2ITlWn0XN3mNAsB5IbxoQRHBs74xTCuj L/eK3w9wrmCo+ZMBoi3w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1phW74-000SCw-24; Wed, 29 Mar 2023 13:45:18 +0000 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1phW70-000SB9-0Y for hostap@lists.infradead.org; Wed, 29 Mar 2023 13:45:16 +0000 Received: by mail-ed1-x536.google.com with SMTP id x3so63463266edb.10 for ; Wed, 29 Mar 2023 06:45:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mind.be; s=google; t=1680097511; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9GlgtdA1N29ghQbc+nIfxw6OVHNxCxSlKlkGvirTdIA=; b=Qajt9maWwbMdeNAvC1uAjxOLHCyZsV1LGw15njfrmP/Z9L9uve/q2cj9wcbvry42/x hUn89E3gwOVPpmr/TK0/1/Ep5dS+YMebUQcM+99tGUNEhSqQXGRo+TSWQVZBe5sZoPYS fNQYt6aYeioxRTRVDS9t2cQs+nepDJTdpDb/fv+jIbz8a5xIRZx/Y9ElEeRLiPCn+04B wLkZB/eY7ReN2M8lLpycKuiuLqeESHxyq58YCvMPNQitSOZdjkYgTrAFnd4YC685pr+l gnjzBG/cRUValXudoSttexQCmszueLAAY4Ql4wFF5r6H5vnq2Gn5t3ThWRVTX/AV4Sqj /hoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680097511; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9GlgtdA1N29ghQbc+nIfxw6OVHNxCxSlKlkGvirTdIA=; b=K4idD3KhEe4O/ypYoD1od6QAeXaQ8BKnGUJobAGpW4DcIRpy8kRY802tnOUmd3NaPp 7BpRLsrcdJy3+MpCLTxUGk7vCbrVqtd18rUZZ4weonHIrDPGJ311hFuEVV9EgRHFEeyb lyRBexPV0kB1Q5ThZTTxWR783145NfQgnBgZJdSpx6gTCY0rAfYrVu5A+hnKE06/uc3K rlNmHHOMaEh7IvZ45KhsuktmtRWg2hn8Dn8bnalF8STIz8O6M7vEj2PrrCAEQ5mvbO9J n59GIcK6MT2zkdlR7INLKuWukVuP+0E7n+4RX9VeeUd2mLWEIe0wwVLfuycw+SG9ohT5 SEzA== X-Gm-Message-State: AAQBX9dsmkK+HmvfEv3RR3BcIF4rmV+P++J9RYE8Tj6nTY/FXFYSXUPY hY8Ot0QxY9w07fqXHBDgWnEkFFFO2yDG6v8fR83vtg== X-Google-Smtp-Source: AKy350ZB+DH8kq32WiWa39g2D3zcovlarKEMgKO2UsY7Xe0PUWvbsOzyXRsTnKIXxGPUHmJcIFK/SQ== X-Received: by 2002:a05:6402:28c:b0:501:cde8:c523 with SMTP id l12-20020a056402028c00b00501cde8c523mr19760609edv.6.1680097510774; Wed, 29 Mar 2023 06:45:10 -0700 (PDT) Received: from localhost.localdomain (ip-188-118-3-185.reverse.destiny.be. [188.118.3.185]) by smtp.gmail.com with ESMTPSA id y94-20020a50bb67000000b004be11e97ca2sm17057389ede.90.2023.03.29.06.45.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Mar 2023 06:45:10 -0700 (PDT) From: =?utf-8?b?UmFwaGHDq2wgTcOpbG90dGU=?= To: hostap@lists.infradead.org Cc: nbd@nbd.name, arnout@mind.be, raphael.melotte@mind.be, Abhilash.Tuse@imgtec.com Subject: [PATCH 2/4] Add support for AP+STA on a single radio Date: Wed, 29 Mar 2023 15:44:53 +0200 Message-Id: <20230329134455.4019868-3-raphael.melotte@mind.be> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230329134455.4019868-1-raphael.melotte@mind.be> References: <20230329134455.4019868-1-raphael.melotte@mind.be> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230329_064514_214335_3856E0C8 X-CRM114-Status: GOOD ( 35.03 ) X-Spam-Score: 0.1 (/) 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: From: Felix Fietkau Although it is currently possible to have an AP (i.e. hostapd) and a STA (i.e. wpa_supplicant) interface running simultaneously on the same radio, this has severe limitations: Content analysis details: (0.1 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:536 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Felix Fietkau Although it is currently possible to have an AP (i.e. hostapd) and a STA (i.e. wpa_supplicant) interface running simultaneously on the same radio, this has severe limitations: - If the AP is enabled first, the STA can only associate on the same channel that was configured by the AP. - Once the STA is connected and the AP is enabled, it is no longer possible to switch channels. Thus, if the BSS to which the STA is associated switches channels, the connection is lost. To overcome this limitation, add a command-line option to wpa_supplicant with the hostapd socket that it can interact with. When the STA starts scanning, the AP is first stopped with the STOP_AP command. When the STA connection is completed, the AP is started again with the UPDATE command. The new channel information is passed as well, so hostapd can update its internal state. Since the radio is already configured on this channel, no switch is required. When the STA receives a CSA, it is forwarded to the AP with the CHAN_SWITCH command. To make this possible, the count is retrieved from the CSA and added to struct ch_switch. Since CHAN_SWITCH is also supposed to specify HT, VHT and HE options, but we don't want to override these, add the 'auto-ht' option to the command so it can be read from the config instead of from the command. Signed-off-by: Felix Fietkau Signed-off-by: Arnout Vandecappelle (Essensium/Mind) [ Raphaël: Fix cs count, remove unused ht_capab, replace asprintf, use channel_width_to_int, adapt to mainline ] Signed-off-by: Raphaël Mélotte --- hostapd/ctrl_iface.c | 6 +++ src/ap/beacon.c | 5 --- src/drivers/driver.h | 2 + src/drivers/driver_nl80211_event.c | 6 ++- wpa_supplicant/Makefile | 2 + wpa_supplicant/bss.c | 10 +++++ wpa_supplicant/bss.h | 2 + wpa_supplicant/events.c | 44 ++++++++++++++++++- wpa_supplicant/main.c | 8 +++- wpa_supplicant/wpa_supplicant.c | 70 ++++++++++++++++++++++++++++++ wpa_supplicant/wpa_supplicant_i.h | 7 +++ 11 files changed, 153 insertions(+), 9 deletions(-) diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c index f76028cd5..949d47925 100644 --- a/hostapd/ctrl_iface.c +++ b/hostapd/ctrl_iface.c @@ -2698,6 +2698,12 @@ static int hostapd_ctrl_iface_chan_switch(struct hostapd_iface *iface, return 0; } + if (os_strstr(pos, " auto-ht")) { + settings.freq_params.ht_enabled = iface->conf->ieee80211n; + settings.freq_params.vht_enabled = iface->conf->ieee80211ac; + settings.freq_params.he_enabled = iface->conf->ieee80211ax; + } + for (i = 0; i < iface->num_bss; i++) { /* Save CHAN_SWITCH VHT, HE, and EHT config */ diff --git a/src/ap/beacon.c b/src/ap/beacon.c index c25a5bbc3..e097bc675 100644 --- a/src/ap/beacon.c +++ b/src/ap/beacon.c @@ -2052,11 +2052,6 @@ static int __ieee802_11_set_beacon(struct hostapd_data *hapd) return -1; } - if (hapd->csa_in_progress) { - wpa_printf(MSG_ERROR, "Cannot set beacons during CSA period"); - return -1; - } - hapd->beacon_set_done = 1; if (ieee802_11_build_ap_params(hapd, ¶ms) < 0) diff --git a/src/drivers/driver.h b/src/drivers/driver.h index 7c0e949b9..35b5ca1bc 100644 --- a/src/drivers/driver.h +++ b/src/drivers/driver.h @@ -6324,6 +6324,7 @@ union wpa_event_data { /** * struct ch_switch + * @count: Count until channel switch activates * @freq: Frequency of new channel in MHz * @ht_enabled: Whether this is an HT channel * @ch_offset: Secondary channel offset @@ -6334,6 +6335,7 @@ union wpa_event_data { * @punct_bitmap: Puncturing bitmap */ struct ch_switch { + int count; int freq; int ht_enabled; int ch_offset; diff --git a/src/drivers/driver_nl80211_event.c b/src/drivers/driver_nl80211_event.c index a6f8c97ca..9b83533ab 100644 --- a/src/drivers/driver_nl80211_event.c +++ b/src/drivers/driver_nl80211_event.c @@ -995,7 +995,7 @@ static void mlme_event_ch_switch(struct wpa_driver_nl80211_data *drv, struct nlattr *ifindex, struct nlattr *link, struct nlattr *freq, struct nlattr *type, struct nlattr *bw, struct nlattr *cf1, - struct nlattr *cf2, + struct nlattr *cf2, struct nlattr *count, struct nlattr *punct_bitmap, int finished) { @@ -1060,6 +1060,8 @@ static void mlme_event_ch_switch(struct wpa_driver_nl80211_data *drv, data.ch_switch.cf1 = nla_get_u32(cf1); if (cf2) data.ch_switch.cf2 = nla_get_u32(cf2); + if (count) + data.ch_switch.count = nla_get_u32(count); if (finished) bss->flink->freq = data.ch_switch.freq; @@ -3603,6 +3605,7 @@ static void do_process_drv_event(struct i802_bss *bss, int cmd, tb[NL80211_ATTR_CHANNEL_WIDTH], tb[NL80211_ATTR_CENTER_FREQ1], tb[NL80211_ATTR_CENTER_FREQ2], + tb[NL80211_ATTR_CH_SWITCH_COUNT], tb[NL80211_ATTR_PUNCT_BITMAP], 0); break; @@ -3615,6 +3618,7 @@ static void do_process_drv_event(struct i802_bss *bss, int cmd, tb[NL80211_ATTR_CHANNEL_WIDTH], tb[NL80211_ATTR_CENTER_FREQ1], tb[NL80211_ATTR_CENTER_FREQ2], + NULL, tb[NL80211_ATTR_PUNCT_BITMAP], 1); break; diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile index 57620fe79..09796ceea 100644 --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile @@ -125,6 +125,8 @@ OBJS_c += ../src/utils/common.o OBJS_c += ../src/common/cli.o OBJS += wmm_ac.o +OBJS += ../src/common/wpa_ctrl.o + ifndef CONFIG_OS ifdef CONFIG_NATIVE_WINDOWS CONFIG_OS=win32 diff --git a/wpa_supplicant/bss.c b/wpa_supplicant/bss.c index 320441426..b3501705c 100644 --- a/wpa_supplicant/bss.c +++ b/wpa_supplicant/bss.c @@ -11,6 +11,7 @@ #include "utils/common.h" #include "utils/eloop.h" #include "common/ieee802_11_defs.h" +#include "common/ieee802_11_common.h" #include "drivers/driver.h" #include "eap_peer/eap.h" #include "wpa_supplicant_i.h" @@ -283,6 +284,9 @@ void calculate_update_time(const struct os_reltime *fetch_time, static void wpa_bss_copy_res(struct wpa_bss *dst, struct wpa_scan_res *src, struct os_reltime *fetch_time) { + struct ieee80211_ht_operation *oper; + struct ieee802_11_elems elems; + dst->flags = src->flags; os_memcpy(dst->bssid, src->bssid, ETH_ALEN); dst->freq = src->freq; @@ -296,6 +300,12 @@ static void wpa_bss_copy_res(struct wpa_bss *dst, struct wpa_scan_res *src, dst->est_throughput = src->est_throughput; dst->snr = src->snr; + memset(&elems, 0, sizeof(elems)); + ieee802_11_parse_elems((u8 *) (src + 1), src->ie_len, &elems, 0); + oper = (struct ieee80211_ht_operation *) elems.ht_operation; + if (oper) + dst->ht_param = oper->ht_param; + calculate_update_time(fetch_time, src->age, &dst->last_update); } diff --git a/wpa_supplicant/bss.h b/wpa_supplicant/bss.h index 611da8844..372fee97e 100644 --- a/wpa_supplicant/bss.h +++ b/wpa_supplicant/bss.h @@ -94,6 +94,8 @@ struct wpa_bss { u8 ssid[SSID_MAX_LEN]; /** Length of SSID */ size_t ssid_len; + /* Five octets of HT Operation Information */ + u8 ht_param; /** Frequency of the channel in MHz (e.g., 2412 = channel 1) */ int freq; /** Beacon interval in TUs (host byte order) */ diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index ebac8a152..28c1e7885 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -5235,6 +5235,46 @@ static void wpas_event_unprot_beacon(struct wpa_supplicant *wpa_s, } +static void +supplicant_ch_switch_started(struct wpa_supplicant *wpa_s, + union wpa_event_data *data) +{ + char buf[256]; + size_t len = sizeof(buf); + char cmd[256]; + int width = 20; + int ret; + + if (!wpa_s->hostapd) + return; + + wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_CHANNEL_SWITCH + "count=%d freq=%d ht_enabled=%d ch_offset=%d ch_width=%s cf1=%d cf2=%d", + data->ch_switch.count, + data->ch_switch.freq, + data->ch_switch.ht_enabled, + data->ch_switch.ch_offset, + channel_width_to_string(data->ch_switch.ch_width), + data->ch_switch.cf1, + data->ch_switch.cf2); + + data->ch_switch.ch_width = channel_width_to_int(data->ch_switch.ch_width); + + os_snprintf(cmd, sizeof(cmd), + "CHAN_SWITCH %d %d sec_channel_offset=%d center_freq1=%d center_freq2=%d, bandwidth=%d auto-ht\n", + data->ch_switch.count, + data->ch_switch.freq, + data->ch_switch.ch_offset, + data->ch_switch.cf1, + data->ch_switch.cf2, + width); + ret = wpa_ctrl_request(wpa_s->hostapd, cmd, os_strlen(cmd), buf, &len, NULL); + + if (ret < 0) + wpa_printf(MSG_ERROR, "\nFailed to reload hostapd AP interfaces\n"); +} + + void wpa_supplicant_event(void *ctx, enum wpa_event_type event, union wpa_event_data *data) { @@ -5584,8 +5624,10 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event, channel_width_to_string(data->ch_switch.ch_width), data->ch_switch.cf1, data->ch_switch.cf2); - if (event == EVENT_CH_SWITCH_STARTED) + if (event == EVENT_CH_SWITCH_STARTED) { + supplicant_ch_switch_started(wpa_s, data); break; + } wpa_s->assoc_freq = data->ch_switch.freq; wpa_s->current_ssid->frequency = data->ch_switch.freq; diff --git a/wpa_supplicant/main.c b/wpa_supplicant/main.c index 9229eb51f..535923ecd 100644 --- a/wpa_supplicant/main.c +++ b/wpa_supplicant/main.c @@ -35,7 +35,7 @@ static void usage(void) "vW] [-P] " "[-g] \\\n" " [-G] \\\n" - " -i -c [-C] [-D] " + " -i -c [-C] [-D] [-H] " "[-p] \\\n" " [-b] [-e]" #ifdef CONFIG_DEBUG_FILE @@ -75,6 +75,7 @@ static void usage(void) " -g = global ctrl_interface\n" " -G = global ctrl_interface group\n" " -h = show this help text\n" + " -H = connect to a hostapd instance to manage state changes\n" " -i = interface name\n" " -I = additional configuration file\n" " -K = include keys (passwords, etc.) in debug output\n" @@ -202,7 +203,7 @@ int main(int argc, char *argv[]) for (;;) { c = getopt(argc, argv, - "b:Bc:C:D:de:f:g:G:hi:I:KLMm:No:O:p:P:qsTtuvW"); + "b:Bc:C:D:de:f:g:G:hH:i:I:KLMm:No:O:p:P:qsTtuvW"); if (c < 0) break; switch (c) { @@ -249,6 +250,9 @@ int main(int argc, char *argv[]) usage(); exitcode = 0; goto out; + case 'H': + iface->hostapd_ctrl = optarg; + break; case 'i': iface->ifname = optarg; break; diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index 1de6fa036..bcaede701 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -131,6 +131,55 @@ static void wpas_update_fils_connect_params(struct wpa_supplicant *wpa_s); static void wpas_update_owe_connect_params(struct wpa_supplicant *wpa_s); #endif /* CONFIG_OWE */ +static int hostapd_stop(struct wpa_supplicant *wpa_s) +{ + const char *cmd = "STOP_AP"; + char buf[256]; + size_t len = sizeof(buf); + + if (wpa_ctrl_request(wpa_s->hostapd, cmd, os_strlen(cmd), buf, &len, NULL) < 0) { + wpa_printf(MSG_ERROR, "\nFailed to stop hostapd AP interfaces\n"); + return -1; + } + return 0; +} + +static int hostapd_reload(struct wpa_supplicant *wpa_s, struct wpa_bss *bss) +{ + char cmd[256]; + char buf[256]; + size_t len = sizeof(buf); + enum hostapd_hw_mode hw_mode; + u8 channel; + int sec_chan = 0; + int ret; + + if (!bss) + return -1; + + if (bss->ht_param & HT_INFO_HT_PARAM_STA_CHNL_WIDTH) { + int sec = bss->ht_param & HT_INFO_HT_PARAM_SECONDARY_CHNL_OFF_MASK; + if (sec == HT_INFO_HT_PARAM_SECONDARY_CHNL_ABOVE) + sec_chan = 1; + else if (sec == HT_INFO_HT_PARAM_SECONDARY_CHNL_BELOW) + sec_chan = -1; + } + + hw_mode = ieee80211_freq_to_chan(bss->freq, &channel); + + ret = os_snprintf(cmd, sizeof(cmd), "UPDATE channel=%d sec_chan=%d hw_mode=%d", + channel, sec_chan, hw_mode); + if (os_snprintf_error(sizeof(cmd), ret)) + return -1; + + ret = wpa_ctrl_request(wpa_s->hostapd, cmd, os_strlen(cmd), buf, &len, NULL); + + if (ret < 0) { + wpa_printf(MSG_ERROR, "\nFailed to reload hostapd AP interfaces\n"); + return -1; + } + return 0; +} #ifdef CONFIG_WEP /* Configure default/group WEP keys for static WEP */ @@ -1026,6 +1075,8 @@ void wpa_supplicant_set_state(struct wpa_supplicant *wpa_s, sme_sched_obss_scan(wpa_s, 1); + if (wpa_s->hostapd) + hostapd_reload(wpa_s, wpa_s->current_bss); #if defined(CONFIG_FILS) && defined(IEEE8021X_EAPOL) if (!fils_hlp_sent && ssid && ssid->eap.erp) update_fils_connect_params = true; @@ -1036,6 +1087,8 @@ void wpa_supplicant_set_state(struct wpa_supplicant *wpa_s, #endif /* CONFIG_OWE */ } else if (state == WPA_DISCONNECTED || state == WPA_ASSOCIATING || state == WPA_ASSOCIATED) { + if (wpa_s->hostapd) + hostapd_stop(wpa_s); wpa_s->new_connection = 1; wpa_drv_set_operstate(wpa_s, 0); #ifndef IEEE8021X_EAPOL @@ -2519,6 +2572,8 @@ void wpa_supplicant_associate(struct wpa_supplicant *wpa_s, return; } wpa_s->current_bss = bss; + if (wpa_s->hostapd) + hostapd_reload(wpa_s, wpa_s->current_bss); #else /* CONFIG_MESH */ wpa_msg(wpa_s, MSG_ERROR, "mesh mode support not included in the build"); @@ -6996,6 +7051,16 @@ static int wpa_supplicant_init_iface(struct wpa_supplicant *wpa_s, sizeof(wpa_s->bridge_ifname)); } + if (iface->hostapd_ctrl) { + wpa_s->hostapd = wpa_ctrl_open(iface->hostapd_ctrl); + if (!wpa_s->hostapd) { + wpa_printf(MSG_ERROR, "\nFailed to connect to hostapd\n"); + return -1; + } + if (hostapd_stop(wpa_s) < 0) + return -1; + } + /* RSNA Supplicant Key Management - INITIALIZE */ eapol_sm_notify_portEnabled(wpa_s->eapol, false); eapol_sm_notify_portValid(wpa_s->eapol, false); @@ -7338,6 +7403,11 @@ static void wpa_supplicant_deinit_iface(struct wpa_supplicant *wpa_s, if (terminate) wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_TERMINATING); + if (wpa_s->hostapd) { + wpa_ctrl_close(wpa_s->hostapd); + wpa_s->hostapd = NULL; + } + wpa_supplicant_ctrl_iface_deinit(wpa_s, wpa_s->ctrl_iface); wpa_s->ctrl_iface = NULL; diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h index d5b3dab67..8af948c36 100644 --- a/wpa_supplicant/wpa_supplicant_i.h +++ b/wpa_supplicant/wpa_supplicant_i.h @@ -105,6 +105,11 @@ struct wpa_interface { */ const char *ifname; + /** + * hostapd_ctrl - path to hostapd control socket for notification + */ + const char *hostapd_ctrl; + /** * bridge_ifname - Optional bridge interface name * @@ -665,6 +670,8 @@ struct wpa_supplicant { #endif /* CONFIG_CTRL_IFACE_BINDER */ char bridge_ifname[16]; + struct wpa_ctrl *hostapd; + char *confname; char *confanother; From patchwork Wed Mar 29 13:44:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?UmFwaGHDq2wgTcOpbG90dGU=?= X-Patchwork-Id: 1762765 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) 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=A33PhoDl; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mind.be header.i=@mind.be header.a=rsa-sha256 header.s=google header.b=LsjauYRj; dkim-atps=neutral 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 (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pmnrm6qKCz1yYv for ; Thu, 30 Mar 2023 00:46:16 +1100 (AEDT) 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:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Klbii7ufyWRBrXId1tOrb0c07gnpI1k19woOfOWQk0Y=; b=A33PhoDlAFCkNh oWg/FZxpiO7b0anJY/RMYYarUT4c7fjnyQq3uMAULBGXqoENPyJXXUhdc8U09kWt2stBcT1fmUo2W nuczH9unepsl/Zx/pIae582g1j8ChFqjofffvx6R5Qo1lff7Hx3dEgeTx/E3yO0jJbK+eMHOmndLA Pa8ECFpg/mBVe6gM4XK4NwwP7m0AbUuK4r+1ge7TkFzScolpJQMmYNtF9+H1Aq8ip2pvovphhI9jr kzW7dJVSvATLBucV+PAzC3qzcrhkW2ny3u0c6Fs84CaRwnPOwFXq8exsqjz5vBUdhQhYxTBcnv8g0 UePrLV9WcesZD76F3xkg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1phW79-000SDj-1Q; Wed, 29 Mar 2023 13:45:23 +0000 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1phW77-000SBS-1H for hostap@lists.infradead.org; Wed, 29 Mar 2023 13:45:22 +0000 Received: by mail-ed1-x533.google.com with SMTP id w9so63587340edc.3 for ; Wed, 29 Mar 2023 06:45:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mind.be; s=google; t=1680097512; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DM69nBReN9PbMkyQR5ZGYBH02Jau3l0gjn0gIeYQonA=; b=LsjauYRjKYtvdEjtIKgWmw+jELHNHmZkuf4DcjM9+XPT/zSjyknWGjJ3HFFKCeXVBd H+B8Xd0XuAzUrsmZRuaBNB6afrAeAoummS1fVwPbzK2mzQidnRXPmF3+CuB7vf4/N2Lo aCAhVrIpHkIHmX+L0u+7cxy2G//bxFnvExF9394g4DpO7b7KmFPrXOdTW0sNB55qJ7Oc wJ/5qr7HZ2LpbHgImvnesaJ9z5xEIs7pWY4zq9hBcWHeRtqPXHFw/bLfTowBsgkfeyRJ k1NrlaKHfNlR+eqcvxN9GOS8PZmq9OEzANNwn6njc9mg5BTq31UAc8FqHmxID7RItfSQ aMPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680097512; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DM69nBReN9PbMkyQR5ZGYBH02Jau3l0gjn0gIeYQonA=; b=3Vgt2hox2zUyFC3BhZz1ySxpiX7igl+lPSuX3JAcDU5A61ZYDF83MvhFUDk+gN5EaE wvYxGcFoD+swh8Sx55XZDy8NU/KwKz/gtJTdWP+HAhiebThxPeZMshmi627fjV1fDCg/ qtvxPIEO5mBRLv8qRU9izI4huBvmypdwNBo7LJJLc8iV0cQE6mDzdwML9wJnMgJwzWS3 ygZCvEOpc9s663a2k/UDnT/lNIdzHttmpg0aVuxqo5cM1dB2SR7EQsmhIQsvhuDYi6L+ PqKmekr8GrA8ejCcZCBk0r0c0FGP7Z1pp+llOX305Ym6YZpZwYw1tuLtqzqfiekx8H9h f/lw== X-Gm-Message-State: AAQBX9d90lZknnKsZVcjeRZbHc5940v3I7wh5NldQ5M1LSMBIgev7scW b50qHmWAzhFc2KsKAY9VGm5+pvKFl25LnC2edzqPDg== X-Google-Smtp-Source: AKy350YB5cKw1cFnemlbM5a7mU5Lawt/1Wx/67iAK338ME2k64kk3AhABiJ7w20BqKehJ4J2r+RKoA== X-Received: by 2002:a17:906:e99:b0:930:8590:95ef with SMTP id p25-20020a1709060e9900b00930859095efmr2311586ejf.18.1680097512051; Wed, 29 Mar 2023 06:45:12 -0700 (PDT) Received: from localhost.localdomain (ip-188-118-3-185.reverse.destiny.be. [188.118.3.185]) by smtp.gmail.com with ESMTPSA id y94-20020a50bb67000000b004be11e97ca2sm17057389ede.90.2023.03.29.06.45.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Mar 2023 06:45:11 -0700 (PDT) From: =?utf-8?b?UmFwaGHDq2wgTcOpbG90dGU=?= To: hostap@lists.infradead.org Cc: nbd@nbd.name, arnout@mind.be, raphael.melotte@mind.be, Abhilash.Tuse@imgtec.com Subject: [PATCH 3/4] hostapd_reload_config: allow update of mode and frequency Date: Wed, 29 Mar 2023 15:44:54 +0200 Message-Id: <20230329134455.4019868-4-raphael.melotte@mind.be> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230329134455.4019868-1-raphael.melotte@mind.be> References: <20230329134455.4019868-1-raphael.melotte@mind.be> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230329_064521_432735_E657164D X-CRM114-Status: GOOD ( 19.05 ) X-Spam-Score: 0.1 (/) 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: From: Felix Fietkau In commit 513dcec6562948e9f2dc3348923833c8d659eaf2, hostapd_reload_config was changed to no longer reload the channel information. However, we really do want to be able to switch channels, change mode [...] Content analysis details: (0.1 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:533 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Felix Fietkau In commit 513dcec6562948e9f2dc3348923833c8d659eaf2, hostapd_reload_config was changed to no longer reload the channel information. However, we really do want to be able to switch channels, change mode, etc. when changing the configuration. Therefore, revert that commit. Instead, make sure that the changed mode and channel is correctly taken into account. Use hostapd_set_freq to update the internal data structures and the driver. Use hostapd_hw_get_freq to get the frequency from the selected mode and channel. The new frequency may also be in another band. Update the current_mode structure based on the configured hw_mode and prepare rates table after frequency selection. Signed-off-by: Felix Fietkau [cleanup, patch refresh] [Abhilash Tuse: add support for switching bands] Signed-off-by: Abhilash Tuse [Arnout: add commit message, adapt to current mainline] Signed-off-by: Arnout Vandecappelle --- src/ap/hostapd.c | 50 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 15 deletions(-) diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c index 141c77f4b..cd9d1e6f0 100644 --- a/src/ap/hostapd.c +++ b/src/ap/hostapd.c @@ -142,6 +142,29 @@ static void hostapd_reload_bss(struct hostapd_data *hapd) #endif /* CONFIG_NO_RADIUS */ ssid = &hapd->conf->ssid; + + hostapd_set_freq(hapd, hapd->iconf->hw_mode, hapd->iface->freq, + hapd->iconf->channel, + hapd->iconf->enable_edmg, + hapd->iconf->edmg_channel, + hapd->iconf->ieee80211n, + hapd->iconf->ieee80211ac, + hapd->iconf->ieee80211ax, + hapd->iconf->ieee80211be, + hapd->iconf->secondary_channel, + hostapd_get_oper_chwidth(hapd->iconf), + hostapd_get_oper_centr_freq_seg0_idx(hapd->iconf), + hostapd_get_oper_centr_freq_seg1_idx(hapd->iconf)); + + if (hapd->iface->current_mode) { + if (hostapd_prepare_rates(hapd->iface, hapd->iface->current_mode)) { + wpa_printf(MSG_ERROR, "Failed to prepare rates table."); + hostapd_logger(hapd, NULL, HOSTAPD_MODULE_IEEE80211, + HOSTAPD_LEVEL_WARNING, + "Failed to prepare rates table."); + } + } + if (!ssid->wpa_psk_set && ssid->wpa_psk && !ssid->wpa_psk->next && ssid->wpa_passphrase_set && ssid->wpa_passphrase) { /* @@ -250,6 +273,7 @@ int hostapd_reload_config(struct hostapd_iface *iface) struct hostapd_data *hapd = iface->bss[0]; struct hostapd_config *newconf, *oldconf; size_t j; + int i; if (iface->config_fname == NULL) { /* Only in-memory config in use - assume it has been updated */ @@ -300,6 +324,17 @@ int hostapd_reload_config(struct hostapd_iface *iface) } iface->conf = newconf; + for (i = 0; i < iface->num_hw_features; i++) { + struct hostapd_hw_modes *mode = &iface->hw_features[i]; + if (mode->mode == iface->conf->hw_mode) { + iface->current_mode = mode; + break; + } + } + + if (iface->conf->channel) + iface->freq = hostapd_hw_get_freq(hapd, iface->conf->channel); + for (j = 0; j < iface->num_bss; j++) { hapd = iface->bss[j]; if (!hapd->conf->config_id || !newconf->bss[j]->config_id || @@ -307,21 +342,6 @@ int hostapd_reload_config(struct hostapd_iface *iface) newconf->bss[j]->config_id) != 0) hostapd_clear_old_bss(hapd); hapd->iconf = newconf; - hapd->iconf->channel = oldconf->channel; - hapd->iconf->acs = oldconf->acs; - hapd->iconf->secondary_channel = oldconf->secondary_channel; - hapd->iconf->ieee80211n = oldconf->ieee80211n; - hapd->iconf->ieee80211ac = oldconf->ieee80211ac; - hapd->iconf->ht_capab = oldconf->ht_capab; - hapd->iconf->vht_capab = oldconf->vht_capab; - hostapd_set_oper_chwidth(hapd->iconf, - hostapd_get_oper_chwidth(oldconf)); - hostapd_set_oper_centr_freq_seg0_idx( - hapd->iconf, - hostapd_get_oper_centr_freq_seg0_idx(oldconf)); - hostapd_set_oper_centr_freq_seg1_idx( - hapd->iconf, - hostapd_get_oper_centr_freq_seg1_idx(oldconf)); hapd->conf = newconf->bss[j]; hostapd_reload_bss(hapd); } From patchwork Wed Mar 29 13:44:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?UmFwaGHDq2wgTcOpbG90dGU=?= X-Patchwork-Id: 1762769 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) 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=qleeIAAU; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mind.be header.i=@mind.be header.a=rsa-sha256 header.s=google header.b=K11I0VDh; dkim-atps=neutral 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 (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pmnrm6zjwz1yYx for ; Thu, 30 Mar 2023 00:46:16 +1100 (AEDT) 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:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=AlffyurdjXZawWAUqWTW6jekhjIarqzVQjp4D/fWBDg=; b=qleeIAAUBmnEsN 6cXJHK3EdUKISeRk7YlUY/LihUYrrm8MYMWGSUrHRhfJe9ockcz6dUEK2a3/6akaXrV66MPZnbVGS ddLEsfxR7Ueoo5b7c0SNZGz3zM81uX6NTv1jFOwlXAwKbZJ8aZrEHQgPgBOGlUAvUYcbRBUJ2f6mO ON5NxoL/vKinoeb5XzQKdbu4Dj+2Pe4+VgJ+R5/cccxCP2uo7h6WvD4JF0AvSMGLEQf+DFZ8EqAVf WUOw84Lfj6jA1FI1g8ZERtZoF8Ny6gfHs7YnZbSeP4H6toh5sB7CksbxFBwF2IHyRyE4ErZK1an2i IfCilQCAqOquxXaBixkQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1phW73-000SCc-2I; Wed, 29 Mar 2023 13:45:17 +0000 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1phW70-000SBe-2J for hostap@lists.infradead.org; Wed, 29 Mar 2023 13:45:16 +0000 Received: by mail-ed1-x529.google.com with SMTP id h8so63524826ede.8 for ; Wed, 29 Mar 2023 06:45:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mind.be; s=google; t=1680097513; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ktqDI88XqlTHJ3AlE0r24p0Rw2ZFXn2xeKu7MuPN0S8=; b=K11I0VDhv1kcLFdtzfWGUaC1eYAQYOnA3d2MNs/E84+6X+YDtnQHI9BE65FX768Dk5 UH2HxG0uwpI4G1ux1HcXbtMSuLHOiZabosZsDgrMiqk5yuNc4DKRm9jke4tUYS1Y0Eso 5uQRHW0S0Ugcu7a8BVEeA1fJ36ejV9NR9yJc0vjYoOh0mcgy4Rzf6cOu4uMjKUuyfN4h 5ajgn1p3IS8Ttzyoc9eoJaoDP8Xt8/Xas7NM3zUFMYlb13VGxV6ksD85SmSLH3Zxlfai VMykXemR7izyCvBMq1fab+QGnNrFNwthITzHYuyUeMd1pGAVda3qXWkypqWHQUQrmAiG +nmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680097513; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ktqDI88XqlTHJ3AlE0r24p0Rw2ZFXn2xeKu7MuPN0S8=; b=jB6eNq+Bfaz7MLEV2cK1K7edRhY9SN9GMVlJpZ40zrdNTfbBivTWBh/CM/JU1yLOHH 5hifwe0sw7Z9GXMqejPRy6C4QdqpwTZVhKspgt/mLVJ4mbHs5l9J4s4PXVUD7wFjPhZ6 Pteyvso5Fqg+qKfIDLA6zP9boQxGeISmqc4TUKGlRZhGTPLNztUqTmmen3N59O/RTYXT 2q31ASyrAbfSE3DQEVXfVDe+DUQqtcSPGnYPQ8woasWxbde5o3D1698/EXg/7ApbEMth HVDzlm3xcxDXDt3dwwSGga+HBZ2EyPUKsc+FBaqzhDNRczZHzjsI268tg6sZ154NeWDx AKUg== X-Gm-Message-State: AAQBX9d7c148tr7jSKzP5zdhvEKqfCoxR4r0EnM11N4mbKFJFHBNum4g UXoiiQjAhjn4x3Mkqe8BUi0vIuyf9FvwAcPh7QPSIw== X-Google-Smtp-Source: AKy350b5mJWVxODLV/zjewaE0T/gCOpwogyQ4z73958jXbAHInvwsRWIXB8+OlaD6rDKaFjA9Q8hVg== X-Received: by 2002:aa7:d452:0:b0:4fa:733f:8abb with SMTP id q18-20020aa7d452000000b004fa733f8abbmr18324113edr.32.1680097513410; Wed, 29 Mar 2023 06:45:13 -0700 (PDT) Received: from localhost.localdomain (ip-188-118-3-185.reverse.destiny.be. [188.118.3.185]) by smtp.gmail.com with ESMTPSA id y94-20020a50bb67000000b004be11e97ca2sm17057389ede.90.2023.03.29.06.45.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Mar 2023 06:45:13 -0700 (PDT) From: =?utf-8?b?UmFwaGHDq2wgTcOpbG90dGU=?= To: hostap@lists.infradead.org Cc: nbd@nbd.name, arnout@mind.be, raphael.melotte@mind.be, Abhilash.Tuse@imgtec.com Subject: [PATCH 4/4] tests: AP+STA on same radio Date: Wed, 29 Mar 2023 15:44:55 +0200 Message-Id: <20230329134455.4019868-5-raphael.melotte@mind.be> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230329134455.4019868-1-raphael.melotte@mind.be> References: <20230329134455.4019868-1-raphael.melotte@mind.be> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230329_064514_782308_9C27873C X-CRM114-Status: GOOD ( 15.96 ) X-Spam-Score: 0.1 (/) 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: From: "Arnout Vandecappelle (Essensium/Mind)" Add a test for the support of an AP (hostapd) and a STA (wpa_supplicant) running simultaneously on the same radio. The test creates a new radio, with a managed and a station interface on that radio. On the managed interface, hostapd is started in the usual way. On the station interface, wpa_supplicant is started m [...] Content analysis details: (0.1 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:529 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: "Arnout Vandecappelle (Essensium/Mind)" Add a test for the support of an AP (hostapd) and a STA (wpa_supplicant) running simultaneously on the same radio. The test creates a new radio, with a managed and a station interface on that radio. On the managed interface, hostapd is started in the usual way. On the station interface, wpa_supplicant is started manually so we can pass the -H argument. The station is connected to apdev[0]; dev[0] is connected to the AP. Finally, a channel switch is started on apdev[0]. This channel switch must propagate all the way down to dev[0]. Without the AP+STA functionality, the test fails in the following ways. - Once AP2 is started on channel 11, it's not possible for wpas to connect to channel 1. For that, the AP has to be stopped first. - When AP2 is started on channel 1, it's possible for wpas to connect. However, it cannot follow the CSA from AP1. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- tests/hwsim/test_ap_csa.py | 115 +++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/tests/hwsim/test_ap_csa.py b/tests/hwsim/test_ap_csa.py index 744d1e1f2..93bf6a892 100644 --- a/tests/hwsim/test_ap_csa.py +++ b/tests/hwsim/test_ap_csa.py @@ -9,9 +9,11 @@ import time import logging logger = logging.getLogger() +from hwsim import HWSimRadio import hwsim_utils import hostapd from utils import * +from wpasupplicant import WpaSupplicant def connect(dev, apdev, scan_freq="2412", **kwargs): params = {"ssid": "ap-csa", @@ -187,3 +189,116 @@ def test_ap_csa_disable(dev, apdev): ap.enable() dev[0].wait_disconnected() dev[0].wait_connected() + +def write_hostapd_config(conffile, ifname, ssid): + with open(conffile, "w") as f: + f.write("driver=nl80211\n") + f.write("hw_mode=g\n") + f.write("channel=11\n") + f.write("ieee80211n=1\n") + f.write("ctrl_interface=/var/run/hostapd\n") + f.write("interface=" + ifname + "\n") + f.write("ssid=" + ssid + "\n") + +def test_ap_csa_1_switch_backhaul(dev, apdev, test_params): + """AP Channel Switch of backhaul with AP on same radio, one switch""" + csa_supported(dev[0]) + + params1 = {"ssid": "ap-csa-back", + "channel": "1"} + ap1 = hostapd.add_ap(apdev[0], params1) + + with HWSimRadio() as (radio, ifname): + apifname2 = ifname + "_ap" + apdev2 = {"ifname": apifname2} + + subprocess.call(['iw', 'dev', ifname, 'interface', 'add', apifname2, + 'type', 'managed']) + + ap2 = None + try: + prefix = "ap_csa_1_switch_backhaul-ap" + conffile = os.path.join(test_params["logdir"], prefix + ".conf") + logfile = os.path.join(test_params["logdir"], prefix + ".log") + pidfile = os.path.join(test_params["logdir"], prefix + ".pid") + prg = os.path.join(test_params['logdir'], 'alt-hostapd/hostapd/hostapd') + if not os.path.exists(prg): + prg = '../../hostapd/hostapd' + write_hostapd_config(conffile, apifname2, "ap-csa-front") + arg = [prg, '-B', '-dddt', '-P', pidfile, '-f', logfile, conffile] + logger.info("Start hostapd: " + str(arg)) + res = subprocess.check_call(arg) + if res != 0: + raise Exception("Could not start hostapd: %s" % str(res)) + ap2 = hostapd.Hostapd(apifname2) + ap2.ping() + + freq = int(ap2.get_status_field("freq")) + if freq != 2462: + raise Exception("Unexpected AP2 freq=%d before association" % freq) + + prefix = "ap_csa_1_switch_backhaul-sta" + conffile = os.path.join(test_params["logdir"], prefix + ".conf") + logfile = os.path.join(test_params["logdir"], prefix + ".log") + pidfile2 = os.path.join(test_params["logdir"], prefix + ".pid") + + with open(conffile, 'w') as f: + f.write("ctrl_interface=DIR=/var/run/wpa_supplicant\n") + + prg = os.path.join(test_params['logdir'], + 'alt-wpa_supplicant/wpa_supplicant/wpa_supplicant') + if not os.path.exists(prg): + prg = '../../wpa_supplicant/wpa_supplicant' + + arg = [prg, '-BddtK', '-P', pidfile2, '-f', logfile, + '-Dnl80211', '-c', conffile, '-i', ifname, + '-H', '/var/run/hostapd/' + apifname2] + logger.info("Start wpa_supplicant: " + str(arg)) + subprocess.call(arg) + wpas = WpaSupplicant(ifname=ifname) + try: + csa_supported(wpas) + + wpas.connect("ap-csa-back", key_mgmt="NONE", scan_freq="2412") + freq = int(wpas.get_driver_status_field("freq")) + if freq != 2412: + raise Exception("Unexpected freq=%d after association" % freq) + hwsim_utils.test_connectivity(wpas, ap1) + + freq = int(ap2.get_status_field("freq")) + if freq != 2412: + raise Exception("Unexpected AP2 freq=%d after association" % freq) + + dev[0].connect("ap-csa-front", key_mgmt="NONE", scan_freq="2412 2462") + freq = int(dev[0].get_status_field("freq")) + if freq != 2412: + raise Exception("Unexpected freq=%d after association" % freq) + hwsim_utils.test_connectivity(dev[0], ap2) + + switch_channel(ap1, 10, 2437) + wait_channel_switch(wpas, 2437) + wait_channel_switch(dev[0], 2437) + + hwsim_utils.test_connectivity(wpas, ap1) + hwsim_utils.test_connectivity(dev[0], ap2) + + for f in (ap1, wpas, ap2, dev[0]): + freq = int(f.get_status_field("freq")) + if freq != 2437: + raise Exception("Unexpected driver freq=%d after channel switch" % freq) + finally: + wpas.close_monitor() + wpas.request("TERMINATE") + finally: + if ap2: + if "OK" not in ap2.request("TERMINATE"): + raise Exception("Failed to terminate hostapd process") + ev = ap2.wait_event(["CTRL-EVENT-TERMINATING"], timeout=15) + if ev is None: + raise Exception("CTRL-EVENT-TERMINATING not seen") + for i in range(30): + time.sleep(0.1) + if not os.path.exists(pidfile): + break + if os.path.exists(pidfile): + raise Exception("PID file exits after process termination")