aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-hci_h4.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-hci_h4.c')
-rw-r--r--epan/dissectors/packet-hci_h4.c229
1 files changed, 120 insertions, 109 deletions
diff --git a/epan/dissectors/packet-hci_h4.c b/epan/dissectors/packet-hci_h4.c
index 748504d199..125174f4cb 100644
--- a/epan/dissectors/packet-hci_h4.c
+++ b/epan/dissectors/packet-hci_h4.c
@@ -44,23 +44,23 @@ static gint ett_hci_h4 = -1;
static dissector_table_t hci_h4_table;
static dissector_handle_t data_handle;
-static emem_tree_t *chandle_to_bdaddr_table = NULL;
-static emem_tree_t *bdaddr_to_name_table = NULL;
-static emem_tree_t *localhost_name = NULL;
-static emem_tree_t *localhost_bdaddr = NULL;
+static wmem_tree_t *chandle_to_bdaddr_table = NULL;
+static wmem_tree_t *bdaddr_to_name_table = NULL;
+static wmem_tree_t *localhost_name = NULL;
+static wmem_tree_t *localhost_bdaddr = NULL;
static const value_string hci_h4_type_vals[] = {
- {HCI_H4_TYPE_CMD, "HCI Command"},
- {HCI_H4_TYPE_ACL, "ACL Data"},
- {HCI_H4_TYPE_SCO, "SCO Data"},
- {HCI_H4_TYPE_EVT, "HCI Event"},
- {0, NULL }
+ {HCI_H4_TYPE_CMD, "HCI Command"},
+ {HCI_H4_TYPE_ACL, "ACL Data"},
+ {HCI_H4_TYPE_SCO, "SCO Data"},
+ {HCI_H4_TYPE_EVT, "HCI Event"},
+ {0, NULL }
};
static const value_string hci_h4_direction_vals[] = {
- {P2P_DIR_SENT, "Sent"},
- {P2P_DIR_RECV, "Rcvd"},
- {P2P_DIR_UNKNOWN, "Unspecified"},
- {0, NULL}
+ {P2P_DIR_SENT, "Sent"},
+ {P2P_DIR_RECV, "Rcvd"},
+ {P2P_DIR_UNKNOWN, "Unspecified"},
+ {0, NULL}
};
void proto_register_hci_h4(void);
@@ -69,113 +69,124 @@ void proto_reg_handoff_hci_h4(void);
static void
dissect_hci_h4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
- guint8 type;
- tvbuff_t *next_tvb;
- proto_item *ti = NULL;
- proto_tree *hci_h4_tree = NULL;
- void *pd_save;
- hci_data_t *hci_data;
-
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "HCI H4");
- switch (pinfo->p2p_dir) {
-
- case P2P_DIR_SENT:
- col_add_fstr(pinfo->cinfo, COL_INFO, "Sent ");
- break;
-
- case P2P_DIR_RECV:
- col_add_fstr(pinfo->cinfo, COL_INFO, "Rcvd ");
- break;
-
- case P2P_DIR_UNKNOWN:
- break;
-
- default:
- col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ",
- pinfo->p2p_dir);
- break;
- }
-
- type = tvb_get_guint8(tvb, 0);
-
- if (tree) {
- ti = proto_tree_add_item(tree, proto_hci_h4, tvb, 0, 1, ENC_NA);
- hci_h4_tree = proto_item_add_subtree(ti, ett_hci_h4);
- }
-
- pd_save = pinfo->private_data;
- hci_data = (hci_data_t *) wmem_new(wmem_packet_scope(), hci_data_t);
- hci_data->interface_id = HCI_INTERFACE_H4;
- hci_data->adapter_id = HCI_ADAPTER_DEFAULT;
- hci_data->chandle_to_bdaddr_table = chandle_to_bdaddr_table;
- hci_data->bdaddr_to_name_table = bdaddr_to_name_table;
- hci_data->localhost_bdaddr = localhost_bdaddr;
- hci_data->localhost_name = localhost_name;
- pinfo->private_data = hci_data;
-
- ti = proto_tree_add_uint(hci_h4_tree, hf_hci_h4_direction, tvb, 0, 0, pinfo->p2p_dir);
- PROTO_ITEM_SET_GENERATED(ti);
-
- proto_tree_add_item(hci_h4_tree, hf_hci_h4_type,
- tvb, 0, 1, ENC_LITTLE_ENDIAN);
- col_append_fstr(pinfo->cinfo, COL_INFO, "%s",
- val_to_str(type, hci_h4_type_vals, "Unknown HCI packet type 0x%02x"));
-
- next_tvb = tvb_new_subset_remaining(tvb, 1);
- if (!dissector_try_uint(hci_h4_table, type, next_tvb, pinfo, tree)) {
- call_dissector(data_handle, next_tvb, pinfo, tree);
- }
-
- pinfo->private_data = pd_save;
+ guint8 type;
+ tvbuff_t *next_tvb;
+ proto_item *ti = NULL;
+ proto_tree *hci_h4_tree = NULL;
+ void *pd_save;
+ hci_data_t *hci_data;
+
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "HCI H4");
+ switch (pinfo->p2p_dir) {
+
+ case P2P_DIR_SENT:
+ col_add_fstr(pinfo->cinfo, COL_INFO, "Sent ");
+ break;
+
+ case P2P_DIR_RECV:
+ col_add_fstr(pinfo->cinfo, COL_INFO, "Rcvd ");
+ break;
+
+ case P2P_DIR_UNKNOWN:
+ break;
+
+ default:
+ col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ",
+ pinfo->p2p_dir);
+ break;
+ }
+
+ type = tvb_get_guint8(tvb, 0);
+
+ if (tree) {
+ ti = proto_tree_add_item(tree, proto_hci_h4, tvb, 0, 1, ENC_NA);
+ hci_h4_tree = proto_item_add_subtree(ti, ett_hci_h4);
+ }
+
+ pd_save = pinfo->private_data;
+ hci_data = (hci_data_t *) wmem_new(wmem_packet_scope(), hci_data_t);
+ hci_data->interface_id = HCI_INTERFACE_H4;
+ hci_data->adapter_id = HCI_ADAPTER_DEFAULT;
+ hci_data->chandle_to_bdaddr_table = chandle_to_bdaddr_table;
+ hci_data->bdaddr_to_name_table = bdaddr_to_name_table;
+ hci_data->localhost_bdaddr = localhost_bdaddr;
+ hci_data->localhost_name = localhost_name;
+ pinfo->private_data = hci_data;
+
+ ti = proto_tree_add_uint(hci_h4_tree, hf_hci_h4_direction, tvb, 0, 0, pinfo->p2p_dir);
+ PROTO_ITEM_SET_GENERATED(ti);
+
+ proto_tree_add_item(hci_h4_tree, hf_hci_h4_type,
+ tvb, 0, 1, ENC_LITTLE_ENDIAN);
+ col_append_fstr(pinfo->cinfo, COL_INFO, "%s",
+ val_to_str(type, hci_h4_type_vals, "Unknown HCI packet type 0x%02x"));
+
+ next_tvb = tvb_new_subset_remaining(tvb, 1);
+ if (!dissector_try_uint(hci_h4_table, type, next_tvb, pinfo, tree)) {
+ call_dissector(data_handle, next_tvb, pinfo, tree);
+ }
+
+ pinfo->private_data = pd_save;
}
void
proto_register_hci_h4(void)
{
- static hf_register_info hf[] = {
- { &hf_hci_h4_type,
- { "HCI Packet Type", "hci_h4.type",
- FT_UINT8, BASE_HEX, VALS(hci_h4_type_vals), 0x0,
- NULL, HFILL }},
-
- { &hf_hci_h4_direction,
- { "Direction", "hci_h4.direction",
- FT_UINT8, BASE_HEX, VALS(hci_h4_direction_vals), 0x0,
- "HCI Packet Direction Sent/Rcvd", HFILL }},
-
- };
-
- static gint *ett[] = {
- &ett_hci_h4,
- };
-
- proto_hci_h4 = proto_register_protocol("Bluetooth HCI H4",
- "HCI_H4", "hci_h4");
-
- register_dissector("hci_h4", dissect_hci_h4, proto_hci_h4);
-
- proto_register_field_array(proto_hci_h4, hf, array_length(hf));
- proto_register_subtree_array(ett, array_length(ett));
-
- hci_h4_table = register_dissector_table("hci_h4.type",
- "HCI H4 pdu type", FT_UINT8, BASE_HEX);
-
- chandle_to_bdaddr_table = se_tree_create(EMEM_TREE_TYPE_RED_BLACK, "hci adapter/chandle to bdaddr");
- bdaddr_to_name_table = se_tree_create(EMEM_TREE_TYPE_RED_BLACK, "hci bdaddr to name");
- localhost_bdaddr = se_tree_create(EMEM_TREE_TYPE_RED_BLACK, "hci adaper/frame to bdaddr");
- localhost_name = se_tree_create(EMEM_TREE_TYPE_RED_BLACK, "hci adaper/frame to name");
+ static hf_register_info hf[] = {
+ { &hf_hci_h4_type,
+ { "HCI Packet Type", "hci_h4.type",
+ FT_UINT8, BASE_HEX, VALS(hci_h4_type_vals), 0x0,
+ NULL, HFILL }
+ },
+ { &hf_hci_h4_direction,
+ { "Direction", "hci_h4.direction",
+ FT_UINT8, BASE_HEX, VALS(hci_h4_direction_vals), 0x0,
+ "HCI Packet Direction Sent/Rcvd", HFILL }
+ }
+ };
+
+ static gint *ett[] = {
+ &ett_hci_h4,
+ };
+
+ proto_hci_h4 = proto_register_protocol("Bluetooth HCI H4",
+ "HCI_H4", "hci_h4");
+
+ register_dissector("hci_h4", dissect_hci_h4, proto_hci_h4);
+
+ proto_register_field_array(proto_hci_h4, hf, array_length(hf));
+ proto_register_subtree_array(ett, array_length(ett));
+
+ hci_h4_table = register_dissector_table("hci_h4.type",
+ "HCI H4 pdu type", FT_UINT8, BASE_HEX);
+
+ chandle_to_bdaddr_table = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope()); /* adapter, chandle: bdaddr */
+ bdaddr_to_name_table = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope()); /* bdaddr: name */
+ localhost_bdaddr = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope()); /* adaper, frame: bdaddr */
+ localhost_name = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope()); /* adaper, frame: name */
}
void
proto_reg_handoff_hci_h4(void)
{
- dissector_handle_t hci_h4_handle;
+ dissector_handle_t hci_h4_handle;
- data_handle = find_dissector("data");
- hci_h4_handle = find_dissector("hci_h4");
- dissector_add_uint("wtap_encap", WTAP_ENCAP_BLUETOOTH_H4, hci_h4_handle);
- dissector_add_uint("wtap_encap", WTAP_ENCAP_BLUETOOTH_H4_WITH_PHDR, hci_h4_handle);
+ data_handle = find_dissector("data");
+ hci_h4_handle = find_dissector("hci_h4");
+ dissector_add_uint("wtap_encap", WTAP_ENCAP_BLUETOOTH_H4, hci_h4_handle);
+ dissector_add_uint("wtap_encap", WTAP_ENCAP_BLUETOOTH_H4_WITH_PHDR, hci_h4_handle);
}
-
+/*
+ * Editor modelines - http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 01:02:52 +0000