osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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

svn path=/trunk/; revision=19492
This commit is contained in:
Ronnie Sahlberg 2006-10-11 10:38:59 +00:00
parent 72817cf7bd
commit 494e873eb0
24 changed files with 66 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
epan/dissectors/packet-fc.c
View File

@ -49,6 +49,7 @@
#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"

45
epan/dissectors/packet-fc.h
View File

@ -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
/* 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 */

1
epan/dissectors/packet-fcct.c
View File

@ -44,6 +44,7 @@
#include <epan/packet.h>
#include <epan/etypes.h>
#include <epan/conversation.h>
#include "packet-scsi.h"
#include "packet-fc.h"
#include "packet-fcct.h"

1
epan/dissectors/packet-fcdns.c
View File

@ -51,6 +51,7 @@
#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"

1
epan/dissectors/packet-fcels.c
View File

@ -50,6 +50,7 @@
#include <epan/emem.h>
#include <epan/conversation.h>
#include <epan/etypes.h>
#include "packet-scsi.h"
#include "packet-fc.h"
#include "packet-fcels.h"

1
epan/dissectors/packet-fcfcs.c
View File

@ -45,6 +45,7 @@
#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"

1
epan/dissectors/packet-fcfzs.c
View File

@ -51,6 +51,7 @@
#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"

1
epan/dissectors/packet-fclctl.c
View File

@ -45,6 +45,7 @@
#include <epan/emem.h>
#include <epan/etypes.h>
#include <epan/conversation.h>
#include "packet-scsi.h"
#include "packet-fc.h"
#include "packet-fclctl.h"

2
epan/dissectors/packet-fcp.c
View File

@ -46,9 +46,9 @@
#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-scsi.h"
/* Initialize the protocol and registered fields */
static int proto_fcp = -1;

1
epan/dissectors/packet-fcsb3.c
View File

@ -52,6 +52,7 @@
#include <epan/packet.h>
#include <epan/conversation.h>
#include <epan/etypes.h>
#include "packet-scsi.h"
#include "packet-fc.h"
#include "packet-fcsb3.h"

1
epan/dissectors/packet-fcsp.c
View File

@ -52,6 +52,7 @@
#include <epan/packet.h>
#include <epan/conversation.h>
#include <epan/etypes.h>
#include "packet-scsi.h"
#include "packet-fc.h"
/* Message Codes */

1
epan/dissectors/packet-fcswils.c
View File

@ -45,6 +45,7 @@
#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"

1
epan/dissectors/packet-ipfc.c
View File

@ -39,6 +39,7 @@
#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"

1
epan/dissectors/packet-iscsi.c
View File

@ -45,7 +45,6 @@
#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>

1
epan/dissectors/packet-llc.c
View File

@ -37,6 +37,7 @@
#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"

1
epan/dissectors/packet-ndmp.c
View File

@ -43,7 +43,6 @@
#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>

2
epan/dissectors/packet-scsi-osd.c
View File

@ -35,8 +35,8 @@
#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"

2
epan/dissectors/packet-scsi.c
View File

@ -91,8 +91,8 @@
#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 = -1;

46
epan/dissectors/packet-scsi.h
View File

@ -26,6 +26,52 @@
#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,

1
gtk/conversations_fc.c
View File

@ -39,6 +39,7 @@
#include <epan/tap.h>
#include "../register.h"
#include "conversations_table.h"
#include <epan/dissectors/packet-scsi.h>
#include <epan/dissectors/packet-fc.h>

1
gtk/fc_stat.c
View File

@ -40,6 +40,7 @@
#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"

1
gtk/hostlist_fc.c
View File

@ -40,6 +40,7 @@
#include "../register.h"
#include "hostlist_table.h"
#include <epan/conversation.h>
#include <epan/dissectors/packet-scsi.h>
#include <epan/dissectors/packet-fc.h>

2
gtk/scsi_stat.c
View File

@ -50,8 +50,8 @@
#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-fc.h>
static GtkWidget *dlg=NULL;

1
tap-iousers.c
View File

@ -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-scsi.h>
#include <epan/dissectors/packet-fc.h>
#include <epan/dissectors/packet-fddi.h>