diff options
| author | Stephen Fisher <steve@stephen-fisher.com> | 2009-02-16 07:24:04 +0000 |
|---|---|---|
| committer | Stephen Fisher <steve@stephen-fisher.com> | 2009-02-16 07:24:04 +0000 |
| commit | 18f3436e85cd898995e4635c8de204d19d3aec86 (patch) | |
| tree | 8c57e4d8da5544e0db05149a4119ebca4b7ffd0d /epan/dissectors/packet-frame.c | |
| parent | 5742ede54c6427d581c718ffd7c2e43cfe40bf56 (diff) | |
Add support for reading Apple's Bluetooth PacketLogger capture files to
wiretap. Modify various other locations to accommodate the fact that
PacketLogger files do not specify the direction of packets.
svn path=/trunk/; revision=27463
Diffstat (limited to 'epan/dissectors/packet-frame.c')
| -rw-r--r-- | epan/dissectors/packet-frame.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index 8cff404268..49fb0b9154 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.c @@ -81,6 +81,7 @@ static gboolean force_docsis_encap = FALSE; static gboolean generate_md5_hash = FALSE; static const value_string p2p_dirs[] = { + { P2P_DIR_UNKNOWN, "Unknown" }, { P2P_DIR_SENT, "Sent" }, { P2P_DIR_RECV, "Received" }, { 0, NULL } @@ -143,8 +144,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) break; case WTAP_ENCAP_BLUETOOTH_HCI: - pinfo->p2p_dir = pinfo->pseudo_header->bthci.sent ? - P2P_DIR_SENT : P2P_DIR_RECV; + pinfo->p2p_dir = pinfo->pseudo_header->bthci.sent; break; case WTAP_ENCAP_LAPB: @@ -283,7 +283,7 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) /* Check for existences of P2P pseudo header */ if (pinfo->p2p_dir != P2P_DIR_UNKNOWN) { - proto_tree_add_uint(fh_tree, hf_frame_p2p_dir, tvb, + proto_tree_add_int(fh_tree, hf_frame_p2p_dir, tvb, 0, 0, pinfo->p2p_dir); } @@ -574,7 +574,7 @@ proto_register_frame(void) NULL, HFILL }}, { &hf_frame_p2p_dir, - { "Point-to-Point Direction", "frame.p2p_dir", FT_UINT8, BASE_DEC, VALS(p2p_dirs), 0x0, + { "Point-to-Point Direction", "frame.p2p_dir", FT_INT8, BASE_DEC, VALS(p2p_dirs), 0x0, NULL, HFILL }}, { &hf_link_number, |