move the ITL and the ITLQ structure to packet-scsi.h where it belongs

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19492 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c
index 1922873397222bbec1e4a15d2f950fc07acdc3ed..72503b818c4bd1718d4baf3703d8e2ca266c6263 100644 (file)
--- a/epan/dissectors/packet-fc.c
+++ b/epan/dissectors/packet-fc.c
@@ -49,6 +49,7 @@
 #include <epan/reassemble.h>
 #include <epan/conversation.h>
 #include <epan/etypes.h>
 #include <epan/reassemble.h>
 #include <epan/conversation.h>
 #include <epan/etypes.h>

+#include "packet-scsi.h"

 #include "packet-fc.h"
 #include "packet-fclctl.h"
 #include "packet-fcbls.h"
 #include "packet-fc.h"
 #include "packet-fclctl.h"
 #include "packet-fcbls.h"

diff --git a/epan/dissectors/packet-fc.h b/epan/dissectors/packet-fc.h
index dbd19f30702cfc1d6ef46552f6508f4745555d84..67e79eba0479d04b1b0b6c5f6d1e36a31adf019e 100644 (file)
--- a/epan/dissectors/packet-fc.h
+++ b/epan/dissectors/packet-fc.h
@@ -125,51 +125,6 @@ WS_VAR_IMPORT const value_string fc_fc4_val[];
 #define FC_FCTL_ABTS_MASK              0x000030
 #define FC_FCTL_REL_OFFSET             0x000008
 
 #define FC_FCTL_ABTS_MASK              0x000030
 #define FC_FCTL_REL_OFFSET             0x000008
 

-/* Structure containing itl nexus data :
- * The itlq nexus is a structure containing data specific
- * for a initiator target lun combination.
- */
-typedef struct _itl_nexus_t {
-#define SCSI_CMDSET_DEFAULT    0x80
-#define SCSI_CMDSET_MASK       0x7f
-    guint8 cmdset;         /* This is a bitfield.
-                           * The MSB (0x80) represents whether 
-                           * 0: the commandset is known from a INQ PDU
-                           * 1: is using the "default" from preferences.
-                           * The lower 7 bits represent the commandset used
-                           * for decoding commands on this itl nexus.
-                           * The field is initialized to 0xff == unknown.
-                           */
-} itl_nexus_t;
-
-/* Structure containing itlq nexus data :
- * The itlq nexus is a structure containing data specific
- * for a initiator target lun queue/commandid combination.
- */
-typedef struct _itlq_nexus_t {
-    guint32 first_exchange_frame;
-    guint32 last_exchange_frame;
-    guint16 lun;         /* initialized to 0xffff == unknown */
-    guint16 scsi_opcode; /* initialized to 0xffff == unknown */
-    guint16 flags;
-    guint32 alloc_len; /* we need to track alloc_len between the CDB and 
-                        * the DATA pdus for some opcodes. 
-                        */
-    nstime_t fc_time;
-    void *extra_data;     /* extra data that that is task specific */
-} itlq_nexus_t;
-
-
-#define SCSI_PDU_TYPE_CDB       1
-#define SCSI_PDU_TYPE_DATA      2
-#define SCSI_PDU_TYPE_RSP       4
-#define SCSI_PDU_TYPE_SNS       5
-typedef struct _scsi_task_data {
-    int type;
-    itlq_nexus_t *itlq;
-    itl_nexus_t *itl;
-} scsi_task_data_t;
-

 
 
 /* FC header structure */
 
 
 /* FC header structure */

diff --git a/epan/dissectors/packet-fcct.c b/epan/dissectors/packet-fcct.c
index 99834c7303d3dd98134ce4b6380cc175e7122233..27f3548865fec1083546a641bdc67b7e4f01a536 100644 (file)
--- a/epan/dissectors/packet-fcct.c
+++ b/epan/dissectors/packet-fcct.c
@@ -44,6 +44,7 @@
 #include <epan/packet.h>
 #include <epan/etypes.h>
 #include <epan/conversation.h>
 #include <epan/packet.h>
 #include <epan/etypes.h>
 #include <epan/conversation.h>

+#include "packet-scsi.h"

 #include "packet-fc.h"
 #include "packet-fcct.h"
 
 #include "packet-fc.h"
 #include "packet-fcct.h"
 

