From patchwork Fri Jun 1 01:01:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 923693 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="Ft9F2NP/"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="RZ5UzuP7"; 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 40xmKY31kzz9rxs for ; Fri, 1 Jun 2018 11:03:13 +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=MIESJMEB2fu9ArvqMwAzFm0LAgOXoR3wXwhe5B06BIM=; b=Ft9F2NP/tkdPNs tg1WITt/M1sIlyGvcVbN+g5BBGu9eILDYCFTun1JVt1GYic4NxxHPSQScr3zjG6da12bpyaMVbH4N EIx45R0ekBTr3or6sjb6PY1ycST/AwYi+fqDobvGW1CUfKz9LHAqMcs2DdKGA0UfjTrKOxaiK1aXa jC+zDRXIIOlr1XDBK2kxXg9ifswE7YwjATkapHjZLRlQqA/gWo5U57vwm4wYwDGM3fjnSf8tQJhmS xfPM4x89nsVdnz/aTLMWVscjLrzsglr/ZTCB0Ia2p3hj5B5HT9zJH1ROf3TSZcvctQCpE+QjW+OCs 37IvXMiTg/8ACdpNKOxA==; 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 1fOYSv-0000R5-4J; Fri, 01 Jun 2018 01:02:49 +0000 Received: from mail-eopbgr40085.outbound.protection.outlook.com ([40.107.4.85] helo=EUR03-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fOYSp-0000NK-7e for hostap@lists.infradead.org; Fri, 01 Jun 2018 01:02:45 +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:X-MS-Exchange-SenderADCheck; bh=z+7x3UVESil6KalUj3VhFLxwmrtbbfvfalW6N2G10Sk=; b=RZ5UzuP7aGoFk4JPaZpFYJC4cFDXnWLhKsyjyBd2izoyMw9YS6/sFCXKN81G4JBAShbapJkF+C+/WBI/EqfHNKA9XcYHes5/VTu0KiZF/6FTycliuXGB85rRcANKOmLGSYON9cbsIyxV0skOE29ioaByBSgJDc2xbWIpeQuXIXo= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:f8b1:4178:69fc:b611) by HE1PR04MB1657.eurprd04.prod.outlook.com (2a01:111:e400:59aa::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.797.11; Fri, 1 Jun 2018 01:02:29 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v6 01/15] mesh: factor out mesh join function Date: Thu, 31 May 2018 18:01:55 -0700 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [2001:1900:2200:85:f8b1:4178:69fc:b611] X-ClientProxiedBy: BYAPR01CA0007.prod.exchangelabs.com (2603:10b6:a02:80::20) To HE1PR04MB1657.eurprd04.prod.outlook.com (2a01:111:e400:59aa::11) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:HE1PR04MB1657; X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 3:JQer9yML6T1Wa5QkuTfF2tItNFq5rACOKZwS2Mk68yAKnh9ObJg4R3WwoyowDK2IHMz4zn1iEl8uQPLlQjbdeuvTA6gJaFTex8UvckbW5PeufhQr8ytMmU36qLG8FPrfULytxz1zINekYfXyZ2uruSpvJIJBJsQPApiXNeGpIHai5ZhFo3vR+xb1bsv8x1MHXWWnWWka29tHP+dUa+jvHJExZZ5OFeGTdf6EjhVEWm9VWFgNZ+tAbewjXrBETJ4+; 25:zlYYnL9EehqjIvwfe8IpvhAFdN2kQp/Sa5dpuqztU7qmFo+gHhN1GPTdIlS7HbwVMvhWAJS/vYx7Yr1o0zqpZY15jWesYivUtk6h8XdSTvV4mkQe6/Fhgv+95DPWxk/9uSmMS8IR2sm6HwkBNl+cm73p+6vkE3OCJzs00Uimuv4S3ZWvMwM3kcqgao9V+H11W6cJSJwapI02fQEsR2kPRsFk8rBaG+I83JAKfqsA3AgpEQT3dy4WFEqwWGYm+fThwWHpLzw7x9eXwKcT2EjjDTAGtfYzOnbCMJR0Kc020joelQPEHxbtHdpiOyz2IC41oSmhWIarccR+KRq5SBQqeg==; 31:ezDS2D1tbVjQtjk3kIYFKKDzlPOnB1DPryD0mDwSkNyQz0DpiKP0rpXe6I50Mw664d05aU1toqX2yhC+h+rrH6IF42DBfPyLKUhu4eWdrRAGAgv6DkLPjpXY/fNEplUqV8f4+O7yx7wWilTNleIUkSRNZe8eaHuyI2Vys03jzGRq/EU50D4KDUSO+6wCvodZFsXyNgfduyrSnSfJ6iM2oqGfpwwuvo7TugjPOig5AxE= X-MS-TrafficTypeDiagnostic: HE1PR04MB1657: X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 20:YVD2gPcxqcwf2ucm3t+DankEVYRK/pKU41QH7E3VRYbFhRubknKKrihudAIFLsyaJBCw/JBLYv9BcupjKy1DCYD0SIq58qmHzdtvnlpiGdzwXJXxXFKZW94MLmUTETgB9iO6ijfsguEzOoeDEkV5JQkSUqON4PceyVNQUXZULIEHqxc5M8pfeTRC8wiYDh/yGO1CoBIoit88Umy2WYEZj9sKE58HKD+uoLdhGXgqjfiy5gqVTbqZ8h5DROyLaeFhZxU5xvnyJY0MglUcDDkbk34kDhpcrR0DjjNBMcCoifqggkNR+bMyVY+3SasoDb9pLjH+cbcmeOBOuyt4wQWhZcewnPfT5hghpNCZmJ4vLugvaZWRux8aJWv5oz229hA8I1Y1FOHoc5o/xJ/z37eWr3ueOsVrUNfxWrsIKPzK7Ic=; 4:JbFacoZhe74kg7R2dVxLAn/t/itnAMgWqZIs9kHY+dChDMKiLJhFJxjWk/Ziy40TQ/jq3AwrxzqUoh8OheDDkR6e5Xb/m6lsKqIoKTuOv+Tp1PjZEvECYcXntlhA2SvVLfXucXKzj4U58TBrzxJmTQCjcVlSVq30zFmAYtlXuu7XQ7DysY01K99AEgCBtAVvvONTk0V9pi55gH6lwndZ70VRE5GELRd7xQm5Dg7v03RhmLg66qaHA/OkiGMB6HF/MpxnU/0HvKgJr5upLQxRPA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(149027)(150027)(6041310)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:HE1PR04MB1657; BCL:0; PCL:0; RULEID:; SRVR:HE1PR04MB1657; X-Forefront-PRVS: 0690E5FF22 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(376002)(396003)(366004)(346002)(39850400004)(39380400002)(52314003)(189003)(199004)(6512007)(48376002)(105586002)(2616005)(16586007)(575784001)(86362001)(6666003)(6916009)(478600001)(486006)(9686003)(25786009)(476003)(106356001)(11346002)(53416004)(316002)(6116002)(46003)(50226002)(36756003)(107886003)(2906002)(85782001)(446003)(16810700005)(53936002)(6486002)(305945005)(2361001)(81156014)(81166006)(69596002)(186003)(76176011)(52396003)(52116002)(2351001)(16526019)(51416003)(8936002)(4326008)(97736004)(33896004)(68736007)(6506007)(118296001)(8676002)(7736002)(50466002)(47776003)(5660300001)(386003)(85772001)(309714004); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR04MB1657; H:smtp.office365.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: bowerswilkins.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR04MB1657; 23:PARHxxK9x1dXgFUMivjoPB2hXgnuMaa+mAt6P1tE2?= Sz6ieCShtm4otH3WTVY58VaWPcDph1xFCtnbEcwoZ+FyFYmtkXI7iC+v0QvyPbkd9kps9braeYOIebTOGuURssOi66a9lzpvV/Sp8N7xWrpN/4bxoHJDyeBpyu0pnd9/tLFMapUrZjNIHN54daKQ9wLNQQEIeVaM/wU2vNTOn398XerQOZ2U8vDGqQdl+hFgAcHx4SHRF+gIpKkBCGddEbxR85glPFxJvAg5GhNsk8yTUG+m66a2MWTAk/hE9HkPSRkbrKH2aEJM39ogO7ALAxtXjbjpYglSd8W+7mw9SKVGzR/jiqslH0TNlJt8wZevUhDNfEgXX4JEIr6yPMij+kqFAb2ZPhyJ9KXf1dfHxYm9S5seLJ95awr3CsrNzrTqf9TTDHH+hWCCgucYrkDFNtk3dsuW1yrgXKPBcVnR+MNjjEl3YSxv4seIGQygMScKgoBPqSxDvKzSz/gVpz/mnPRW6xM0iLcSOCeAW/iVjDMK1zNL3hQKoDCUoRbjaGqHXoaU0USn5wjUm0E7CoPOSgoWlUOeEv4r3TJ4m2IuWhxYjsUbE12BxOAOOZVYfogZfCaQdn+Z0Qy9TAFdgdbw8yWOE4B1eVrEYHK9O37iPELxQuU3x3Np7clKqZHGekCNfFPPFEGJGwwaCZwkA35dshuixtPU4SjFaVsJ/wmHLvcjSrjHdn0R4Ol8PXBjT+QLN1NZclCbDlSyYlc8SdClFlTNGVF4USpslDitJlgNu9+uPfRLnw40U8pxwuY6fZrWzePVDInCrMM7QuPFRhxghGlckAJn3s5x1Ck2r6pQAqkuUfI2X6RaKKrFaakGw8+PLzdNESDMec8dcYX53YdLIQA9+DW8qzSq7xB5xwtkqInirB4j+iszbBdJz9Th0WDOYlAvSdF7JQLGK6YKnLV7eMWyn+uRKAd2P4gMUUbnV3HZPFkST3ig3FmgNVcZGSZXXjX9zOOHuewvgcQNav6xv4ZZ5A272R2I7DtsFYyZgIz5igAuAnZM8pQwUD4nPHE2K8tE+7rA2vw05DdLMt1fXVE3DRf8lIEObeFAvMx/PMLK4/VumqR9ywzAU+k8D8lUofrBAioXoj4pQgaA3DUCRyFj3yzqhlrVqG+rZT65nc5n3PQPWjW/F89qjZZFnF7EZCZwjktirJ4hG64NXvPzwDJ6ADYQKu/bs4gukFgatzXaSQKoa61U2ZXbsHU0M0fgDVfFER64sICfFpiZxeCxLF2+56de2GiTDPokIwiXcD08G0KUs+9sciEakfFLLK7EnYB8L9nSZ/A7Zo8dIOONjzStEFLJkzzkt1ISnYm0lWr+bvkA3s/8u9HI95ApMWGYRU3uLY4worJdLooB8+t803LAgsV0UFYZVK6laEUskbW4uzwgbZJFcendAOhUtR18U0= X-Microsoft-Antispam-Message-Info: 8UQ/X6JONb92c9Kg8jozaBSexPiDDBbZxq6C0DhF9/odvik7tONGDXmpscT7Pm1qpvErbZbTnndwnPEag58+WXo4fU9u0JboD/++zpw0q7kE+Ohss0Sqkotp3cRkPXILQMR+a39d1KQ11sbTM4SRPMLNC0wcFeOb3Yx4nyH+2EA0hKciUqAGFlNDTmnsRvx8 X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 6:Ll2Xnen494bm6P+ZD27MY2+W1AfDhe41VF4hwzkONETaEGXTdCb5m90lv4s0MgZF7XzkebcB55I1Lu0kWIMyJjwkToaPMKN/l4sinJuYtR+Ja3X07LXLFD9klH5Wx+l/u43UnTGPCfnjRYreC1xpMCJzOTprZSBy1SnsVI9EHBndSpc6mkKuoGN0Eg/QOYgjmr3DiVWSle2Uwhe75HU1Y2oR9+2nMjsE2hJiQJnCbvaFqC+m9GoGH0t5G3X5cxlXwhwdfPd0PYrYo9oUIa5s8ozWrVbPfHZQfUB8kNil/3l2Rv+VNQnybTX5Wi3ZF60O7zLtB4D7dQLCsflsdletkXLW3Ama3mKH0M0BjqloUY7hl4gwq/z/lwhcaEXUg1wIxUdwIxaP0khw5e5cbAGDNZWEEYA8pwLaN6Oekb7ZRhA4mGdByytULGyJ9gyCzVwweKCWVe/dl1Hn607HHTQwsw==; 5:0GXU8kW++haZdNvzrefX8TQzyWF0SsoBBvl4XcrFx+I55NzH2JmN68gop5uLdLfWmIqaPTPnL+itAa5aNwYn/Y0s8NahorKoJKIPATjkvPB3x7xc4xW+FnkQu5L5sTXAMn3dXklcS2o1pZ+6lQnfKEfhagOc6p7W9A0b10iQuP0=; 24:Q8cZRjvn7rL1pSUBtGy41DbrAJ6vGjB7D3xVRI7+Ps83Z5qQglTNWdPQeiF78MmDYN4j/DeK+52fHkniDgyIxl88Fyz3EaO1bUqk021W6R8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR04MB1657; 7:hshtDCG0qKbPlUrICnCCxZTZGMHiqXoBdvx7Fdhg84/gCdaMHEe7d8pboFseWQYwsIsC+YxG3+MGf3LXTFSfQ7GNujSOehFjnjvS6dIsM0Zvzc4A1OzKVqDWQBj/Ch5StexNX3jD5aFUrspRIPKusyWBhnAEnTufxER3K9QSwrRHU3JPgL8IU5N/x/DKRQjaZVFFnFKuhGuysDZeCYumj/FkvYLx4OF6mrMoaNkwOx0ov6CHg27uwknL6VO2qk0r X-MS-Office365-Filtering-Correlation-Id: 692f6947-f123-4fee-b513-08d5c75b597b X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2018 01:02:29.2680 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 692f6947-f123-4fee-b513-08d5c75b597b X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR04MB1657 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180531_180243_450049_E8832D91 X-CRM114-Status: GOOD ( 13.98 ) 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 [40.107.4.85 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 | 123 +++++++++++++++++++++----------------- wpa_supplicant/mesh.h | 1 + wpa_supplicant/wpa_supplicant_i.h | 1 + 3 files changed, 71 insertions(+), 54 deletions(-) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 38b9fb3..577b5ba 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -34,6 +34,8 @@ static void wpa_supplicant_mesh_deinit(struct wpa_supplicant *wpa_s) wpa_s->current_ssid = NULL; os_free(wpa_s->mesh_rsn); wpa_s->mesh_rsn = NULL; + os_free(wpa_s->mesh_params); + wpa_s->mesh_params = NULL; /* TODO: leave mesh (stop beacon). This will happen on link down * anyway, so it's not urgent */ } @@ -364,14 +366,50 @@ 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; + os_free(params); goto out; } @@ -381,22 +419,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; } @@ -410,67 +448,44 @@ 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)) { + os_free(wpa_s->mesh_params); + 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 2b0dca0..3fdef82 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;