Message ID | 20181205102401.17810-10-arnout@mind.be |
---|---|
State | Accepted |
Headers | show
Return-Path: <hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mind.be Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="sJU6hui+"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mind-be.20150623.gappssmtp.com header.i=@mind-be.20150623.gappssmtp.com header.b="Ftl3yuJp"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 438w133Sykz9s8F for <incoming@patchwork.ozlabs.org>; Wed, 5 Dec 2018 21:28:05 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc: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:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=59dUr+QLkN4NOn+rw5MWkfcLLmbHkIk2J1Zbcq/fpns=; b=sJU6hui+ATsA20 wStgPukEv11huUV4EPjl+4jdbPaQDAfZzsPHKYDcY8DAciRCdKZH8Yv6oduADHWTYzJRgCU5Di1R3 aOAOOIVKfE9eA1hU5m4NSMCkcFetWI54p+Cgk2ZHGZazqfbJy40PqjERiAp3u8AHve6Oy7KGflWIV 1+uLtBfJGE3etsw71xiui8VuQzD3fdG2rgRk5BoufSwVU+PQ80Y3PS8IAAxi3MinuuhZcjdr9vmLd CycC3sS5tdCnhH7h59z38lr1FfSxSigZID8PeHvCRTWruQnzqDwK/dzp22MYdd5eFZvqMqqXwaLWv PYscYkvdRkb+QnFWlaOA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gUUPI-0007CN-Sn; Wed, 05 Dec 2018 10:27:52 +0000 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gUUOb-0006JD-Bb for hostap@lists.infradead.org; Wed, 05 Dec 2018 10:27:13 +0000 Received: by mail-ed1-x541.google.com with SMTP id x30so16571492edx.2 for <hostap@lists.infradead.org>; Wed, 05 Dec 2018 02:26:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mind-be.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4fCgNlndH0ogW1KIin+NtIE0jInjyiE7wFIXMh7zz1c=; b=Ftl3yuJp+Tr7WSDc7qXaQn9B8hijr4YYjELu4DhAgov9qgjyhlk5GeLCvZ53ivsKoj b8AIKHDbha2pRBMwsp1DbOVl4KuNcFuiEQTQXQwgowt9mofP18xzbq/uKfvTuRxYTg2q FRGgTrhA06oM4RsgwZbHhxcoIIFNguW17EbSXE46SXP1GC+X8C2hwfygoirsuSW30IP2 39ZOm98ad68b0TqOmvM/26aKoYgO04MikK1ooeuFflnAUsVOscTx1GxMcQYja5EEO6aK A9aAstSDPoF24VMwDveZqGHLRE+78bRhiemZz0O01NQTsxUdQxKmnAb/ZEpDP6sQS34f DN+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4fCgNlndH0ogW1KIin+NtIE0jInjyiE7wFIXMh7zz1c=; b=TvbDJyweM8omCgkAYh6WvvTYNNZpTPHhemlSqCEMrJ9yKgZijNojOTmVqUnUi8+HSh gq92wqO8ulDA+SBUVSvmqCJ1OVWJ13C0yG5SKJPxVQust5cgFZBGXjC8G8ns5JFYN0Qd vHB1xKj5jRYFfJb60V8NexFZTjYjyQkyGLD5FQ4WjBhCWSGcinTDKU829FAlPUWRYT0q wM+rPCB+WvP947wHSvyrhaf+AyR9OJc8Ft04PFWorL0rErFk50u1Nta6WN3COomvDCm1 J9htzRhlaVPUDMOKj6HLSFXbRemwDMDOWIjm2VMfHH81gxuYiUesQBaUGRd2petxeK1B G2UQ== X-Gm-Message-State: AA+aEWZd0UBPVcvupkc4olm2Sh3bf5FeTjdmE3+lc8gCMLav/V+nGxdW Lf1YL8BaN5fdbsIC1XYSB9JxBFDn5+o= X-Google-Smtp-Source: AFSGD/UTg+WTgHka1dHmu76nr6w5BCvzdEUBnZA4JFGJfpw+db1hRHZ/IyoZTv18lIE9ztGBBKY1dw== X-Received: by 2002:a17:906:b7d1:: with SMTP id fy17-v6mr18252303ejb.70.1544005617550; Wed, 05 Dec 2018 02:26:57 -0800 (PST) Received: from localhost.localdomain (ip-188-118-3-185.reverse.destiny.be. [188.118.3.185]) by smtp.gmail.com with ESMTPSA id z2sm5438020edd.4.2018.12.05.02.26.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Dec 2018 02:26:57 -0800 (PST) From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be> To: hostap@lists.infradead.org Subject: [PATCH v3 09/12] wpa_supplicant: SME: correct use of multi_ap_backhaul_sta Date: Wed, 5 Dec 2018 11:23:59 +0100 Message-Id: <20181205102401.17810-10-arnout@mind.be> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181205102401.17810-1-arnout@mind.be> References: <20181205102401.17810-1-arnout@mind.be> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181205_022710_033457_152CB07B X-CRM114-Status: GOOD ( 15.12 ) X-Spam-Score: 1.0 (+) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (1.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:541 listed in] [list.dnswl.org] 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 0.0 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -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 0.0 DKIMWL_WL_MED DKIMwl.org - Whitelisted Medium sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <hostap.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/hostap>, <mailto:hostap-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/hostap/> List-Post: <mailto:hostap@lists.infradead.org> List-Help: <mailto:hostap-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/hostap>, <mailto:hostap-request@lists.infradead.org?subject=subscribe> Cc: Venkateswara Naralasetty <vnaralas@codeaurora.org>, "Arnout Vandecappelle \(Essensium/Mind\)" <arnout@mind.be> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Hostap" <hostap-bounces@lists.infradead.org> Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org |
Series |
[v3,01/12] hostapd: Add Multi-AP protocol support
|
expand
|
diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c index 947095820..570aadfcf 100644 --- a/wpa_supplicant/sme.c +++ b/wpa_supplicant/sme.c @@ -1547,7 +1547,7 @@ void sme_associate(struct wpa_supplicant *wpa_s, enum wpas_mode mode, } #endif /* CONFIG_OWE */ - if (wpa_s->conf->ssid->multi_ap_backhaul_sta) { + if (wpa_s->current_ssid && wpa_s->current_ssid->multi_ap_backhaul_sta) { size_t multi_ap_ie_len = add_multi_ap_ie( wpa_s->sme.assoc_req_ie + wpa_s->sme.assoc_req_ie_len, sizeof(wpa_s->sme.assoc_req_ie) - wpa_s->sme.assoc_req_ie_len,
In the SME case when there are multiple SSIDs configured, we should use the multi_ap_backhaul_sta setting of the current SSID, not arbitrarily the first one. Also, in general (e.g. when performing WPS) there may be no configured SSID at all. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Cc: Venkateswara Naralasetty <vnaralas@codeaurora.org> --- I'm not 100% sure about this patch. But I tested it (with a single SSID) and it still works. And it looks obvious to me that using the first configured SSID makes no sense. --- wpa_supplicant/sme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)