diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2007-03-25 22:53:35 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2007-03-25 22:53:35 +0000 |
| commit | 747b009566f7f830c08301d48a5267017fe26f54 (patch) | |
| tree | 69776f88b77fff5fa41e55b1105a609b3a80e008 | |
| parent | 07d6794bea3dadc612b70d5f16cf52da2d1d1081 (diff) | |
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
| -rw-r--r-- | epan/dissectors/packet-usb-masstorage.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-usb.c | 3 | ||||
| -rw-r--r-- | epan/dissectors/packet-usb.h | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/epan/dissectors/packet-usb-masstorage.c b/epan/dissectors/packet-usb-masstorage.c index 2384548ce7..031e6eac4b 100644 --- a/epan/dissectors/packet-usb-masstorage.c +++ b/epan/dissectors/packet-usb-masstorage.c @@ -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; } diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index ddbf89a36b..ab01c8d153 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -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++; diff --git a/epan/dissectors/packet-usb.h b/epan/dissectors/packet-usb.h index 9bf0c3aa85..8c3271e2d9 100644 --- a/epan/dissectors/packet-usb.h +++ b/epan/dissectors/packet-usb.h @@ -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 */ |