From Javier Godoy:

Remove function osd_list_collection and update scsi_osd_svcaction.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8944#attach_11229

svn path=/trunk/; revision=50809

1 files changed, 2 insertions, 78 deletions

diff --git a/epan/dissectors/packet-scsi-osd.c b/epan/dissectors/packet-scsi-osd.c
index b1881a5720..0ed685bbee 100644
--- a/epan/dissectors/packet-scsi-osd.c
+++ b/epan/dissectors/packet-scsi-osd.c
@@ -1346,7 +1346,7 @@ static const true_false_string list_lstchg_tfs = {
 };
 static const true_false_string list_root_tfs = {
     "Objects are from root and are PARTITION IDs",
-    "Objects are from a partition and are USER OBJECTs"
+    "Objects are from the partition and are USER OBJECTs"
 };
 static const true_false_string list_coltn_tfs = {
     "Objects are from the partition and are COLLECTION IDs",
@@ -2662,82 +2662,6 @@ dissect_osd_get_attributes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
 
 static void
-dissect_osd_list_collection(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
-                        guint offset, gboolean isreq, gboolean iscdb,
-                        guint payload_len _U_, scsi_task_data_t *cdata _U_,
-                        scsi_osd_conv_info_t *conv_info _U_,
-                        scsi_osd_lun_info_t *lun_info)
-{
-    /* dissecting the CDB   dissection starts at byte 10 of the CDB */
-    if(isreq && iscdb){
-        /* one reserved byte */
-        offset++;
-
-        /* getset attributes byte */
-        dissect_osd_getsetattrib(tvb, offset, tree, cdata);
-        offset++;
-
-        /* timestamps control */
-        dissect_osd_timestamps_control(tvb, offset, tree);
-        offset++;
-
-        /* 3 reserved bytes */
-        offset+=3;
-
-        /* partiton id */
-        dissect_osd_partition_id(pinfo, tvb, offset, tree, hf_scsi_osd_partition_id, lun_info, FALSE, FALSE);
-        offset+=8;
-
-        /* collection object id */
-        dissect_osd_collection_object_id(tvb, offset, tree, hf_scsi_osd_collection_object_id);
-        offset+=8;
-
-        /* list identifier */
-        dissect_osd_list_identifier(tvb, offset, tree);
-        offset+=4;
-
-        /* allocation length */
-        dissect_osd_allocation_length(tvb, offset, tree, cdata);
-        offset+=8;
-
-        /* initial object id */
-        dissect_osd_initial_object_id(tvb, offset, tree);
-        offset+=8;
-
-        /* attribute parameters */
-        dissect_osd_attribute_parameters(pinfo, tvb, offset, tree, cdata);
-        offset+=28;
-
-        /* capability */
-        dissect_osd_capability(tvb, offset, tree);
-        offset+=80;
-
-        /* security parameters */
-        dissect_osd_security_parameters(tvb, offset, tree);
-        offset+=40;
-    }
-
-    /* dissecting the DATA OUT */
-    if(isreq && !iscdb){
-        /* attribute data out */
-        dissect_osd_attribute_data_out(pinfo, tvb, offset, tree, cdata);
-
-        /* no data out for list collection */
-    }
-
-    /* dissecting the DATA IN */
-    if(!isreq && !iscdb){
-        /* attribute data in */
-        dissect_osd_attribute_data_in(pinfo, tvb, offset, tree, cdata);
-
-/* XXX dissect the data */
-    }
-
-}
-
-
-
-static void
 dissect_osd_read(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
                         guint offset, gboolean isreq, gboolean iscdb,
                         guint payload_len _U_, scsi_task_data_t *cdata _U_,
@@ -3070,7 +2994,7 @@ static const scsi_osd_svcaction_t scsi_osd_svcaction[] = {
     {OSD_CREATE_AND_WRITE, dissect_osd_create_and_write},
     {OSD_CREATE_COLLECTION, dissect_osd_create_collection},
     {OSD_REMOVE_COLLECTION, dissect_osd_remove_collection},
-    {OSD_LIST_COLLECTION, dissect_osd_list_collection},
+    {OSD_LIST_COLLECTION, dissect_osd_list},
     {OSD_SET_KEY, dissect_osd_set_key},
     {OSD_FLUSH_COLLECTION, dissect_osd_flush_collection},
     {OSD_FLUSH_PARTITION, dissect_osd_flush_partition},