From patchwork Thu Aug 29 22:23:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 2851631 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4EDDA9F3DC for ; Thu, 29 Aug 2013 22:24:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1F150204FE for ; Thu, 29 Aug 2013 22:24:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1BF9A204E7 for ; Thu, 29 Aug 2013 22:24:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755899Ab3H2WY3 (ORCPT ); Thu, 29 Aug 2013 18:24:29 -0400 Received: from mail.candelatech.com ([208.74.158.172]:46047 "EHLO ns3.lanforge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756778Ab3H2WY2 (ORCPT ); Thu, 29 Aug 2013 18:24:28 -0400 Received: from localhost.localdomain (firewall.candelatech.com [70.89.124.249]) by ns3.lanforge.com (8.14.2/8.14.2) with ESMTP id r7TMNs01006954 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 29 Aug 2013 15:23:57 -0700 From: greearb@candelatech.com To: linux-wireless@vger.kernel.org Cc: Ben Greear Subject: [PATCH v2 3/4] iw: Print 802.11u roaming consortium IE in scan results. Date: Thu, 29 Aug 2013 15:23:46 -0700 Message-Id: <1377815027-3736-3-git-send-email-greearb@candelatech.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1377815027-3736-1-git-send-email-greearb@candelatech.com> References: <1377815027-3736-1-git-send-email-greearb@candelatech.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-9.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ben Greear Example output: 802.11u Roaming Consortium: ANQP OIs: 0 OI 1: 01010101 Signed-off-by: Ben Greear --- :100644 100644 53cef39... 14a4272... M scan.c scan.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/scan.c b/scan.c index 53cef39..14a4272 100644 --- a/scan.c +++ b/scan.c @@ -711,6 +711,58 @@ static void print_11u_advert(const uint8_t type, uint8_t len, const uint8_t *dat } } +static void print_11u_rcon(const uint8_t type, uint8_t len, const uint8_t *data) +{ + /* See Section 7.3.2.96 in the 802.11u spec. */ + int idx = 0; + int ln0 = data[1] & 0xf; + int ln1 = ((data[1] & 0xf0) >> 4); + int ln2 = 0; + printf("\n"); + + if (ln1) { + ln2 = len - 2 - ln0 - ln1; + } + printf("\t\tANQP OIs: %i\n", data[0]); + + if (ln0 > 0) { + printf("\t\tOI 1: "); + if (2 + ln0 > len) { + printf("Invalid IE length.\n"); + } + else { + for (idx = 0; idx < ln0; idx++) { + printf("%02hx", data[2 + idx]); + } + printf("\n"); + } + } + if (ln1 > 0) { + printf("\t\tOI 2: "); + if (2 + ln0 + ln1 > len) { + printf("Invalid IE length.\n"); + } + else { + for (idx = 0; idx < ln1; idx++) { + printf("%02hx", data[2 + ln0 + idx]); + } + printf("\n"); + } + } + if (ln2 > 0) { + printf("\t\tOI 3: "); + if (2 + ln0 + ln1 + ln2 > len) { + printf("Invalid IE length.\n"); + } + else { + for (idx = 0; idx < ln2; idx++) { + printf("%02hx", data[2 + ln0 + ln1 + idx]); + } + printf("\n"); + } + } +} + static const char *ht_secondary_offset[4] = { "no secondary", "above", @@ -990,6 +1042,7 @@ static const struct ie_print ieprinters[] = { [127] = { "Extended capabilities", print_capabilities, 0, 255, BIT(PRINT_SCAN), }, [107] = { "802.11u Interworking", print_interworking, 0, 255, BIT(PRINT_SCAN), }, [108] = { "802.11u Advertisement", print_11u_advert, 0, 255, BIT(PRINT_SCAN), }, + [111] = { "802.11u Roaming Consortium", print_11u_rcon, 0, 255, BIT(PRINT_SCAN), }, }; static void print_wifi_wpa(const uint8_t type, uint8_t len, const uint8_t *data)