osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

bluetooth hci event dissector 

svn path=/trunk/; revision=18145
This commit is contained in:
Ronnie Sahlberg 2006-05-14 06:24:57 +00:00
parent 396a33dbee
commit c7096041a8
4 changed files with 1709 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
epan/dissectors/Makefile.common
View File

@ -132,6 +132,7 @@ DISSECTOR_SRC = \
packet-bssap.c \
packet-bssgp.c \
packet-bthci_cmd.c \
packet-bthci_evt.c \
packet-bvlc.c \
packet-camel.c \
packet-cast.c \

1692
epan/dissectors/packet-bthci-evt.c Normal file
View File

File diff suppressed because it is too large Load Diff

22
epan/dissectors/packet-bthci_cmd.c
View File

@ -167,7 +167,7 @@ static gint ett_bthci_cmd = -1;
static gint ett_opcode = -1;
static const value_string cmd_opcode_vals[] = {
const value_string bthci_cmd_opcode_vals[] = {
{0x0000, "No Operation"},
{0x0401, "Inquiry"},
{0x0402, "Inquiry Cancel"},
@ -453,17 +453,7 @@ static const value_string cmd_loopback_modes[] = {
};
/*
* The HCI_OGF_ values for "ogf".
*/
#define HCI_OGF_LINK_CONTROL 0x01
#define HCI_OGF_LINK_POLICY 0x02
#define HCI_OGF_HOST_CONTROLLER 0x03
#define HCI_OGF_INFORMATIONAL 0x04
#define HCI_OGF_STATUS 0x05
#define HCI_OGF_TESTING 0x06
static const value_string ogf_vals[] = {
const value_string bthci_ogf_vals[] = {
{ HCI_OGF_LINK_CONTROL, "Link Control Commands" },
{ HCI_OGF_LINK_POLICY, "Link Policy Commands" },
{ HCI_OGF_HOST_CONTROLLER,"Host Controller & Baseband Commands" },
@ -1218,14 +1208,14 @@ dissect_bthci_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
ocf = opcode & 0x03ff;
ogf = tvb_get_guint8(tvb, 1) >> 2;
proto_item_append_text(ti_cmd," - %s", val_to_str(opcode, cmd_opcode_vals, "Unknown 0x%04x"));
proto_item_append_text(ti_cmd," - %s", val_to_str(opcode, bthci_cmd_opcode_vals, "Unknown 0x%04x"));
if(check_col(pinfo->cinfo, COL_PROTOCOL)){
col_set_str(pinfo->cinfo, COL_PROTOCOL, "HCI_CMD");
}
if((check_col(pinfo->cinfo, COL_INFO))){
col_append_fstr(pinfo->cinfo, COL_INFO, " %s", val_to_str(opcode, cmd_opcode_vals, "Unknown 0x%04x"));
col_append_fstr(pinfo->cinfo, COL_INFO, " %s", val_to_str(opcode, bthci_cmd_opcode_vals, "Unknown 0x%04x"));
}
@ -1291,11 +1281,11 @@ proto_register_bthci_cmd(void)
static hf_register_info hf[] = {
{ &hf_bthci_cmd_opcode,
{ "Command Opcode","bthci_cmd.opcode", FT_UINT16, BASE_HEX,
VALS(cmd_opcode_vals), 0x0, "HCI Command Opcode", HFILL }
VALS(bthci_cmd_opcode_vals), 0x0, "HCI Command Opcode", HFILL }
},
{ &hf_bthci_cmd_ogf,
{ "ogf", "bthci_cmd.ogf",
FT_UINT16, BASE_HEX, VALS(ogf_vals), 0xfc00,
FT_UINT16, BASE_HEX, VALS(bthci_ogf_vals), 0xfc00,
"Opcode Group Field", HFILL }
},
{ &hf_bthci_cmd_ocf,

10
epan/dissectors/packet-hci_h4.h
View File

@ -29,4 +29,14 @@
#define HCI_H4_TYPE_SCO 0x03
#define HCI_H4_TYPE_EVT 0x04
extern const value_string bthci_cmd_opcode_vals[];
#define HCI_OGF_LINK_CONTROL 0x01
#define HCI_OGF_LINK_POLICY 0x02
#define HCI_OGF_HOST_CONTROLLER 0x03
#define HCI_OGF_INFORMATIONAL 0x04
#define HCI_OGF_STATUS 0x05
#define HCI_OGF_TESTING 0x06
extern const value_string bthci_ogf_vals[];
#endif