From 07f4c5a7c856e7308d315762a82c76743cf5ec4b Mon Sep 17 00:00:00 2001 From: Andrei Emeltchenko Date: Thu, 28 Jun 2012 16:09:21 +0300 Subject: [PATCH] hcidump: Make assoc dump function available for HCI parser AMP Assoc dump will be used also for HCI dump functions --- tools/parser/amp.c | 126 +++++++++++++++++++++++++++++++++++++++++++ tools/parser/l2cap.c | 106 ++---------------------------------- 2 files changed, 130 insertions(+), 102 deletions(-) create mode 100644 tools/parser/amp.c diff --git a/tools/parser/amp.c b/tools/parser/amp.c new file mode 100644 index 000000000..158ca4a75 --- /dev/null +++ b/tools/parser/amp.c @@ -0,0 +1,126 @@ +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2012 Intel Corporation. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include "parser.h" +#include "lib/amp.h" + +static void amp_dump_chanlist(int level, struct amp_tlv *tlv, char *prefix) +{ + struct amp_chan_list *chan_list = (void *) tlv->val; + struct amp_country_triplet *triplet; + int i, num; + + num = (tlv->len - sizeof(*chan_list)) / sizeof(*triplet); + + printf("%s (number of triplets %d)\n", prefix, num); + + p_indent(level+2, 0); + + printf("Country code: %c%c%c\n", chan_list->country_code[0], + chan_list->country_code[1], chan_list->country_code[2]); + + for (i = 0; i < num; i++) { + triplet = &chan_list->triplets[i]; + + p_indent(level+2, 0); + + if (triplet->chans.first_channel >= 201) { + printf("Reg ext id %d reg class %d coverage class %d\n", + triplet->ext.reg_extension_id, + triplet->ext.reg_class, + triplet->ext.coverage_class); + } else { + if (triplet->chans.num_channels == 1) + printf("Channel %d max power %d\n", + triplet->chans.first_channel, + triplet->chans.max_power); + else + printf("Channels %d - %d max power %d\n", + triplet->chans.first_channel, + triplet->chans.first_channel + + triplet->chans.num_channels, + triplet->chans.max_power); + } + } +} + +void amp_assoc_dump(int level, uint8_t *assoc, uint16_t len) +{ + struct amp_tlv *tlv = (void *) assoc; + + p_indent(level, 0); + printf("Assoc data [len %d]:\n", len); + + while (len > sizeof(*tlv)) { + uint16_t tlvlen = btohs(tlv->len); + struct amp_pal_ver *ver; + + p_indent(level+1, 0); + + switch (tlv->type) { + case A2MP_MAC_ADDR_TYPE: + if (tlvlen != 6) + break; + printf("MAC: %2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X\n", + tlv->val[0], tlv->val[1], tlv->val[2], + tlv->val[3], tlv->val[4], tlv->val[5]); + break; + + case A2MP_PREF_CHANLIST_TYPE: + amp_dump_chanlist(level, tlv, "Preferred Chan List"); + break; + + case A2MP_CONNECTED_CHAN: + amp_dump_chanlist(level, tlv, "Connected Chan List"); + break; + + case A2MP_PAL_CAP_TYPE: + if (tlvlen != 4) + break; + printf("PAL CAP: %2.2x %2.2x %2.2x %2.2x\n", + tlv->val[0], tlv->val[1], tlv->val[2], + tlv->val[3]); + break; + + case A2MP_PAL_VER_INFO: + if (tlvlen != 5) + break; + ver = (struct amp_pal_ver *) tlv->val; + printf("PAL VER: %2.2x Comp ID: %4.4x SubVer: %4.4x\n", + ver->ver, btohs(ver->company_id), + btohs(ver->sub_ver)); + break; + + default: + printf("Unrecognized type %d\n", tlv->type); + break; + } + + len -= tlvlen + sizeof(*tlv); + assoc += tlvlen + sizeof(*tlv); + tlv = (struct amp_tlv *) assoc; + } +} diff --git a/tools/parser/l2cap.c b/tools/parser/l2cap.c index e8b7b024c..f26f58d2e 100644 --- a/tools/parser/l2cap.c +++ b/tools/parser/l2cap.c @@ -38,6 +38,7 @@ #include "lib/hci.h" #include "lib/l2cap.h" #include "lib/a2mp.h" +#include "lib/amp.h" typedef struct { uint16_t handle; @@ -1162,112 +1163,13 @@ static inline void a2mp_assoc_req(int level, struct frame *frm) printf("Get AMP Assoc req: id %d\n", h->id); } -static void a2mp_dump_chanlist(int level, struct a2mp_tlv *tlv, char *prefix) -{ - struct a2mp_chan_list *chan_list = (struct a2mp_chan_list *) tlv->val; - struct a2mp_country_triplet *triplet; - int i, num; - - num = (tlv->len - sizeof(*chan_list)) / sizeof(*triplet); - - printf("%s number of triplets %d\n", prefix, num); - - p_indent(level+2, 0); - - printf("Country code: %c%c%c\n", chan_list->country_code[0], - chan_list->country_code[1], chan_list->country_code[2]); - - for (i = 0; i < num; i++) { - triplet = &chan_list->triplets[i]; - - p_indent(level+2, 0); - - if (triplet->chans.first_channel >= 201) { - printf("Reg ext id %d reg class %d coverage class %d\n", - triplet->ext.reg_extension_id, - triplet->ext.reg_class, - triplet->ext.coverage_class); - } else { - if (triplet->chans.num_channels == 1) - printf("Channel %d max power %d\n", - triplet->chans.first_channel, - triplet->chans.max_power); - else - printf("Channels %d - %d max power %d\n", - triplet->chans.first_channel, - triplet->chans.first_channel + - triplet->chans.num_channels, - triplet->chans.max_power); - } - } -} - -static inline void a2mp_assoc_dump(int level, uint8_t *assoc, uint16_t len) -{ - struct a2mp_tlv *tlv; - - p_indent(level, 0); - printf("Assoc data [len %d]:\n", len); - - tlv = (struct a2mp_tlv *) assoc; - while (len > sizeof(*tlv)) { - uint16_t tlvlen = btohs(tlv->len); - struct a2mp_pal_ver *ver; - - p_indent(level+1, 0); - - switch (tlv->type) { - case A2MP_MAC_ADDR_TYPE: - if (tlvlen != 6) - break; - printf("MAC: %2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X\n", - tlv->val[0], tlv->val[1], tlv->val[2], - tlv->val[3], tlv->val[4], tlv->val[5]); - break; - - case A2MP_PREF_CHANLIST_TYPE: - a2mp_dump_chanlist(level, tlv, "Preferred Chan List"); - break; - - case A2MP_CONNECTED_CHAN: - a2mp_dump_chanlist(level, tlv, "Connected Chan List"); - break; - - case A2MP_PAL_CAP_TYPE: - if (tlvlen != 4) - break; - printf("PAL CAP: %2.2x %2.2x %2.2x %2.2x\n", - tlv->val[0], tlv->val[1], tlv->val[2], - tlv->val[3]); - break; - - case A2MP_PAL_VER_INFO: - if (tlvlen != 5) - break; - ver = (struct a2mp_pal_ver *) tlv->val; - printf("PAL VER: %2.2x Comp ID: %4.4x SubVer: %4.4x\n", - ver->ver, btohs(ver->company_id), - btohs(ver->sub_ver)); - break; - - default: - printf("Unrecognized type %d\n", tlv->type); - break; - } - - len -= tlvlen + sizeof(*tlv); - assoc += tlvlen + sizeof(*tlv); - tlv = (struct a2mp_tlv *) assoc; - } -} - static inline void a2mp_assoc_rsp(int level, struct frame *frm, uint16_t len) { struct a2mp_assoc_rsp *h = frm->ptr; - printf("Get AMP Assoc rsp: id %d status (%d) %s \n", + printf("Get AMP Assoc rsp: id %d status (%d) %s\n", h->id, h->status, a2mpstatus2str(h->status)); - a2mp_assoc_dump(level + 1, (uint8_t *) &h->assoc_data, len - 2); + amp_assoc_dump(level + 1, h->assoc_data, len - sizeof(*h)); } static inline void a2mp_create_req(int level, struct frame *frm, uint16_t len) @@ -1276,7 +1178,7 @@ static inline void a2mp_create_req(int level, struct frame *frm, uint16_t len) printf("Create Physical Link req: local id %d remote id %d\n", h->local_id, h->remote_id); - a2mp_assoc_dump(level + 1, (uint8_t *) &h->assoc_data, len - 2); + amp_assoc_dump(level + 1, h->assoc_data, len - sizeof(*h)); } static inline void a2mp_create_rsp(int level, struct frame *frm) -- 2.47.3