http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=50605
User: etxrab
Date: 2013/07/14 09:56 PM
Log:
From Javier Godoy:
adds support for the OSD-2 CREATE USER TRACKING COLLECTION service action, following the approach described in bug 8832. It also implements dissection of the CDB continuation segment.
Change in scsi_osd_extra_data_t:
- Add a continuation_length field (we need that value from the CDB when later dissecting the Data In buffer)
The following fields were added:
- hf_scsi_osd2_cdb_continuation_length
- hf_scsi_osd2_cdb_continuation_format
- hf_scsi_osd2_continued_service_action
- hf_scsi_osd2_cdb_continuation_descriptor_type
- hf_scsi_osd2_cdb_continuation_descriptor_pad_length
- hf_scsi_osd2_cdb_continuation_descriptor_length
- hf_scsi_osd2_source_collection_object_id
The following expert_info fields were added:
- ei_osd2_cdb_continuation_format_unknown (PI_UNDECODED, PI_ERROR)
- ei_osd2_continued_service_action_mismatch (PI_PROTOCOL, PI_WARN)
- ei_osd2_cdb_continuation_descriptor_type_unknown (PI_UNDECODED, PI_WARN)
- ei_osd2_cdb_continuation_descriptor_length_invalid (PI_PROTOCOL, PI_ERROR)
- ei_osd2_cdb_continuation_length_invalid (PI_PROTOCOL, PI_ERROR)
The following value_string arrays were added:
- scsi_osd2_cdb_continuation_format_val (OSD2r4 Table 69)
- scsi_osd2_cdb_continuation_descriptor_type_val (OSD2r4 Table 71)
The following functions were added:
- dissect_osd2_cdb_continuation_length (dissect the cdb continuation length field in cdb and save continuation_length in extra_data)
- dissect_osd2_cdb_continuation (dissect the cdb continuation segment from the data out buffer; currently, descriptor-specific fields are not dissected)
- dissect_osd2_create_user_tracking_collection
Changes in dissect_osd_collection_object_id
- add an int hfindex parameter
- the return type was made void (previously it returned int, but the return type was unused)
- this function is used for filling collection_id related fields (there are several flavors of them) and may be modified for displaying creation/removal information (à la dissect_osd_partition_id)
- one call to dissect_osd_requested_collection_object_id was replaced by dissect_osd_collection_object_id(...,hf_scsi_osd_requested_collection_object_id)
- two calls to dissect_osd_collection_object_id were updated with the new signature
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8922
Directory: /trunk/epan/dissectors/
Changes Path Action
+232 -22 packet-scsi-osd.c Modified