aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2006-04-06 08:33:08 +0000
committerRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2006-04-06 08:33:08 +0000
commit0257503efcc392895b7168026c4ef4b20b9d76c9 (patch)
treeb2e56bc35e59faea8d9533909276cb326d8c81ec
parentd422653d53473648cbbddd1d3cbb41d37a6a68cc (diff)
add a field for storing the scsi opcode in the exchange struct.
it is silly that scsi has to track these things itself when all the transports already keep track of exchanges. the scsi transports should all use the fc_exchange_data structure to pass lun to scsi and where scsi kan store the opcode between requests and data/response packets svn path=/trunk/; revision=17829
-rw-r--r--epan/dissectors/packet-fc.c1
-rw-r--r--epan/dissectors/packet-fc.h3
2 files changed, 3 insertions, 1 deletions
diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c
index 274c9254dc..33c18d20cc 100644
--- a/epan/dissectors/packet-fc.c
+++ b/epan/dissectors/packet-fc.c
@@ -674,6 +674,7 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean
fc_ex->first_exchange_frame=0;
fc_ex->last_exchange_frame=0;
fc_ex->lun=0xffff;
+ fc_ex->scsi_opcode=0xffff;
fc_ex->fc_time=pinfo->fd->abs_ts;
se_tree_insert32(fc_conv_data->exchanges, fchdr.oxid, fc_ex);
}
diff --git a/epan/dissectors/packet-fc.h b/epan/dissectors/packet-fc.h
index 91005c51db..c8a820250b 100644
--- a/epan/dissectors/packet-fc.h
+++ b/epan/dissectors/packet-fc.h
@@ -131,7 +131,8 @@ ETH_VAR_IMPORT const value_string fc_fc4_val[];
typedef struct _fc_exchange_data {
guint32 first_exchange_frame;
guint32 last_exchange_frame;
- guint16 lun; /* used by FCP, initialized to 0xffff == unknown */
+ guint16 lun; /* initialized to 0xffff == unknown */
+ guint16 scsi_opcode; /* initialized to 0xffff == unknown */
nstime_t fc_time;
} fc_exchange_data;