From 15d3176063a31c89bc99d8a9859e23a2f9ef63f6 Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Thu, 12 Oct 2006 10:54:36 +0000 Subject: wireshark does not yet consume enough memory for me to be happy pass conversation form the transports up to the scsi layer add tracking of conversation specific info to scsi osd add tracking of conversation+lun specific info to scsi osd for scsi osd add tracking of PARTITIONS and display in which frame they were created/removed svn path=/trunk/; revision=19505 --- epan/dissectors/packet-iscsi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'epan/dissectors/packet-iscsi.c') diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c index cd6663e352..8668189219 100644 --- a/epan/dissectors/packet-iscsi.c +++ b/epan/dissectors/packet-iscsi.c @@ -740,7 +740,7 @@ handleDataSegmentAsTextKeys(proto_item *ti, tvbuff_t *tvb, guint offset, guint d /* Code to actually dissect the packets */ static void -dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset, guint8 opcode, const char *opcode_str, guint32 data_segment_len, iscsi_session_t *iscsi_session) { +dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset, guint8 opcode, const char *opcode_str, guint32 data_segment_len, iscsi_session_t *iscsi_session, conversation_t *conversation) { guint original_offset = offset; proto_tree *ti = NULL; @@ -839,6 +839,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off if(!itl){ itl=se_alloc(sizeof(itl_nexus_t)); itl->cmdset=0xff; + itl->conversation=conversation; se_tree_insert32(iscsi_session->itl, lun, itl); } @@ -2385,7 +2386,7 @@ dissect_iscsi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean chec col_append_str(pinfo->cinfo, COL_INFO, ", "); } - dissect_iscsi_pdu(tvb, pinfo, tree, offset, opcode, opcode_str, data_segment_len, iscsi_session); + dissect_iscsi_pdu(tvb, pinfo, tree, offset, opcode, opcode_str, data_segment_len, iscsi_session, conversation); if(pduLen > available_bytes) pduLen = available_bytes; offset += pduLen; -- cgit v1.2.3