Improved reading Apple's PacketLogger files:

- Send last byte of header (type) and data to a packetlogger dissector
- Rewrite type to ACI channel in the dissector
- Direction is indirectly given from the PL type
- Dissect PacketLogger NewC and Info as text


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28141 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 177 insertions, 0 deletions

diff --git a/epan/dissectors/packet-packetlogger.c b/epan/dissectors/packet-packetlogger.c
new file mode 100644
index 0000000000..eda0385262
--- /dev/null
+++ b/epan/dissectors/packet-packetlogger.c
@@ -0,0 +1,177 @@
+/* packet-packetlogger.c
+ * Routines for Apple's PacketLogger Types
+ *
+ * Copyright 2009, Stig Bjorlykke <stig@bjorlykke.org>
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <epan/packet.h>
+
+#define PNAME  "PacketLogger"
+#define PSNAME "PKTLOG"
+#define PFNAME "packetlogger"
+
+static dissector_table_t hci_h1_table;
+static dissector_handle_t data_handle;
+
+static int proto_packetlogger = -1;
+
+static int hf_type = -1;
+static int hf_info = -1;
+
+static gint ett_packetlogger = -1;
+
+#define PKT_HCI_COMMAND     0x00
+#define PKT_HCI_EVENT       0x01
+#define PKT_SENT_ACL_DATA   0x02
+#define PKT_RECV_ACL_DATA   0x03
+#define PKT_INFO            0xFB
+#define PKT_NEW_CONTROLLER  0xFE
+
+static const value_string type_vals[] = {
+  { PKT_HCI_COMMAND,     "HCI Command"     },
+  { PKT_HCI_EVENT,       "HCI Event"       },
+  { PKT_SENT_ACL_DATA,   "Sent ACL Data"   },
+  { PKT_RECV_ACL_DATA,   "Recv ACL Data"   },
+  { PKT_INFO,            "Info"            },
+  { PKT_NEW_CONTROLLER,  "New Controller"  },
+  { 0, NULL }
+};
+
+static void dissect_packetlogger (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+  proto_tree *packetlogger_tree = NULL;
+  tvbuff_t   *next_tvb;
+  proto_item *ti = NULL;
+  guint8      pl_type;
+  gint        len;
+
+  col_set_str (pinfo->cinfo, COL_PROTOCOL, PSNAME);
+  col_clear (pinfo->cinfo, COL_INFO);
+
+  ti = proto_tree_add_item (tree, proto_packetlogger, tvb, 0, -1, FALSE);
+  packetlogger_tree = proto_item_add_subtree (ti, ett_packetlogger);
+
+  pl_type = tvb_get_guint8 (tvb, 0);
+  proto_tree_add_item (packetlogger_tree, hf_type, tvb, 0, 1, FALSE);
+  proto_item_append_text (ti, " %s", val_to_str (pl_type, type_vals, "Unknown 0x%02x"));
+
+  len = tvb_length_remaining (tvb, 1);
+  next_tvb = tvb_new_subset (tvb, 1, len, len);
+
+  if (pl_type <= PKT_RECV_ACL_DATA) {
+    /* HCI H1 packages */
+    switch (pl_type) {
+    case PKT_HCI_COMMAND:
+      pinfo->pseudo_header->bthci.channel = BTHCI_CHANNEL_COMMAND;
+      pinfo->pseudo_header->bthci.sent = P2P_DIR_SENT;
+      pinfo->p2p_dir = P2P_DIR_SENT;
+      break;
+    case PKT_HCI_EVENT:
+      pinfo->pseudo_header->bthci.channel = BTHCI_CHANNEL_EVENT;
+      pinfo->pseudo_header->bthci.sent = P2P_DIR_RECV;
+      pinfo->p2p_dir = P2P_DIR_RECV;
+      break;
+    case PKT_SENT_ACL_DATA:
+      pinfo->pseudo_header->bthci.channel = BTHCI_CHANNEL_ACL;
+      pinfo->pseudo_header->bthci.sent = P2P_DIR_SENT;
+      pinfo->p2p_dir = P2P_DIR_SENT;
+      break;
+    case PKT_RECV_ACL_DATA:
+      pinfo->pseudo_header->bthci.channel = BTHCI_CHANNEL_ACL;
+      pinfo->pseudo_header->bthci.sent = P2P_DIR_RECV;
+      pinfo->p2p_dir = P2P_DIR_RECV;
+      break;
+    default:
+      pinfo->pseudo_header->bthci.channel = pl_type;
+      pinfo->pseudo_header->bthci.sent = P2P_DIR_UNKNOWN;
+      pinfo->p2p_dir = P2P_DIR_UNKNOWN;
+      break;
+    }
+    proto_item_set_len (ti, 1);
+
+    col_add_fstr (pinfo->cinfo, COL_INFO, "%s", val_to_str(pl_type, type_vals, "Unknown 0x%02x"));
+    if (!dissector_try_port (hci_h1_table, pinfo->pseudo_header->bthci.channel, next_tvb, pinfo, tree)) {
+      call_dissector (data_handle, next_tvb, pinfo, tree);
+    }
+  } else {
+    /* PacketLogger data */
+    switch (pl_type) {
+    case PKT_INFO:
+    case PKT_NEW_CONTROLLER:
+      proto_tree_add_item (packetlogger_tree, hf_info, next_tvb, 0, len, FALSE);
+      col_set_str (pinfo->cinfo, COL_INFO, tvb_format_stringzpad_wsp (next_tvb, 0, len));
+      break;
+    default:
+      call_dissector (data_handle, next_tvb, pinfo, tree);
+      col_add_fstr (pinfo->cinfo, COL_INFO, "Unknown 0x%02x", pl_type);
+      break;
+    }
+  }
+}
+
+void proto_register_packetlogger (void)
+{
+  static hf_register_info hf[] = {
+    { &hf_type,
+      { "Type", "packetlogger.type", FT_UINT8, BASE_HEX, VALS(type_vals), 0x0, NULL, HFILL } },
+    { &hf_info,
+      { "Info", "packetlogger.info", FT_STRING, BASE_DEC, NULL, 0x0, NULL, HFILL } },
+  };
+
+  static gint *ett[] = {
+    &ett_packetlogger
+  };
+
+  proto_packetlogger = proto_register_protocol (PNAME, PSNAME, PFNAME);
+  register_dissector (PFNAME, dissect_packetlogger, proto_packetlogger);
+  
+  proto_register_field_array (proto_packetlogger, hf, array_length (hf));
+  proto_register_subtree_array (ett, array_length (ett));
+}
+
+void proto_reg_handoff_packetlogger (void)
+{
+  dissector_handle_t packetlogger_handle;
+
+  packetlogger_handle = find_dissector (PFNAME);
+  hci_h1_table = find_dissector_table("hci_h1.type");
+  data_handle = find_dissector("data");
+  dissector_add ("wtap_encap", WTAP_ENCAP_PACKETLOGGER, packetlogger_handle);
+}
+
+/*
+ * Editor modelines
+ *
+ * Local Variables:
+ * c-basic-offset: 2
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * ex: set shiftwidth=2 tabstop=8 noexpandtab
+ * :indentSize=2:tabSize=8:noTabs=false:
+ */