Adding upstream version 4.2.2.upstream/4.2.2

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 154 insertions, 0 deletions

diff --git a/epan/dissectors/packet-hci_h4.c b/epan/dissectors/packet-hci_h4.c
new file mode 100644
index 00000000..c35e08b3
--- /dev/null
+++ b/epan/dissectors/packet-hci_h4.c
@@ -0,0 +1,154 @@
+/* packet-hci_h4.c
+ * Routines for the Bluetooth HCI H4 dissection
+ *
+ * Copyright 2002, Christoph Scholz <scholz@cs.uni-bonn.de>
+ *  From: http://affix.sourceforge.net/archive/ethereal_affix-3.patch
+ *
+ * Refactored for wireshark checkin
+ *   Ronnie Sahlberg 2006
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "config.h"
+
+#include <epan/packet.h>
+#include <wiretap/wtap.h>
+#include "packet-bluetooth.h"
+
+static int proto_hci_h4 = -1;
+static int hf_hci_h4_type = -1;
+static int hf_hci_h4_direction = -1;
+
+static gint ett_hci_h4 = -1;
+
+static dissector_handle_t hci_h4_handle;
+
+static dissector_table_t hci_h4_table;
+
+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"},
+    {HCI_H4_TYPE_ISO, "ISO Data"},
+    {0, NULL }
+};
+static const value_string hci_h4_direction_vals[] = {
+    {P2P_DIR_SENT,        "Sent"},
+    {P2P_DIR_RECV,        "Rcvd"},
+    {P2P_DIR_UNKNOWN,     "Unspecified"},
+    {0, NULL}
+};
+
+void proto_register_hci_h4(void);
+void proto_reg_handoff_hci_h4(void);
+
+static gint
+dissect_hci_h4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
+{
+    guint8             type;
+    tvbuff_t          *next_tvb;
+    proto_item        *main_item;
+    proto_tree        *main_tree;
+    proto_item        *sub_item;
+    bluetooth_data_t  *bluetooth_data;
+
+    bluetooth_data = (bluetooth_data_t *) 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);
+
+    main_item = proto_tree_add_item(tree, proto_hci_h4, tvb, 0, 1, ENC_NA);
+    main_tree = proto_item_add_subtree(main_item, ett_hci_h4);
+
+    sub_item = proto_tree_add_uint(main_tree, hf_hci_h4_direction, tvb, 0, 0, pinfo->p2p_dir);
+    proto_item_set_generated(sub_item);
+
+    proto_tree_add_item(main_tree, hf_hci_h4_type,
+        tvb, 0, 1, ENC_LITTLE_ENDIAN);
+    col_append_str(pinfo->cinfo, COL_INFO,
+            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_new(hci_h4_table, type, next_tvb, pinfo, tree, TRUE, bluetooth_data)) {
+        call_data_dissector(next_tvb, pinfo, tree);
+    }
+
+    return 1;
+}
+
+
+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");
+
+    hci_h4_handle = 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", proto_hci_h4, FT_UINT8, BASE_HEX);
+}
+
+void
+proto_reg_handoff_hci_h4(void)
+{
+    dissector_add_uint("bluetooth.encap", WTAP_ENCAP_BLUETOOTH_H4, hci_h4_handle);
+    dissector_add_uint("bluetooth.encap", WTAP_ENCAP_BLUETOOTH_H4_WITH_PHDR, hci_h4_handle);
+}
+
+/*
+ * Editor modelines  -  https://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:
+ */