diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-11-28 18:11:02 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-11-28 18:11:02 +0000 |
| commit | 8dab82556c2a4799800b09a111dab61cb9935883 (patch) | |
| tree | 8d58b8edafc5053ada1654af6955dffa1b9753b4 /epan/dissectors/packet-bthci_cmd.c | |
| parent | 30ae01c73bee0443409e29141ff23bc4629ef736 (diff) | |
Bluetooth improvements. Bug 9446 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9446)
From Michal Labedzki.
1. Bluetooth: HFP: Fix recognizing roles. There is need to check which side SDP record is, then it is possible to recognize roles.
2. Bluetooth: RFCOMM/HFP: Fix recognizing services and roles. Direction bit means only that device is initiator of connection or not. But need information who is owner of connection (remote device or localhost), so use this information from L2CAP.
3. Bluetooth: HFP: Fix unexpected expert info
4. Bluetooth: HCI: Set addresses to host/controller. Also optimize a little handing of dissectors handles.
svn path=/trunk/; revision=53628
Diffstat (limited to 'epan/dissectors/packet-bthci_cmd.c')
| -rw-r--r-- | epan/dissectors/packet-bthci_cmd.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c index ef2f0888ba..5beea2fe52 100644 --- a/epan/dissectors/packet-bthci_cmd.c +++ b/epan/dissectors/packet-bthci_cmd.c @@ -410,6 +410,8 @@ static gint ett_eir_subtree = -1; static gint ett_eir_struct_subtree = -1; static gint ett_flow_spec_subtree = -1; +static dissector_handle_t bthci_cmd_handle; + extern value_string_ext ext_usb_vendors_vals; extern value_string_ext ext_usb_products_vals; extern value_string_ext did_vendor_id_source_vals_ext; @@ -3237,6 +3239,9 @@ dissect_bthci_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat break; } + SET_ADDRESS(&pinfo->src, AT_STRINGZ, 5, "host"); + SET_ADDRESS(&pinfo->dst, AT_STRINGZ, 11, "controller"); + opcode = tvb_get_letohs(tvb, offset); ocf = opcode & 0x03ff; ogf = (guint8) (opcode >> 10); @@ -5146,7 +5151,7 @@ proto_register_bthci_cmd(void) /* Register the protocol name and description */ proto_bthci_cmd = proto_register_protocol("Bluetooth HCI Command", "HCI_CMD", "bthci_cmd"); - new_register_dissector("bthci_cmd", dissect_bthci_cmd, proto_bthci_cmd); + bthci_cmd_handle = new_register_dissector("bthci_cmd", dissect_bthci_cmd, proto_bthci_cmd); /* Required function calls to register the header fields and subtrees used */ proto_register_field_array(proto_bthci_cmd, hf, array_length(hf)); @@ -5169,8 +5174,6 @@ proto_register_bthci_cmd(void) void proto_reg_handoff_bthci_cmd(void) { - dissector_handle_t bthci_cmd_handle; - bthci_cmd_handle = find_dissector("bthci_cmd"); dissector_add_uint("hci_h4.type", HCI_H4_TYPE_CMD, bthci_cmd_handle); dissector_add_uint("hci_h1.type", BTHCI_CHANNEL_COMMAND, bthci_cmd_handle); } |