--- /dev/null
+/* 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:
+ */
typedef struct packetlogger_header {
guint32 len;
guint64 ts;
- guint8 type;
} packetlogger_header_t;
-#define PACKETLOGGER_HEADER_SIZE 13
+#define PACKETLOGGER_HEADER_SIZE 12
static gboolean packetlogger_read(wtap *wth, int *err, gchar **err_info _U_,
gint64 *data_offset);
static gboolean packetlogger_seek_read(wtap *wth, gint64 seek_off,
- union wtap_pseudo_header *pseudo_header,
+ union wtap_pseudo_header *pseudo_header _U_,
guchar *pd, int length, int *err,
gchar **err_info _U_);
static gboolean packetlogger_read_header(packetlogger_header_t *pl_hdr,
int packetlogger_open(wtap *wth, int *err, gchar **err_info _U_)
{
packetlogger_header_t pl_hdr;
+ guint8 type;
if(!packetlogger_read_header(&pl_hdr, wth->fh, err))
return -1;
+ file_read(&type, 1, 1, wth->fh);
/* Verify this file belongs to us */
- if(!((pl_hdr.len & 0xFFFF0000) == 0 && (pl_hdr.type < 0x04 ||
- pl_hdr.type == 0xFE ||
- pl_hdr.type == 0xFF)))
+ if(!((pl_hdr.len & 0xFFFF0000) == 0 && (type < 0x04 ||
+ type == 0xFB ||
+ type == 0xFE ||
+ type == 0xFF)))
return 0;
/* No file header. Reset the fh to 0 so we can read the first packet */
wth->data_offset = 0;
wth->file_type = WTAP_FILE_PACKETLOGGER;
- wth->file_encap = WTAP_ENCAP_BLUETOOTH_HCI;
+ wth->file_encap = WTAP_ENCAP_PACKETLOGGER;
wth->tsprecision = WTAP_FILE_TSPREC_USEC;
return 1; /* Our kind of file */
if(!packetlogger_read_header(&pl_hdr, wth->fh, err))
return FALSE;
- buffer_assure_space(wth->frame_buffer, pl_hdr.len - 9);
+ buffer_assure_space(wth->frame_buffer, pl_hdr.len - 8);
bytes_read = file_read(buffer_start_ptr(wth->frame_buffer), 1,
- pl_hdr.len - 9,
+ pl_hdr.len - 8,
wth->fh);
- if(bytes_read != pl_hdr.len - 9) {
+ if(bytes_read != pl_hdr.len - 8) {
*err = file_error(wth->fh);
if(*err == 0)
*err = WTAP_ERR_SHORT_READ;
wth->data_offset += (pl_hdr.len + 4);
- wth->phdr.len = pl_hdr.len - 9;
- wth->phdr.caplen = pl_hdr.len - 9;
+ wth->phdr.len = pl_hdr.len - 8;
+ wth->phdr.caplen = pl_hdr.len - 8;
wth->phdr.ts.secs = (time_t) (pl_hdr.ts >> 32);
wth->phdr.ts.nsecs = (int)((pl_hdr.ts & 0xFFFFFFFF) * 1000);
- switch(pl_hdr.type) {
-
- case 0 :
- wth->pseudo_header.bthci.channel = BTHCI_CHANNEL_COMMAND;
- break;
- case 1 :
- wth->pseudo_header.bthci.channel = BTHCI_CHANNEL_EVENT;
- break;
-
- default :
- wth->pseudo_header.bthci.channel = pl_hdr.type;
- break;
- }
-
- wth->pseudo_header.bthci.sent = P2P_DIR_UNKNOWN;
-
return TRUE;
}
static gboolean
packetlogger_seek_read(wtap *wth, gint64 seek_off, union wtap_pseudo_header
- *pseudo_header, guchar *pd, int length, int *err,
+ *pseudo_header _U_, guchar *pd, int length, int *err,
gchar **err_info _U_)
{
packetlogger_header_t pl_hdr;
return FALSE;
}
- if(length != (int)pl_hdr.len - 9) {
+ if(length != (int)pl_hdr.len - 8) {
*err = WTAP_ERR_BAD_RECORD;
*err_info = g_strdup_printf("packetlogger: record length %u doesn't match requested length %d", pl_hdr.len, length);
return FALSE;
}
- bytes_read = file_read(pd, 1, pl_hdr.len - 9, wth->random_fh);
- if(bytes_read != (pl_hdr.len - 9)) {
+ bytes_read = file_read(pd, 1, pl_hdr.len - 8, wth->random_fh);
+ if(bytes_read != (pl_hdr.len - 8)) {
*err = file_error(wth->random_fh);
if(*err == 0)
*err = WTAP_ERR_SHORT_READ;
return FALSE;
}
- switch(pl_hdr.type) {
-
- case 0 :
- pseudo_header->bthci.channel = BTHCI_CHANNEL_COMMAND;
- break;
- case 1 :
- pseudo_header->bthci.channel = BTHCI_CHANNEL_EVENT;
- break;
-
- default :
- pseudo_header->bthci.channel = pl_hdr.type;
- break;
- }
-
- pseudo_header->bthci.sent = P2P_DIR_UNKNOWN;
-
return TRUE;
}
bytes_read += file_read(&pl_hdr->len, 4, 1, fh);
bytes_read += file_read(&pl_hdr->ts, 8, 1, fh);
- bytes_read += file_read(&pl_hdr->type, 1, 1, fh);
/* Convert multi-byte values from big endian to host endian */
pl_hdr->len = GUINT32_FROM_BE(pl_hdr->len);
git.samba.org / obnox / wireshark / wip.git / commitdiff