diff --git a/epan/dissectors/packet-fcdns.c b/epan/dissectors/packet-fcdns.c
index 68b62fbad078624bd484ee63eeb2af104da1e706..794dc27941b32d486ac159f399f9f2422d3d0426 100644 (file)
--- a/epan/dissectors/packet-fcdns.c
+++ b/epan/dissectors/packet-fcdns.c
@@ -51,6 +51,7 @@
 #include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/etypes.h>
 #include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/etypes.h>

+#include "packet-scsi.h"

 #include "packet-fc.h"
 #include "packet-fcct.h"
 #include "packet-fcdns.h"
 #include "packet-fc.h"
 #include "packet-fcct.h"
 #include "packet-fcdns.h"

diff --git a/epan/dissectors/packet-fcels.c b/epan/dissectors/packet-fcels.c
index c4a013ce102669d3574c6b8da2fd65c45bee3395..afb7fffe12e25127553493ca6e01a6ed0a8b2a24 100644 (file)
--- a/epan/dissectors/packet-fcels.c
+++ b/epan/dissectors/packet-fcels.c
@@ -50,6 +50,7 @@
 #include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/etypes.h>
 #include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/etypes.h>

+#include "packet-scsi.h"

 #include "packet-fc.h"
 #include "packet-fcels.h"
 
 #include "packet-fc.h"
 #include "packet-fcels.h"
 

diff --git a/epan/dissectors/packet-fcfcs.c b/epan/dissectors/packet-fcfcs.c
index 294142557a265a6ee54a1116e954437a9fbc470a..18d7ee7816c3ea52851bbdb553ca682ef838c146 100644 (file)
--- a/epan/dissectors/packet-fcfcs.c
+++ b/epan/dissectors/packet-fcfcs.c
@@ -45,6 +45,7 @@
 #include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/etypes.h>
 #include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/etypes.h>

+#include "packet-scsi.h"

 #include "packet-fc.h"
 #include "packet-fcct.h"
 #include "packet-fcfcs.h"
 #include "packet-fc.h"
 #include "packet-fcct.h"
 #include "packet-fcfcs.h"

diff --git a/epan/dissectors/packet-fcfzs.c b/epan/dissectors/packet-fcfzs.c
index 3d276809d6de9337d127393d07c42f7e810f56eb..95dac45b01d9b2317aec99e433be81c8c38d46b9 100644 (file)
--- a/epan/dissectors/packet-fcfzs.c
+++ b/epan/dissectors/packet-fcfzs.c
@@ -51,6 +51,7 @@
 #include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/etypes.h>
 #include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/etypes.h>

+#include "packet-scsi.h"

 #include "packet-fc.h"
 #include "packet-fcct.h"
 #include "packet-fcfzs.h"
 #include "packet-fc.h"
 #include "packet-fcct.h"
 #include "packet-fcfzs.h"

diff --git a/epan/dissectors/packet-fclctl.c b/epan/dissectors/packet-fclctl.c
index ca8bd98098abafb4c859fc24ea47e3690d206ad1..17999a2d990288cf12d7e93648a2391186483ab4 100644 (file)
--- a/epan/dissectors/packet-fclctl.c
+++ b/epan/dissectors/packet-fclctl.c
@@ -45,6 +45,7 @@
 #include <epan/emem.h>
 #include <epan/etypes.h>
 #include <epan/conversation.h>
 #include <epan/emem.h>
 #include <epan/etypes.h>
 #include <epan/conversation.h>

+#include "packet-scsi.h"

 #include "packet-fc.h"
 #include "packet-fclctl.h"
 
 #include "packet-fc.h"
 #include "packet-fclctl.h"
 

diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c
index 1ce32a66c481354dffce0cfa8225f636d09bea23..c32499e93e68c22f6f600c6f0447871d02c74e8c 100644 (file)
--- a/epan/dissectors/packet-fcp.c
+++ b/epan/dissectors/packet-fcp.c
@@ -46,9 +46,9 @@
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/etypes.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/etypes.h>

+#include "packet-scsi.h"

 #include "packet-fc.h"
 #include "packet-fcp.h"
 #include "packet-fc.h"
 #include "packet-fcp.h"

-#include "packet-scsi.h"

 
 /* Initialize the protocol and registered fields */
 static int proto_fcp         = -1;
 
 /* Initialize the protocol and registered fields */
 static int proto_fcp         = -1;

