forked from osmocom/wireshark
![Michael Mann](/assets/img/avatar_default.png)
This saves many dissectors the need to find the data dissector and store a handle to it. There were also some that were finding it, but not using it. For others this was the only reason for their handoff function, so it could be eliminated. Change-Id: I5d3f951ee1daa3d30c060d21bd12bbc881a8027b Reviewed-on: https://code.wireshark.org/review/14530 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
193 lines
5.8 KiB
C
193 lines
5.8 KiB
C
/* packet-packetlogger.c
|
|
* Routines for Apple's PacketLogger Types
|
|
*
|
|
* Copyright 2009, Stig Bjorlykke <stig@bjorlykke.org>
|
|
*
|
|
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <epan/packet.h>
|
|
#include <wiretap/wtap.h>
|
|
|
|
#include "packet-bluetooth.h"
|
|
|
|
void proto_register_packetlogger(void);
|
|
void proto_reg_handoff_packetlogger(void);
|
|
|
|
#define PNAME "PacketLogger"
|
|
#define PSNAME "PKTLOG"
|
|
#define PFNAME "packetlogger"
|
|
|
|
static int proto_packetlogger = -1;
|
|
|
|
static int hf_type = -1;
|
|
static int hf_info = -1;
|
|
|
|
static gint ett_packetlogger = -1;
|
|
|
|
static dissector_handle_t packetlogger_handle;
|
|
static dissector_table_t hci_h1_table;
|
|
|
|
#define PKT_HCI_COMMAND 0x00
|
|
#define PKT_HCI_EVENT 0x01
|
|
#define PKT_SENT_ACL_DATA 0x02
|
|
#define PKT_RECV_ACL_DATA 0x03
|
|
#define PKT_LMP_SEND 0x0A
|
|
#define PKT_LMP_RECV 0x0B
|
|
#define PKT_POWER 0xFB
|
|
#define PKT_NOTE 0xFC
|
|
#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_LMP_SEND, "Sent LMP Data" },
|
|
{ PKT_LMP_RECV, "Recv LMP Data" },
|
|
{ PKT_POWER, "Power" },
|
|
{ PKT_NOTE, "Note" },
|
|
{ PKT_NEW_CONTROLLER, "New Controller" },
|
|
{ 0, NULL }
|
|
};
|
|
|
|
static int dissect_packetlogger(tvbuff_t *tvb, packet_info *pinfo,
|
|
proto_tree *tree, void *data)
|
|
{
|
|
proto_tree *packetlogger_tree = NULL;
|
|
tvbuff_t *next_tvb;
|
|
proto_item *ti = NULL;
|
|
guint8 pl_type;
|
|
gint len;
|
|
bluetooth_data_t *bluetooth_data;
|
|
struct bthci_phdr bthci;
|
|
|
|
bluetooth_data = (bluetooth_data_t *) data;
|
|
|
|
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, ENC_NA);
|
|
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, ENC_BIG_ENDIAN);
|
|
proto_item_append_text (ti, " %s", val_to_str (pl_type, type_vals, "Unknown 0x%02x"));
|
|
|
|
len = tvb_reported_length_remaining (tvb, 1);
|
|
next_tvb = tvb_new_subset_remaining (tvb, 1);
|
|
|
|
if (pl_type <= PKT_RECV_ACL_DATA) {
|
|
/* HCI H1 packages */
|
|
switch (pl_type) {
|
|
case PKT_HCI_COMMAND:
|
|
bthci.channel = BTHCI_CHANNEL_COMMAND;
|
|
bthci.sent = P2P_DIR_SENT;
|
|
pinfo->p2p_dir = P2P_DIR_SENT;
|
|
break;
|
|
case PKT_HCI_EVENT:
|
|
bthci.channel = BTHCI_CHANNEL_EVENT;
|
|
bthci.sent = P2P_DIR_RECV;
|
|
pinfo->p2p_dir = P2P_DIR_RECV;
|
|
break;
|
|
case PKT_SENT_ACL_DATA:
|
|
bthci.channel = BTHCI_CHANNEL_ACL;
|
|
bthci.sent = P2P_DIR_SENT;
|
|
pinfo->p2p_dir = P2P_DIR_SENT;
|
|
break;
|
|
case PKT_RECV_ACL_DATA:
|
|
bthci.channel = BTHCI_CHANNEL_ACL;
|
|
bthci.sent = P2P_DIR_RECV;
|
|
pinfo->p2p_dir = P2P_DIR_RECV;
|
|
break;
|
|
default:
|
|
bthci.channel = pl_type;
|
|
bthci.sent = P2P_DIR_UNKNOWN;
|
|
pinfo->p2p_dir = P2P_DIR_UNKNOWN;
|
|
break;
|
|
}
|
|
bluetooth_data->previous_protocol_data.bthci = &bthci;
|
|
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_uint_new(hci_h1_table, bthci.channel,
|
|
next_tvb, pinfo, tree, TRUE, bluetooth_data)) {
|
|
call_data_dissector(next_tvb, pinfo, tree);
|
|
}
|
|
} else {
|
|
/* PacketLogger data */
|
|
switch (pl_type) {
|
|
case PKT_POWER:
|
|
case PKT_NOTE:
|
|
case PKT_NEW_CONTROLLER:
|
|
proto_tree_add_item (packetlogger_tree, hf_info, next_tvb, 0, len, ENC_ASCII|ENC_NA);
|
|
col_add_fstr (pinfo->cinfo, COL_INFO, "%s", tvb_format_stringzpad_wsp (next_tvb, 0, len));
|
|
break;
|
|
default:
|
|
call_data_dissector(next_tvb, pinfo, tree);
|
|
col_add_fstr (pinfo->cinfo, COL_INFO, "Unknown 0x%02x", pl_type);
|
|
break;
|
|
}
|
|
}
|
|
|
|
return tvb_captured_length(tvb);
|
|
}
|
|
|
|
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_NONE, NULL, 0x0, NULL, HFILL } },
|
|
};
|
|
|
|
static gint *ett[] = {
|
|
&ett_packetlogger
|
|
};
|
|
|
|
proto_packetlogger = proto_register_protocol (PNAME, PSNAME, PFNAME);
|
|
|
|
packetlogger_handle = 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)
|
|
{
|
|
hci_h1_table = find_dissector_table("hci_h1.type");
|
|
dissector_add_uint ("bluetooth.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 expandtab:
|
|
* :indentSize=2:tabSize=8:noTabs=true:
|
|
*/
|