osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From Jon Smirl 

change the private data pointer name from  masstorage to class_data
since there will be future class specific dissectors that will also want to hang
some extra data off these structures



svn path=/trunk/; revision=21193
This commit is contained in:
Ronnie Sahlberg 2007-03-25 22:53:35 +00:00
parent 07d6794bea
commit 747b009566
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-usb-masstorage.c
View File

@ -197,12 +197,12 @@ dissect_usb_ms_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
usb_conv_info=pinfo->usb_conv_info;
/* verify that we do have a usb_ms_conv_info */
usb_ms_conv_info=usb_conv_info->masstorage;
usb_ms_conv_info=usb_conv_info->class_data;
if(!usb_ms_conv_info){
usb_ms_conv_info=se_alloc(sizeof(usb_ms_conv_info_t));
usb_ms_conv_info->itl=se_tree_create_non_persistent(EMEM_TREE_TYPE_RED_BLACK, "USB ITL");
usb_ms_conv_info->itlq=se_tree_create_non_persistent(EMEM_TREE_TYPE_RED_BLACK, "USB ITLQ");
usb_conv_info->masstorage=usb_ms_conv_info;
usb_conv_info->class_data=usb_ms_conv_info;
}

3
epan/dissectors/packet-usb.c
View File

@ -220,7 +220,7 @@ get_usb_conv_info(conversation_t *conversation)
usb_conv_info = se_alloc(sizeof(usb_conv_info_t));
usb_conv_info->class=IF_CLASS_UNKNOWN;
usb_conv_info->transactions=se_tree_create_non_persistent(EMEM_TREE_TYPE_RED_BLACK, "usb transactions");
usb_conv_info->masstorage=NULL;
usb_conv_info->class_data=NULL;
conversation_add_proto_data(conversation, proto_usb, usb_conv_info);
}
@ -482,7 +482,6 @@ dissect_usb_interface_descriptor(packet_info *pinfo, proto_tree *parent_tree, tv
usb_trans_info->interface_info=se_alloc(sizeof(usb_conv_info_t));
usb_trans_info->interface_info->class=tvb_get_guint8(tvb, offset);
usb_trans_info->interface_info->transactions=se_tree_create_non_persistent(EMEM_TREE_TYPE_RED_BLACK, "usb transactions");
usb_trans_info->interface_info->masstorage=NULL;
}
offset++;

2
epan/dissectors/packet-usb.h
View File

@ -61,8 +61,8 @@ typedef struct _usb_trans_info_t {
struct _usb_conv_info_t {
guint16 class; /* class for this conversation */
emem_tree_t *transactions;
void *masstorage; /* mass storage data */
usb_trans_info_t *usb_trans_info; /* pointer to the current transaction */
void *class_data; /* private class/id decode data */
};
/* This is what a tap will tap */