From patchwork Mon Aug 27 21:28:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Oh X-Patchwork-Id: 962647 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="SZ961dqK"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=bowerswilkins.com header.i=@bowerswilkins.com header.b="B9dMX5g6"; 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 41zlS10czyz9s4V for ; Tue, 28 Aug 2018 07:30:57 +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=Qy8LqqJG/UsqumknaOKo6q329zdvt1OCO6jYjjw/NIs=; b=SZ961dqKoUBKxS 4WaPhqivW3qYuMjrmdjUx839Pqhdw/fFuyMbBAZpsWXuWx7aFtEIYmpYsnL/xoRGqIqoLpjFjA8NU SaIRZfQNyQgIHCHiHvhTRMkO7W+vuIa7x1x62ukgFsJOy4SdDFIl1Rtu6O55FK6jH8o+8qhfIeRtz VRSAIihDnxqVCfl+XFmatnP26FXzJ/6trnzD39ny7KLeDNuAALDs5/Bd2KEpMucfOkhbe39j+MCxO r2s69OLvdPMKndspcPVjJ48NRBr7/XyUZGokEctyJsDgi28dKjfuCniO2zak+9F1AyffnCnAK7+F4 5phao5gWS6Z1TzYQdGmg==; 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 1fuP5q-0008K5-S5; Mon, 27 Aug 2018 21:30:38 +0000 Received: from mail-eopbgr50084.outbound.protection.outlook.com ([40.107.5.84] helo=EUR03-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuP4b-0006Rg-O7 for hostap@lists.infradead.org; Mon, 27 Aug 2018 21:29:24 +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=7zVKfePe5BGHCBQnwq10XLTZBn04ziGZIdoFDiAP904=; b=B9dMX5g6wZ3XpW1/CWnIFLFxQCGMCXghts5W1fiovzkGpAxuX0+qzTzazg04n0GsxhHajzcfO/RiVHXfEyRG9S7joL3OEBhUvoL1P3HR4vRt4HJx/4crkEAo+RXDhg1ViZ3xdOFzUFSzMn4Mv9dAm4hgRo+ahyxpPWArSEnTdzo= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peter.oh@bowerswilkins.com; Received: from smtp.office365.com (2001:1900:2200:85:78a5:2e99:49b5:88c8) by AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Mon, 27 Aug 2018 21:29:01 +0000 From: peter.oh@bowerswilkins.com To: hostap@lists.infradead.org Subject: [PATCH v8 01/16] mesh: factor out mesh join function Date: Mon, 27 Aug 2018 14:28:34 -0700 Message-Id: <8222a60e4ec6f0f75801ac3742d722e5a3f3676c.1535403927.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:78a5:2e99:49b5:88c8] X-ClientProxiedBy: SN6PR0102CA0027.prod.exchangelabs.com (2603:10b6:805:1::40) To AM6PR04MB4151.eurprd04.prod.outlook.com (2603:10a6:209:4e::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 235007b6-9dbf-4822-ead8-08d60c641b94 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:AM6PR04MB4151; X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 3:HT8eczfnkyoZfjWFm5GqAZqWbu8PFBUc2WwiADxsdyBpT3vxNLpMvQ5vdL28sFj9lK8CeHh2dZyDhqntR4gDWB84QER6lRVf6QAgvjkWxsSMLx+c272V98XRUJcBLhzpV0uOdj3U93O+P+zp1bCXNTc07wtTAEcDAZinYL0fQXVGXygbYlL0TZhP2gNDezsV55OgSgG9OHkPGbCA9SbbJWe7PGQd8FON45BWYNG7noXAr/IUgqrLEHOq7/vSOY87; 25:f8EZ69bmXGfpC2HsAixl77q3ueTGJaNfheZ5hKhBfBesjTb42qWIt7/hj0fijyFE+axUaIALj7KtcwCQw2jgXc0wWTpOcUf6Z6AYDXpZoWzcYJvGPVvX6U8t/328bZvqFr55XFI0Rd90cUOnTHeoxvnyNof8SmiA6KZ5Z1LjY1YCWxpIBGgJujDTrC++yFLRxiBco/bqbHwtv+Gw5xkJBilTfDp3FTyuvbrIoJp9Vrg3dd/Ktsm+3kohANm6hF4N+6YxTJB/8XYhUt9zY0XvKFMFcZHTXOKZF+YzR6THH+hRgFvyTBzr/8lcO9nkhn/DBC27p16tEaytk66VddRsIw==; 31:wgDpTUhRy4mqQ3tHiwHs6BNHIIOyauYgIeThqpaMM0DcFaA1GSOa+GM6pZmkwRpyM+DDOOkKqncUQqJkCUcVCYjxLYQHiaNr7DSfzYB5KHvlj9vJ3CucFuQx08YrYQmj61Cceo4shenysbJH0GlagKHi0MIf12IdniTFodJfAmGJWr93eD8ZjLHpUg20UqQQIAZGkpozmAeV6OgWPTQBcvdPWihwfQQ8gNXor+G7cjs= X-MS-TrafficTypeDiagnostic: AM6PR04MB4151: X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 20:UQlhk2M2adNWV8tsesRcpengRSoA8fUVwDbYjBUZZ1WGAvIEcUVLp+dYi5h+/0pcifxnGlearcZCCWg15YHA4oql+W3zOpuECLGp3Gj+CV3w6oWruuyTApl+lFWAKmN/g6PWxEufK4eRUmrJZIP5VOvhFHlOYk11R5y6mbSyeUN/nPraifrix55jb9NM4wljleTmED1AnDmMgDfIm4O7QolfwATLVY0RaMFJFhI2zZPqb/ADJsvq83Nr3uMauhouYnsuXdjlMNGb3psRBDxOv3CtSK3Skm21W13J7B809F2cgnLXbl2Msmqc/gWJ7yRUMg6rF4OeX8yNtB0uL+qrPFnFrHKsLY0c1KG+eZayGzJUYy0xTh+8iCODKRe3tpVGI44VGAhnaP115cMf+MohI0f490a1bIoBBgoHi+wPHFK8OYdKh63VvKPS4SRWfpJU1oacX+3j9xHr5KBPabMWj81OVYHBVlgYGZnAYBgfnSFeakF99kFOsvMX21BSXra0; 4:OJg7KI0OGU9qbPX2cyPAfvzY1ftAaSckBX9SYjZ0WnOKXYPkKzVm8N8ZwszyxACk0o4AtxE6BmLYf4LsQz7nW+DbqQlViUXW6zkR1SnO92cFe76TY6fTuMoJlnm/BvBvudmfW/p5N5awY+udfDOJLYd/zFL7HewDjMv5GsXPh8gKGCzU9cl+LETQ2m/c3dpI9lxtFSa50j2qOsoVpiR+Q700NUdQJyZIz3dOTq3fS4S7PtI6ZpbG9SVY9ujt+9nCwNgV+s8mg8l4T8HqF7TFmg== 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)(93006095)(93001095)(3002001)(10201501046)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699016); SRVR:AM6PR04MB4151; BCL:0; PCL:0; RULEID:; SRVR:AM6PR04MB4151; X-Forefront-PRVS: 07778E4001 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(136003)(366004)(346002)(39850400004)(52314003)(199004)(189003)(8676002)(81166006)(105586002)(4326008)(6666003)(5660300001)(36756003)(6116002)(69596002)(7736002)(305945005)(53416004)(51416003)(76176011)(186003)(52116002)(16526019)(106356001)(2616005)(476003)(446003)(11346002)(6506007)(386003)(52396003)(97736004)(81156014)(316002)(85782001)(33896004)(16586007)(86362001)(486006)(46003)(118296001)(8936002)(47776003)(50226002)(2361001)(68736007)(107886003)(53936002)(2351001)(6512007)(16810700005)(6486002)(48376002)(9686003)(25786009)(478600001)(2906002)(50466002)(6916009)(85772001)(309714004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR04MB4151; H:smtp.office365.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: bowerswilkins.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM6PR04MB4151; 23:F2GCzyTeNDKioy3DhcgbLM0db/Z+39bhddZODhYxW?= el+7VYjq3jyv616K2V4KEXxThs7hQbBg2IlX5ivOM97yA75c90ZbaPGmGKH5UN1MPHtHA9WOvJ9hVWk1CMSvHlVbUkavmVolw/D2CtrG1lHQhRcxsfjsd12R0pcs1XPtC/HCXtN2jtIbIIPLqOpf39RGYaTgKodIEfd+sFYTrX7Y2G6uli0cIXZcx+sjSKWZpovM8wczpXr4QSy4JnOGKnGLj8PFGfsj9yJYnNEOxAQz/AOyMoo65FYbbBpzmxwbOToE/yXi7XhFXTfFj6VlPVuJCymZUkduNbzNw7Db0alf5axIBzy7WKb8r1+elrP9uxA2jnr4wkJcrtka1LjgMrVCU9DjDxuFdVY8QzJiLpnNzD3E9UDr51JLpxR9UT1RRGVGx7Cue2r31D/uDldkZPWvICTcUZsF6RjG+sOuSTl5J/XD0vVYfwXLwtcvuMdUd3YyY+82Qdj9oWuIwke5jScR3TIkLzItOVM22bxFKNcmHmTy5xcw9hBz9LpBdP+F0OA9JH2Vc/syyBQh6M2VQKQT0nl9pFcnGfIcZEL9DL7C/95H6rXDreCFuwqnPv//vy9VINKI7x45Q4he//GwllZ474dDo/rJD5CbPvdqKmKC95kuXMqDv2Cf9jeoo9r4eztptOHrmZk6nD3k+u+nwzeUvCFyHoQyec0ewexTIdUJkfYAsAlfsLu5dgdyPAETNpQ0GjHSI8heCcMNCPtLQ6HoRXREoNkhL4N0APcfab6Vxctl3wmHsRca6zz/Kq54Sja6mFpNTzpUZMCQZH658pF1ZnKwGztYSMCMdzGbjCSzZ8vsk+aod8KfBYfgSatfqUeMlQQ51zBOMj9gjlID2XdQlZgXjZX10kzxcxKcQ0C7TlS67Px444g9Y3AMwUl8JZvikqvH4ij5Up/Oy3L/4qvqyv5en5WyU9eT4xRbiZwhk3RoghZhKjw8BvO4Kx6fljIwsYQbZBljMXec9UxUMujfd7CkpM1ra13VT9JMuVj7Yf4P50pYqYk8D4KJKVpWCcie4dg/c7u/k+8JtfubrE39UWe9sT+TkdIeizkFIFBvXb2zo00b9nO+A7N/6/GL1vIUDC0zDmEdV1RHFeNk3TCVRvBrkNA5kQRrVWSb2SilN+jyXduTVZ+8IPmWaG8re3Tqr6GeTBYhVDK7A6nOcL1xh4MqtSW9+CVbc+AcZN1MLFMsPqXi3EZlfLhIfiI9T58zjqVoEvAAZITOB5kbcrEQ/u5W/SoLFYZs3FXDDYek3rwoMrzFsel6B7+JPuyMO9v4xy+Aqou0kDMpKOzVDmVyyICLzQQQX1W0bWZecbjzAYy4lLt6AUkh67hc5tCaPt/ls2jJTyzhdGJe/2Af8tI5EZtbP7k/oVLywP9Mmg1WA== X-Microsoft-Antispam-Message-Info: 5xYQ2OUUdXb1pDFtQigj3fL4k0nbl2TaeC/M7F9PoKuDiPckUPNtUyb9zsCveCEbRPc93S7SJ4KYT+N8qgaF5imI5+4s6F7cV24zbDIKV0YpS6w/p5H+O+Zi0xq0Bw0UEjl54ETS3MrKIrLs1syum8XVnvDEAHA00NnzRz9fIwb/c08gSalDpa/dUnObbOHyrLJAR3TZjQLD2Fs2y4upEeA0RrzQmUBn4ucM9jve7uel9WEnNf1CHlgWGZL/H/xdyfETPrbwpYEFcDBVcnLJYiOjvcERePbIGaK0NMO3s82oA+U291qi5Wn2KbRZ55TqO0mePcUiqXt4bNJpHMOssvlpR/7uhmA5TtOunVlRAh0= X-Microsoft-Exchange-Diagnostics: 1; AM6PR04MB4151; 6:m9X8KNb5cPk+B8uFKx7VXokhTYjkU+B6R4FpQwP+snZ5EaNCuG2ap3Bt6jNG4tarm2y/pr0o28oaeIT5k44uo1L4Dxk4GuFU+tzRUe41zXA/ikAf3Kti6H5DjnnNqDoe0OY4CFX+jztp+y1mlroz7aIPq7bsS8Mu6PlLpE1Vk9yjgWpt/Y4berk97UGvKPgghFJH4f0FvE52lMbGa3chXc+/F/vv6Bwdkg8uqLxfwkbSCQ6ZrhQQ6f/mgVIMvxz8wK/QvshN8CV540cFMfTEuVFWz3F06XmUI3ItULUWd/TmweT+nmcx61nrVgvE8c2Dn1lF7tTMpmo5uZElKxzH+8+6kKQdeAxWifs17NXEj5hgClw6PvEZCcfTWR8DSTUuTdK5vlUjIwcT0I+pu3i4bbXcFrayiTsBT1RF9jt/8vzx3k08u6ZQ6PMyCAQtXmKzxA0Lg5tq+kcYx1yfgV0yng==; 5:0wZtPhZiKRd/x/u4JaeFDRrZMpKX+iO73rZUpTpDe8+mBa3ZlEQeAyAFna4JyH8aByH/hXrivZ6YzHdkEQbKDUwmmgwLfNxahfcT5bI6Sy5EB9wTdTxCOcLZ0LXEcOLDGoTh3pjRjkYwc38DwJ5mixgd37u3ybKLJH9KZy52fto=; 7:Y9b8kxOq5nytn7QA2/3O/41MPk5OiUxil+hnq17Jjp6QIplOYOqwr5QP1FPwx8VguVBOx8tTdFDNKysKVj+VBWZbF5I79CkCdxZNRYehQJ7Z8D0ouVGuNCDWYCCmc8+dt5FVDWbdRk4137MpAtPFlITG2YH47k1qdSSR0Y7aatsyAV8G2S+RlgFvpXZxWeVoI/dTtFu9eNaHGKzPgLFZyF/Uk3ms3FIt392MnG2bxL5o+ygK+mp08RjxjGVkaZ+/ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: bowerswilkins.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2018 21:29:01.1846 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 235007b6-9dbf-4822-ead8-08d60c641b94 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a75a45bb-4772-448f-a2c6-9d2413d86410 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4151 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180827_142921_997540_9465E41A X-CRM114-Status: GOOD ( 14.17 ) 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.5.84 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -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 consists 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 | 124 +++++++++++++++++++++----------------- wpa_supplicant/wpa_supplicant_i.h | 1 + 2 files changed, 71 insertions(+), 54 deletions(-) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index 38b9fb3..9bbff4c 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 */ } @@ -147,6 +149,41 @@ static void wpas_mesh_copy_groups(struct hostapd_data *bss, } +static void wpas_mesh_complete_cb(void *ctx) +{ + struct wpa_supplicant *wpa_s = (struct wpa_supplicant *)ctx; + 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; +} + + static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid, struct hostapd_freq_params *freq) @@ -367,11 +404,13 @@ void wpa_supplicant_mesh_add_scan_ie(struct wpa_supplicant *wpa_s, 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 +420,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 +449,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_mesh_complete_cb(wpa_s); out: return ret; } diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h index c6d6d84..d02c358 100644 --- a/wpa_supplicant/wpa_supplicant_i.h +++ b/wpa_supplicant/wpa_supplicant_i.h @@ -812,6 +812,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;