From a9dd765d474264d86c9809f943fb872f29aa9b06 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Mon, 25 Nov 2013 16:04:57 +0000 Subject: Remove Fibre Channel specific fields from packet_info and just have the fc_hdr or fc_data_t structure passed between all necessary dissectors. svn path=/trunk/; revision=53569 --- epan/packet_info.h | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'epan/packet_info.h') diff --git a/epan/packet_info.h b/epan/packet_info.h index 6f10272e56..4fae937d7f 100644 --- a/epan/packet_info.h +++ b/epan/packet_info.h @@ -48,11 +48,6 @@ #define P2P_DIR_UL 0 #define P2P_DIR_DL 1 -#define PINFO_SOF_FIRST_FRAME 0x1 -#define PINFO_SOF_SOFF 0x2 -#define PINFO_EOF_LAST_FRAME 0x80 -#define PINFO_EOF_INVALID 0x40 - typedef struct _packet_info { const char *current_proto; /**< name of protocol currently being dissected */ column_info *cinfo; /**< Column formatting information */ @@ -137,15 +132,6 @@ typedef struct _packet_info { outbound (P2P_DIR_SENT) inbound (P2P_DIR_RECV) unknown (P2P_DIR_UNKNOWN) */ - guint16 oxid; /**< next 2 fields reqd to identify fibre */ - guint16 rxid; /**< channel conversations */ - guint8 r_ctl; /**< R_CTL field in Fibre Channel Protocol */ - guint8 sof_eof; /**< FC's SOF/EOF encoding passed to FC decoder - * Bit 7 set if Last frame in sequence - * Bit 6 set if invalid frame content - * Bit 2 set if SOFf - * Bit 1 set if first frame in sequence - */ /**< Extra data for handling of decryption of GSSAPI wrapped tvbuffs. Caller sets decrypt_gssapi_tvb if this service is requested. -- cgit v1.2.1