From patchwork Wed Aug 26 08:32:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Masashi Honma X-Patchwork-Id: 510761 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from maxx.maxx.shmoo.com (maxx.shmoo.com [205.134.188.171]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 85FA314012C for ; Wed, 26 Aug 2015 18:41:08 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=hyRxdf/B; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 27FD89C112; Wed, 26 Aug 2015 04:41:06 -0400 (EDT) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pxHYfe3SYLdB; Wed, 26 Aug 2015 04:41:05 -0400 (EDT) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id B8D5C9C10C; Wed, 26 Aug 2015 04:41:00 -0400 (EDT) X-Original-To: mailman-post+hostap@maxx.shmoo.com Delivered-To: mailman-post+hostap@maxx.shmoo.com Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 2BB3E9C10C for ; Wed, 26 Aug 2015 04:40:59 -0400 (EDT) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PCP1P9f-I76r for ; Wed, 26 Aug 2015 04:40:53 -0400 (EDT) Received: from mail-pa0-f54.google.com (mail-pa0-f54.google.com [209.85.220.54]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (not verified)) by maxx.maxx.shmoo.com (Postfix) with ESMTPS id 4BEE29C10A for ; Wed, 26 Aug 2015 04:40:53 -0400 (EDT) Received: by pacdd16 with SMTP id dd16so153746412pac.2 for ; Wed, 26 Aug 2015 01:40:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=MXXgKHSdv4vvGLYJFzAUY/htu3iNfXcEZ0FcW+AzvRE=; b=hyRxdf/BIqERmPE9/Ly4VCEn1kwdUaJbZ3OIzm8SITOa1nLT4vf249xmS6n1J8mG9b cOtvE/Gn1pAWp1RZ5Co+I9ISHTRj6KMaxK1h01SS4aWUkQZ16R3mxQvMThT6G1BYNIyJ KWrTc2sgCtIqUvLBpfsW81PFDYbC5rFZYbePCLMFlY7BYSN6O4GmE0wEF65hpRZFtNzP xPzHXal5KwpJGnxW5IMzz6sqMRjbrWc+EQsdNzP6kvyfd79wuYKSwjcNc5F4qPGeSWNI LgEq8pxuoHrTfI+EYyLotgNHBYLnKimdC1gRziAVXGLgOnh0ccGugBt8xC2p0KLgClMN Fq1Q== X-Received: by 10.66.164.130 with SMTP id yq2mr68437504pab.67.1440577987723; Wed, 26 Aug 2015 01:33:07 -0700 (PDT) Received: from localhost.localdomain (p034397.kngwnt01.ap.so-net.ne.jp. [121.3.67.151]) by smtp.gmail.com with ESMTPSA id w2sm22329117pdo.89.2015.08.26.01.33.06 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Aug 2015 01:33:07 -0700 (PDT) From: Masashi Honma To: hostap@lists.shmoo.com Subject: [PATCH 1/3] mesh: Add RSN IE to open/confirm frame Date: Wed, 26 Aug 2015 17:32:37 +0900 Message-Id: <1440577959-3540-1-git-send-email-masashi.honma@gmail.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 X-BeenThere: hostap@lists.shmoo.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: HostAP Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: hostap-bounces@lists.shmoo.com Errors-To: hostap-bounces@lists.shmoo.com The RSN IE is required by spec[1] on SAE use case. [1] Table 8-262—Mesh Peering Open frame Action field format [1] Table 8-263—Mesh Peering Confirm frame Action field format This patch inserts the RSN IE to them. [1] IEEE Std 802.11 2012 Signed-off-by: Masashi Honma --- wpa_supplicant/mesh_mpm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wpa_supplicant/mesh_mpm.c b/wpa_supplicant/mesh_mpm.c index b29b5ff..25470c8 100644 --- a/wpa_supplicant/mesh_mpm.c +++ b/wpa_supplicant/mesh_mpm.c @@ -228,6 +228,7 @@ static void mesh_mpm_send_plink_action(struct wpa_supplicant *wpa_s, 2 + /* AID */ 2 + 8 + /* supported rates */ 2 + (32 - 8) + + conf->ie_len + /* RSN IE */ 2 + 32 + /* mesh ID */ 2 + 7 + /* mesh config */ 2 + 23 + /* peering management */ @@ -262,6 +263,9 @@ static void mesh_mpm_send_plink_action(struct wpa_supplicant *wpa_s, pos = hostapd_eid_ext_supp_rates(bss, pos); wpabuf_put_data(buf, supp_rates, pos - supp_rates); + /* IE: RSN IE */ + wpabuf_put_data(buf, conf->ies, conf->ie_len); + /* IE: Mesh ID */ wpabuf_put_u8(buf, WLAN_EID_MESH_ID); wpabuf_put_u8(buf, conf->meshid_len);