diff --git a/epan/dissectors/packet-fcsb3.c b/epan/dissectors/packet-fcsb3.c
index 46b8c3657d8452fac7daa1dbd771375c8ff9f502..99ff7fe51a6e0a4647b37844a1bc1774149ef033 100644 (file)
--- a/epan/dissectors/packet-fcsb3.c
+++ b/epan/dissectors/packet-fcsb3.c
@@ -52,6 +52,7 @@
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/etypes.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/etypes.h>

+#include "packet-scsi.h"

 #include "packet-fc.h"
 #include "packet-fcsb3.h"
 
 #include "packet-fc.h"
 #include "packet-fcsb3.h"
 

diff --git a/epan/dissectors/packet-fcsp.c b/epan/dissectors/packet-fcsp.c
index ca7c893896cc3d034cf20837952647543f939ec4..e323ce7c0c38132d76628e5d251c4ac82fd70efa 100644 (file)
--- a/epan/dissectors/packet-fcsp.c
+++ b/epan/dissectors/packet-fcsp.c
@@ -52,6 +52,7 @@
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/etypes.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/etypes.h>

+#include "packet-scsi.h"

 #include "packet-fc.h"
 
 /* Message Codes */
 #include "packet-fc.h"
 
 /* Message Codes */

diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c
index 2d15848133bd913e0caa2c0cf4e0bac31d16be3f..48c0695be53b9da49fcdf0921fe2d2230ae49d2a 100644 (file)
--- a/epan/dissectors/packet-fcswils.c
+++ b/epan/dissectors/packet-fcswils.c
@@ -45,6 +45,7 @@
 #include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/etypes.h>
 #include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/etypes.h>

+#include "packet-scsi.h"

 #include "packet-fc.h"
 #include "packet-fcswils.h"
 #include "packet-fcct.h"
 #include "packet-fc.h"
 #include "packet-fcswils.h"
 #include "packet-fcct.h"

diff --git a/epan/dissectors/packet-ipfc.c b/epan/dissectors/packet-ipfc.c
index 25c05fd8dbcf41b88987fa9fea3754afcd40dcf0..a4e49538768021c70f1f8ef513ec392ac7ce3463 100644 (file)
--- a/epan/dissectors/packet-ipfc.c
+++ b/epan/dissectors/packet-ipfc.c
@@ -39,6 +39,7 @@
 #include <epan/packet.h>
 #include <epan/etypes.h>
 #include <epan/conversation.h>
 #include <epan/packet.h>
 #include <epan/etypes.h>
 #include <epan/conversation.h>

+#include "packet-scsi.h"

 #include "packet-fc.h"
 #include "packet-ipfc.h"
 #include "packet-llc.h"
 #include "packet-fc.h"
 #include "packet-ipfc.h"
 #include "packet-llc.h"

diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c
index 8e747cc2fd88aadcf74ff014f9670935f5cf4bee..9355c219725b8bce58dc3b18c8e2fc6b1a749679 100644 (file)
--- a/epan/dissectors/packet-iscsi.c
+++ b/epan/dissectors/packet-iscsi.c
@@ -45,7 +45,6 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/conversation.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/conversation.h>

-#include "packet-fc.h"

 #include "packet-scsi.h"
 #include "epan/nstime.h"
 #include <epan/emem.h>
 #include "packet-scsi.h"
 #include "epan/nstime.h"
 #include <epan/emem.h>

diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c
index 864dfc90e0407353b4a95bd4dc662ec3d54818b9..d2b9f81a45c545b505094757e2f9ca39d6e0d254 100644 (file)
--- a/epan/dissectors/packet-llc.c
+++ b/epan/dissectors/packet-llc.c
@@ -37,6 +37,7 @@
 #include <epan/ppptypes.h>
 #include <epan/arcnet_pids.h>
 #include <epan/conversation.h>
 #include <epan/ppptypes.h>
 #include <epan/arcnet_pids.h>
 #include <epan/conversation.h>

+#include "packet-scsi.h"

 #include "packet-fc.h"
 #include "packet-ip.h"
 #include "packet-ipx.h"
 #include "packet-fc.h"
 #include "packet-ip.h"
 #include "packet-ipx.h"

diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c
index 4b70864739bbe3003c8809aa4e854ea1b0b67aed..7502e49d159258f13cd210e7f66760ee259a31cc 100644 (file)
--- a/epan/dissectors/packet-ndmp.c
+++ b/epan/dissectors/packet-ndmp.c
@@ -43,7 +43,6 @@
 #include <epan/emem.h>
 #include "packet-rpc.h"
 #include "packet-tcp.h"
 #include <epan/emem.h>
 #include "packet-rpc.h"
 #include "packet-tcp.h"

-#include "packet-fc.h"

 #include "packet-scsi.h"
 #include "packet-frame.h"
 #include <epan/prefs.h>
 #include "packet-scsi.h"
 #include "packet-frame.h"
 #include <epan/prefs.h>

diff --git a/epan/dissectors/packet-scsi-osd.c b/epan/dissectors/packet-scsi-osd.c
index 9c71131b453dbc7b783db89b34fa13dbd3399153..85c156cb653c4aedc27de12e0d8e9313575a7d48 100644 (file)
--- a/epan/dissectors/packet-scsi-osd.c
+++ b/epan/dissectors/packet-scsi-osd.c
@@ -35,8 +35,8 @@
 #include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/tap.h>
 #include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/tap.h>

-#include "packet-fc.h"

 #include "packet-scsi.h"
 #include "packet-scsi.h"

+#include "packet-fc.h"

 #include "packet-scsi-osd.h"
 
 
 #include "packet-scsi-osd.h"
 
 

diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c
index 425de78bd86cd9e931a44569242ae88417735ef7..c5c71d148c394e6f48308187b3d802e0e047537f 100644 (file)
--- a/epan/dissectors/packet-scsi.c
+++ b/epan/dissectors/packet-scsi.c
@@ -91,8 +91,8 @@
 #include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/tap.h>
 #include <epan/emem.h>
 #include <epan/conversation.h>
 #include <epan/tap.h>

-#include "packet-fc.h"

 #include "packet-scsi.h"
 #include "packet-scsi.h"

+#include "packet-fc.h"

 #include "packet-scsi-osd.h"
 
 static int proto_scsi                    = -1;
 #include "packet-scsi-osd.h"
 
 static int proto_scsi                    = -1;

diff --git a/epan/dissectors/packet-scsi.h b/epan/dissectors/packet-scsi.h
index 69f62331f119632a9a43364b409f30dbee862009..41b82f696d79246ff0dddba05eb66a60346d1a49 100644 (file)
--- a/epan/dissectors/packet-scsi.h
+++ b/epan/dissectors/packet-scsi.h
@@ -26,6 +26,52 @@
 #define __PACKET_SCSI_H_
 
 
 #define __PACKET_SCSI_H_
 
 

