osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Bluetooth: OBEX: Storing info about previous protocol is not needed anymore. Bug 9303 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9303) 

From Michal Labedzki.

svn path=/trunk/; revision=53110
This commit is contained in:
Michael Mann 2013-11-06 18:40:29 +00:00
parent 5efc340771
commit dc53bb7648
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
epan/dissectors/packet-btobex.c
View File

@ -221,8 +221,6 @@ static gint ett_btobex_application_parameters = -1;
static wmem_tree_t *obex_profile = NULL;
static wmem_tree_t *obex_last_opcode = NULL;
static wmem_tree_t *obex_over_l2cap = NULL;
static dissector_handle_t xml_handle;
static dissector_handle_t data_handle;
@ -1275,18 +1273,11 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
guint32 k_channel;
obex_last_opcode_data_t *obex_last_opcode_data;
guint32 k_direction;
gint parent_proto;
save_fragmented = pinfo->fragmented;
parent_proto = (gint) GPOINTER_TO_UINT(wmem_list_frame_data(
wmem_list_frame_prev(wmem_list_tail(pinfo->layers))));
if (!pinfo->fd->flags.visited && parent_proto == proto_btrfcomm) {
wmem_tree_insert32(obex_over_l2cap, pinfo->fd->num, (void *) TRUE);
} else {
is_obex_over_l2cap = wmem_tree_lookup32(obex_over_l2cap, pinfo->fd->num) ? TRUE : FALSE;
}
is_obex_over_l2cap = (proto_btrfcomm == (gint) GPOINTER_TO_UINT(wmem_list_frame_data(
wmem_list_frame_prev(wmem_list_tail(pinfo->layers)))));
if (is_obex_over_l2cap) {
btl2cap_data_t *l2cap_data;
@ -2324,7 +2315,6 @@ proto_register_btobex(void)
obex_profile = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
obex_last_opcode = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
obex_over_l2cap = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
proto_btobex = proto_register_protocol("Bluetooth OBEX Protocol", "BT OBEX", "btobex");