From patchwork Wed Apr 18 04:54:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 899886 Return-Path: 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bowerswilkins.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="OWeDSt8v"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="Y6nmCNGJ"; 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 40Qqb928L3z9rxp for ; Wed, 18 Apr 2018 14:56:37 +1000 (AEST) 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=CpmmInLABJaY1u00GzxYZt/tiuBjosc9ooVppns2WU4=; b=OWeDSt8vHpgm5E 6pwUiiXMYAsjZ3omWKFypUPRUZpJpEHha9JfqZZ3f4wIZbNWrWDGwBDik2FYo7izOalzV+lAUwxDE gZQiTUcqyXZnE1sBkmuHSChySvMRWdxYmzWzmLb89H9ha3E/YkyDMV+8WzO+cFIB8UyLT6FjyMUZR Wy+w/wc2zwSAV+PZTdvGNBuYQ4Ef3IUuCJ80po+SvaY1OV0J8qfMgss8/yu5hsRpuHFCERi0sNcev guDLGKjCyVLNARx7u0RjTdJV7xQVf93cGHGXBcrHY437s+SRRx+niTTAnIy71CkxR/AuoKanPLBT5 bSqtBf/FNYvwfP6e0Dqg==; 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 1f8f8v-0003RC-RI; Wed, 18 Apr 2018 04:56:29 +0000 Received: from mail-he1eur01on0067.outbound.protection.outlook.com ([104.47.0.67] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f8f8F-00036K-5l for hostap@lists.infradead.org; Wed, 18 Apr 2018 04:55:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bowerswilkins.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=6ToRLTA8Ae+Ym3oHVix8y4wXHy7ju1Ke6uBLsIcqnXw=; b=Y6nmCNGJDZxOc55a03QffucMOBoacLHUjPKhF4MPnTh4AwDvgOojn7T2soiDTn/uwXmGKLg5GmBh30HGa+6tilNVrFBBmsxGmO7tXfXbLEoqkx/vzuvr9iEtcvEm9kC+7llqRpQJEchsLG8BGresAFXKwufMm+xF7sY9rt5ETGI= Authentication-Results: lists.infradead.org; dkim=none (message not signed) header.d=none; lists.infradead.org; dmarc=none action=none header.from=bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:d9cc:2ac8:6f:5e3b) by VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.675.15; Wed, 18 Apr 2018 04:55:27 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v3 01/15] mesh: factor out mesh join function Date: Tue, 17 Apr 2018 21:54:58 -0700 Message-Id: <7ab9ce7949e01a819570dcaa9690b0a88dc12637.1524027184.git.peter.oh@bowerswilkins.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:d9cc:2ac8:6f:5e3b] X-ClientProxiedBy: SN4PR0501CA0014.namprd05.prod.outlook.com (2603:10b6:803:40::27) To VI1PR04MB1663.eurprd04.prod.outlook.com (2a01:111:e400:596c::13) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB1663; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 3:s1dWbpNTtfLml0aHOL8KkA0fiK+KAikmK0cqkw2fvcIVImiERI/6tXD/e5F6NsRmMt+mT14FdPg4EWe/iQAvetwExsxnpwGiSaeh3qvDd19F7OFoiioBgx7eEFGW+KEP5rWbvDydabuux7gOVLkfNur1ozLE0i2DVuSGTMovnXawUANmunrNL7wkK0Fz5ssby19gF5wqcz6Bw2daiJBeY8Nknb46z06/lLcBSXsWX+g7IlZHhradpsswRYqTzWIg; 25:iVSyLMkWqBQoQc8RD78tklN6tFRUY6KIVB3T3pUJW+PRpXVWVmZ72+8lubB0yd/FEMMhTcMnQkWPC2kznnrCAfPEqepysLei1N3ubIMmyuPnq8x3D5SFqiXLT+Av2UIJ4xQAjpwtHxj6UFUJ8s3zAWepgEXQHqEJX+YxMF5dFIBlQYzfCBbTwFTNH5i6j4wqxwij76e1gZMqQCtjP1qPF3FrFME4U8fAXKjjQeLORNxGTD0bJ06T3wMZK7S0gFD5VlF21s6N4+dxC0rMzeGsFGF49NvMTs/x+2HFJ5Ijz4RcLhpGCcCLAEOq1wVoRCdi2NAJQvU5cbino8a7uRrbJg==; 31:kbQab0jlOYRECSLVGbz1961PlFpCsLRR2YJIkymoFrBS28uAEEK8L4uCxiFi2V8+LfOWolTvZJd/XybhuhjnSXg+6uvR+fFVItFVGOLGfQ4E/yzZ1UDwl+WNUAIlxureUf0KQTXA3mA2gxLhiKq4J/jfm2LsCTspme0yU//mMBn34g9c1mn1fR0ckQQlje7SN9vGyiQXX+eKfw4oG1P35RAYlwjCiw9go4w8wznqWfU= X-MS-TrafficTypeDiagnostic: VI1PR04MB1663: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 20:+kbcKwqkldzjnq/FfoyKisucVFKDlzzqMz1aymmabIIK7C6uSp9iE33gIgzjSf/Z2EZK6HPS9gLY9+NuQc5h1s1u1RNnXlRDPJiH09UiiRwFVjKQRQxS05fPWi9/YV32jGUBsGr3EpaF8ZJC+Fsx2TBlGuHWSzPIkk+ywfqA7FraXG94IBQWCaiMbVZkkkRhffvHhXYYEKCSg6XzzmesmrGBBsJDoLkuDA9kxwiiCPGRVmT4KiQbfigaZTahgA6nfICLwy+HJm44TzNBvduh/1/4O3RF0akN4ofCr+mBFjpIQQvtuMnNWxX2aRGsBgx8MEemRVLyH2FcEFKeeb54uw==; 4:WA20+qk3Gm9J3esz7vfWRVf/6YnHoRvlkRnt6O0aU6c4IXr14t4iBTR2ruMsT1zxnwGp0PMmmcPPbJP/sh5R52g4RL+JUgyFJ1P44n0TB1Tf9+HBBQrkmHG5AvrhSVMrPLvFOl8aXDr2ZEem55nSwRZbVIa9Qu5y9O+wD6Ew9xFqfKMEsHMXmhrBigb7+QjDEC3iwzYcPfrpU7BXYkh56x/4St4Xoiy5uxY8WfD8Kn4e7XZtWfhZOQTGPy0E0A84jM/45lJovGCs0cEmimWPcA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231232)(944501327)(52105095)(10201501046)(93006095)(93001095)(3002001)(6041310)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:VI1PR04MB1663; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB1663; X-Forefront-PRVS: 06469BCC91 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(346002)(39850400004)(39380400002)(396003)(376002)(48376002)(50466002)(2361001)(478600001)(52116002)(52396003)(2906002)(50226002)(2351001)(53416004)(118296001)(2616005)(8676002)(11346002)(6116002)(6916009)(6666003)(36756003)(6486002)(76176011)(25786009)(5660300001)(81166006)(446003)(6512007)(9686003)(4326008)(16526019)(16586007)(33896004)(316002)(6506007)(86362001)(305945005)(46003)(7736002)(186003)(476003)(85782001)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1663; H:smtp.office365.com; FPR:; SPF:None; LANG:en; MLV:sfv; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB1663; 23:DVNSCQ7o97PWhy6plCygRo430KBLWzca5QXtyatzq?= G5eBXs/DYidKDhxAh9k4Tx8yRgVCyFzjzjQvHC/7PArcH3GF4K75lNchnpCgo4bt68ToxrZLCH9lxA9noDr2SeQsCHQR9OeRX6mpkt6c4FtYg4q2X7uHo945OFw5gTBd1tVMocL+0R2fz9Ix4HvdOoWSVv82JfyCbV5JDiK+GfalsQTJn71rrt8R6fdbjA/89Ww2Lgqpy9zrWuYcGw7ovxUXUxBSqCVBTPYanjEBYLkvzsBRMcNpsjov8Puq0huAIQiJVR2XDz2n9ro63gWODreqKp9jDPk2dachDdieT5M0X1Jy9fiMDJJQyxbce6hhQKBdDA2PScYJbl/8JVj8ADzKG4TAc7K/wWxw5XtGHQHoHdpr/YGW/MAUkQaKskKiTj09r1MgyJMFkuN3tOabK/D/umVugCWmRkboM7vZh+m3FKcRDSmxj7ECtDDYNFpvfwj3/CC3OKA+jmb/qzLSJptB1XWRzHa3iJpFUCQPIHRhxYu4EjAuQjyrZjpXkXZdRgcMYQRCFonrGeKflb8R/76mvKyK2+IDbdXIn6Aejf/RH3dX9ClJjRru/Yv0wQj8TDpFT3HquaBrT8ADLBaIffB8eP1YB5aT1E1rYUXCC19doeSHwGx4M8TPd17kmV0UVdDaLULfWxmQGjU8IH4V1LZU1tolwOgCzOJj2vvDPUgj1qEwOLrATZms6ai4+O3LXBX+VtUehcz9sFFiI5AAteudvnmEKlMEy1IoP3FvMSNWMjiFvRVanYc4gr3UZzg97e9n+rV1gBAO0i4ZtivHF3CyOU7HliqhNDmTqpdM5lKOu9/4Jo5sxJtdm0RvROX2TfS40OPCPOs9B8Vqubm2+oJ3vkNENFyoErbUszStPhrMJWNny31eIMVo91akpjdJgWXPU05/1zBEr1aMhAbRTdUYfbPdN92tP9DvnAlcPioopcWnqNCj88m+9OPxGcx7Q1XF//aV+avsSI+21vbr05Fr9lNOU2GqzRgnexE/4bFZCiv3qBCmRk/yANlRDMWvEY= X-Microsoft-Antispam-Message-Info: nUl/UM+TTofEUtVILCOPFhuWc/lRrkbgzVUvNktVKiiWGWvZsN+4uefjnIroO0e2e6ABr+rzr/uMVzPZScxvLsOEkGQwfUcZ6blk4CCHKGFHpQoKPJJu8WLJQMrO/SG5lzonCycX4pRx2tOuzQT2Ifx/qk921l7TdAXqvSKzSTYodUaFIFbPV+MYTGOv0GGL X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 6:pI3Jt21fbN4kmJgoHf/S9yLCkbl1tDllPq2w/uAUUi/N7rFkyh5Kk+ImhPihL4pDTYIxIqwzOqz4bC2RuIm8R5cdIxo92A8Zn4dS010bc70l62BisCZ4zje9wBV/MgQUiv0wTBj/Bh9W0lUIOdRyZODm4sgaxGaJb3zFLMUkNbflFFC1rwTwTRx6FHNnqGgA4n8be7mrVF/+onpM0RZfCl/kGjrfxti+6m0LHXwGkiaMwi8Wo7KRpExMSn8jCdCh+esPvS7gD9JSmdb5UNVjbVYKDpsuSc57+m72aS9jOADxVaeSytFrqoNKj3/ktA9cBrQUcrJnwnRVK9vxEMY7UaX+cfClR1S0CVb0ULmrU9bjPIQnOtV2FDH67QpqR1bj5yEfO4z1NMxEHnyBSt3ENSSQRgZ0CQlqAriOm5baR/Q2bkoi5IZ3roRMJjLr5QBjjyeunQmGoL+VhB0IVmrDkg==; 5:9dHI3txy6mMf/0ACu+2lN2mmG6nXrpDexTgd/Y2/W1QqYBEBIrKSxOmM+uMsavlTP18mfnb89qK6+ww5GZzpi9LHayVTj7u4HVeY9XBPZwv8JoJCHrqkS6hHpinWs/TdLNXGqmppL6NOrAXazMht5WIKaIeKtZ1F4dx7imUl34o=; 24:rpMRofOICSgysaJVtAE737WOi5+xLJrQsXsSb0pqlN4QtZvb+ABkIHFtiX86G2b1rSJfonHCK+PsgetTQaI0uvBa3bMTtkNsGWXvMBYL91Q= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1663; 7:cNVYbpeFJQj3+yXd4IbwHruRAdW4QTONA9n51txziIYGVkiJuPsLQ/h6gk9Zs1LSzd6JMTz6vsal3KOCL8XAcNRaqzmUDCW4BB3prmD5fReI76TPNb7U1feMUWAN+JNtHVO8Xg5AHPcLR+bxmiXmzECLgdY/nH3fwEE33xRs5/blAwFUQpstm9tXwrbehYUz+Zu6VZnv26eqMqYCAYH0j9OEto7JrCh8H3L/sjr+Uy6IXesgKO4GhHyycDI5749m X-MS-Office365-Filtering-Correlation-Id: b538b003-fe95-41c5-ffd2-08d5a4e89acb X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2018 04:55:27.2502 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b538b003-fe95-41c5-ffd2-08d5a4e89acb X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1663 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180417_215547_431305_93BF112A X-CRM114-Status: GOOD ( 14.75 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [104.47.0.67 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -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.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Oh Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Peter Oh mesh join function consitss of 2 parts which are preparing configurations and sending join event to driver. Since physical mesh join event could happen either right after mesh configuration is done or after CAC is done in case of DFS channel is used, factor out the function into 2 parts to reduce redundant calls. Signed-off-by: Peter Oh --- wpa_supplicant/mesh.c | 119 +++++++++++++++++++++----------------- wpa_supplicant/mesh.h | 1 + wpa_supplicant/wpa_supplicant_i.h | 1 + 3 files changed, 67 insertions(+), 54 deletions(-) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 19b66b4..3f3461f 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -363,13 +363,48 @@ void wpa_supplicant_mesh_add_scan_ie(struct wpa_supplicant *wpa_s, } +void wpas_join_mesh(struct wpa_supplicant *wpa_s) +{ + struct wpa_driver_mesh_join_params *params = wpa_s->mesh_params; + struct wpa_ssid *ssid = wpa_s->current_ssid; + int ret = 0; + + if (ssid->key_mgmt & WPA_KEY_MGMT_SAE) { + wpa_s->pairwise_cipher = wpa_s->mesh_rsn->pairwise_cipher; + wpa_s->group_cipher = wpa_s->mesh_rsn->group_cipher; + wpa_s->mgmt_group_cipher = wpa_s->mesh_rsn->mgmt_group_cipher; + } + + if (wpa_s->ifmsh) { + params->ies = wpa_s->ifmsh->mconf->rsn_ie; + params->ie_len = wpa_s->ifmsh->mconf->rsn_ie_len; + params->basic_rates = wpa_s->ifmsh->basic_rates; + params->conf.flags |= WPA_DRIVER_MESH_CONF_FLAG_HT_OP_MODE; + params->conf.ht_opmode = wpa_s->ifmsh->bss[0]->iface->ht_op_mode; + } + + ret = wpa_drv_join_mesh(wpa_s, params); + if (ret) + wpa_msg(wpa_s, MSG_ERROR, "mesh join error=%d\n", ret); + + /* hostapd sets the interface down until we associate */ + wpa_drv_set_operstate(wpa_s, 1); + + if (!ret) + wpa_supplicant_set_state(wpa_s, WPA_COMPLETED); + + return; +} + + int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid) { - struct wpa_driver_mesh_join_params params; + struct wpa_driver_mesh_join_params *params = + os_zalloc(sizeof(struct wpa_driver_mesh_join_params)); int ret = 0; - if (!ssid || !ssid->ssid || !ssid->ssid_len || !ssid->frequency) { + if (!ssid || !ssid->ssid || !ssid->ssid_len || !ssid->frequency || !params) { ret = -ENOENT; goto out; } @@ -380,22 +415,22 @@ int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s, wpa_s->group_cipher = WPA_CIPHER_NONE; wpa_s->mgmt_group_cipher = 0; - os_memset(¶ms, 0, sizeof(params)); - params.meshid = ssid->ssid; - params.meshid_len = ssid->ssid_len; - ibss_mesh_setup_freq(wpa_s, ssid, ¶ms.freq); - wpa_s->mesh_ht_enabled = !!params.freq.ht_enabled; - wpa_s->mesh_vht_enabled = !!params.freq.vht_enabled; - if (params.freq.ht_enabled && params.freq.sec_channel_offset) - ssid->ht40 = params.freq.sec_channel_offset; + params->meshid = ssid->ssid; + params->meshid_len = ssid->ssid_len; + ibss_mesh_setup_freq(wpa_s, ssid, ¶ms->freq); + wpa_s->mesh_ht_enabled = !!params->freq.ht_enabled; + wpa_s->mesh_vht_enabled = !!params->freq.vht_enabled; + if (params->freq.ht_enabled && params->freq.sec_channel_offset) + ssid->ht40 = params->freq.sec_channel_offset; + if (wpa_s->mesh_vht_enabled) { ssid->vht = 1; - switch (params.freq.bandwidth) { + switch (params->freq.bandwidth) { case 80: - if (params.freq.center_freq2) { + if (params->freq.center_freq2) { ssid->max_oper_chwidth = VHT_CHANWIDTH_80P80MHZ; ssid->vht_center_freq2 = - params.freq.center_freq2; + params->freq.center_freq2; } else { ssid->max_oper_chwidth = VHT_CHANWIDTH_80MHZ; } @@ -409,67 +444,43 @@ int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s, } } if (ssid->beacon_int > 0) - params.beacon_int = ssid->beacon_int; + params->beacon_int = ssid->beacon_int; else if (wpa_s->conf->beacon_int > 0) - params.beacon_int = wpa_s->conf->beacon_int; + params->beacon_int = wpa_s->conf->beacon_int; if (ssid->dtim_period > 0) - params.dtim_period = ssid->dtim_period; + params->dtim_period = ssid->dtim_period; else if (wpa_s->conf->dtim_period > 0) - params.dtim_period = wpa_s->conf->dtim_period; - params.conf.max_peer_links = wpa_s->conf->max_peer_links; + params->dtim_period = wpa_s->conf->dtim_period; + params->conf.max_peer_links = wpa_s->conf->max_peer_links; if (ssid->mesh_rssi_threshold < DEFAULT_MESH_RSSI_THRESHOLD) { - params.conf.rssi_threshold = ssid->mesh_rssi_threshold; - params.conf.flags |= WPA_DRIVER_MESH_CONF_FLAG_RSSI_THRESHOLD; + params->conf.rssi_threshold = ssid->mesh_rssi_threshold; + params->conf.flags |= WPA_DRIVER_MESH_CONF_FLAG_RSSI_THRESHOLD; } if (ssid->key_mgmt & WPA_KEY_MGMT_SAE) { - params.flags |= WPA_DRIVER_MESH_FLAG_SAE_AUTH; - params.flags |= WPA_DRIVER_MESH_FLAG_AMPE; + params->flags |= WPA_DRIVER_MESH_FLAG_SAE_AUTH; + params->flags |= WPA_DRIVER_MESH_FLAG_AMPE; wpa_s->conf->user_mpm = 1; } if (wpa_s->conf->user_mpm) { - params.flags |= WPA_DRIVER_MESH_FLAG_USER_MPM; - params.conf.auto_plinks = 0; + params->flags |= WPA_DRIVER_MESH_FLAG_USER_MPM; + params->conf.auto_plinks = 0; } else { - params.flags |= WPA_DRIVER_MESH_FLAG_DRIVER_MPM; - params.conf.auto_plinks = 1; + params->flags |= WPA_DRIVER_MESH_FLAG_DRIVER_MPM; + params->conf.auto_plinks = 1; } - params.conf.peer_link_timeout = wpa_s->conf->mesh_max_inactivity; + params->conf.peer_link_timeout = wpa_s->conf->mesh_max_inactivity; - if (wpa_supplicant_mesh_init(wpa_s, ssid, ¶ms.freq)) { + wpa_s->mesh_params = params; + if (wpa_supplicant_mesh_init(wpa_s, ssid, ¶ms->freq)) { wpa_msg(wpa_s, MSG_ERROR, "Failed to init mesh"); wpa_drv_leave_mesh(wpa_s); ret = -1; goto out; } - if (ssid->key_mgmt & WPA_KEY_MGMT_SAE) { - wpa_s->pairwise_cipher = wpa_s->mesh_rsn->pairwise_cipher; - wpa_s->group_cipher = wpa_s->mesh_rsn->group_cipher; - wpa_s->mgmt_group_cipher = wpa_s->mesh_rsn->mgmt_group_cipher; - } - - if (wpa_s->ifmsh) { - params.ies = wpa_s->ifmsh->mconf->rsn_ie; - params.ie_len = wpa_s->ifmsh->mconf->rsn_ie_len; - params.basic_rates = wpa_s->ifmsh->basic_rates; - params.conf.flags |= WPA_DRIVER_MESH_CONF_FLAG_HT_OP_MODE; - params.conf.ht_opmode = wpa_s->ifmsh->bss[0]->iface->ht_op_mode; - } - - wpa_msg(wpa_s, MSG_INFO, "joining mesh %s", - wpa_ssid_txt(ssid->ssid, ssid->ssid_len)); - ret = wpa_drv_join_mesh(wpa_s, ¶ms); - if (ret) - wpa_msg(wpa_s, MSG_ERROR, "mesh join error=%d", ret); - - /* hostapd sets the interface down until we associate */ - wpa_drv_set_operstate(wpa_s, 1); - - if (!ret) - wpa_supplicant_set_state(wpa_s, WPA_COMPLETED); - + wpas_join_mesh(wpa_s); out: return ret; } diff --git a/wpa_supplicant/mesh.h b/wpa_supplicant/mesh.h index 7317083..2e2f3cf 100644 --- a/wpa_supplicant/mesh.h +++ b/wpa_supplicant/mesh.h @@ -21,6 +21,7 @@ int wpas_mesh_add_interface(struct wpa_supplicant *wpa_s, char *ifname, int wpas_mesh_peer_remove(struct wpa_supplicant *wpa_s, const u8 *addr); int wpas_mesh_peer_add(struct wpa_supplicant *wpa_s, const u8 *addr, int duration); +void wpas_join_mesh(struct wpa_supplicant *wpa_s); #ifdef CONFIG_MESH diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h index 4d18177..c023ad2 100644 --- a/wpa_supplicant/wpa_supplicant_i.h +++ b/wpa_supplicant/wpa_supplicant_i.h @@ -810,6 +810,7 @@ struct wpa_supplicant { unsigned int mesh_if_created:1; unsigned int mesh_ht_enabled:1; unsigned int mesh_vht_enabled:1; + struct wpa_driver_mesh_join_params *mesh_params; #ifdef CONFIG_PMKSA_CACHE_EXTERNAL /* struct external_pmksa_cache::list */ struct dl_list mesh_external_pmksa_cache;