korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-30 07:34:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

hcidump: Add the initial part for vendor packets of a BPA

Browse Source
This commit is contained in:
Marcel Holtmann 2004-10-23 17:57:17 +00:00
parent c66b60617a
commit 2b777b21fc
4 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/hcidump.1
View File

@ -79,6 +79,9 @@ For every packet, not only is the packet type displayed, but also all data in he
.BR -R ", " "\-\^\-raw"
Raw mode: do not display packet type, only data.
.TP
.BR -B ", " "\-\^\-bpa"
BPA mode: only display vendor specific data packets.
.TP
.BR -C ", " "\-\^\-cmtp"
Sets the PSM value for the CAPI Message Transport Protocol
.TP

26
tools/hcidump.c
View File

@ -257,7 +257,7 @@ static int open_file(char *file, int mode)
return f;
}
static int open_socket(int dev)
static int open_socket(int dev, unsigned long flags)
{
struct sockaddr_hci addr;
struct hci_filter flt;
@ -283,8 +283,14 @@ static int open_socket(int dev)
/* Setup filter */
hci_filter_clear(&flt);
hci_filter_all_ptypes(&flt);
hci_filter_all_events(&flt);
if (flags & DUMP_BPA) {
hci_filter_set_ptype(HCI_VENDOR_PKT, &flt);
hci_filter_set_event(EVT_VENDOR, &flt);
} else {
hci_filter_all_ptypes(&flt);
hci_filter_all_events(&flt);
hci_filter_clear_ptype(HCI_VENDOR_PKT, &flt);
}
if (setsockopt(sk, SOL_HCI, HCI_FILTER, &flt, sizeof(flt)) < 0) {
perror("Can't set HCI filter");
exit(1);
@ -436,6 +442,7 @@ static void usage(void)
" -x, --hex Dump data in hex\n"
" -X, --ext Dump data in hex and ascii\n"
" -R, --raw Raw mode\n"
" -B, --bpa BPA mode\n"
" -C, --cmtp=psm PSM for CMTP\n"
" -H, --hcrp=psm PSM for HCRP\n"
" -O, --obex=channel Channel for OBEX\n"
@ -458,6 +465,7 @@ static struct option main_options[] = {
{ "hex", 0, 0, 'x' },
{ "ext", 0, 0, 'X' },
{ "raw", 0, 0, 'R' },
{ "bpa", 0, 0, 'B' },
{ "cmtp", 1, 0, 'C' },
{ "hcrp", 1, 0, 'H' },
{ "obex", 1, 0, 'O' },
@ -473,7 +481,7 @@ int main(int argc, char *argv[])
printf("HCIDump - HCI packet analyzer ver %s\n", VERSION);
while ((opt=getopt_long(argc, argv, "i:l:p:m:w:r:s:n:taxXRC:H:O:h", main_options, NULL)) != -1) {
while ((opt=getopt_long(argc, argv, "i:l:p:m:w:r:s:n:taxXRBC:H:O:h", main_options, NULL)) != -1) {
switch(opt) {
case 'i':
device = atoi(optarg + 3);
@ -547,6 +555,10 @@ int main(int argc, char *argv[])
flags |= DUMP_RAW;
break;
case 'B':
flags |= DUMP_BPA;
break;
case 'C':
set_proto(0, atoi(optarg), 0, SDP_UUID_CMTP);
break;
@ -580,7 +592,7 @@ int main(int argc, char *argv[])
switch (mode) {
case PARSE:
init_parser(flags, filter, defpsm, defcompid);
process_frames(device, open_socket(device), -1);
process_frames(device, open_socket(device, flags), -1);
break;
case READ:
@ -589,7 +601,7 @@ int main(int argc, char *argv[])
break;
case WRITE:
process_frames(device, open_socket(device), open_file(dump_file, mode));
process_frames(device, open_socket(device, flags), open_file(dump_file, mode));
break;
case RECEIVE:
@ -598,7 +610,7 @@ int main(int argc, char *argv[])
break;
case SEND:
process_frames(device, open_socket(device), open_connection(dump_addr, dump_port));
process_frames(device, open_socket(device, flags), open_connection(dump_addr, dump_port));
break;
}

11
tools/parser/hci.c
View File

@ -426,6 +426,13 @@ static inline void sco_dump(int level, struct frame *frm)
}
}
static inline void vendor_dump(int level, struct frame *frm)
{
p_indent(level, frm);
printf("Vendor data: len %d\n", frm->len);
raw_dump(level, frm);
}
void hci_dump(int level, struct frame *frm)
{
uint8_t type = *(uint8_t *)frm->ptr;
@ -449,6 +456,10 @@ void hci_dump(int level, struct frame *frm)
sco_dump(level, frm);
break;
case HCI_VENDOR_PKT:
vendor_dump(level, frm);
break;
default:
if (p_filter(FILT_HCI))
break;

3
tools/parser/parser.h
View File

@ -49,7 +49,8 @@ struct frame {
#define DUMP_HEX 0x02
#define DUMP_EXT 0x04
#define DUMP_RAW 0x08
#define DUMP_TSTAMP 0x10
#define DUMP_BPA 0x10
#define DUMP_TSTAMP 0x80
#define DUMP_TYPE_MASK (DUMP_ASCII | DUMP_HEX | DUMP_EXT)
/* Parser filter */