+/* Structure containing itl nexus data :
+ * The itlq nexus is a structure containing data specific
+ * for a initiator target lun combination.
+ */
+typedef struct _itl_nexus_t {
+#define SCSI_CMDSET_DEFAULT    0x80
+#define SCSI_CMDSET_MASK       0x7f
+    guint8 cmdset;         /* This is a bitfield.
+                           * The MSB (0x80) represents whether 
+                           * 0: the commandset is known from a INQ PDU
+                           * 1: is using the "default" from preferences.
+                           * The lower 7 bits represent the commandset used
+                           * for decoding commands on this itl nexus.
+                           * The field is initialized to 0xff == unknown.
+                           */
+} itl_nexus_t;
+
+/* Structure containing itlq nexus data :
+ * The itlq nexus is a structure containing data specific
+ * for a initiator target lun queue/commandid combination.
+ */
+typedef struct _itlq_nexus_t {
+    guint32 first_exchange_frame;
+    guint32 last_exchange_frame;
+    guint16 lun;         /* initialized to 0xffff == unknown */
+    guint16 scsi_opcode; /* initialized to 0xffff == unknown */
+    guint16 flags;
+    guint32 alloc_len; /* we need to track alloc_len between the CDB and 
+                        * the DATA pdus for some opcodes. 
+                        */
+    nstime_t fc_time;
+    void *extra_data;     /* extra data that that is task specific */
+} itlq_nexus_t;
+
+
+#define SCSI_PDU_TYPE_CDB       1
+#define SCSI_PDU_TYPE_DATA      2
+#define SCSI_PDU_TYPE_RSP       4
+#define SCSI_PDU_TYPE_SNS       5
+typedef struct _scsi_task_data {
+    int type;
+    itlq_nexus_t *itlq;
+    itl_nexus_t *itl;
+} scsi_task_data_t;
+
+

 /* list of commands for each commandset */
 typedef void (*scsi_dissector_t)(tvbuff_t *tvb, packet_info *pinfo,
                proto_tree *tree, guint offset,
 /* list of commands for each commandset */
 typedef void (*scsi_dissector_t)(tvbuff_t *tvb, packet_info *pinfo,
                proto_tree *tree, guint offset,

diff --git a/gtk/conversations_fc.c b/gtk/conversations_fc.c
index 75a3719876c03ab8be0f858d8cfa60218b09b967..e9a5005ed6ec25535c0388efc33995a2f671ea25 100644 (file)
--- a/gtk/conversations_fc.c
+++ b/gtk/conversations_fc.c
@@ -39,6 +39,7 @@
 #include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"
 #include <epan/tap.h>
 #include "../register.h"
 #include "conversations_table.h"

+#include <epan/dissectors/packet-scsi.h>

 #include <epan/dissectors/packet-fc.h>
 
 
 #include <epan/dissectors/packet-fc.h>
 
 

diff --git a/gtk/fc_stat.c b/gtk/fc_stat.c
index 71a204e15697a43e3f245bcf1ae45c0ef1912803..1837901ad4cb696690253a90e0f92ea83e731326 100644 (file)
--- a/gtk/fc_stat.c
+++ b/gtk/fc_stat.c
@@ -40,6 +40,7 @@
 
 #include <epan/tap.h>
 #include <epan/conversation.h>
 
 #include <epan/tap.h>
 #include <epan/conversation.h>

+#include <epan/dissectors/packet-scsi.h>

 #include <epan/dissectors/packet-fc.h>
 #include "../register.h"
 #include "../timestats.h"
 #include <epan/dissectors/packet-fc.h>
 #include "../register.h"
 #include "../timestats.h"

diff --git a/gtk/hostlist_fc.c b/gtk/hostlist_fc.c
index 8ff756882b785f22437e6374bb984a8ed93c745e..b1ead4526c389c9403c0f5ce8d8d6a3e8db80676 100644 (file)
--- a/gtk/hostlist_fc.c
+++ b/gtk/hostlist_fc.c
@@ -40,6 +40,7 @@
 #include "../register.h"
 #include "hostlist_table.h"
 #include <epan/conversation.h>
 #include "../register.h"
 #include "hostlist_table.h"
 #include <epan/conversation.h>

+#include <epan/dissectors/packet-scsi.h>

 #include <epan/dissectors/packet-fc.h>
 
 
 #include <epan/dissectors/packet-fc.h>
 
 

diff --git a/gtk/scsi_stat.c b/gtk/scsi_stat.c
index b25e03c08613e5ee346639c838a47532e81e2353..bbbce8e81d3a15a63be324719106f18595d14c7d 100644 (file)
--- a/gtk/scsi_stat.c
+++ b/gtk/scsi_stat.c
@@ -50,8 +50,8 @@
 #include "service_response_time_table.h"
 #include "gtkglobals.h"
 #include <epan/conversation.h>
 #include "service_response_time_table.h"
 #include "gtkglobals.h"
 #include <epan/conversation.h>

-#include <epan/dissectors/packet-fc.h>

 #include <epan/dissectors/packet-scsi.h>
 #include <epan/dissectors/packet-scsi.h>

+#include <epan/dissectors/packet-fc.h>

 
 static GtkWidget *dlg=NULL;
 
 
 static GtkWidget *dlg=NULL;
 

diff --git a/tap-iousers.c b/tap-iousers.c
index 9444e05c85ac4272e98299edaba3d2ce5f81781e..c030f469a7f0cc4741f4eb3d528d29b473b83da6 100644 (file)
--- a/tap-iousers.c
+++ b/tap-iousers.c
@@ -48,6 +48,7 @@
 #include <epan/dissectors/packet-eth.h>
 #include <epan/dissectors/packet-sctp.h>
 #include <epan/dissectors/packet-tr.h>
 #include <epan/dissectors/packet-eth.h>
 #include <epan/dissectors/packet-sctp.h>
 #include <epan/dissectors/packet-tr.h>

+#include <epan/dissectors/packet-scsi.h>

 #include <epan/dissectors/packet-fc.h>
 #include <epan/dissectors/packet-fddi.h>
 
 #include <epan/dissectors/packet-fc.h>
 #include <epan/dissectors/packet-fddi.h>