/* packet-scsi-osd.c
* Ronnie sahlberg 2006
+ * Joe Breher 2006
*
* $Id$
*
#include <epan/emem.h>
#include <epan/conversation.h>
#include <epan/tap.h>
-#include "packet-fc.h"
#include "packet-scsi.h"
+#include "packet-fc.h"
#include "packet-scsi-osd.h"
+
static int proto_scsi_osd = -1;
int hf_scsi_osd_opcode = -1;
static int hf_scsi_osd_control = -1;
static int hf_scsi_osd_formatted_capacity = -1;
static int hf_scsi_osd_get_attributes_page = -1;
static int hf_scsi_osd_get_attributes_allocation_length = -1;
+static int hf_scsi_osd_get_attributes_list_length= -1;
+static int hf_scsi_osd_get_attributes_list_offset= -1;
static int hf_scsi_osd_retreived_attributes_offset = -1;
static int hf_scsi_osd_set_attributes_page = -1;
static int hf_scsi_osd_set_attribute_length = -1;
static int hf_scsi_osd_set_attribute_number = -1;
static int hf_scsi_osd_set_attributes_offset = -1;
+static int hf_scsi_osd_set_attributes_list_length= -1;
+static int hf_scsi_osd_set_attributes_list_offset= -1;
static int hf_scsi_osd_capability_format = -1;
static int hf_scsi_osd_key_version = -1;
static int hf_scsi_osd_icva = -1;
static int hf_scsi_osd_capability_discriminator = -1;
static int hf_scsi_osd_object_created_time= -1;
static int hf_scsi_osd_object_type = -1;
-static int hf_scsi_osd_permission_bitmask= -1;
+static int hf_scsi_osd_permissions = -1;
+static int hf_scsi_osd_permissions_read = -1;
+static int hf_scsi_osd_permissions_write = -1;
+static int hf_scsi_osd_permissions_get_attr = -1;
+static int hf_scsi_osd_permissions_set_attr = -1;
+static int hf_scsi_osd_permissions_create = -1;
+static int hf_scsi_osd_permissions_remove = -1;
+static int hf_scsi_osd_permissions_obj_mgmt = -1;
+static int hf_scsi_osd_permissions_append = -1;
+static int hf_scsi_osd_permissions_dev_mgmt = -1;
+static int hf_scsi_osd_permissions_global = -1;
+static int hf_scsi_osd_permissions_pol_sec = -1;
static int hf_scsi_osd_object_descriptor_type = -1;
static int hf_scsi_osd_object_descriptor= -1;
static int hf_scsi_osd_ricv = -1;
static int hf_scsi_osd_partition_id = -1;
static int hf_scsi_osd_list_identifier = -1;
static int hf_scsi_osd_allocation_length= -1;
+static int hf_scsi_osd_length= -1;
+static int hf_scsi_osd_starting_byte_address = -1;
static int hf_scsi_osd_initial_object_id= -1;
static int hf_scsi_osd_additional_length= -1;
static int hf_scsi_osd_continuation_object_id= -1;
static int hf_scsi_osd_user_object_id= -1;
static int hf_scsi_osd_requested_user_object_id = -1;
static int hf_scsi_osd_number_of_user_objects = -1;
+static int hf_scsi_osd_key_to_set = -1;
+static int hf_scsi_osd_set_key_version = -1;
+static int hf_scsi_osd_key_identifier = -1;
+static int hf_scsi_osd_seed = -1;
+static int hf_scsi_osd_collection_fcr = -1;
+static int hf_scsi_osd_collection_object_id = -1;
+static int hf_scsi_osd_requested_collection_object_id = -1;
+static int hf_scsi_osd_partition_created_in = -1;
+static int hf_scsi_osd_partition_removed_in = -1;
+static int hf_scsi_osd_flush_scope = -1;
+static int hf_scsi_osd_flush_collection_scope = -1;
+static int hf_scsi_osd_flush_partition_scope = -1;
+static int hf_scsi_osd_flush_osd_scope = -1;
static gint ett_osd_option = -1;
+static gint ett_osd_partition = -1;
+static gint ett_osd_attribute_parameters= -1;
+static gint ett_osd_capability = -1;
+static gint ett_osd_permission_bitmask = -1;
+static gint ett_osd_security_parameters = -1;
+
+
+
+/* There will be one such structure create for each conversation ontop of which
+ * there is an OSD session
+ */
+typedef struct _scsi_osd_conv_info_t {
+ emem_tree_t *luns;
+} scsi_osd_conv_info_t;
+
+/* there will be one such structure created for each lun for each conversation
+ * that is handled by the OSD dissector
+ */
+typedef struct _scsi_osd_lun_info_t {
+ emem_tree_t *partitions;
+} scsi_osd_lun_info_t;
+
+typedef void (*scsi_osd_dissector_t)(tvbuff_t *tvb, packet_info *pinfo,
+ proto_tree *tree, guint offset,
+ gboolean isreq, gboolean iscdb,
+ guint32 payload_len, scsi_task_data_t *cdata,
+ scsi_osd_conv_info_t *conv_info,
+ scsi_osd_lun_info_t *lun_info
+ );
+
+/* One such structure is created per conversation/lun/partition to
+ * keep track of when partitions are created/used/destroyed
+ */
+typedef struct _partition_info_t {
+ int created_in;
+ int removed_in;
+} partition_info_t;
+/* This is a set of extra data specific to OSD that we need to attach to every
+ * task.
+ */
typedef struct _scsi_osd_extra_data_t {
guint16 svcaction;
guint8 gsatype;
+ union {
+ struct { /* gsatype: attribute list */
+ guint32 get_list_length;
+ guint32 get_list_offset;
+ guint32 get_list_allocation_length;
+ guint32 retreived_list_offset;
+ guint32 set_list_length;
+ guint32 set_list_offset;
+ };
+ };
} scsi_osd_extra_data_t;
static const true_false_string option_dpo_tfs = {
}
-/* do we need to store these in the itlq structure ?*/
static void
-dissect_osd_attribute_parameters(tvbuff_t *tvb, int offset, proto_tree *tree, scsi_task_data_t *cdata)
+dissect_osd_attribute_parameters(tvbuff_t *tvb, int offset, proto_tree *parent_tree, scsi_task_data_t *cdata)
{
guint8 gsatype=0;
+ proto_item *item=NULL;
+ proto_tree *tree=NULL;
+ scsi_osd_extra_data_t *extra_data=NULL;
+ if(parent_tree){
+ item = proto_tree_add_text(parent_tree, tvb, offset, 28,
+ "Attribute Parameters");
+ tree = proto_item_add_subtree(item, ett_osd_attribute_parameters);
+ }
+
if(cdata && cdata->itlq && cdata->itlq->extra_data){
- scsi_osd_extra_data_t *extra_data=cdata->itlq->extra_data;
+ extra_data=cdata->itlq->extra_data;
gsatype=extra_data->gsatype;
} else {
return;
offset+=4;
proto_tree_add_item(tree, hf_scsi_osd_set_attributes_page, tvb, offset, 4, 0);
offset+=4;
- proto_tree_add_item(tree, hf_scsi_osd_set_attribute_length, tvb, offset, 4, 0);
- offset+=4;
proto_tree_add_item(tree, hf_scsi_osd_set_attribute_number, tvb, offset, 4, 0);
offset+=4;
+ proto_tree_add_item(tree, hf_scsi_osd_set_attribute_length, tvb, offset, 4, 0);
+ offset+=4;
proto_tree_add_item(tree, hf_scsi_osd_set_attributes_offset, tvb, offset, 4, 0);
offset+=4;
break;
case 3: /* 5.2.2.3 attribute list */
+ proto_tree_add_item(tree, hf_scsi_osd_get_attributes_list_length, tvb, offset, 4, 0);
+ extra_data->get_list_length=tvb_get_ntohl(tvb, offset);
+ offset+=4;
+
+ proto_tree_add_item(tree, hf_scsi_osd_get_attributes_list_offset, tvb, offset, 4, 0);
+ extra_data->get_list_offset=tvb_get_ntohl(tvb, offset);
+ offset+=4;
+
+ proto_tree_add_item(tree, hf_scsi_osd_get_attributes_allocation_length, tvb, offset, 4, 0);
+ extra_data->get_list_allocation_length=tvb_get_ntohl(tvb, offset);
+ offset+=4;
+
+ proto_tree_add_item(tree, hf_scsi_osd_retreived_attributes_offset, tvb, offset, 4, 0);
+ extra_data->retreived_list_offset=tvb_get_ntohl(tvb, offset);
+ offset+=4;
+
+ proto_tree_add_item(tree, hf_scsi_osd_set_attributes_list_length, tvb, offset, 4, 0);
+ extra_data->set_list_length=tvb_get_ntohl(tvb, offset);
+ offset+=4;
+
+ proto_tree_add_item(tree, hf_scsi_osd_set_attributes_list_offset, tvb, offset, 4, 0);
+ extra_data->set_list_offset=tvb_get_ntohl(tvb, offset);
+ offset+=4;
+
+ /* 4 reserved bytes */
+ offset+=4;
+
+ break;
+ }
+}
+
+
+static void
+dissect_osd_attribute_data_out(tvbuff_t *tvb, int offset _U_, proto_tree *tree, scsi_task_data_t *cdata)
+{
+ guint8 gsatype=0;
+ scsi_osd_extra_data_t *extra_data=NULL;
+
+ if(cdata && cdata->itlq && cdata->itlq->extra_data){
+ extra_data=cdata->itlq->extra_data;
+ gsatype=extra_data->gsatype;
+ } else {
+ return;
+ }
+
+ switch(gsatype){
+ case 2: /* 5.2.2.2 attribute page */
+/*qqq*/
+ break;
+ case 3: /* 5.2.2.3 attribute list */
+ if(extra_data->get_list_length){
+ proto_tree_add_text(tree, tvb, extra_data->get_list_offset, extra_data->get_list_length, "Get Attributes Data");
+ }
+ if(extra_data->set_list_length){
+ proto_tree_add_text(tree, tvb, extra_data->set_list_offset, extra_data->set_list_length, "Set Attributes Data");
+ }
+ break;
+ }
+}
+
+
+static void
+dissect_osd_attribute_data_in(tvbuff_t *tvb, int offset _U_, proto_tree *tree, scsi_task_data_t *cdata)
+{
+ guint8 gsatype=0;
+ scsi_osd_extra_data_t *extra_data=NULL;
+
+ if(cdata && cdata->itlq && cdata->itlq->extra_data){
+ extra_data=cdata->itlq->extra_data;
+ gsatype=extra_data->gsatype;
+ } else {
+ return;
+ }
+
+ switch(gsatype){
+ case 2: /* 5.2.2.2 attribute page */
/*qqq*/
break;
+ case 3: /* 5.2.2.3 attribute list */
+ if(extra_data->get_list_allocation_length){
+ proto_tree_add_text(tree, tvb, extra_data->retreived_list_offset, extra_data->get_list_allocation_length, "Get Attributes Data");
+ }
+ break;
}
}
static const value_string scsi_osd_capability_format_vals[] = {
{0x00, "No Capability"},
- {0x01, "SCSI OSD2 Capabilities"},
+ {0x01, "SCSI OSD Capabilities"},
{0, NULL},
};
static const value_string scsi_osd_object_type_vals[] = {
{0, NULL},
};
+static const true_false_string permissions_read_tfs = {
+ "READ is SET",
+ "Read is NOT set"
+};
+static const true_false_string permissions_write_tfs = {
+ "WRITE is SET",
+ "Write is NOT set"
+};
+static const true_false_string permissions_get_attr_tfs = {
+ "GET_ATTR is SET",
+ "Get_attr is NOT set"
+};
+static const true_false_string permissions_set_attr_tfs = {
+ "SET_ATTR is SET",
+ "Set_attr is NOT set"
+};
+static const true_false_string permissions_create_tfs = {
+ "CREATE is SET",
+ "Create is NOT set"
+};
+static const true_false_string permissions_remove_tfs = {
+ "REMOVE is SET",
+ "Remove is NOT set"
+};
+static const true_false_string permissions_obj_mgmt_tfs = {
+ "OBJ_MGMT is SET",
+ "Obj_mgmt is NOT set"
+};
+static const true_false_string permissions_append_tfs = {
+ "APPEND is SET",
+ "Append is NOT set"
+};
+static const true_false_string permissions_dev_mgmt_tfs = {
+ "DEV_MGMT is SET",
+ "Dev_mgmt is NOT set"
+};
+static const true_false_string permissions_global_tfs = {
+ "GLOBAL is SET",
+ "Global is NOT set"
+};
+static const true_false_string permissions_pol_sec_tfs = {
+ "POL/SEC is SET",
+ "Pol/sec is NOT set"
+};
+/* OSD 4.9.2.2.1 */
+static void
+dissect_osd_permissions(tvbuff_t *tvb, int offset, proto_tree *parent_tree)
+{
+ proto_tree *tree=NULL;
+ proto_item *it=NULL;
+ guint16 permissions;
+
+ permissions=tvb_get_ntohs(tvb, offset);
+
+ if(parent_tree){
+ it=proto_tree_add_item(parent_tree, hf_scsi_osd_permissions, tvb, offset, 2, 0);
+ tree = proto_item_add_subtree(it, ett_osd_permission_bitmask);
+ }
+
+ proto_tree_add_item(tree, hf_scsi_osd_permissions_read, tvb, offset, 2, 0);
+ if(permissions&0x8000){
+ proto_item_append_text(tree, " READ");
+ }
+ proto_tree_add_item(tree, hf_scsi_osd_permissions_write, tvb, offset, 2, 0);
+ if(permissions&0x4000){
+ proto_item_append_text(tree, " WRITE");
+ }
+ proto_tree_add_item(tree, hf_scsi_osd_permissions_get_attr, tvb, offset, 2, 0);
+ if(permissions&0x2000){
+ proto_item_append_text(tree, " GET_ATTR");
+ }
+ proto_tree_add_item(tree, hf_scsi_osd_permissions_set_attr, tvb, offset, 2, 0);
+ if(permissions&0x1000){
+ proto_item_append_text(tree, " SET_ATTR");
+ }
+ proto_tree_add_item(tree, hf_scsi_osd_permissions_create, tvb, offset, 2, 0);
+ if(permissions&0x0800){
+ proto_item_append_text(tree, " CREATE");
+ }
+ proto_tree_add_item(tree, hf_scsi_osd_permissions_remove, tvb, offset, 2, 0);
+ if(permissions&0x0400){
+ proto_item_append_text(tree, " REMOVE");
+ }
+ proto_tree_add_item(tree, hf_scsi_osd_permissions_obj_mgmt, tvb, offset, 2, 0);
+ if(permissions&0x0200){
+ proto_item_append_text(tree, " OBJ_MGMT");
+ }
+ proto_tree_add_item(tree, hf_scsi_osd_permissions_append, tvb, offset, 2, 0);
+ if(permissions&0x0100){
+ proto_item_append_text(tree, " APPEND");
+ }
+ proto_tree_add_item(tree, hf_scsi_osd_permissions_dev_mgmt, tvb, offset, 2, 0);
+ if(permissions&0x0080){
+ proto_item_append_text(tree, " DEV_MGMT");
+ }
+ proto_tree_add_item(tree, hf_scsi_osd_permissions_global, tvb, offset, 2, 0);
+ if(permissions&0x0040){
+ proto_item_append_text(tree, " GLOBAL");
+ }
+ proto_tree_add_item(tree, hf_scsi_osd_permissions_pol_sec, tvb, offset, 2, 0);
+ if(permissions&0x0020){
+ proto_item_append_text(tree, " POL/SEC");
+ }
+}
+
/* 4.9.2.2 */
static void
-dissect_osd_capability(tvbuff_t *tvb, int offset, proto_tree *tree)
+dissect_osd_capability(tvbuff_t *tvb, int offset, proto_tree *parent_tree)
{
+ proto_item *item=NULL;
+ proto_tree *tree=NULL;
+
+ if(parent_tree){
+ item = proto_tree_add_text(parent_tree, tvb, offset, 80,
+ "Capability");
+ tree = proto_item_add_subtree(item, ett_osd_capability);
+ }
+
/* capability format */
proto_tree_add_item(tree, hf_scsi_osd_capability_format, tvb, offset, 1, 0);
offset++;
offset++;
/* permission bitmask */
-/*qqq should be broken out into a helper and have the individual bits dissected */
- proto_tree_add_item(tree, hf_scsi_osd_permission_bitmask, tvb, offset, 5, 0);
+ dissect_osd_permissions(tvb, offset, tree);
offset+=5;
/* a reserved byte */
/* 5.2.6 */
static void
-dissect_osd_security_parameters(tvbuff_t *tvb, int offset, proto_tree *tree)
+dissect_osd_security_parameters(tvbuff_t *tvb, int offset, proto_tree *parent_tree)
{
+ proto_item *item=NULL;
+ proto_tree *tree=NULL;
+
+ if(parent_tree){
+ item = proto_tree_add_text(parent_tree, tvb, offset, 40,
+ "Security Parameters");
+ tree = proto_item_add_subtree(item, ett_osd_security_parameters);
+ }
+
/* request integrity check value */
proto_tree_add_item(tree, hf_scsi_osd_ricv, tvb, offset, 20, 0);
offset+=20;
}
static void
-dissect_osd_format_osd(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
+dissect_osd_format_osd(tvbuff_t *tvb, packet_info *pinfo _U_, 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 _U_)
+{
+ /* dissecting the CDB dissection starts at byte 10 of the CDB */
+ if(isreq && iscdb){
+ /* options byte */
+ dissect_osd_option(tvb, offset, tree);
+ offset++;
+
+ /* getset attributes byte */
+ dissect_osd_getsetattrib(tvb, offset, tree, cdata);
+ offset++;
+
+ /* timestamps control */
+ dissect_osd_timestamps_control(tvb, offset, tree);
+ offset++;
+
+ /* 23 reserved bytes */
+ offset+=23;
+
+ /* formatted capacity */
+ dissect_osd_formatted_capacity(tvb, offset, tree);
+ offset+=8;
+
+ /* 8 reserved bytes */
+ offset+=8;
+
+ /* attribute parameters */
+ dissect_osd_attribute_parameters(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(tvb, offset, tree, cdata);
+
+ /* no data out for format osd */
+ }
+
+ /* dissecting the DATA IN */
+ if(!isreq && !iscdb){
+ /* attribute data in */
+ dissect_osd_attribute_data_in(tvb, offset, tree, cdata);
+
+ /* no data in for format osd */
+ }
+
+}
+
+
+static void
+dissect_osd_partition_id(packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tree *tree, int hf_index, scsi_osd_lun_info_t *lun_info, gboolean is_created, gboolean is_removed)
+{
+ proto_item *item=NULL;
+ guint64 partition_id;
+
+ /* partition id */
+ item=proto_tree_add_item(tree, hf_index, tvb, offset, 8, 0);
+ partition_id=tvb_get_ntoh64(tvb, offset);
+ if(!partition_id){
+ proto_item_append_text(item, " (ROOT partition)");
+ } else {
+ partition_info_t *part_info;
+ emem_tree_key_t pikey[2];
+ proto_tree *partition_tree=NULL;
+
+ pikey[0].length=2;
+ pikey[0].key=(guint32 *)&partition_id;
+ pikey[1].length=0;
+ part_info=se_tree_lookup32_array(lun_info->partitions, &pikey[0]);
+ if(!part_info){
+ part_info=se_alloc(sizeof(partition_info_t));
+ part_info->created_in=0;
+ part_info->removed_in=0;
+
+ pikey[0].length=2;
+ pikey[0].key=(guint32 *)&partition_id;
+ pikey[1].length=0;
+ se_tree_insert32_array(lun_info->partitions, &pikey[0], part_info);
+ }
+ if(is_created){
+ part_info->created_in=pinfo->fd->num;
+ }
+ if(is_removed){
+ part_info->removed_in=pinfo->fd->num;
+ }
+ if(item){
+ partition_tree=proto_item_add_subtree(item, ett_osd_partition);
+ }
+ if(part_info->created_in){
+ proto_item *tmp_item;
+ tmp_item=proto_tree_add_uint(partition_tree, hf_scsi_osd_partition_created_in, tvb, 0, 0, part_info->created_in);
+ PROTO_ITEM_SET_GENERATED(tmp_item);
+ }
+ if(part_info->removed_in){
+ proto_item *tmp_item;
+ tmp_item=proto_tree_add_uint(partition_tree, hf_scsi_osd_partition_removed_in, tvb, 0, 0, part_info->removed_in);
+ PROTO_ITEM_SET_GENERATED(tmp_item);
+ }
+ }
+ offset+=8;
+}
+
+
+
+static void
+dissect_osd_create_partition(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){
+ /* options byte */
+ dissect_osd_option(tvb, offset, tree);
+ 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;
+
+ /* requested partiton id */
+ dissect_osd_partition_id(pinfo, tvb, offset, tree, hf_scsi_osd_requested_partition_id, lun_info, TRUE, FALSE);
+ offset+=8;
+
+ /* 28 reserved bytes */
+ offset+=28;
+
+ /* attribute parameters */
+ dissect_osd_attribute_parameters(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(tvb, offset, tree, cdata);
+
+ /* no data out for create partition */
+ }
+
+ /* dissecting the DATA IN */
+ if(!isreq && !iscdb){
+ /* attribute data in */
+ dissect_osd_attribute_data_in(tvb, offset, tree, cdata);
+
+ /* no data in for create partition */
+ }
+
+}
+
+static const value_string scsi_osd_sort_order_vals[] = {
+ {0x00, "Ascending numeric value"},
+ {0, NULL},
+};
+static void
+dissect_osd_sortorder(tvbuff_t *tvb, int offset, proto_tree *tree)
+{
+ /* sort order */
+ proto_tree_add_item(tree, hf_scsi_osd_sortorder, tvb, offset, 1, 0);
+ offset++;
+}
+
+static void
+dissect_osd_list_identifier(tvbuff_t *tvb, int offset, proto_tree *tree)
+{
+ /* list identifier */
+ proto_tree_add_item(tree, hf_scsi_osd_list_identifier, tvb, offset, 4, 0);
+ offset+=4;
+}
+
+static void
+dissect_osd_allocation_length(tvbuff_t *tvb, int offset, proto_tree *tree)
+{
+ /* allocation length */
+ proto_tree_add_item(tree, hf_scsi_osd_allocation_length, tvb, offset, 8, 0);
+ offset+=8;
+}
+
+static void
+dissect_osd_initial_object_id(tvbuff_t *tvb, int offset, proto_tree *tree)
+{
+ /* initial object id */
+ proto_tree_add_item(tree, hf_scsi_osd_initial_object_id, tvb, offset, 8, 0);
+ offset+=8;
+}
+
+static void
+dissect_osd_additional_length(tvbuff_t *tvb, int offset, proto_tree *tree)
+{
+ /* additional length */
+ proto_tree_add_item(tree, hf_scsi_osd_additional_length, tvb, offset, 8, 0);
+ offset+=8;
+}
+
+
+static void
+dissect_osd_continuation_object_id(tvbuff_t *tvb, int offset, proto_tree *tree)
+{
+ /* continuation object id */
+ proto_tree_add_item(tree, hf_scsi_osd_continuation_object_id, tvb, offset, 8, 0);
+ offset+=8;
+}
+
+static const true_false_string list_lstchg_tfs = {
+ "List has CHANGED since the first List command",
+ "List has NOT changed since first command"
+};
+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"
+};
+
+static void
+dissect_osd_user_object_id(tvbuff_t *tvb, int offset, proto_tree *tree)
+{
+ /* user object id */
+ proto_tree_add_item(tree, hf_scsi_osd_user_object_id, tvb, offset, 8, 0);
+ offset+=8;
+}
+
+static void
+dissect_osd_list(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){
+ /* options byte */
+ dissect_osd_option(tvb, offset, tree);
+ offset++;
+
+ /* getset attributes byte / sort order */
+ dissect_osd_getsetattrib(tvb, offset, tree, cdata);
+ dissect_osd_sortorder(tvb, offset, tree);
+ 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;
+
+ /* 8 reserved bytes */
+ offset+=8;
+
+ /* list identifier */
+ dissect_osd_list_identifier(tvb, offset, tree);
+ offset+=4;
+
+ /* allocation length */
+ dissect_osd_allocation_length(tvb, offset, tree);
+ offset+=8;
+
+ /* initial object id */
+ dissect_osd_initial_object_id(tvb, offset, tree);
+ offset+=8;
+
+ /* attribute parameters */
+ dissect_osd_attribute_parameters(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(tvb, offset, tree, cdata);
+
+ /* no data out for LIST */
+ }
+
+ /* dissecting the DATA IN */
+ if(!isreq && !iscdb){
+ guint64 additional_length;
+ gboolean is_root;
+
+ /* attribute data in */
+ dissect_osd_attribute_data_in(tvb, offset, tree, cdata);
+
+ /* dissection of the LIST DATA-IN */
+ /* additional length */
+ additional_length=tvb_get_ntoh64(tvb, offset);
+ dissect_osd_additional_length(tvb, offset, tree);
+ offset+=8;
+
+ /* continuation object id */
+ dissect_osd_continuation_object_id(tvb, offset, tree);
+ offset+=8;
+
+ /* list identifier */
+ dissect_osd_list_identifier(tvb, offset, tree);
+ offset+=4;
+
+ /* 3 reserved bytes */
+ offset+=3;
+
+ /* LSTCHG and ROOT flags */
+ proto_tree_add_item(tree, hf_scsi_osd_list_flags_lstchg, tvb, offset, 1, 0);
+ proto_tree_add_item(tree, hf_scsi_osd_list_flags_root, tvb, offset, 1, 0);
+ is_root=tvb_get_guint8(tvb, offset)&0x01;
+ offset++;
+
+
+ /* list of user object ids or partition ids */
+ while(additional_length > (offset-8)){
+ if(is_root){
+ dissect_osd_partition_id(pinfo, tvb, offset, tree, hf_scsi_osd_partition_id, lun_info, FALSE, FALSE);
+ } else {
+ dissect_osd_user_object_id(tvb, offset, tree);
+ }
+ offset+=8;
+ }
+ }
+
+}
+
+static void
+dissect_osd_requested_user_object_id(tvbuff_t *tvb, int offset, proto_tree *tree)
+{
+ /* request user object id */
+ proto_tree_add_item(tree, hf_scsi_osd_requested_user_object_id, tvb, offset, 8, 0);
+ offset+=8;
+}
+
+static void
+dissect_osd_number_of_user_objects(tvbuff_t *tvb, int offset, proto_tree *tree)
+{
+ /* number_of_user_objects */
+ proto_tree_add_item(tree, hf_scsi_osd_number_of_user_objects, tvb, offset, 2, 0);
+ offset+=2;
+}
+
+static void
+dissect_osd_create(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){
+ /* options byte */
+ dissect_osd_option(tvb, offset, tree);
+ 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;
+
+ /* requested user_object id */
+ dissect_osd_requested_user_object_id(tvb, offset, tree);
+ offset+=8;
+
+ /* 4 reserved bytes */
+ offset+=4;
+
+ /* number of user objects */
+ dissect_osd_number_of_user_objects(tvb, offset, tree);
+ offset+=2;
+
+ /* 14 reserved bytes */
+ offset+=14;
+
+ /* attribute parameters */
+ dissect_osd_attribute_parameters(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(tvb, offset, tree, cdata);
+
+ /* no data out for create */
+ }
+
+ /* dissecting the DATA IN */
+ if(!isreq && !iscdb){
+ /* attribute data in */
+ dissect_osd_attribute_data_in(tvb, offset, tree, cdata);
+
+ /* no data in for create */
+ }
+
+}
+
+
+static void
+dissect_osd_remove_partition(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){
+ /* options byte */
+ dissect_osd_option(tvb, offset, tree);
+ 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, TRUE);
+ offset+=8;
+
+ /* 28 reserved bytes */
+ offset+=28;
+
+ /* attribute parameters */
+ dissect_osd_attribute_parameters(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(tvb, offset, tree, cdata);
+
+ /* no data out for remove partition */
+ }
+
+ /* dissecting the DATA IN */
+ if(!isreq && !iscdb){
+ /* attribute data in */
+ dissect_osd_attribute_data_in(tvb, offset, tree, cdata);
+
+ /* no data in for remove partition */
+ }
+
+}
+
+static const value_string key_to_set_vals[] = {
+ {1, "Root"},
+ {2, "Partition"},
+ {3, "Working"},
+ {0, NULL},
+};
+static void
+dissect_osd_key_to_set(tvbuff_t *tvb, int offset, proto_tree *tree)
+{
+ proto_tree_add_item(tree, hf_scsi_osd_key_to_set, tvb, offset, 1, 0);
+}
+
+static void
+dissect_osd_set_key_version(tvbuff_t *tvb, int offset, proto_tree *tree)
+{
+ proto_tree_add_item(tree, hf_scsi_osd_set_key_version, tvb, offset, 1, 0);
+}
+
+static void
+dissect_osd_key_identifier(tvbuff_t *tvb, int offset, proto_tree *tree)
+{
+ proto_tree_add_item(tree, hf_scsi_osd_key_identifier, tvb, offset, 7, 0);
+}
+
+static void
+dissect_osd_seed(tvbuff_t *tvb, int offset, proto_tree *tree)
+{
+ proto_tree_add_item(tree, hf_scsi_osd_seed, tvb, offset, 20, 0);
+}
+
+static void
+dissect_osd_set_key(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){
+ /* a reserved byte */
+ offset++;
+
+ /* getset attributes byte and key to set*/
+ dissect_osd_getsetattrib(tvb, offset, tree, cdata);
+ dissect_osd_key_to_set(tvb, offset, tree);
+ 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;
+
+ /* key version */
+ dissect_osd_set_key_version(tvb, offset, tree);
+ offset++;
+
+ /* key identifier */
+ dissect_osd_key_identifier(tvb, offset, tree);
+ offset+=7;
+
+ /* seed */
+ dissect_osd_seed(tvb, offset, tree);
+ offset+=20;
+
+ /* attribute parameters */
+ dissect_osd_attribute_parameters(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(tvb, offset, tree, cdata);
+
+ /* no data out for set key */
+ }
+
+ /* dissecting the DATA IN */
+ if(!isreq && !iscdb){
+ /* attribute data in */
+ dissect_osd_attribute_data_in(tvb, offset, tree, cdata);
+
+ /* no data in for set key */
+ }
+
+}
+
+static void
+dissect_osd_remove(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){
+ /* options byte */
+ dissect_osd_option(tvb, offset, tree);
+ 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;
+
+ /* user object id */
+ dissect_osd_user_object_id(tvb, offset, tree);
+ offset+=8;
+
+ /* 20 reserved bytes */
+ offset+=20;
+
+ /* attribute parameters */
+ dissect_osd_attribute_parameters(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(tvb, offset, tree, cdata);
+
+ /* no data out for remove */
+ }
+
+ /* dissecting the DATA IN */
+ if(!isreq && !iscdb){
+ /* attribute data in */
+ dissect_osd_attribute_data_in(tvb, offset, tree, cdata);
+
+ /* no data in for remove */
+ }
+
+}
+
+static const true_false_string collection_fcr_tfs = {
+ "FCR is SET",
+ "Fcr is NOR set"
+};
+static void
+dissect_osd_collection_fcr(tvbuff_t *tvb, int offset, proto_tree *tree)
+{
+ proto_tree_add_item(tree, hf_scsi_osd_collection_fcr, tvb, offset, 1, 0);
+}
+
+static void
+dissect_osd_collection_object_id(tvbuff_t *tvb, int offset, proto_tree *tree)
+{
+ /* collection object id */
+ proto_tree_add_item(tree, hf_scsi_osd_collection_object_id, tvb, offset, 8, 0);
+ offset+=8;
+}
+
+
+static void
+dissect_osd_remove_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){
+ /* options byte */
+ dissect_osd_option(tvb, offset, tree);
+ offset++;
+
+ /* getset attributes byte */
+ dissect_osd_getsetattrib(tvb, offset, tree, cdata);
+ dissect_osd_collection_fcr(tvb, offset, tree);
+ 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);
+ offset+=8;
+
+ /* 20 reserved bytes */
+ offset+=20;
+
+ /* attribute parameters */
+ dissect_osd_attribute_parameters(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(tvb, offset, tree, cdata);
+
+ /* no data out for remove collection */
+ }
+
+ /* dissecting the DATA IN */
+ if(!isreq && !iscdb){
+ /* attribute data in */
+ dissect_osd_attribute_data_in(tvb, offset, tree, cdata);
+
+ /* no data in for remove collection */
+ }
+
+}
+
+
+static void
+dissect_osd_length(tvbuff_t *tvb, int offset, proto_tree *tree)
+{
+ /* length */
+ proto_tree_add_item(tree, hf_scsi_osd_length, tvb, offset, 8, 0);
+ offset+=8;
+}
+
+static void
+dissect_osd_starting_byte_address(tvbuff_t *tvb, int offset, proto_tree *tree)
+{
+ /* starting_byte_address */
+ proto_tree_add_item(tree, hf_scsi_osd_starting_byte_address, tvb, offset, 8, 0);
+ offset+=8;
+}
+
+
+static void
+dissect_osd_write(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){
+ /* options byte */
+ dissect_osd_option(tvb, offset, tree);
+ offset++;
+
+ /* getset attributes byte / sort order */
+ dissect_osd_getsetattrib(tvb, offset, tree, cdata);
+ dissect_osd_sortorder(tvb, offset, tree);
+ 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;
+
+ /* user object id */
+ dissect_osd_user_object_id(tvb, offset, tree);
+ offset+=8;
+
+ /* 4 reserved bytes */
+ offset+=4;
+
+ /* length */
+ dissect_osd_length(tvb, offset, tree);
+ offset+=8;
+
+ /* starting byte address */
+ dissect_osd_starting_byte_address(tvb, offset, tree);
+ offset+=8;
+
+ /* attribute parameters */
+ dissect_osd_attribute_parameters(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(tvb, offset, tree, cdata);
+
+ /* xxx should dissect the data ? */
+ }
+
+ /* dissecting the DATA IN */
+ if(!isreq && !iscdb){
+ /* attribute data in */
+ dissect_osd_attribute_data_in(tvb, offset, tree, cdata);
+
+ /* no data in for WRITE */
+ }
+
+}
+
+
+static void
+dissect_osd_requested_collection_object_id(tvbuff_t *tvb, int offset, proto_tree *tree)
+{
+ /* requested collection object id */
+ proto_tree_add_item(tree, hf_scsi_osd_requested_collection_object_id, tvb, offset, 8, 0);
+ offset+=8;
+}
+
+
+static void
+dissect_osd_create_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){
+ /* options byte */
+ dissect_osd_option(tvb, offset, tree);
+ offset++;
+
+ /* getset attributes byte */
+ dissect_osd_getsetattrib(tvb, offset, tree, cdata);
+ dissect_osd_collection_fcr(tvb, offset, tree);
+ 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;
+
+ /* requested collection object id */
+ dissect_osd_requested_collection_object_id(tvb, offset, tree);
+ offset+=8;
+
+ /* 20 reserved bytes */
+ offset+=20;
+
+ /* attribute parameters */
+ dissect_osd_attribute_parameters(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(tvb, offset, tree, cdata);
+
+ /* no data out for create collection */
+ }
+
+ /* dissecting the DATA IN */
+ if(!isreq && !iscdb){
+ /* attribute data in */
+ dissect_osd_attribute_data_in(tvb, offset, tree, cdata);
+
+ /* no data in for create collection */
+ }
+
+}
+
+
+static const value_string flush_scope_vals[] = {
+ {0, "User object data and attributes"},
+ {1, "User object attributes only"},
+ {0, NULL}
+};
+
+static void
+dissect_osd_flush_scope(tvbuff_t *tvb, int offset, proto_tree *tree)
+{
+ /* flush scope */
+ proto_tree_add_item(tree, hf_scsi_osd_flush_scope, tvb, offset, 1, 0);
+ offset++;
+}
+
+static void
+dissect_osd_flush(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){
+ /* options byte */
+ dissect_osd_flush_scope(tvb, offset, tree);
+ 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;
+
+ /* user object id */
+ dissect_osd_user_object_id(tvb, offset, tree);
+ offset+=8;
+
+ /* 20 reserved bytes */
+ offset+=20;
+
+ /* attribute parameters */
+ dissect_osd_attribute_parameters(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(tvb, offset, tree, cdata);
+
+ /* no data out for flush */
+ }
+
+ /* dissecting the DATA IN */
+ if(!isreq && !iscdb){
+ /* attribute data in */
+ dissect_osd_attribute_data_in(tvb, offset, tree, cdata);
+
+ /* no data in for flush */
+ }
+
+}
+
+
+static const value_string flush_collection_scope_vals[] = {
+ {0, "List of user objects contained in the collection"},
+ {1, "Collection attributes only"},
+ {2, "List of user objects and collection attributes"},
+ {0, NULL}
+};
+
+static void
+dissect_osd_flush_collection_scope(tvbuff_t *tvb, int offset, proto_tree *tree)
+{
+ /* flush collection scope */
+ proto_tree_add_item(tree, hf_scsi_osd_flush_collection_scope, tvb, offset, 1, 0);
+ offset++;
+}
+
+static void
+dissect_osd_flush_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){
+ /* options byte */
+ dissect_osd_flush_collection_scope(tvb, offset, tree);
+ offset++;
+
+ /* getset attributes byte */
+ dissect_osd_getsetattrib(tvb, offset, tree, cdata);
+ dissect_osd_collection_fcr(tvb, offset, tree);
+ 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);
+ offset+=8;
+
+ /* 20 reserved bytes */
+ offset+=20;
+
+ /* attribute parameters */
+ dissect_osd_attribute_parameters(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(tvb, offset, tree, cdata);
+
+ /* no data out for flush collection */
+ }
+
+ /* dissecting the DATA IN */
+ if(!isreq && !iscdb){
+ /* attribute data in */
+ dissect_osd_attribute_data_in(tvb, offset, tree, cdata);
+
+ /* no data in for flush collection */
+ }
+
+}
+
+
+static void
+dissect_osd_append(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){
+ /* options byte */
+ dissect_osd_option(tvb, offset, tree);
+ offset++;
+
+ /* getset attributes byte / sort order */
+ dissect_osd_getsetattrib(tvb, offset, tree, cdata);
+ dissect_osd_sortorder(tvb, offset, tree);
+ 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;
+
+ /* user object id */
+ dissect_osd_user_object_id(tvb, offset, tree);
+ offset+=8;
+
+ /* 4 reserved bytes */
+ offset+=4;
+
+ /* length */
+ dissect_osd_length(tvb, offset, tree);
+ offset+=8;
+
+ /* 8 reserved bytes */
+ offset+=8;
+
+ /* attribute parameters */
+ dissect_osd_attribute_parameters(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(tvb, offset, tree, cdata);
+
+ /* xxx should dissect the data ? */
+ }
+
+ /* dissecting the DATA IN */
+ if(!isreq && !iscdb){
+ /* attribute data in */
+ dissect_osd_attribute_data_in(tvb, offset, tree, cdata);
+
+ /* no data in for append */
+ }
+
+}
+
+static void
+dissect_osd_create_and_write(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_)
+ 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){
dissect_osd_timestamps_control(tvb, offset, tree);
offset++;
- /* 23 reserved bytes */
- offset+=23;
+ /* 3 reserved bytes */
+ offset+=3;
- /* formatted capacity */
- dissect_osd_formatted_capacity(tvb, offset, tree);
+ /* partiton id */
+ dissect_osd_partition_id(pinfo, tvb, offset, tree, hf_scsi_osd_partition_id, lun_info, FALSE, FALSE);
offset+=8;
- /* 8 reserved bytes */
+ /* requested user_object id */
+ dissect_osd_requested_user_object_id(tvb, offset, tree);
+ offset+=8;
+
+ /* 4 reserved bytes */
+ offset+=4;
+
+ /* length */
+ dissect_osd_length(tvb, offset, tree);
+ offset+=8;
+
+ /* starting byte address */
+ dissect_osd_starting_byte_address(tvb, offset, tree);
offset+=8;
/* attribute parameters */
/* dissecting the DATA OUT */
if(isreq && !iscdb){
- /* no data out for format osd */
+ /* attribute data out */
+ dissect_osd_attribute_data_out(tvb, offset, tree, cdata);
+
+ /* should we dissect the data? */
}
/* dissecting the DATA IN */
if(!isreq && !iscdb){
- /* no data in for format osd */
+ /* attribute data in */
+ dissect_osd_attribute_data_in(tvb, offset, tree, cdata);
+
+ /* no data in for create and write*/
}
}
-static void
-dissect_osd_requested_partition_id(tvbuff_t *tvb, int offset, proto_tree *tree)
-{
- /* request partition id */
- proto_tree_add_item(tree, hf_scsi_osd_requested_partition_id, tvb, offset, 8, 0);
- offset+=8;
-}
+static const value_string flush_osd_scope_vals[] = {
+ {0, "List of partitions contained in the OSD logical unit"},
+ {1, "Root object attributes only"},
+ {2, "Everything"},
+ {0, NULL}
+};
static void
-dissect_osd_partition_id(tvbuff_t *tvb, int offset, proto_tree *tree)
+dissect_osd_flush_osd_scope(tvbuff_t *tvb, int offset, proto_tree *tree)
{
- /* partition id */
- proto_tree_add_item(tree, hf_scsi_osd_partition_id, tvb, offset, 8, 0);
- offset+=8;
+ /* flush osd scope */
+ proto_tree_add_item(tree, hf_scsi_osd_flush_osd_scope, tvb, offset, 1, 0);
+ offset++;
}
-
-
static void
-dissect_osd_create_partition(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
+dissect_osd_flush_osd(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_)
+ 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){
/* options byte */
- dissect_osd_option(tvb, offset, tree);
+ dissect_osd_flush_osd_scope(tvb, offset, tree);
offset++;
/* getset attributes byte */
dissect_osd_timestamps_control(tvb, offset, tree);
offset++;
- /* 3 reserved bytes */
- offset+=3;
-
- /* requested partiton id */
- dissect_osd_requested_partition_id(tvb, offset, tree);
- offset+=8;
-
- /* 28 reserved bytes */
- offset+=28;
+ /* 39 reserved bytes */
+ offset+=39;
/* attribute parameters */
dissect_osd_attribute_parameters(tvb, offset, tree, cdata);
/* dissecting the DATA OUT */
if(isreq && !iscdb){
- /* no data out for create partition */
+ /* attribute data out */
+ dissect_osd_attribute_data_out(tvb, offset, tree, cdata);
+
+ /* no data out for flush osd */
}
/* dissecting the DATA IN */
if(!isreq && !iscdb){
- /* no data in for create partition */
+ /* attribute data in */
+ dissect_osd_attribute_data_in(tvb, offset, tree, cdata);
+
+ /* no data in for flush osd */
}
}
-static const value_string scsi_osd_sort_order_vals[] = {
- {0x00, "Ascending numeric value"},
- {0, NULL},
+
+static const value_string flush_partition_scope_vals[] = {
+ {0, "List of user objects and collections in the partition"},
+ {1, "Partition attributes only"},
+ {2, "Everything"},
+ {0, NULL}
};
+
static void
-dissect_osd_sortorder(tvbuff_t *tvb, int offset, proto_tree *tree)
+dissect_osd_flush_partition_scope(tvbuff_t *tvb, int offset, proto_tree *tree)
{
- /* sort order */
- proto_tree_add_item(tree, hf_scsi_osd_sortorder, tvb, offset, 1, 0);
+ /* flush partition scope */
+ proto_tree_add_item(tree, hf_scsi_osd_flush_partition_scope, tvb, offset, 1, 0);
offset++;
}
-static void
-dissect_osd_list_identifier(tvbuff_t *tvb, int offset, proto_tree *tree)
-{
- /* list identifier */
- proto_tree_add_item(tree, hf_scsi_osd_list_identifier, tvb, offset, 4, 0);
- offset+=4;
-}
static void
-dissect_osd_allocation_length(tvbuff_t *tvb, int offset, proto_tree *tree)
+dissect_osd_flush_partition(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)
{
- /* allocation length */
- proto_tree_add_item(tree, hf_scsi_osd_allocation_length, tvb, offset, 8, 0);
- offset+=8;
-}
+ /* dissecting the CDB dissection starts at byte 10 of the CDB */
+ if(isreq && iscdb){
+ /* options byte */
+ dissect_osd_flush_partition_scope(tvb, offset, tree);
+ offset++;
-static void
-dissect_osd_initial_object_id(tvbuff_t *tvb, int offset, proto_tree *tree)
-{
- /* initial object id */
- proto_tree_add_item(tree, hf_scsi_osd_initial_object_id, tvb, offset, 8, 0);
- offset+=8;
-}
+ /* getset attributes byte */
+ dissect_osd_getsetattrib(tvb, offset, tree, cdata);
+ offset++;
-static void
-dissect_osd_additional_length(tvbuff_t *tvb, int offset, proto_tree *tree)
-{
- /* additional length */
- proto_tree_add_item(tree, hf_scsi_osd_additional_length, tvb, offset, 8, 0);
- offset+=8;
-}
+ /* 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;
-static void
-dissect_osd_continuation_object_id(tvbuff_t *tvb, int offset, proto_tree *tree)
-{
- /* continuation object id */
- proto_tree_add_item(tree, hf_scsi_osd_continuation_object_id, tvb, offset, 8, 0);
- offset+=8;
-}
+ /* 28 reserved bytes */
+ offset+=28;
-static const true_false_string list_lstchg_tfs = {
- "List has CHANGED since the first List command",
- "List has NOT changed since first command"
-};
-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"
-};
+ /* attribute parameters */
+ dissect_osd_attribute_parameters(tvb, offset, tree, cdata);
+ offset+=28;
-static void
-dissect_osd_user_object_id(tvbuff_t *tvb, int offset, proto_tree *tree)
-{
- /* user object id */
- proto_tree_add_item(tree, hf_scsi_osd_user_object_id, tvb, offset, 8, 0);
- offset+=8;
+ /* 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(tvb, offset, tree, cdata);
+
+ /* no data out for flush partition */
+ }
+
+ /* dissecting the DATA IN */
+ if(!isreq && !iscdb){
+ /* attribute data in */
+ dissect_osd_attribute_data_in(tvb, offset, tree, cdata);
+
+ /* no data in for flush partition */
+ }
+
}
+
static void
-dissect_osd_list(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
+dissect_osd_get_attributes(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_)
+ 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){
dissect_osd_option(tvb, offset, tree);
offset++;
- /* getset attributes byte / sort order */
+ /* getset attributes byte */
dissect_osd_getsetattrib(tvb, offset, tree, cdata);
- dissect_osd_sortorder(tvb, offset, tree);
offset++;
/* timestamps control */
offset+=3;
/* partiton id */
- dissect_osd_partition_id(tvb, offset, tree);
+ dissect_osd_partition_id(pinfo, tvb, offset, tree, hf_scsi_osd_partition_id, lun_info, FALSE, TRUE);
offset+=8;
- /* 8 reserved bytes */
- offset+=8;
-
- /* list identifier */
- dissect_osd_list_identifier(tvb, offset, tree);
- offset+=4;
-
- /* allocation length */
- dissect_osd_allocation_length(tvb, offset, tree);
+ /* user_object id */
+ dissect_osd_user_object_id(tvb, offset, tree);
offset+=8;
- /* initial object id */
- dissect_osd_initial_object_id(tvb, offset, tree);
- offset+=8;
+ /* 20 reserved bytes */
+ offset+=20;
/* attribute parameters */
dissect_osd_attribute_parameters(tvb, offset, tree, cdata);
/* dissecting the DATA OUT */
if(isreq && !iscdb){
- /* no data out for LIST */
+ /* attribute data out */
+ dissect_osd_attribute_data_out(tvb, offset, tree, cdata);
+
+ /* no data out for get attributes */
}
/* dissecting the DATA IN */
if(!isreq && !iscdb){
- guint64 additional_length;
- gboolean is_root;
-
- /* dissection of the LIST DATA-IN */
- /* additional length */
- additional_length=tvb_get_ntoh64(tvb, offset);
- dissect_osd_additional_length(tvb, offset, tree);
- offset+=8;
-
- /* continuation object id */
- dissect_osd_continuation_object_id(tvb, offset, tree);
- offset+=8;
-
- /* list identifier */
- dissect_osd_list_identifier(tvb, offset, tree);
- offset+=4;
-
- /* 3 reserved bytes */
- offset+=3;
-
- /* LSTCHG and ROOT flags */
- proto_tree_add_item(tree, hf_scsi_osd_list_flags_lstchg, tvb, offset, 1, 0);
- proto_tree_add_item(tree, hf_scsi_osd_list_flags_root, tvb, offset, 1, 0);
- is_root=tvb_get_guint8(tvb, offset)&0x01;
- offset++;
-
+ /* attribute data in */
+ dissect_osd_attribute_data_in(tvb, offset, tree, cdata);
- /* list of user object ids or partition ids */
- while(additional_length > (offset-8)){
- if(is_root){
- dissect_osd_partition_id(tvb, offset, tree);
- } else {
- dissect_osd_user_object_id(tvb, offset, tree);
- }
- offset+=8;
- }
+ /* no data in for get attributes */
}
}
-static void
-dissect_osd_requested_user_object_id(tvbuff_t *tvb, int offset, proto_tree *tree)
-{
- /* request user object id */
- proto_tree_add_item(tree, hf_scsi_osd_requested_user_object_id, tvb, offset, 8, 0);
- offset+=8;
-}
-
-static void
-dissect_osd_number_of_user_objects(tvbuff_t *tvb, int offset, proto_tree *tree)
-{
- /* number_of_user_objects */
- proto_tree_add_item(tree, hf_scsi_osd_number_of_user_objects, tvb, offset, 2, 0);
- offset+=2;
-}
static void
-dissect_osd_create(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
+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_)
+ 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){
- /* options byte */
- dissect_osd_option(tvb, offset, tree);
+ /* one reserved byte */
offset++;
/* getset attributes byte */
offset+=3;
/* partiton id */
- dissect_osd_partition_id(tvb, offset, tree);
+ dissect_osd_partition_id(pinfo, tvb, offset, tree, hf_scsi_osd_partition_id, lun_info, FALSE, FALSE);
offset+=8;
- /* requested user_object id */
- dissect_osd_requested_user_object_id(tvb, offset, tree);
+ /* collection object id */
+ dissect_osd_collection_object_id(tvb, offset, tree);
offset+=8;
- /* 4 reserved bytes */
+ /* list identifier */
+ dissect_osd_list_identifier(tvb, offset, tree);
offset+=4;
- /* number of user objects */
- dissect_osd_number_of_user_objects(tvb, offset, tree);
- offset+=2;
+ /* allocation length */
+ dissect_osd_allocation_length(tvb, offset, tree);
+ offset+=8;
- /* 14 reserved bytes */
- offset+=14;
+ /* initial object id */
+ dissect_osd_initial_object_id(tvb, offset, tree);
+ offset+=8;
/* attribute parameters */
dissect_osd_attribute_parameters(tvb, offset, tree, cdata);
/* dissecting the DATA OUT */
if(isreq && !iscdb){
- /* no data out for create */
+ /* attribute data out */
+ dissect_osd_attribute_data_out(tvb, offset, tree, cdata);
+
+ /* no data out for list collection */
}
/* dissecting the DATA IN */
if(!isreq && !iscdb){
- /* no data in for create */
+ /* attribute data in */
+ dissect_osd_attribute_data_in(tvb, offset, tree, cdata);
+
+/* XXX dissect the data */
}
}
-
/* OSD Service Actions */
#define OSD_FORMAT_OSD 0x8801
#define OSD_CREATE 0x8802
#define OSD_LIST 0x8803
+#define OSD_WRITE 0x8806
+#define OSD_APPEND 0x8807
+#define OSD_FLUSH 0x8808
+#define OSD_REMOVE 0x880a
#define OSD_CREATE_PARTITION 0x880b
+#define OSD_REMOVE_PARTITION 0x880c
+#define OSD_GET_ATTRIBUTES 0x880e
+#define OSD_CREATE_AND_WRITE 0x8812
+#define OSD_CREATE_COLLECTION 0x8815
+#define OSD_REMOVE_COLLECTION 0x8816
+#define OSD_LIST_COLLECTION 0x8817
+#define OSD_SET_KEY 0x8818
+#define OSD_FLUSH_COLLECTION 0x881a
+#define OSD_FLUSH_PARTITION 0x881b
+#define OSD_FLUSH_OSD 0x881c
static const value_string scsi_osd_svcaction_vals[] = {
{OSD_FORMAT_OSD, "Format OSD"},
{OSD_CREATE, "Create"},
{OSD_LIST, "List"},
+ {OSD_WRITE, "Write"},
+ {OSD_APPEND, "Append"},
+ {OSD_FLUSH, "Flush"},
+ {OSD_REMOVE, "Remove"},
{OSD_CREATE_PARTITION, "Create Partition"},
+ {OSD_REMOVE_PARTITION, "Remove Partition"},
+ {OSD_GET_ATTRIBUTES, "Get Attributes"},
+ {OSD_CREATE_AND_WRITE, "Create And Write"},
+ {OSD_CREATE_COLLECTION, "Create Collection"},
+ {OSD_REMOVE_COLLECTION, "Remove Collection"},
+ {OSD_LIST_COLLECTION, "List Collection"},
+ {OSD_SET_KEY, "Set Key"},
+ {OSD_FLUSH_COLLECTION, "Flush Collection"},
+ {OSD_FLUSH_PARTITION, "Flush Partition"},
+ {OSD_FLUSH_OSD, "Flush OSD"},
{0, NULL},
};
/* OSD Service Action dissectors */
typedef struct _scsi_osd_svcaction_t {
guint16 svcaction;
- scsi_dissector_t dissector;
+ scsi_osd_dissector_t dissector;
} scsi_osd_svcaction_t;
static const scsi_osd_svcaction_t scsi_osd_svcaction[] = {
{OSD_FORMAT_OSD, dissect_osd_format_osd},
{OSD_CREATE, dissect_osd_create},
{OSD_LIST, dissect_osd_list},
+ {OSD_WRITE, dissect_osd_write},
+ {OSD_APPEND, dissect_osd_append},
+ {OSD_FLUSH, dissect_osd_flush},
+ {OSD_REMOVE, dissect_osd_remove},
{OSD_CREATE_PARTITION, dissect_osd_create_partition},
+ {OSD_REMOVE_PARTITION, dissect_osd_remove_partition},
+ {OSD_GET_ATTRIBUTES, dissect_osd_get_attributes},
+ {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_SET_KEY, dissect_osd_set_key},
+ {OSD_FLUSH_COLLECTION, dissect_osd_flush_collection},
+ {OSD_FLUSH_PARTITION, dissect_osd_flush_partition},
+ {OSD_FLUSH_OSD, dissect_osd_flush_osd},
{0, NULL},
};
-static scsi_dissector_t
+static scsi_osd_dissector_t
find_svcaction_dissector(guint16 svcaction)
{
const scsi_osd_svcaction_t *sa=scsi_osd_svcaction;
guint payload_len, scsi_task_data_t *cdata)
{
guint16 svcaction=0;
- scsi_dissector_t dissector;
+ scsi_osd_dissector_t dissector;
+ scsi_osd_conv_info_t *conv_info=NULL;
+ scsi_osd_lun_info_t *lun_info=NULL;
if(!tree) {
return;
}
+ /* We must have an itl an itlq and a conversation */
+ if(!cdata || !cdata->itl || !cdata->itl->conversation || !cdata->itlq){
+ return;
+ }
+ /* make sure we have a conversation info for this */
+ conv_info=conversation_get_proto_data(cdata->itl->conversation, proto_scsi_osd);
+ if(!conv_info){
+ conv_info=se_alloc(sizeof(scsi_osd_conv_info_t));
+ conv_info->luns=se_tree_create_non_persistent(EMEM_TREE_TYPE_RED_BLACK, "SCSI OSD luns tree");
+ conversation_add_proto_data(cdata->itl->conversation, proto_scsi_osd, conv_info);
+ }
+ /* make sure we have a lun_info structure for this */
+ lun_info=se_tree_lookup32(conv_info->luns, cdata->itlq->lun);
+ if(!lun_info){
+ lun_info=se_alloc(sizeof(scsi_osd_lun_info_t));
+ lun_info->partitions=se_tree_create_non_persistent(EMEM_TREE_TYPE_RED_BLACK, "SCSI OSD partitions tree");
+ se_tree_insert32(conv_info->luns, cdata->itlq->lun, (void *)lun_info);
+ }
+
/* dissecting the CDB */
if (isreq && iscdb) {
proto_tree_add_item (tree, hf_scsi_osd_control, tvb, offset, 1, 0);
}
dissector=find_svcaction_dissector(svcaction);
if(dissector){
- (*dissector)(tvb, pinfo, tree, offset, isreq, iscdb, payload_len, cdata);
+ (*dissector)(tvb, pinfo, tree, offset, isreq, iscdb, payload_len, cdata, conv_info, lun_info);
}
return;
}
}
dissector=find_svcaction_dissector(svcaction);
if(dissector){
- (*dissector)(tvb, pinfo, tree, offset, isreq, iscdb, payload_len, cdata);
+ (*dissector)(tvb, pinfo, tree, offset, isreq, iscdb, payload_len, cdata, conv_info, lun_info);
}
}
{"Service Action", "scsi.osd.svcaction", FT_UINT16, BASE_HEX,
VALS(scsi_osd_svcaction_vals), 0x0, "", HFILL}},
{ &hf_scsi_osd_option,
- {"Option", "scsi.osd.option", FT_UINT8, BASE_HEX,
+ {"Options Byte", "scsi.osd.option", FT_UINT8, BASE_HEX,
NULL, 0x0, "", HFILL}},
{ &hf_scsi_osd_option_dpo,
{"DPO", "scsi.osd.option.dpo", FT_BOOLEAN, 8,
{ &hf_scsi_osd_get_attributes_page,
{"Get Attributes Page", "scsi.osd.get_attributes_page", FT_UINT32, BASE_HEX,
NULL, 0x0, "", HFILL}},
+ { &hf_scsi_osd_get_attributes_list_length,
+ {"Get Attributes List Length", "scsi.osd.get_attributes_list_length", FT_UINT32, BASE_HEX,
+ NULL, 0x0, "", HFILL}},
+ { &hf_scsi_osd_get_attributes_list_offset,
+ {"Get Attributes List Offset", "scsi.osd.get_attributes_list_offset", FT_UINT32, BASE_HEX,
+ NULL, 0x0, "", HFILL}},
+ { &hf_scsi_osd_set_attributes_list_length,
+ {"Set Attributes List Length", "scsi.osd.set_attributes_list_length", FT_UINT32, BASE_HEX,
+ NULL, 0x0, "", HFILL}},
+ { &hf_scsi_osd_set_attributes_list_offset,
+ {"Set Attributes List Offset", "scsi.osd.set_attributes_list_offset", FT_UINT32, BASE_HEX,
+ NULL, 0x0, "", HFILL}},
{ &hf_scsi_osd_get_attributes_allocation_length,
{"Get Attributes Allocation Length", "scsi.osd.get_attributes_allocation_length", FT_UINT32, BASE_HEX,
NULL, 0x0, "", HFILL}},
{ &hf_scsi_osd_object_type,
{"Object Type", "scsi.osd.object_type", FT_UINT8, BASE_HEX,
VALS(scsi_osd_object_type_vals), 0, "", HFILL}},
- { &hf_scsi_osd_permission_bitmask,
- {"Permission Bitmask", "scsi.osd.permission_bitmask", FT_BYTES, BASE_HEX,
+ { &hf_scsi_osd_permissions,
+ {"Permissions", "scsi.osd.permissions", FT_UINT16, BASE_HEX,
NULL, 0, "", HFILL}},
+ { &hf_scsi_osd_permissions_read,
+ {"READ", "scsi.osd.permissions.read", FT_BOOLEAN, 16,
+ TFS(&permissions_read_tfs), 0x8000, "", HFILL}},
+ { &hf_scsi_osd_permissions_write,
+ {"WRITE", "scsi.osd.permissions.write", FT_BOOLEAN, 16,
+ TFS(&permissions_write_tfs), 0x4000, "", HFILL}},
+ { &hf_scsi_osd_permissions_get_attr,
+ {"GET_ATTR", "scsi.osd.permissions.get_attr", FT_BOOLEAN, 16,
+ TFS(&permissions_get_attr_tfs), 0x2000, "", HFILL}},
+ { &hf_scsi_osd_permissions_set_attr,
+ {"SET_ATTR", "scsi.osd.permissions.set_attr", FT_BOOLEAN, 16,
+ TFS(&permissions_set_attr_tfs), 0x1000, "", HFILL}},
+ { &hf_scsi_osd_permissions_create,
+ {"CREATE", "scsi.osd.permissions.create", FT_BOOLEAN, 16,
+ TFS(&permissions_create_tfs), 0x0800, "", HFILL}},
+ { &hf_scsi_osd_permissions_remove,
+ {"REMOVE", "scsi.osd.permissions.remove", FT_BOOLEAN, 16,
+ TFS(&permissions_remove_tfs), 0x0400, "", HFILL}},
+ { &hf_scsi_osd_permissions_obj_mgmt,
+ {"OBJ_MGMT", "scsi.osd.permissions.obj_mgmt", FT_BOOLEAN, 16,
+ TFS(&permissions_obj_mgmt_tfs), 0x0200, "", HFILL}},
+ { &hf_scsi_osd_permissions_append,
+ {"APPEND", "scsi.osd.permissions.append", FT_BOOLEAN, 16,
+ TFS(&permissions_append_tfs), 0x0100, "", HFILL}},
+ { &hf_scsi_osd_permissions_dev_mgmt,
+ {"DEV_MGMT", "scsi.osd.permissions.dev_mgmt", FT_BOOLEAN, 16,
+ TFS(&permissions_dev_mgmt_tfs), 0x0080, "", HFILL}},
+ { &hf_scsi_osd_permissions_global,
+ {"GLOBAL", "scsi.osd.permissions.global", FT_BOOLEAN, 16,
+ TFS(&permissions_global_tfs), 0x0040, "", HFILL}},
+ { &hf_scsi_osd_permissions_pol_sec,
+ {"POL/SEC", "scsi.osd.permissions.pol_sec", FT_BOOLEAN, 16,
+ TFS(&permissions_pol_sec_tfs), 0x0020, "", HFILL}},
+
{ &hf_scsi_osd_object_descriptor_type,
{"Object Descriptor Type", "scsi.osd.object_descriptor_type", FT_UINT8, BASE_HEX,
VALS(scsi_osd_object_descriptor_type_vals), 0xf0, "", HFILL}},
{"Data-Out Integrity Check Value Offset", "scsi.osd.doicvo", FT_UINT32, BASE_DEC,
NULL, 0, "", HFILL}},
{ &hf_scsi_osd_requested_partition_id,
- {"Requested Partition Id", "scsi.osd.requested_partition_id", FT_BYTES, BASE_HEX,
+ {"Requested Partition Id", "scsi.osd.requested_partition_id", FT_UINT64, BASE_HEX,
NULL, 0, "", HFILL}},
{ &hf_scsi_osd_sortorder,
{"Sort Order", "scsi.osd.sort_order", FT_UINT8, BASE_DEC,
VALS(scsi_osd_sort_order_vals), 0x0f, "", HFILL}},
{ &hf_scsi_osd_partition_id,
- {"Partition Id", "scsi.osd.partition_id", FT_BYTES, BASE_HEX,
+ {"Partition Id", "scsi.osd.partition_id", FT_UINT64, BASE_HEX,
NULL, 0, "", HFILL}},
{ &hf_scsi_osd_list_identifier,
{"List Identifier", "scsi.osd.list_identifier", FT_UINT32, BASE_DEC,
{ &hf_scsi_osd_allocation_length,
{"Allocation Length", "scsi.osd.allocation_length", FT_UINT64, BASE_DEC,
NULL, 0, "", HFILL}},
+ { &hf_scsi_osd_length,
+ {"Length", "scsi.osd.length", FT_UINT64, BASE_DEC,
+ NULL, 0, "", HFILL}},
+ { &hf_scsi_osd_starting_byte_address,
+ {"Starting Byte Address", "scsi.osd.starting_byte_address", FT_UINT64, BASE_DEC,
+ NULL, 0, "", HFILL}},
{ &hf_scsi_osd_initial_object_id,
{"Initial Object Id", "scsi.osd.initial_object_id", FT_BYTES, BASE_HEX,
NULL, 0, "", HFILL}},
{ &hf_scsi_osd_number_of_user_objects,
{"Number Of User Objects", "scsi.osd.number_of_user_objects", FT_UINT16, BASE_DEC,
NULL, 0, "", HFILL}},
+ { &hf_scsi_osd_key_to_set,
+ {"Key to Set", "scsi.osd.key_to_set", FT_UINT8, BASE_DEC,
+ VALS(key_to_set_vals), 0x03, "", HFILL}},
+ { &hf_scsi_osd_set_key_version,
+ {"Key Version", "scsi.osd.set_key_version", FT_UINT8, BASE_DEC,
+ NULL, 0x0f, "", HFILL}},
+ { &hf_scsi_osd_key_identifier,
+ {"Key Identifier", "scsi.osd.key_identifier", FT_BYTES, BASE_HEX,
+ NULL, 0, "", HFILL}},
+ { &hf_scsi_osd_seed,
+ {"Seed", "scsi.osd.seed", FT_BYTES, BASE_HEX,
+ NULL, 0, "", HFILL}},
+ { &hf_scsi_osd_collection_fcr,
+ {"FCR", "scsi.osd.collection.fcr", FT_BOOLEAN, 8,
+ TFS(&collection_fcr_tfs), 0x01, "", HFILL}},
+ { &hf_scsi_osd_collection_object_id,
+ {"Collection Object Id", "scsi.osd.collection_object_id", FT_BYTES, BASE_HEX,
+ NULL, 0, "", HFILL}},
+ { &hf_scsi_osd_requested_collection_object_id,
+ {"Requested Collection Object Id", "scsi.osd.requested_collection_object_id", FT_BYTES, BASE_HEX,
+ NULL, 0, "", HFILL}},
+ { &hf_scsi_osd_partition_created_in,
+ { "Created In", "scsi.osd.partition.created_in", FT_FRAMENUM, BASE_NONE,
+ NULL, 0x0, "The frame this partition was created", HFILL }},
+
+ { &hf_scsi_osd_partition_removed_in,
+ { "Removed In", "scsi.osd.partition.removed_in", FT_FRAMENUM, BASE_NONE,
+ NULL, 0x0, "The frame this partition was removed", HFILL }},
+
+ { &hf_scsi_osd_flush_scope,
+ {"Flush Scope", "scsi.osd.flush.scope", FT_UINT8, BASE_DEC,
+ VALS(flush_scope_vals), 0x03, "", HFILL}},
+
+ { &hf_scsi_osd_flush_collection_scope,
+ {"Flush Collection Scope", "scsi.osd.flush_collection.scope", FT_UINT8, BASE_DEC,
+ VALS(flush_collection_scope_vals), 0x03, "", HFILL}},
+
+ { &hf_scsi_osd_flush_partition_scope,
+ {"Flush Partition Scope", "scsi.osd.flush_partition.scope", FT_UINT8, BASE_DEC,
+ VALS(flush_partition_scope_vals), 0x03, "", HFILL}},
+
+ { &hf_scsi_osd_flush_osd_scope,
+ {"Flush OSD Scope", "scsi.osd.flush_osd.scope", FT_UINT8, BASE_DEC,
+ VALS(flush_osd_scope_vals), 0x03, "", HFILL}},
};
/* Setup protocol subtree array */
static gint *ett[] = {
&ett_osd_option,
+ &ett_osd_partition,
+ &ett_osd_attribute_parameters,
+ &ett_osd_capability,
+ &ett_osd_permission_bitmask,
+ &ett_osd_security_parameters,
};
/* Register the protocol name and description */
git.samba.org / obnox / wireshark / wip.git / blobdiff