2002-12-08 02:32:36 +00:00
|
|
|
/* packet-fcels.c
|
|
|
|
* Routines for FC Extended Link Services
|
|
|
|
* Copyright 2001, Dinesh G Dutt <ddutt@cisco.com>
|
|
|
|
*
|
2003-01-22 06:26:36 +00:00
|
|
|
* $Id: packet-fcels.c,v 1.3 2003/01/22 06:26:33 guy Exp $
|
2002-12-08 02:32:36 +00:00
|
|
|
*
|
|
|
|
* Ethereal - Network traffic analyzer
|
|
|
|
* By Gerald Combs <gerald@ethereal.com>
|
|
|
|
* Copyright 1998 Gerald Combs
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
* of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* TODO Still (Complete compliance with FC-MI):
|
|
|
|
* - Decode RNID, RLIR
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
# include "config.h"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
|
|
# include <sys/types.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_NETINET_IN_H
|
|
|
|
# include <netinet/in.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <glib.h>
|
|
|
|
|
|
|
|
#ifdef NEED_SNPRINTF_H
|
|
|
|
# include "snprintf.h"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <epan/packet.h>
|
|
|
|
#include <epan/conversation.h>
|
|
|
|
#include "etypes.h"
|
|
|
|
#include "packet-fc.h"
|
|
|
|
#include "packet-fcels.h"
|
|
|
|
|
|
|
|
#define FC_ELS_RPLY 0
|
|
|
|
#define FC_ELS_REQ 1
|
|
|
|
|
|
|
|
/* Initialize the protocol and registered fields */
|
|
|
|
static int proto_fcels = -1;
|
|
|
|
static int hf_fcels_opcode = -1;
|
|
|
|
static int hf_fcels_rjtcode = -1;
|
|
|
|
static int hf_fcels_rjtdetcode = -1;
|
|
|
|
static int hf_fcels_vnduniq = -1;
|
|
|
|
static int hf_fcels_b2b = -1;
|
|
|
|
static int hf_fcels_cmnfeatures = -1;
|
|
|
|
static int hf_fcels_bbscnum = -1;
|
|
|
|
static int hf_fcels_rcvsize = -1;
|
|
|
|
static int hf_fcels_maxconseq = -1;
|
|
|
|
static int hf_fcels_reloffset = -1;
|
|
|
|
static int hf_fcels_edtov = -1;
|
|
|
|
static int hf_fcels_npname = -1;
|
|
|
|
static int hf_fcels_fnname = -1;
|
|
|
|
static int hf_fcels_cls1param = -1;
|
|
|
|
static int hf_fcels_cls2param = -1;
|
|
|
|
static int hf_fcels_cls3param = -1;
|
|
|
|
static int hf_fcels_cls4param = -1;
|
|
|
|
static int hf_fcels_vendorvers = -1;
|
|
|
|
static int hf_fcels_svcavail = -1;
|
|
|
|
static int hf_fcels_clsflags = -1;
|
|
|
|
static int hf_fcels_initctl = -1;
|
|
|
|
static int hf_fcels_rcptctl = -1;
|
|
|
|
static int hf_fcels_clsrcvsize = -1;
|
|
|
|
static int hf_fcels_conseq = -1;
|
|
|
|
static int hf_fcels_e2e = -1;
|
|
|
|
static int hf_fcels_openseq = -1;
|
|
|
|
static int hf_fcels_nportid = -1;
|
|
|
|
static int hf_fcels_oxid = -1;
|
|
|
|
static int hf_fcels_rxid = -1;
|
|
|
|
static int hf_fcels_recovqual = -1;
|
|
|
|
static int hf_fcels_fabricaddr = -1;
|
|
|
|
static int hf_fcels_fabricpname = -1;
|
|
|
|
static int hf_fcels_failedrcvr = -1;
|
|
|
|
static int hf_fcels_flacompliance = -1;
|
|
|
|
static int hf_fcels_loopstate = -1;
|
|
|
|
static int hf_fcels_publicloop_bmap = -1;
|
|
|
|
static int hf_fcels_pvtloop_bmap = -1;
|
|
|
|
static int hf_fcels_alpa_map = -1;
|
|
|
|
static int hf_fcels_scrregn = -1;
|
|
|
|
static int hf_fcels_farp_matchcodept = -1;
|
|
|
|
static int hf_fcels_farp_respaction = -1;
|
|
|
|
static int hf_fcels_resportid = -1;
|
|
|
|
static int hf_fcels_respname = -1;
|
|
|
|
static int hf_fcels_respnname = -1;
|
|
|
|
static int hf_fcels_reqipaddr = -1;
|
|
|
|
static int hf_fcels_respipaddr = -1;
|
|
|
|
static int hf_fcels_hardaddr = -1;
|
|
|
|
static int hf_fcels_rps_flag = -1;
|
|
|
|
static int hf_fcels_rps_portnum = -1;
|
|
|
|
static int hf_fcels_rps_portstatus = -1;
|
|
|
|
static int hf_fcels_rnft_fc4type = -1;
|
|
|
|
static int hf_fcels_rscn_evqual = -1;
|
|
|
|
static int hf_fcels_rscn_addrfmt = -1;
|
|
|
|
static int hf_fcels_rscn_domain = -1;
|
|
|
|
static int hf_fcels_rscn_area = -1;
|
|
|
|
static int hf_fcels_rscn_port = -1;
|
|
|
|
static int hf_fcels_nodeidfmt = -1;
|
|
|
|
static int hf_fcels_spidlen = -1;
|
|
|
|
static int hf_fcels_vendoruniq = -1;
|
|
|
|
static int hf_fcels_vendorsp = -1;
|
|
|
|
static int hf_fcels_asstype = -1;
|
|
|
|
static int hf_fcels_physport = -1;
|
|
|
|
static int hf_fcels_attnodes = -1;
|
|
|
|
static int hf_fcels_nodemgmt = -1;
|
|
|
|
static int hf_fcels_ipvers = -1;
|
|
|
|
static int hf_fcels_tcpport = -1;
|
|
|
|
static int hf_fcels_ip = -1;
|
|
|
|
|
|
|
|
static gint ett_fcels;
|
|
|
|
static gint ett_fcels_lsrjt;
|
|
|
|
static gint ett_fcels_acc;
|
|
|
|
static gint ett_fcels_logi;
|
|
|
|
static gint ett_fcels_logi_cmnsvc;
|
|
|
|
static gint ett_fcels_logi_clssvc;
|
|
|
|
static gint ett_fcels_logo;
|
|
|
|
static gint ett_fcels_abtx;
|
|
|
|
static gint ett_fcels_rsi;
|
|
|
|
static gint ett_fcels_rrq;
|
|
|
|
static gint ett_fcels_prli;
|
|
|
|
static gint ett_fcels_prli_svcpg;
|
|
|
|
static gint ett_fcels_adisc;
|
|
|
|
static gint ett_fcels_farp;
|
|
|
|
static gint ett_fcels_rps;
|
|
|
|
static gint ett_fcels_rpl;
|
|
|
|
static gint ett_fcels_rplpb;
|
|
|
|
static gint ett_fcels_fan;
|
|
|
|
static gint ett_fcels_rscn;
|
|
|
|
static gint ett_fcels_rscn_rec;
|
|
|
|
static gint ett_fcels_scr;
|
|
|
|
static gint ett_fcels_rnft;
|
|
|
|
static gint ett_fcels_rnft_fc4;
|
|
|
|
static gint ett_fcels_lsts;
|
|
|
|
static gint ett_fcels_rnid;
|
|
|
|
static gint ett_fcels_rlir;
|
|
|
|
static gint ett_fcels_lirr;
|
|
|
|
static gint ett_fcels_srl;
|
|
|
|
static gint ett_fcels_rpsc;
|
|
|
|
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
static const value_string fc_prli_fc4_val[] = {
|
|
|
|
{FC_TYPE_SCSI , "FCP"},
|
|
|
|
{FC_TYPE_IP , "IP/FC"},
|
|
|
|
{FC_TYPE_LLCSNAP , "LLC_SNAP"},
|
|
|
|
{FC_TYPE_ELS , "Ext Link Svc"},
|
|
|
|
{FC_TYPE_FCCT , "FC_CT"},
|
|
|
|
{FC_TYPE_SWILS , "SW_ILS"},
|
|
|
|
{FC_TYPE_AL , "AL"},
|
|
|
|
{FC_TYPE_SNMP , "SNMP"},
|
|
|
|
{FC_TYPE_CMNSVC , "Common to all FC-4 Types"},
|
|
|
|
{0, NULL},
|
|
|
|
};
|
|
|
|
|
2002-12-08 02:32:36 +00:00
|
|
|
typedef struct _fcels_conv_key {
|
|
|
|
guint32 conv_idx;
|
|
|
|
} fcels_conv_key_t;
|
|
|
|
|
|
|
|
typedef struct _fcels_conv_data {
|
|
|
|
guint32 opcode;
|
|
|
|
} fcels_conv_data_t;
|
|
|
|
|
|
|
|
GHashTable *fcels_req_hash = NULL;
|
|
|
|
GMemChunk *fcels_req_keys = NULL;
|
|
|
|
GMemChunk *fcels_req_vals = NULL;
|
|
|
|
guint32 fcels_init_count = 25;
|
|
|
|
|
|
|
|
static dissector_handle_t data_handle;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Hash Functions
|
|
|
|
*/
|
|
|
|
static gint
|
|
|
|
fcels_equal(gconstpointer v, gconstpointer w)
|
|
|
|
{
|
|
|
|
fcels_conv_key_t *v1 = (fcels_conv_key_t *)v;
|
|
|
|
fcels_conv_key_t *v2 = (fcels_conv_key_t *)w;
|
|
|
|
|
|
|
|
return (v1->conv_idx == v2->conv_idx);
|
|
|
|
}
|
|
|
|
|
|
|
|
static guint
|
|
|
|
fcels_hash (gconstpointer v)
|
|
|
|
{
|
|
|
|
fcels_conv_key_t *key = (fcels_conv_key_t *)v;
|
|
|
|
guint val;
|
|
|
|
|
|
|
|
val = key->conv_idx;
|
|
|
|
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Protocol initialization
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
fcels_init_protocol(void)
|
|
|
|
{
|
|
|
|
if (fcels_req_keys)
|
|
|
|
g_mem_chunk_destroy(fcels_req_keys);
|
|
|
|
if (fcels_req_vals)
|
|
|
|
g_mem_chunk_destroy(fcels_req_vals);
|
|
|
|
if (fcels_req_hash)
|
|
|
|
g_hash_table_destroy(fcels_req_hash);
|
|
|
|
|
|
|
|
fcels_req_hash = g_hash_table_new(fcels_hash, fcels_equal);
|
|
|
|
fcels_req_keys = g_mem_chunk_new ("fcels_req_keys",
|
|
|
|
sizeof(fcels_conv_key_t),
|
|
|
|
fcels_init_count *
|
|
|
|
sizeof(fcels_conv_key_t),
|
|
|
|
G_ALLOC_AND_FREE);
|
|
|
|
fcels_req_vals = g_mem_chunk_new ("fcels_req_vals",
|
|
|
|
sizeof(fcels_conv_data_t),
|
|
|
|
fcels_init_count *
|
|
|
|
sizeof(fcels_conv_data_t),
|
|
|
|
G_ALLOC_AND_FREE);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
construct_cmnsvc_string (guint16 flag, gchar *flagstr, guint8 opcode)
|
|
|
|
{
|
|
|
|
int stroff = 0;
|
|
|
|
gchar punc[3];
|
|
|
|
|
|
|
|
punc[0] = '\0';
|
|
|
|
|
|
|
|
if ((opcode == FC_ELS_PLOGI) || (opcode == FC_ELS_PDISC)) {
|
|
|
|
if (flag & 0x8000) {
|
|
|
|
strcpy (flagstr, "Cont. Incr. Offset Supported");
|
|
|
|
stroff += 28;
|
|
|
|
strcpy (punc, ", ");
|
|
|
|
}
|
|
|
|
if (flag & 0x4000) {
|
|
|
|
sprintf (&flagstr[stroff], "%sRRO Supported", punc);
|
|
|
|
stroff += 15;
|
|
|
|
strcpy (punc, ", ");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (flag & 0x2000) {
|
|
|
|
sprintf (flagstr, "%sValid Vendor Version Level", punc);
|
|
|
|
strcpy (punc, ", ");
|
|
|
|
stroff += 28;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (flag & 0x0800) {
|
2003-01-22 06:26:36 +00:00
|
|
|
sprintf (&flagstr[stroff], "%sAlt B2B Credit Mgmt", punc);
|
2002-12-08 02:32:36 +00:00
|
|
|
strcpy (punc, ", ");
|
|
|
|
stroff += 24;
|
|
|
|
}
|
|
|
|
else {
|
2003-01-22 06:26:36 +00:00
|
|
|
sprintf (&flagstr[stroff], "%sNormal B2B Credit Mgmt", punc);
|
2002-12-08 02:32:36 +00:00
|
|
|
strcpy (punc, ", ");
|
|
|
|
stroff += 21;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((opcode == FC_ELS_PLOGI) || (opcode == FC_ELS_PDISC)) {
|
|
|
|
if (flag & 0x0400) {
|
|
|
|
strcpy (&flagstr[stroff], ", E_D_TOV Resolution in ns");
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
strcpy (&flagstr[stroff], ", E_D_TOV Resolution in ms");
|
|
|
|
}
|
|
|
|
stroff += 26;
|
|
|
|
|
|
|
|
if (flag & 0x0040) {
|
|
|
|
strcpy (&flagstr[stroff], ", Simplex Dedicated Conn Supported");
|
|
|
|
stroff += 34;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (flag & 0x0010) {
|
|
|
|
strcpy (&flagstr[stroff], ", Clk Sync Prim Capable");
|
|
|
|
stroff += 23;
|
|
|
|
}
|
|
|
|
if (flag & 0x0004) {
|
|
|
|
strcpy (&flagstr[stroff], ", DHD Capable");
|
|
|
|
stroff += 13;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((opcode == FC_ELS_PLOGI) || (opcode == FC_ELS_PDISC)) {
|
|
|
|
if (flag & 0x0002) {
|
|
|
|
strcpy (&flagstr[stroff], ", Cont. Incr SEQCNT rules");
|
|
|
|
stroff += 25;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
strcpy (&flagstr[stroff], ", Normal SEQCNT rules");
|
|
|
|
stroff += 21;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (flag & 0x0001) {
|
|
|
|
sprintf (&flagstr[stroff], ", Payload Len=256 bytes");
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
sprintf (&flagstr[stroff], ", Payload Len=116 bytes");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The next 3 routines decode only Class 2 & Class 3 relevant bits */
|
|
|
|
static void
|
|
|
|
construct_clssvc_string (guint16 flag, gchar *flagstr, guint8 opcode)
|
|
|
|
{
|
|
|
|
int stroff = 0;
|
|
|
|
|
|
|
|
if (!(flag & 0x8000)) {
|
|
|
|
strcpy (flagstr, "Class Not Supported");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((opcode == FC_ELS_FLOGI) || (opcode == FC_ELS_FDISC)) {
|
|
|
|
if (flag & 0x0800) {
|
|
|
|
strcpy (flagstr, "Seq Delivery Requested");
|
|
|
|
stroff += 22;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
strcpy (flagstr, "Out of Order Delivery Requested");
|
|
|
|
stroff += 31;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (flag & 0x0080) {
|
|
|
|
strcpy (&flagstr[stroff], ", Priority/preemption supported");
|
|
|
|
stroff += 31;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((opcode == FC_ELS_PLOGI) || (opcode == FC_ELS_PDISC)) {
|
|
|
|
if (flag & 0x0040) {
|
|
|
|
strcpy (&flagstr[stroff], "Non-zero CS_CTL Tolerated");
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
strcpy (&flagstr[stroff], "Non-zero CS_CTL Maybe Tolerated");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
construct_initctl_string (guint16 flag, gchar *flagstr, guint8 opcode)
|
|
|
|
{
|
|
|
|
int stroff = 0;
|
|
|
|
|
|
|
|
if ((opcode == FC_ELS_PLOGI) || (opcode == FC_ELS_PDISC)) {
|
|
|
|
switch ((flag & 0x3000)) {
|
|
|
|
case 0x0:
|
|
|
|
strcpy (flagstr, "Initial P_A Not Supported");
|
|
|
|
stroff += 25;
|
|
|
|
break;
|
|
|
|
case 0x1000:
|
|
|
|
strcpy (flagstr, "Initial P_A Supported");
|
|
|
|
stroff += 21;
|
|
|
|
break;
|
|
|
|
case 0x3000:
|
|
|
|
strcpy (flagstr, "Initial P_A Required & Supported");
|
|
|
|
stroff += 32;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (flag & 0x0800) {
|
|
|
|
strcpy (&flagstr[stroff], ", ACK0 Capable");
|
|
|
|
stroff += 14;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (flag & 0x0200) {
|
|
|
|
strcpy (&flagstr[stroff], ", ACK Generation Assistance Avail");
|
|
|
|
stroff += 33;
|
|
|
|
}
|
|
|
|
if (flag & 0x0010) {
|
|
|
|
strcpy (&flagstr[stroff], ", Clock Sync ELS Supported");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (flag & 0x0010) {
|
|
|
|
strcpy (&flagstr[stroff], "Clock Sync ELS Supported");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
construct_rcptctl_string (guint16 flag, gchar *flagstr, guint8 opcode)
|
|
|
|
{
|
|
|
|
int stroff = 0;
|
|
|
|
gchar punc[3];
|
|
|
|
|
|
|
|
punc[0] = '\0';
|
|
|
|
|
|
|
|
if ((opcode == FC_ELS_PLOGI) || (opcode == FC_ELS_PDISC)) {
|
|
|
|
if (flag & 0x8000) {
|
|
|
|
strcpy (flagstr, "ACK_0 Supported");
|
|
|
|
stroff += 15;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
strcpy (flagstr, "ACK_0 Not Supported");
|
|
|
|
stroff += 19;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (flag & 0x2000) {
|
|
|
|
strcpy (&flagstr[stroff], ", X_ID Interlock Reqd");
|
|
|
|
stroff += 21;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (flag & 0x1800) {
|
|
|
|
case 0x0:
|
|
|
|
strcpy (&flagstr[stroff], ", Error Policy: Discard Policy only");
|
|
|
|
stroff += 43;
|
|
|
|
break;
|
|
|
|
case 0x1000:
|
|
|
|
strcpy (&flagstr[stroff], ", Error Policy: Both discard and process policies supported");
|
|
|
|
stroff += 52;
|
|
|
|
break;
|
|
|
|
case 0x0800:
|
|
|
|
strcpy (&flagstr[stroff], ", Error Policy: Reserved");
|
|
|
|
stroff += 41;
|
|
|
|
break;
|
|
|
|
case 0x1800:
|
|
|
|
strcpy (&flagstr[stroff], ", Error Policy: Reserved");
|
|
|
|
stroff += 52;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (flag & 0x0030) {
|
|
|
|
case 0:
|
|
|
|
strcpy (&flagstr[stroff], ", 1 Category/Seq");
|
|
|
|
stroff += 16;
|
|
|
|
break;
|
|
|
|
case 0x0010:
|
|
|
|
strcpy (&flagstr[stroff], ", 2 Categories/Seq");
|
|
|
|
stroff += 18;
|
|
|
|
break;
|
|
|
|
case 0x0030:
|
|
|
|
strcpy (&flagstr[stroff], ", More than 2 Categories/Seq");
|
|
|
|
stroff += 28;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (flag & 0x0008) {
|
|
|
|
strcpy (&flagstr[stroff], ", Clk Sync ELS Supported");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (flag & 0x0008) {
|
|
|
|
strcpy (&flagstr[stroff], "Clk Sync ELS Supported");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_fcels_logi (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
|
|
|
|
proto_item *ti, guint8 opcode)
|
|
|
|
{
|
|
|
|
/* Set up structures needed to add the protocol subtree and manage it */
|
|
|
|
int offset = 0,
|
|
|
|
svcvld = 0,
|
|
|
|
class;
|
|
|
|
proto_tree *logi_tree, *cmnsvc_tree;
|
|
|
|
proto_item *subti;
|
|
|
|
gchar flagstr[256];
|
|
|
|
guint16 flag;
|
|
|
|
|
|
|
|
if (tree) {
|
|
|
|
logi_tree = proto_item_add_subtree (ti, ett_fcels_logi);
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (logi_tree, hf_fcels_opcode, tvb, offset, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
|
|
|
|
subti = proto_tree_add_text (logi_tree, tvb, offset+4, 16,
|
|
|
|
"Common Svc Parameters");
|
|
|
|
cmnsvc_tree = proto_item_add_subtree (subti, ett_fcels_logi_cmnsvc);
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (cmnsvc_tree, hf_fcels_b2b, tvb, offset+6, 2, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
flag = tvb_get_ntohs (tvb, offset+8);
|
|
|
|
|
|
|
|
if (flag & 0x0001) {
|
|
|
|
svcvld = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
construct_cmnsvc_string (flag, flagstr, opcode);
|
|
|
|
proto_tree_add_uint_format (cmnsvc_tree, hf_fcels_cmnfeatures, tvb,
|
|
|
|
offset+8, 2, flag,
|
|
|
|
"Common Svc Parameters: 0x%x (%s)",
|
|
|
|
flag, flagstr);
|
|
|
|
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (cmnsvc_tree, hf_fcels_bbscnum, tvb, offset+10, 1, FALSE);
|
|
|
|
proto_tree_add_item (cmnsvc_tree, hf_fcels_rcvsize, tvb, offset+10, 2, FALSE);
|
|
|
|
proto_tree_add_item (cmnsvc_tree, hf_fcels_maxconseq, tvb, offset+12, 2, FALSE);
|
|
|
|
proto_tree_add_item (cmnsvc_tree, hf_fcels_reloffset, tvb, offset+14, 2, FALSE);
|
|
|
|
proto_tree_add_item (cmnsvc_tree, hf_fcels_edtov, tvb, offset+16, 4, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
proto_tree_add_string (cmnsvc_tree, hf_fcels_npname, tvb, offset+20, 8,
|
|
|
|
fcwwn_to_str (tvb_get_ptr (tvb, offset+20, 8)));
|
|
|
|
proto_tree_add_string (cmnsvc_tree, hf_fcels_fnname, tvb, offset+28, 8,
|
|
|
|
fcwwn_to_str (tvb_get_ptr (tvb, offset+28, 8)));
|
|
|
|
|
|
|
|
/* Add subtree for class paramters */
|
|
|
|
offset = 36;
|
|
|
|
for (class = 1; class < 5; class++) {
|
|
|
|
subti = proto_tree_add_text (logi_tree, tvb, offset, 16,
|
|
|
|
"Class %d Svc Parameters", class);
|
|
|
|
cmnsvc_tree = proto_item_add_subtree (subti, ett_fcels_logi_cmnsvc);
|
|
|
|
|
|
|
|
flag = tvb_get_ntohs (tvb, offset);
|
|
|
|
construct_clssvc_string (flag, flagstr, opcode);
|
|
|
|
proto_tree_add_uint_format (cmnsvc_tree, hf_fcels_clsflags, tvb,
|
|
|
|
offset, 2, flag,
|
|
|
|
"Service Options: 0x%x(%s)", flag,
|
|
|
|
flagstr);
|
|
|
|
if (flag & 0x8000) {
|
|
|
|
flag = tvb_get_ntohs (tvb, offset+2);
|
|
|
|
construct_initctl_string (flag, flagstr, opcode);
|
|
|
|
proto_tree_add_uint_format (cmnsvc_tree, hf_fcels_initctl, tvb,
|
|
|
|
offset+2, 2, flag,
|
|
|
|
"Initiator Control: 0x%x(%s)", flag,
|
|
|
|
flagstr);
|
|
|
|
|
|
|
|
flag = tvb_get_ntohs (tvb, offset+4);
|
|
|
|
construct_rcptctl_string (flag, flagstr, opcode);
|
|
|
|
proto_tree_add_uint_format (cmnsvc_tree, hf_fcels_initctl, tvb,
|
|
|
|
offset+4, 2, flag,
|
|
|
|
"Recipient Control: 0x%x(%s)", flag,
|
|
|
|
flagstr);
|
|
|
|
|
|
|
|
proto_tree_add_item (cmnsvc_tree, hf_fcels_clsrcvsize, tvb,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
offset+6, 2, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
proto_tree_add_item (cmnsvc_tree, hf_fcels_conseq, tvb,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
offset+8, 2, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
proto_tree_add_item (cmnsvc_tree, hf_fcels_e2e, tvb,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
offset+10, 2, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
proto_tree_add_item (cmnsvc_tree, hf_fcels_openseq, tvb,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
offset+12, 2, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
}
|
|
|
|
offset += 16;
|
|
|
|
}
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (logi_tree, hf_fcels_vendorvers, tvb, offset, 16, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
if (svcvld) {
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (logi_tree, hf_fcels_svcavail, tvb, offset+32, 8, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_fcels_plogi (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
|
|
|
guint8 isreq _U_, proto_item *ti)
|
|
|
|
{
|
|
|
|
dissect_fcels_logi (tvb, pinfo, tree, ti, FC_ELS_PLOGI);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_fcels_flogi (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
|
|
|
guint8 isreq _U_, proto_item *ti)
|
|
|
|
{
|
|
|
|
dissect_fcels_logi (tvb, pinfo, tree, ti, FC_ELS_FLOGI);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_fcels_logout (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
|
|
|
|
guint8 isreq, proto_item *ti)
|
|
|
|
{
|
|
|
|
/* Set up structures needed to add the protocol subtree and manage it */
|
|
|
|
int offset = 5; /* bypass opcode+rsvd field */
|
|
|
|
proto_tree *logo_tree;
|
|
|
|
|
|
|
|
if (tree) {
|
|
|
|
logo_tree = proto_item_add_subtree (ti, ett_fcels_logo);
|
|
|
|
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (logo_tree, hf_fcels_opcode, tvb, offset-5, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
|
|
|
|
if (!isreq) {
|
|
|
|
/* Accept has no payload */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
proto_tree_add_string (logo_tree, hf_fcels_nportid, tvb, offset, 3,
|
|
|
|
fc_to_str (tvb_get_ptr (tvb, offset, 3)));
|
|
|
|
proto_tree_add_string (logo_tree, hf_fcels_npname, tvb, offset+3, 6,
|
|
|
|
fcwwn_to_str (tvb_get_ptr (tvb, offset+3, 6)));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_fcels_abtx (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
|
|
|
|
guint8 isreq, proto_item *ti)
|
|
|
|
{
|
|
|
|
/* Set up structures needed to add the protocol subtree and manage it */
|
|
|
|
int offset = 0;
|
|
|
|
proto_tree *abtx_tree;
|
|
|
|
|
|
|
|
if (tree) {
|
|
|
|
abtx_tree = proto_item_add_subtree (ti, ett_fcels_abtx);
|
|
|
|
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (abtx_tree, hf_fcels_opcode, tvb, offset, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
|
|
|
|
if (!isreq) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
proto_tree_add_text (abtx_tree, tvb, offset+4, 1,
|
|
|
|
"Recovery Qualifier Status: 0x%x",
|
|
|
|
tvb_get_guint8 (tvb, offset+4));
|
|
|
|
proto_tree_add_string (abtx_tree, hf_fcels_nportid, tvb, offset+5, 3,
|
|
|
|
fc_to_str (tvb_get_ptr (tvb, offset+5, 3)));
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (abtx_tree, hf_fcels_oxid, tvb, offset+8, 2, FALSE);
|
|
|
|
proto_tree_add_item (abtx_tree, hf_fcels_rxid, tvb, offset+10, 2, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_fcels_rsi (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
|
|
|
|
guint8 isreq, proto_item *ti)
|
|
|
|
{
|
|
|
|
/* Set up structures needed to add the protocol subtree and manage it */
|
|
|
|
int offset = 4;
|
|
|
|
proto_tree *rsi_tree;
|
|
|
|
|
|
|
|
if (tree) {
|
|
|
|
rsi_tree = proto_item_add_subtree (ti, ett_fcels_rsi);
|
|
|
|
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (rsi_tree, hf_fcels_opcode, tvb, offset-4, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
if (!isreq)
|
|
|
|
return;
|
|
|
|
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (rsi_tree, hf_fcels_recovqual, tvb, offset, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
proto_tree_add_string (rsi_tree, hf_fcels_nportid, tvb, offset+1, 3,
|
|
|
|
fc_to_str (tvb_get_ptr (tvb, offset+1, 3)));
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (rsi_tree, hf_fcels_rxid, tvb, offset+4, 2, FALSE);
|
|
|
|
proto_tree_add_item (rsi_tree, hf_fcels_oxid, tvb, offset+6, 2, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_fcels_rrq (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
|
|
|
|
guint8 isreq, proto_item *ti)
|
|
|
|
{
|
|
|
|
/* Set up structures needed to add the protocol subtree and manage it */
|
|
|
|
int offset = 0;
|
|
|
|
proto_tree *rrq_tree;
|
|
|
|
|
|
|
|
if (tree) {
|
|
|
|
rrq_tree = proto_item_add_subtree (ti, ett_fcels_rrq);
|
|
|
|
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (rrq_tree, hf_fcels_opcode, tvb, offset, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
if (!isreq)
|
|
|
|
return;
|
|
|
|
|
|
|
|
proto_tree_add_string (rrq_tree, hf_fcels_nportid, tvb, offset+5, 3,
|
|
|
|
fc_to_str (tvb_get_ptr (tvb, offset+5, 3)));
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (rrq_tree, hf_fcels_oxid, tvb, offset+8, 2, FALSE);
|
|
|
|
proto_tree_add_item (rrq_tree, hf_fcels_rxid, tvb, offset+10, 2, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_fcels_pdisc (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
|
|
|
guint8 isreq _U_, proto_item *ti)
|
|
|
|
{
|
|
|
|
dissect_fcels_logi (tvb, pinfo, tree, ti, FC_ELS_PDISC);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_fcels_fdisc (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
|
|
|
guint8 isreq _U_, proto_item *ti)
|
|
|
|
{
|
|
|
|
dissect_fcels_logi (tvb, pinfo, tree, ti, FC_ELS_FDISC);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_fcels_adisc (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
|
|
|
|
guint8 isreq _U_, proto_item *ti)
|
|
|
|
{
|
|
|
|
/* Set up structures needed to add the protocol subtree and manage it */
|
|
|
|
int offset = 5;
|
|
|
|
proto_tree *adisc_tree;
|
|
|
|
|
|
|
|
if (tree) {
|
|
|
|
adisc_tree = proto_item_add_subtree (ti, ett_fcels_adisc);
|
|
|
|
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (adisc_tree, hf_fcels_opcode, tvb, offset-5, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
|
|
|
|
proto_tree_add_string (adisc_tree, hf_fcels_hardaddr, tvb, offset, 3,
|
|
|
|
fc_to_str (tvb_get_ptr (tvb, offset, 3)));
|
|
|
|
proto_tree_add_string (adisc_tree, hf_fcels_npname, tvb, offset+3, 8,
|
|
|
|
fcwwn_to_str (tvb_get_ptr (tvb, offset+3, 8)));
|
|
|
|
proto_tree_add_string (adisc_tree, hf_fcels_fnname, tvb, offset+11, 8,
|
|
|
|
fcwwn_to_str (tvb_get_ptr (tvb, offset+11, 8)));
|
|
|
|
proto_tree_add_string (adisc_tree, hf_fcels_nportid, tvb, offset+20, 3,
|
|
|
|
fc_to_str (tvb_get_ptr (tvb, offset+20, 3)));
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_fcels_farp (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
|
|
|
|
proto_item *ti)
|
|
|
|
{
|
|
|
|
int offset = 4;
|
|
|
|
proto_tree *farp_tree;
|
|
|
|
|
|
|
|
if (tree) {
|
|
|
|
farp_tree = proto_item_add_subtree (ti, ett_fcels_farp);
|
|
|
|
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (farp_tree, hf_fcels_opcode, tvb, offset-4, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
|
|
|
|
proto_tree_add_item (farp_tree, hf_fcels_farp_matchcodept,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
tvb, offset, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
proto_tree_add_string (farp_tree, hf_fcels_nportid, tvb, offset+1,
|
|
|
|
3, fc_to_str (tvb_get_ptr (tvb, offset+1, 3)));
|
|
|
|
proto_tree_add_item (farp_tree, hf_fcels_farp_respaction, tvb,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
offset+4, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
proto_tree_add_string (farp_tree, hf_fcels_resportid, tvb, offset+5,
|
|
|
|
3, fc_to_str (tvb_get_ptr (tvb, offset+5, 3)));
|
|
|
|
proto_tree_add_string (farp_tree, hf_fcels_npname, tvb, offset+8,
|
|
|
|
8, fcwwn_to_str (tvb_get_ptr (tvb, offset+8, 8)));
|
|
|
|
proto_tree_add_string (farp_tree, hf_fcels_fnname, tvb, offset+16,
|
|
|
|
8, fcwwn_to_str (tvb_get_ptr (tvb, offset+16, 8)));
|
|
|
|
proto_tree_add_string (farp_tree, hf_fcels_respname, tvb, offset+24,
|
|
|
|
8, fcwwn_to_str (tvb_get_ptr (tvb, offset+24, 8)));
|
|
|
|
proto_tree_add_string (farp_tree, hf_fcels_respnname, tvb, offset+32,
|
|
|
|
8, fcwwn_to_str (tvb_get_ptr (tvb, offset+32, 8)));
|
|
|
|
proto_tree_add_item (farp_tree, hf_fcels_reqipaddr, tvb, offset+40,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
16, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
proto_tree_add_item (farp_tree, hf_fcels_respipaddr, tvb, offset+56,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
16, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_fcels_farp_req (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
|
|
|
guint8 isreq _U_, proto_item *ti)
|
|
|
|
{
|
|
|
|
dissect_fcels_farp (tvb, pinfo, tree, ti);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_fcels_farp_rply (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
|
|
|
guint8 isreq _U_, proto_item *ti)
|
|
|
|
{
|
|
|
|
dissect_fcels_farp (tvb, pinfo, tree, ti);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_fcels_rps (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
|
|
|
|
guint8 isreq, proto_item *ti)
|
|
|
|
{
|
|
|
|
/* Set up structures needed to add the protocol subtree and manage it */
|
|
|
|
int offset = 3;
|
|
|
|
guint8 flag;
|
|
|
|
proto_tree *rps_tree;
|
|
|
|
|
|
|
|
flag = tvb_get_guint8 (tvb, offset);
|
|
|
|
|
|
|
|
if (tree) {
|
|
|
|
rps_tree = proto_item_add_subtree (ti, ett_fcels_rps);
|
|
|
|
|
|
|
|
if (isreq) {
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (rps_tree, hf_fcels_rps_flag, tvb, offset, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (rps_tree, hf_fcels_opcode, tvb, offset-3, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
|
|
|
|
if (flag & 0x2) {
|
|
|
|
proto_tree_add_string (rps_tree, hf_fcels_npname, tvb, offset+1,
|
|
|
|
8, fcwwn_to_str (tvb_get_ptr (tvb,
|
|
|
|
offset+1,
|
|
|
|
8)));
|
|
|
|
}
|
|
|
|
else if (flag & 0x1) {
|
|
|
|
proto_tree_add_item (rps_tree, hf_fcels_rps_portnum, tvb,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
offset+5, 3, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (rps_tree, hf_fcels_rps_flag, tvb, offset, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
proto_tree_add_item (rps_tree, hf_fcels_rps_portstatus, tvb,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
offset+3, 2, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
/* Next 6 fields are from Link Error Status Block (LESB) */
|
|
|
|
proto_tree_add_text (rps_tree, tvb, offset+5, 4,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"Link Failure Count: %u",
|
2002-12-08 02:32:36 +00:00
|
|
|
tvb_get_ntohl (tvb, offset+5));
|
|
|
|
proto_tree_add_text (rps_tree, tvb, offset+9, 4,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"Loss of Sync Count: %u",
|
2002-12-08 02:32:36 +00:00
|
|
|
tvb_get_ntohl (tvb, offset+9));
|
|
|
|
proto_tree_add_text (rps_tree, tvb, offset+13, 4,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"Loss of Signal Count: %u",
|
2002-12-08 02:32:36 +00:00
|
|
|
tvb_get_ntohl (tvb, offset+13));
|
|
|
|
proto_tree_add_text (rps_tree, tvb, offset+17, 4,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"Primitive Seq Protocol Err: %u",
|
2002-12-08 02:32:36 +00:00
|
|
|
tvb_get_ntohl (tvb, offset+17));
|
|
|
|
proto_tree_add_text (rps_tree, tvb, offset+21, 4,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"Invalid Xmission Word: %u",
|
2002-12-08 02:32:36 +00:00
|
|
|
tvb_get_ntohl (tvb, offset+21));
|
|
|
|
proto_tree_add_text (rps_tree, tvb, offset+25, 4,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"Invalid CRC Count: %u",
|
2002-12-08 02:32:36 +00:00
|
|
|
tvb_get_ntohl (tvb, offset+25));
|
|
|
|
if (flag & 0x01) {
|
|
|
|
/* Next 6 fields are from L_Port Extension field */
|
|
|
|
proto_tree_add_text (rps_tree, tvb, offset+31, 2,
|
|
|
|
"L_Port Status: 0x%x",
|
|
|
|
tvb_get_ntohs (tvb, offset+31));
|
|
|
|
proto_tree_add_text (rps_tree, tvb, offset+36, 1,
|
|
|
|
"LIP AL_PS: 0x%x",
|
|
|
|
tvb_get_guint8 (tvb, offset+36));
|
|
|
|
proto_tree_add_text (rps_tree, tvb, offset+37, 4,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"LIP F7 Initiated Count: %u",
|
2002-12-08 02:32:36 +00:00
|
|
|
tvb_get_ntohl (tvb, offset+37));
|
|
|
|
proto_tree_add_text (rps_tree, tvb, offset+41, 4,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"LIP F7 Received Count: %u",
|
2002-12-08 02:32:36 +00:00
|
|
|
tvb_get_ntohl (tvb, offset+41));
|
|
|
|
proto_tree_add_text (rps_tree, tvb, offset+45, 4,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"LIP F8 Initiated Count: %u",
|
2002-12-08 02:32:36 +00:00
|
|
|
tvb_get_ntohl (tvb, offset+45));
|
|
|
|
proto_tree_add_text (rps_tree, tvb, offset+49, 4,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"LIP F8 Received Count: %u",
|
2002-12-08 02:32:36 +00:00
|
|
|
tvb_get_ntohl (tvb, offset+49));
|
|
|
|
proto_tree_add_text (rps_tree, tvb, offset+53, 4,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"LIP Reset Initiated Count: %u",
|
2002-12-08 02:32:36 +00:00
|
|
|
tvb_get_ntohl (tvb, offset+53));
|
|
|
|
proto_tree_add_text (rps_tree, tvb, offset+57, 4,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"LIP Reset Received Count: %u",
|
2002-12-08 02:32:36 +00:00
|
|
|
tvb_get_ntohl (tvb, offset+57));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_fcels_rpl (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
|
|
|
|
guint8 isreq, proto_item *ti)
|
|
|
|
{
|
|
|
|
/* Set up structures needed to add the protocol subtree and manage it */
|
|
|
|
int offset = 0;
|
|
|
|
proto_tree *rpl_tree, *pb_tree;
|
|
|
|
proto_item *subti;
|
|
|
|
int loop;
|
|
|
|
|
|
|
|
if (tree) {
|
|
|
|
rpl_tree = proto_item_add_subtree (ti, ett_fcels_rpl);
|
|
|
|
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (rpl_tree, hf_fcels_opcode, tvb, offset, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
|
|
|
|
if (isreq) {
|
|
|
|
proto_tree_add_text (rpl_tree, tvb, offset+6, 2,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"Max Size: %u",
|
2002-12-08 02:32:36 +00:00
|
|
|
tvb_get_ntohs (tvb, offset+6));
|
|
|
|
proto_tree_add_text (rpl_tree, tvb, offset+9, 3,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"Index: %u",
|
2002-12-08 02:32:36 +00:00
|
|
|
tvb_get_ntoh24 (tvb, offset+9));
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* Reply consists of a header and a number of port blocks */
|
|
|
|
proto_tree_add_text (rpl_tree, tvb, offset+2, 2,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"Payload Length: %u",
|
2002-12-08 02:32:36 +00:00
|
|
|
tvb_get_ntohs (tvb, offset+2));
|
|
|
|
proto_tree_add_text (rpl_tree, tvb, offset+5, 3,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"List Length: %u",
|
2002-12-08 02:32:36 +00:00
|
|
|
tvb_get_ntoh24 (tvb, offset+5));
|
|
|
|
proto_tree_add_text (rpl_tree, tvb, offset+9, 3,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"Index of I Port Block: %u",
|
2002-12-08 02:32:36 +00:00
|
|
|
tvb_get_ntoh24 (tvb, offset+9));
|
|
|
|
offset = 12;
|
|
|
|
/* The following loop is for dissecting the port blocks */
|
|
|
|
for (loop = tvb_get_ntoh24 (tvb, 5); loop > 0; loop--) {
|
|
|
|
subti = proto_tree_add_text (rpl_tree, tvb, offset+12, 16,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"Port Block %u", loop);
|
2002-12-08 02:32:36 +00:00
|
|
|
pb_tree = proto_item_add_subtree (subti, ett_fcels_rplpb);
|
|
|
|
|
|
|
|
proto_tree_add_text (pb_tree, tvb, offset, 4,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"Physical Port #: %u",
|
2002-12-08 02:32:36 +00:00
|
|
|
tvb_get_ntohl (tvb, offset));
|
|
|
|
proto_tree_add_text (pb_tree, tvb, offset+5, 3,
|
|
|
|
"Port Identifier: %s",
|
|
|
|
fc_to_str (tvb_get_ptr (tvb, offset+5, 3)));
|
|
|
|
proto_tree_add_text (pb_tree, tvb, offset+8, 8,
|
|
|
|
"Port Name: %s",
|
|
|
|
fcwwn_to_str (tvb_get_ptr (tvb, offset+8, 8)));
|
|
|
|
offset += 16;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_fcels_fan (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
|
|
|
|
guint8 isreq _U_, proto_item *ti)
|
|
|
|
{
|
|
|
|
/* Set up structures needed to add the protocol subtree and manage it */
|
|
|
|
int offset = 5;
|
|
|
|
proto_tree *fan_tree;
|
|
|
|
|
|
|
|
if (tree) {
|
|
|
|
fan_tree = proto_item_add_subtree (ti, ett_fcels_fan);
|
|
|
|
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (fan_tree, hf_fcels_opcode, tvb, offset-5, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
|
|
|
|
proto_tree_add_string (fan_tree, hf_fcels_fabricaddr, tvb, offset, 3,
|
|
|
|
fc_to_str (tvb_get_ptr (tvb, offset, 3)));
|
|
|
|
proto_tree_add_string (fan_tree, hf_fcels_fabricpname, tvb, offset+3,
|
|
|
|
8, fcwwn_to_str (tvb_get_ptr (tvb, offset, 8)));
|
|
|
|
proto_tree_add_string (fan_tree, hf_fcels_fnname, tvb, offset+11, 8,
|
|
|
|
fcwwn_to_str (tvb_get_ptr (tvb, offset+11, 8)));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_fcels_rscn (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
|
|
|
|
guint8 isreq, proto_item *ti)
|
|
|
|
{
|
|
|
|
/* Set up structures needed to add the protocol subtree and manage it */
|
|
|
|
int offset = 1;
|
|
|
|
proto_tree *rscn_tree, *rectree;
|
|
|
|
proto_item *subti;
|
|
|
|
int numrec, plen, i;
|
|
|
|
|
|
|
|
if (tree) {
|
|
|
|
rscn_tree = proto_item_add_subtree (ti, ett_fcels_rscn);
|
|
|
|
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (rscn_tree, hf_fcels_opcode, tvb, offset-1, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
if (!isreq)
|
|
|
|
return;
|
|
|
|
|
|
|
|
proto_tree_add_text (rscn_tree, tvb, offset, 1,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"Page Len: %u", tvb_get_guint8 (tvb, offset));
|
2002-12-08 02:32:36 +00:00
|
|
|
plen = tvb_get_ntohs (tvb, offset+1);
|
|
|
|
proto_tree_add_text (rscn_tree, tvb, offset+1, 2,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"Payload Len: %u", plen);
|
2002-12-08 02:32:36 +00:00
|
|
|
numrec = (plen - 4)/4;
|
|
|
|
|
|
|
|
offset = 4;
|
|
|
|
for (i = 0; i < numrec; i++) {
|
|
|
|
subti = proto_tree_add_text (rscn_tree, tvb, offset, 4,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"Affected N_Port Page %u", i);
|
2002-12-08 02:32:36 +00:00
|
|
|
rectree = proto_item_add_subtree (subti, ett_fcels_rscn_rec);
|
|
|
|
|
|
|
|
proto_tree_add_item (rectree, hf_fcels_rscn_evqual, tvb, offset,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
proto_tree_add_item (rectree, hf_fcels_rscn_addrfmt, tvb, offset,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
proto_tree_add_item (rectree, hf_fcels_rscn_domain, tvb, offset+1,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
proto_tree_add_item (rectree, hf_fcels_rscn_area, tvb, offset+2,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
proto_tree_add_item (rectree, hf_fcels_rscn_port, tvb, offset+3,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
offset += 4;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_fcels_scr (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
|
|
|
|
guint8 isreq, proto_item *ti)
|
|
|
|
{
|
|
|
|
/* Set up structures needed to add the protocol subtree and manage it */
|
|
|
|
int offset = 7;
|
|
|
|
proto_tree *scr_tree;
|
|
|
|
|
|
|
|
if (tree) {
|
|
|
|
scr_tree = proto_item_add_subtree (ti, ett_fcels_scr);
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (scr_tree, hf_fcels_opcode, tvb, offset-7, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
if (isreq)
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (scr_tree, hf_fcels_scrregn, tvb, offset, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_fcels_rnft (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
|
|
|
|
guint8 isreq, proto_item *ti)
|
|
|
|
{
|
|
|
|
int offset = 0;
|
|
|
|
guint16 numrec, i;
|
|
|
|
proto_tree *rnft_tree, *fc4_tree;
|
|
|
|
proto_item *subti;
|
|
|
|
|
|
|
|
if (tree) {
|
|
|
|
rnft_tree = proto_item_add_subtree (ti, ett_fcels_rnft);
|
|
|
|
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (rnft_tree, hf_fcels_opcode, tvb, offset, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
|
|
|
|
if (isreq) {
|
|
|
|
proto_tree_add_text (rnft_tree, tvb, offset+2, 2,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"Max Size: %u", tvb_get_ntohs (tvb, offset+2));
|
2002-12-08 02:32:36 +00:00
|
|
|
proto_tree_add_text (rnft_tree, tvb, offset+7, 1,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"Index: %u", tvb_get_guint8 (tvb, offset+7));
|
2002-12-08 02:32:36 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
proto_tree_add_text (rnft_tree, tvb, offset+2, 2,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"Payload Len: %u",
|
2002-12-08 02:32:36 +00:00
|
|
|
tvb_get_ntohs (tvb, offset+2));
|
|
|
|
numrec = tvb_get_guint8 (tvb, offset+5);
|
|
|
|
proto_tree_add_text (rnft_tree, tvb, offset+5, 1,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"List Length: %u", numrec);
|
2002-12-08 02:32:36 +00:00
|
|
|
proto_tree_add_text (rnft_tree, tvb, offset+7, 1,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"Index of First Rec in List: %u",
|
2002-12-08 02:32:36 +00:00
|
|
|
tvb_get_guint8 (tvb, offset+7));
|
|
|
|
offset = 8;
|
|
|
|
for (i = 0; i < numrec; i++) {
|
|
|
|
subti = proto_tree_add_text (rnft_tree, tvb, offset, 4,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"FC-4 Entry #%u", i);
|
2002-12-08 02:32:36 +00:00
|
|
|
fc4_tree = proto_item_add_subtree (subti, ett_fcels_rnft_fc4);
|
|
|
|
|
|
|
|
proto_tree_add_item (fc4_tree, hf_fcels_rnft_fc4type, tvb,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
offset, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
proto_tree_add_text (fc4_tree, tvb, offset+1, 3,
|
|
|
|
"FC-4 Qualifier 0x%x",
|
|
|
|
tvb_get_ntoh24 (tvb, offset+1));
|
|
|
|
offset += 4;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_fcels_lsts (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
|
|
|
|
guint8 isreq, proto_item *ti)
|
|
|
|
{
|
|
|
|
/* Set up structures needed to add the protocol subtree and manage it */
|
|
|
|
int offset = 5;
|
|
|
|
proto_tree *lsts_tree;
|
|
|
|
|
|
|
|
if (tree) {
|
|
|
|
lsts_tree = proto_item_add_subtree (ti, ett_fcels_lsts);
|
|
|
|
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (lsts_tree, hf_fcels_opcode, tvb, offset-5, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
if (isreq) {
|
|
|
|
/* In case of LSTS, the reply has the meat */
|
|
|
|
return;
|
|
|
|
}
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (lsts_tree, hf_fcels_failedrcvr, tvb, offset, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
proto_tree_add_item (lsts_tree, hf_fcels_flacompliance, tvb, offset+1,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
1, FALSE);
|
|
|
|
proto_tree_add_item (lsts_tree, hf_fcels_loopstate, tvb, offset+2, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
proto_tree_add_item (lsts_tree, hf_fcels_publicloop_bmap, tvb, offset+3,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
16, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
proto_tree_add_item (lsts_tree, hf_fcels_pvtloop_bmap, tvb, offset+19,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
16, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
proto_tree_add_item (lsts_tree, hf_fcels_alpa_map, tvb, offset+35,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
128, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_fcels_prlilo_payload (tvbuff_t *tvb, packet_info *pinfo _U_,
|
|
|
|
guint8 isreq, proto_item *ti, guint8 opcode)
|
|
|
|
{
|
|
|
|
int offset = 0,
|
|
|
|
stroff = 0;
|
|
|
|
guint8 type;
|
|
|
|
proto_tree *prli_tree, *svcpg_tree;
|
|
|
|
int num_svcpg, payload_len, i, flag;
|
|
|
|
proto_item *subti;
|
|
|
|
gchar flagstr[100];
|
|
|
|
|
|
|
|
/* We're assuming that we're invoked only if tree is not NULL i.e.
|
|
|
|
* we don't do the usual "if (tree)" check here, the caller must.
|
|
|
|
*/
|
|
|
|
prli_tree = proto_item_add_subtree (ti, ett_fcels_prli);
|
|
|
|
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (prli_tree, hf_fcels_opcode, tvb, offset, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
|
|
|
|
proto_tree_add_text (prli_tree, tvb, offset+1, 1,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"Page Length: %u",
|
2002-12-08 02:32:36 +00:00
|
|
|
tvb_get_guint8 (tvb, offset+1));
|
|
|
|
payload_len = tvb_get_ntohs (tvb, offset+2);
|
|
|
|
proto_tree_add_text (prli_tree, tvb, offset+2, 2,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"Payload Length: %u", payload_len);
|
2002-12-08 02:32:36 +00:00
|
|
|
num_svcpg = payload_len/16;
|
|
|
|
|
|
|
|
offset = 4;
|
|
|
|
for (i = 0; i < num_svcpg; i++) {
|
|
|
|
subti = proto_tree_add_text (prli_tree, tvb, offset, 16,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"Service Parameter Page %u", i);
|
2002-12-08 02:32:36 +00:00
|
|
|
svcpg_tree = proto_item_add_subtree (subti, ett_fcels_prli_svcpg);
|
|
|
|
|
|
|
|
type = tvb_get_guint8 (tvb, offset);
|
|
|
|
proto_tree_add_text (svcpg_tree, tvb, offset, 1,
|
|
|
|
"TYPE: %s",
|
|
|
|
val_to_str (type,
|
|
|
|
fc_prli_fc4_val, "0x%x"));
|
|
|
|
proto_tree_add_text (svcpg_tree, tvb, offset+1, 1,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"TYPE Code Extension: %u",
|
2002-12-08 02:32:36 +00:00
|
|
|
tvb_get_guint8 (tvb, offset+1));
|
|
|
|
|
|
|
|
flag = tvb_get_guint8 (tvb, offset+2);
|
|
|
|
flagstr[0] = '\0';
|
|
|
|
stroff = 0;
|
|
|
|
if (opcode != FC_ELS_TPRLO) {
|
|
|
|
if (flag & 0x80) {
|
|
|
|
strcpy (flagstr, "Orig PA Valid, ");
|
|
|
|
stroff += 15;
|
|
|
|
}
|
|
|
|
if (flag & 0x40) {
|
|
|
|
strcpy (&flagstr[stroff], "Resp PA Valid, ");
|
|
|
|
stroff += 15;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (opcode == FC_ELS_PRLI) {
|
|
|
|
if (!isreq) {
|
|
|
|
if (flag & 0x20) {
|
|
|
|
strcpy (&flagstr[stroff], "Image Pair Estd., ");
|
|
|
|
stroff += 18;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
strcpy (&flagstr[stroff], "Image Pair Not Estd., ");
|
|
|
|
stroff += 22;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (flag & 0x20) {
|
|
|
|
strcpy (&flagstr[stroff], "Est Image Pair & Exchg Svc Param, ");
|
|
|
|
stroff += 34;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
strcpy (&flagstr[stroff], "Exchange Svc Param Only, ");
|
|
|
|
stroff += 25;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else { /* Assuming opcode is TPRLO */
|
|
|
|
if (flag & 0x80) {
|
|
|
|
strcpy (flagstr, "3rd Party Orig PA Valid, ");
|
|
|
|
stroff += 25;
|
|
|
|
}
|
|
|
|
if (flag & 0x40) {
|
|
|
|
strcpy (&flagstr[stroff], "Resp PA Valid, ");
|
|
|
|
stroff += 15;
|
|
|
|
}
|
|
|
|
if (flag & 0x20) {
|
|
|
|
strcpy (&flagstr[stroff], "3rd Party N_Port Valid, ");
|
|
|
|
stroff += 24;
|
|
|
|
}
|
|
|
|
if (flag & 0x10) {
|
|
|
|
strcpy (&flagstr[stroff], "Global PRLO, ");
|
|
|
|
stroff += 13;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
proto_tree_add_text (svcpg_tree, tvb, offset+2, 1,
|
|
|
|
"Flags: %s", flagstr);
|
|
|
|
if (!isreq && (opcode != FC_ELS_TPRLO)) {
|
|
|
|
/* This is valid only for ACC */
|
|
|
|
proto_tree_add_text (svcpg_tree, tvb, offset+2, 1,
|
|
|
|
"Response Code: 0x%x",
|
|
|
|
(tvb_get_guint8 (tvb, offset+2) & 0x0F));
|
|
|
|
}
|
|
|
|
if (opcode != FC_ELS_TPRLO) {
|
|
|
|
proto_tree_add_text (svcpg_tree, tvb, offset+4, 4,
|
|
|
|
"Originator PA: 0x%x",
|
|
|
|
tvb_get_ntohl (tvb, offset+4));
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
proto_tree_add_text (svcpg_tree, tvb, offset+4, 4,
|
|
|
|
"3rd Party Originator PA: 0x%x",
|
|
|
|
tvb_get_ntohl (tvb, offset+4));
|
|
|
|
}
|
|
|
|
proto_tree_add_text (svcpg_tree, tvb, offset+8, 4,
|
|
|
|
"Responder PA: 0x%x",
|
|
|
|
tvb_get_ntohl (tvb, offset+8));
|
|
|
|
|
|
|
|
if (type == FC_TYPE_SCSI) {
|
|
|
|
flag = tvb_get_ntohs (tvb, offset+14);
|
|
|
|
flagstr[0] = '\0';
|
|
|
|
stroff = 0;
|
|
|
|
|
|
|
|
if (flag & 0x2000) {
|
|
|
|
if (isreq) {
|
|
|
|
strcpy (flagstr, "Task Retry Ident Req, ");
|
|
|
|
stroff += 22;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
strcpy (flagstr, "Task Retry Ident Acc, ");
|
|
|
|
stroff += 22;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (flag & 0x1000) {
|
|
|
|
strcpy (&flagstr[stroff], "Retry Possible, ");
|
|
|
|
stroff += 16;
|
|
|
|
}
|
|
|
|
if (flag & 0x0080) {
|
|
|
|
strcpy (&flagstr[stroff], "Confirmed Comp, ");
|
|
|
|
stroff += 16;
|
|
|
|
}
|
|
|
|
if (flag & 0x0040) {
|
|
|
|
strcpy (&flagstr[stroff], "Data Overlay, ");
|
|
|
|
stroff += 14;
|
|
|
|
}
|
|
|
|
if (flag & 0x0020) {
|
|
|
|
strcpy (&flagstr[stroff], "Initiator, ");
|
|
|
|
stroff += 11;
|
|
|
|
}
|
|
|
|
if (flag & 0x0010) {
|
|
|
|
strcpy (&flagstr[stroff], "Target, ");
|
|
|
|
stroff += 8;
|
|
|
|
}
|
|
|
|
if (flag & 0x0002) {
|
|
|
|
strcpy (&flagstr[stroff], "Rd Xfer_Rdy Dis, ");
|
|
|
|
stroff += 17;
|
|
|
|
}
|
|
|
|
if (flag & 0x0001) {
|
|
|
|
strcpy (&flagstr[stroff], "Wr Xfer_Rdy Dis");
|
|
|
|
stroff += 15;
|
|
|
|
}
|
|
|
|
proto_tree_add_text (svcpg_tree, tvb, offset+12, 4,
|
|
|
|
"FCP Flags: 0x%x (%s)", flag,
|
|
|
|
flagstr);
|
|
|
|
}
|
|
|
|
else if ((opcode == FC_ELS_PRLI) && !isreq) {
|
|
|
|
proto_tree_add_text (svcpg_tree, tvb, offset+12, 4,
|
|
|
|
"Service Parameter Response: 0x%x",
|
|
|
|
tvb_get_ntohl (tvb, offset+12));
|
|
|
|
}
|
|
|
|
else if (opcode == FC_ELS_TPRLO) {
|
|
|
|
proto_tree_add_text (svcpg_tree, tvb, offset+13, 3,
|
|
|
|
"3rd Party N_Port Id: %s",
|
|
|
|
fc_to_str (tvb_get_ptr (tvb, offset+13, 3)));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_fcels_prli (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
|
|
|
guint8 isreq, proto_item *ti)
|
|
|
|
{
|
|
|
|
if (tree) {
|
|
|
|
dissect_fcels_prlilo_payload (tvb, pinfo, isreq, ti, FC_ELS_PRLI);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_fcels_prlo (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
|
|
|
guint8 isreq, proto_item *ti)
|
|
|
|
{
|
|
|
|
/* Set up structures needed to add the protocol subtree and manage it */
|
|
|
|
if (tree) {
|
|
|
|
dissect_fcels_prlilo_payload (tvb, pinfo, isreq, ti, FC_ELS_PRLO);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_fcels_tprlo (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
|
|
|
guint8 isreq, proto_item *ti)
|
|
|
|
{
|
|
|
|
/* Set up structures needed to add the protocol subtree and manage it */
|
|
|
|
|
|
|
|
if (tree) {
|
|
|
|
dissect_fcels_prlilo_payload (tvb, pinfo, isreq, ti, FC_ELS_TPRLO);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_fcels_lirr (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
|
|
|
|
guint8 isreq _U_, proto_item *ti)
|
|
|
|
{
|
|
|
|
/* Set up structures needed to add the protocol subtree and manage it */
|
|
|
|
int offset = 4;
|
|
|
|
proto_tree *lirr_tree;
|
|
|
|
guint8 lirr_fmt;
|
|
|
|
|
|
|
|
if (tree) {
|
|
|
|
lirr_tree = proto_item_add_subtree (ti, ett_fcels_lirr);
|
|
|
|
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (lirr_tree, hf_fcels_opcode, tvb, offset-4, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
|
|
|
|
proto_tree_add_text (lirr_tree, tvb, offset, 1,
|
|
|
|
"Regn. Function: %s",
|
|
|
|
val_to_str (tvb_get_guint8 (tvb, offset),
|
|
|
|
fc_els_lirr_regfunc_val,
|
|
|
|
"Reserved (0x%x)"));
|
|
|
|
lirr_fmt = tvb_get_guint8 (tvb, offset+1);
|
|
|
|
if (!lirr_fmt) {
|
|
|
|
/* This scheme is resorted to because the value 0 has a string in
|
|
|
|
* the value_string that is not what we want displayed here.
|
|
|
|
*/
|
|
|
|
proto_tree_add_text (lirr_tree, tvb, offset, 1,
|
|
|
|
"Regn. Format: Common Format");
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
proto_tree_add_text (lirr_tree, tvb, offset, 1,
|
|
|
|
"Regn. Format: %s",
|
|
|
|
val_to_str (lirr_fmt, fc_fc4_val, "0x%x"));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_fcels_srl (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
|
|
|
|
guint8 isreq, proto_item *ti)
|
|
|
|
{
|
|
|
|
/* Set up structures needed to add the protocol subtree and manage it */
|
|
|
|
int offset = 4,
|
|
|
|
flag = 0;
|
|
|
|
proto_tree *srl_tree;
|
|
|
|
|
|
|
|
if (tree) {
|
|
|
|
srl_tree = proto_item_add_subtree (ti, ett_fcels_srl);
|
|
|
|
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (srl_tree, hf_fcels_opcode, tvb, offset-4, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
if (!isreq)
|
|
|
|
return;
|
|
|
|
|
|
|
|
flag = tvb_get_guint8 (tvb, offset);
|
|
|
|
if (flag & 0x1) {
|
|
|
|
proto_tree_add_text (srl_tree, tvb, offset, 1,
|
|
|
|
"Flag: Scan only specified FL Port");
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
proto_tree_add_text (srl_tree, tvb, offset, 1,
|
|
|
|
"Flag: Scan all loops in domain");
|
|
|
|
}
|
|
|
|
proto_tree_add_text (srl_tree, tvb, offset+1, 3,
|
|
|
|
"FL_Port Addr: %s",
|
|
|
|
fc_to_str (tvb_get_ptr (tvb, offset+1, 3)));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_fcels_rpsc (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
|
|
|
|
guint8 isreq, proto_item *ti)
|
|
|
|
{
|
|
|
|
/* Set up structures needed to add the protocol subtree and manage it */
|
|
|
|
int offset = 2;
|
|
|
|
int num_entries, i, cap;
|
|
|
|
gchar speed_str[40];
|
|
|
|
int stroff = 0;
|
|
|
|
proto_tree *rpsc_tree;
|
|
|
|
|
|
|
|
if (tree) {
|
|
|
|
rpsc_tree = proto_item_add_subtree (ti, ett_fcels_rpsc);
|
|
|
|
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (rpsc_tree, hf_fcels_opcode, tvb, offset-2, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
if (isreq)
|
|
|
|
return;
|
|
|
|
|
|
|
|
num_entries = tvb_get_ntohs (tvb, offset);
|
|
|
|
proto_tree_add_text (rpsc_tree, tvb, offset, 2,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"Number of Entries: %u", num_entries);
|
2002-12-08 02:32:36 +00:00
|
|
|
offset = 4;
|
|
|
|
for (i = 0; i < num_entries; i++) {
|
|
|
|
cap = tvb_get_ntohs (tvb, offset);
|
|
|
|
speed_str[0] = '\0';
|
|
|
|
stroff = 0;
|
|
|
|
if (cap & 0x8000) {
|
|
|
|
strcpy (speed_str, "1,");
|
|
|
|
stroff += 2;
|
|
|
|
}
|
|
|
|
if (cap & 0x4000) {
|
|
|
|
strcpy (speed_str, "2,");
|
|
|
|
stroff += 2;
|
|
|
|
}
|
|
|
|
if (cap & 0x2000) {
|
|
|
|
strcpy (speed_str, "4,");
|
|
|
|
stroff += 2;
|
|
|
|
}
|
|
|
|
if (cap & 0x1000) {
|
|
|
|
strcpy (speed_str, "10");
|
|
|
|
stroff += 2;
|
|
|
|
}
|
|
|
|
strcpy (&speed_str[stroff], "Gb");
|
|
|
|
proto_tree_add_text (rpsc_tree, tvb, offset, 2,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"Port Speed Capabilities (Port %u): %s", i,
|
2002-12-08 02:32:36 +00:00
|
|
|
speed_str);
|
|
|
|
cap = tvb_get_ntohs (tvb, offset+2);
|
|
|
|
proto_tree_add_text (rpsc_tree, tvb, offset+2, 2,
|
|
|
|
"Port Oper Speed: %s",
|
|
|
|
val_to_str (cap, fc_els_portspeed_val,
|
|
|
|
"0x%x"));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_fcels_rnid (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
|
|
|
|
guint8 isreq, proto_item *ti)
|
|
|
|
{
|
|
|
|
/* Set up structures needed to add the protocol subtree and manage it */
|
|
|
|
int offset = 0;
|
|
|
|
int clen, slen;
|
|
|
|
proto_tree *rnid_tree;
|
|
|
|
|
|
|
|
if (tree) {
|
|
|
|
rnid_tree = proto_item_add_subtree (ti, ett_fcels_rnid);
|
|
|
|
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (rnid_tree, hf_fcels_opcode, tvb, offset, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
if (isreq) {
|
|
|
|
proto_tree_add_item (rnid_tree, hf_fcels_nodeidfmt, tvb, offset+4,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* We only decode responses to nodeid fmt DF */
|
|
|
|
proto_tree_add_item (rnid_tree, hf_fcels_nodeidfmt, tvb, offset+4,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
clen = tvb_get_guint8 (tvb, offset+5);
|
|
|
|
proto_tree_add_text (rnid_tree, tvb, offset+5, 1,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
"Common Identification Data Length: %u", clen);
|
2002-12-08 02:32:36 +00:00
|
|
|
slen = tvb_get_guint8 (tvb, offset+7);
|
|
|
|
proto_tree_add_item (rnid_tree, hf_fcels_spidlen, tvb, offset+7,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
if (clen) {
|
|
|
|
proto_tree_add_string (rnid_tree, hf_fcels_npname, tvb,
|
|
|
|
offset+8, 8,
|
|
|
|
fcwwn_to_str (tvb_get_ptr (tvb, offset+8,
|
|
|
|
8)));
|
|
|
|
proto_tree_add_string (rnid_tree, hf_fcels_fnname, tvb,
|
|
|
|
offset+16, 8,
|
|
|
|
fcwwn_to_str (tvb_get_ptr (tvb,
|
|
|
|
offset+16,
|
|
|
|
8)));
|
|
|
|
}
|
|
|
|
if (tvb_get_guint8 (tvb, offset+4) == 0xDF) {
|
|
|
|
/* Decode the Specific Node ID Format as this is known */
|
|
|
|
proto_tree_add_item (rnid_tree, hf_fcels_vendoruniq, tvb,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
offset+24, 16, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
proto_tree_add_item (rnid_tree, hf_fcels_asstype, tvb,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
offset+40, 4, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
proto_tree_add_item (rnid_tree, hf_fcels_physport, tvb,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
offset+44, 4, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
proto_tree_add_item (rnid_tree, hf_fcels_attnodes, tvb,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
offset+48, 4, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
proto_tree_add_item (rnid_tree, hf_fcels_nodemgmt, tvb,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
offset+52, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
proto_tree_add_item (rnid_tree, hf_fcels_ipvers, tvb,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
offset+53, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
proto_tree_add_item (rnid_tree, hf_fcels_tcpport, tvb,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
offset+54, 2, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
proto_tree_add_item (rnid_tree, hf_fcels_ip, tvb, offset+56,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
16, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
proto_tree_add_item (rnid_tree, hf_fcels_vendorsp, tvb,
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
offset+74, 2, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_fcels_rlir (tvbuff_t *tvb _U_, packet_info *pinfo _U_,
|
|
|
|
proto_tree *tree, guint8 isreq _U_,
|
|
|
|
proto_item *ti _U_)
|
|
|
|
{
|
|
|
|
/* Set up structures needed to add the protocol subtree and manage it */
|
|
|
|
|
|
|
|
if (tree) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_fcels_lsrjt (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
|
|
|
|
guint8 isreq _U_, proto_item *ti)
|
|
|
|
{
|
|
|
|
/* Set up structures needed to add the protocol subtree and manage it */
|
|
|
|
int offset = 5;
|
|
|
|
proto_tree *lsrjt_tree;
|
|
|
|
|
|
|
|
if (tree) {
|
|
|
|
lsrjt_tree = proto_item_add_subtree (ti, ett_fcels_lsrjt);
|
|
|
|
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (lsrjt_tree, hf_fcels_opcode, tvb, offset-5, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
|
Move the handling of the Network_Header for full FC frames into the FC
dissector, and have the LLC dissector register itself as the dissector
for IP-over-FC frames, as the payload is just an LLC 802.2 header plus
payload for the protocol specified by that header.
In the dissector for IP-over-FC as a Wiretap link-layer type, have its
top-level item be a protocol item rather than a text item, and don't
register it as the dissector for IP-over-FC frames from the FC dissector
- it assumes what it's handed includes the Network_Header, but for full
FC frames, the FC dissector has already consumed the Network_Header.
Move the definitions of the value_string tables out of the header file;
most of them are used only in one file, so define them in that file, and
for "fc_fc4_val", define it in "packet-fc.c", make it not static, and
declare it in "packet-fc.h".
Use FALSE, rather than 0, as the last argument to
"proto_tree_add_item()" calls that add a big-endian value.
Fix one "proto_tree_add_uint()" call that was supposed to be a
"proto_tree_add_item()" call.
Use "%u", not "%d", to display unsigned values.
svn path=/trunk/; revision=6773
2002-12-10 02:49:31 +00:00
|
|
|
proto_tree_add_item (lsrjt_tree, hf_fcels_rjtcode, tvb, offset++, 1, FALSE);
|
|
|
|
proto_tree_add_item (lsrjt_tree, hf_fcels_rjtdetcode, tvb, offset++, 1, FALSE);
|
|
|
|
proto_tree_add_item (lsrjt_tree, hf_fcels_vnduniq, tvb, offset, 1, FALSE);
|
2002-12-08 02:32:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_fcels (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|
|
|
{
|
|
|
|
|
|
|
|
/* Set up structures needed to add the protocol subtree and manage it */
|
|
|
|
proto_item *ti = NULL;
|
|
|
|
proto_tree *acc_tree;
|
|
|
|
guint8 isreq = FC_ELS_REQ;
|
|
|
|
int offset = 0;
|
|
|
|
guint8 opcode,
|
|
|
|
failed_opcode = 0;
|
|
|
|
conversation_t *conversation;
|
|
|
|
fcels_conv_data_t *cdata;
|
|
|
|
fcels_conv_key_t ckey, *req_key;
|
|
|
|
guint options;
|
|
|
|
address dstaddr;
|
|
|
|
guint8 addrdata[3];
|
|
|
|
|
|
|
|
/* Make entries in Protocol column and Info column on summary display */
|
|
|
|
if (check_col(pinfo->cinfo, COL_PROTOCOL))
|
|
|
|
col_set_str(pinfo->cinfo, COL_PROTOCOL, "FC ELS");
|
|
|
|
|
|
|
|
/* decoding of this is done by each individual opcode handler */
|
|
|
|
opcode = tvb_get_guint8 (tvb, 0);
|
|
|
|
|
|
|
|
if (tree) {
|
|
|
|
ti = proto_tree_add_protocol_format (tree, proto_fcels, tvb, 0,
|
|
|
|
tvb_length (tvb), "FC ELS");
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Register conversation in case this is not a response */
|
|
|
|
if ((opcode != FC_ELS_LSRJT) && (opcode != FC_ELS_ACC)) {
|
|
|
|
if (opcode == FC_ELS_FLOGI) {
|
|
|
|
if (pinfo->src.data[2]) {
|
|
|
|
/* If it is a loop port, we'll need to remember the ALPA */
|
|
|
|
options = NO_PORT2;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
options = NO_PORT2 | NO_ADDR2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
options = NO_PORT2;
|
|
|
|
}
|
|
|
|
conversation = find_conversation (&pinfo->dst, &pinfo->src,
|
|
|
|
pinfo->ptype, pinfo->oxid,
|
|
|
|
pinfo->rxid, options);
|
|
|
|
|
|
|
|
if (!conversation) {
|
|
|
|
conversation = conversation_new (&pinfo->dst, &pinfo->src,
|
|
|
|
pinfo->ptype, pinfo->oxid,
|
|
|
|
pinfo->rxid, options);
|
|
|
|
}
|
|
|
|
|
|
|
|
ckey.conv_idx = conversation->index;
|
|
|
|
|
|
|
|
cdata = (fcels_conv_data_t *)g_hash_table_lookup (fcels_req_hash,
|
|
|
|
&ckey);
|
|
|
|
if (cdata) {
|
|
|
|
/* Since we never free the memory used by an exchange, this maybe a
|
|
|
|
* case of another request using the same exchange as a previous
|
|
|
|
* req.
|
|
|
|
*/
|
|
|
|
cdata->opcode = opcode;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
req_key = g_mem_chunk_alloc (fcels_req_keys);
|
|
|
|
req_key->conv_idx = conversation->index;
|
|
|
|
|
|
|
|
cdata = g_mem_chunk_alloc (fcels_req_vals);
|
|
|
|
cdata->opcode = opcode;
|
|
|
|
|
|
|
|
g_hash_table_insert (fcels_req_hash, req_key, cdata);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
isreq = FC_ELS_RPLY;
|
|
|
|
|
|
|
|
options = NO_PORT2;
|
|
|
|
conversation = find_conversation (&pinfo->dst, &pinfo->src,
|
|
|
|
pinfo->ptype, pinfo->oxid,
|
|
|
|
pinfo->rxid, options);
|
|
|
|
if (!conversation) {
|
|
|
|
/* FLOGI has two ways to save state: without the src and using just
|
|
|
|
* the port (ALPA) part of the address. Try both.
|
|
|
|
*/
|
|
|
|
addrdata[0] = addrdata[1] = 0;
|
|
|
|
addrdata[2] = pinfo->dst.data[2];
|
|
|
|
SET_ADDRESS (&dstaddr, AT_FC, 3, addrdata);
|
|
|
|
conversation = find_conversation (&dstaddr, &pinfo->src,
|
|
|
|
pinfo->ptype, pinfo->oxid,
|
|
|
|
pinfo->rxid, options);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!conversation) {
|
|
|
|
/* Finally check for FLOGI with both NO_PORT2 and NO_ADDR2 set */
|
|
|
|
options = NO_ADDR2 | NO_PORT2;
|
|
|
|
conversation = find_conversation (&pinfo->src, &pinfo->dst,
|
|
|
|
pinfo->ptype, pinfo->oxid,
|
|
|
|
pinfo->rxid, options);
|
|
|
|
if (!conversation) {
|
|
|
|
if (tree && (opcode == FC_ELS_ACC)) {
|
|
|
|
/* No record of what this accept is for. Can't decode */
|
|
|
|
acc_tree = proto_item_add_subtree (ti, ett_fcels_acc);
|
|
|
|
proto_tree_add_text (acc_tree, tvb, offset, tvb_length (tvb),
|
|
|
|
"No record of Exchange. Unable to decode ACC");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
failed_opcode = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (conversation) {
|
|
|
|
ckey.conv_idx = conversation->index;
|
|
|
|
|
|
|
|
cdata = (fcels_conv_data_t *)g_hash_table_lookup (fcels_req_hash, &ckey);
|
|
|
|
|
|
|
|
if (cdata != NULL) {
|
|
|
|
if ((options & NO_ADDR2) && (cdata->opcode != FC_ELS_FLOGI)) {
|
|
|
|
/* only FLOGI can have this special check */
|
|
|
|
if (tree && (opcode == FC_ELS_ACC)) {
|
|
|
|
/* No record of what this accept is for. Can't decode */
|
|
|
|
acc_tree = proto_item_add_subtree (ti,
|
|
|
|
ett_fcels_acc);
|
|
|
|
proto_tree_add_text (acc_tree, tvb, offset,
|
|
|
|
tvb_length (tvb),
|
|
|
|
"No record of Exchg. Unable to decode ACC");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (opcode == FC_ELS_ACC)
|
|
|
|
opcode = cdata->opcode;
|
|
|
|
else
|
|
|
|
failed_opcode = cdata->opcode;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tree) {
|
|
|
|
if ((cdata == NULL) && (opcode != FC_ELS_LSRJT)) {
|
|
|
|
/* No record of what this accept is for. Can't decode */
|
|
|
|
acc_tree = proto_item_add_subtree (ti, ett_fcels_acc);
|
|
|
|
proto_tree_add_text (acc_tree, tvb, offset, tvb_length (tvb),
|
|
|
|
"No record of ELS Req. Unable to decode ACC");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (check_col (pinfo->cinfo, COL_INFO)) {
|
|
|
|
if (isreq == FC_ELS_REQ) {
|
|
|
|
col_add_str (pinfo->cinfo, COL_INFO,
|
|
|
|
val_to_str (opcode, fc_els_proto_val, "0x%x"));
|
|
|
|
}
|
|
|
|
else if (opcode == FC_ELS_LSRJT) {
|
|
|
|
col_add_fstr (pinfo->cinfo, COL_INFO, "LS_RJT (%s)",
|
|
|
|
val_to_str (failed_opcode, fc_els_proto_val, "0x%x"));
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
col_add_fstr (pinfo->cinfo, COL_INFO, "ACC (%s)",
|
|
|
|
val_to_str (opcode, fc_els_proto_val, "0x%x"));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (opcode) {
|
|
|
|
case FC_ELS_LSRJT:
|
|
|
|
dissect_fcels_lsrjt (tvb, pinfo, tree, isreq, ti);
|
|
|
|
break;
|
|
|
|
case FC_ELS_PLOGI:
|
|
|
|
dissect_fcels_plogi (tvb, pinfo, tree, isreq, ti);
|
|
|
|
break;
|
|
|
|
case FC_ELS_FLOGI:
|
|
|
|
dissect_fcels_flogi (tvb, pinfo, tree, isreq, ti);
|
|
|
|
break;
|
|
|
|
case FC_ELS_LOGOUT:
|
|
|
|
dissect_fcels_logout (tvb, pinfo, tree, isreq, ti);
|
|
|
|
break;
|
|
|
|
case FC_ELS_ABTX:
|
|
|
|
dissect_fcels_abtx (tvb, pinfo, tree, isreq, ti);
|
|
|
|
break;
|
|
|
|
case FC_ELS_RSI:
|
|
|
|
dissect_fcels_rsi (tvb, pinfo, tree, isreq, ti);
|
|
|
|
break;
|
|
|
|
case FC_ELS_RRQ:
|
|
|
|
dissect_fcels_rrq (tvb, pinfo, tree, isreq, ti);
|
|
|
|
break;
|
|
|
|
case FC_ELS_PRLI:
|
|
|
|
dissect_fcels_prli (tvb, pinfo, tree, isreq, ti);
|
|
|
|
break;
|
|
|
|
case FC_ELS_PRLO:
|
|
|
|
dissect_fcels_prlo (tvb, pinfo, tree, isreq, ti);
|
|
|
|
break;
|
|
|
|
case FC_ELS_TPRLO:
|
|
|
|
dissect_fcels_tprlo (tvb, pinfo, tree, isreq, ti);
|
|
|
|
break;
|
|
|
|
case FC_ELS_PDISC:
|
|
|
|
dissect_fcels_pdisc (tvb, pinfo, tree, isreq, ti);
|
|
|
|
break;
|
|
|
|
case FC_ELS_FDISC:
|
|
|
|
dissect_fcels_fdisc (tvb, pinfo, tree, isreq, ti);
|
|
|
|
break;
|
|
|
|
case FC_ELS_ADISC:
|
|
|
|
dissect_fcels_adisc (tvb, pinfo, tree, isreq, ti);
|
|
|
|
break;
|
|
|
|
case FC_ELS_FARP_REQ:
|
|
|
|
dissect_fcels_farp_req (tvb, pinfo, tree, isreq, ti);
|
|
|
|
break;
|
|
|
|
case FC_ELS_FARP_RPLY:
|
|
|
|
dissect_fcels_farp_rply (tvb, pinfo, tree, isreq, ti);
|
|
|
|
break;
|
|
|
|
case FC_ELS_RPS:
|
|
|
|
dissect_fcels_rps (tvb, pinfo, tree, isreq, ti);
|
|
|
|
break;
|
|
|
|
case FC_ELS_RPL:
|
|
|
|
dissect_fcels_rpl (tvb, pinfo, tree, isreq, ti);
|
|
|
|
break;
|
|
|
|
case FC_ELS_FAN:
|
|
|
|
dissect_fcels_fan (tvb, pinfo, tree, isreq, ti);
|
|
|
|
break;
|
|
|
|
case FC_ELS_RSCN:
|
|
|
|
dissect_fcels_rscn (tvb, pinfo, tree, isreq, ti);
|
|
|
|
break;
|
|
|
|
case FC_ELS_SCR:
|
|
|
|
dissect_fcels_scr (tvb, pinfo, tree, isreq, ti);
|
|
|
|
break;
|
|
|
|
case FC_ELS_RNFT:
|
|
|
|
dissect_fcels_rnft (tvb, pinfo, tree, isreq, ti);
|
|
|
|
break;
|
|
|
|
case FC_ELS_LSTS:
|
|
|
|
dissect_fcels_lsts (tvb, pinfo, tree, isreq, ti);
|
|
|
|
break;
|
|
|
|
case FC_ELS_RNID:
|
|
|
|
dissect_fcels_rnid (tvb, pinfo, tree, isreq, ti);
|
|
|
|
break;
|
|
|
|
case FC_ELS_RLIR:
|
|
|
|
dissect_fcels_rlir (tvb, pinfo, tree, isreq, ti);
|
|
|
|
break;
|
|
|
|
case FC_ELS_LIRR:
|
|
|
|
dissect_fcels_lirr (tvb, pinfo, tree, isreq, ti);
|
|
|
|
break;
|
|
|
|
case FC_ELS_SRL:
|
|
|
|
dissect_fcels_srl (tvb, pinfo, tree, isreq, ti);
|
|
|
|
break;
|
|
|
|
case FC_ELS_RPSC:
|
|
|
|
dissect_fcels_rpsc (tvb, pinfo, tree, isreq, ti);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* proto_tree_add_text ( */
|
|
|
|
call_dissector (data_handle, tvb, pinfo, tree);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
proto_register_fcels (void)
|
|
|
|
{
|
|
|
|
|
|
|
|
/* Setup list of header fields See Section 1.6.1 for details*/
|
|
|
|
static hf_register_info hf[] = {
|
|
|
|
{ &hf_fcels_opcode,
|
|
|
|
{"Cmd Code", "fcels.opcode", FT_UINT8, BASE_HEX,
|
|
|
|
VALS (fc_els_proto_val), 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_rjtcode,
|
|
|
|
{"Reason Code", "fcels.rjt.reason", FT_UINT8, BASE_HEX,
|
|
|
|
VALS (fc_els_rjt_val), 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_rjtdetcode,
|
|
|
|
{"Reason Explanation", "fcels.rjt.detail", FT_UINT8, BASE_HEX,
|
|
|
|
VALS (fc_els_rjt_det_val), 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_vnduniq,
|
|
|
|
{"Vendor Unique", "fcels.rjt.vnduniq", FT_UINT8, BASE_HEX, NULL,
|
|
|
|
0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_b2b,
|
|
|
|
{"B2B Credit", "fcels.logi.b2b", FT_UINT8, BASE_DEC, NULL, 0x0, "",
|
|
|
|
HFILL}},
|
|
|
|
{ &hf_fcels_cmnfeatures,
|
|
|
|
{"Common Features", "fcels.logi.cmnfeatures", FT_UINT16, BASE_HEX, NULL,
|
|
|
|
0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_bbscnum,
|
|
|
|
{"BB_SC Number", "fcels.logi.bbscnum", FT_UINT8, BASE_DEC, NULL, 0xF0, "",
|
|
|
|
HFILL}},
|
|
|
|
{ &hf_fcels_rcvsize,
|
|
|
|
{"Receive Size", "fcels.logi.rcvsize", FT_UINT16, BASE_DEC, NULL, 0x0FFF, "",
|
|
|
|
HFILL}},
|
|
|
|
{ &hf_fcels_maxconseq,
|
|
|
|
{"Max Concurrent Seq", "fcels.logi.maxconseq", FT_UINT16, BASE_DEC, NULL,
|
|
|
|
0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_reloffset,
|
|
|
|
{"Relative Offset By Info Cat", "fcels.logi.reloff", FT_UINT16, BASE_DEC,
|
|
|
|
NULL, 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_edtov,
|
|
|
|
{"E_D_TOV", "fcels.edtov", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_npname,
|
|
|
|
{"N_Port Port_Name", "fcels.npname", FT_STRING, BASE_HEX, NULL, 0x0,
|
|
|
|
"", HFILL}},
|
|
|
|
{ &hf_fcels_fnname,
|
|
|
|
{"Fabric/Node Name", "fcels.fnname", FT_STRING, BASE_HEX, NULL, 0x0,
|
|
|
|
"", HFILL}},
|
|
|
|
{ &hf_fcels_cls1param,
|
|
|
|
{"Class 1 Svc Param", "fcels.logi.cls1param", FT_BYTES, BASE_HEX, NULL, 0x0,
|
|
|
|
"", HFILL}},
|
|
|
|
{ &hf_fcels_cls2param,
|
|
|
|
{"Class 2 Svc Param", "fcels.logi.cls2param", FT_BYTES, BASE_HEX, NULL, 0x0,
|
|
|
|
"", HFILL}},
|
|
|
|
{ &hf_fcels_cls3param,
|
|
|
|
{"Class 3 Svc Param", "fcels.logi.cls3param", FT_BYTES, BASE_HEX, NULL, 0x0,
|
|
|
|
"", HFILL}},
|
|
|
|
{ &hf_fcels_cls4param,
|
|
|
|
{"Class 4 Svc Param", "fcels.logi.cls4param", FT_BYTES, BASE_HEX, NULL, 0x0,
|
|
|
|
"", HFILL}},
|
|
|
|
{ &hf_fcels_vendorvers,
|
|
|
|
{"Vendor Version", "fcels.logi.vendvers", FT_BYTES, BASE_HEX, NULL, 0x0, "",
|
|
|
|
HFILL}},
|
|
|
|
{ &hf_fcels_svcavail,
|
|
|
|
{"Services Availability", "fcels.logi.svcavail", FT_BYTES, BASE_HEX, NULL,
|
|
|
|
0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_clsflags,
|
|
|
|
{"Class Flags", "fcels.logi.clsflags", FT_UINT16, BASE_HEX, NULL, 0x0, "",
|
|
|
|
HFILL}},
|
|
|
|
{ &hf_fcels_initctl,
|
|
|
|
{"Initiator Ctl", "fcels.logi.initctl", FT_UINT16, BASE_HEX, NULL, 0x0, "",
|
|
|
|
HFILL}},
|
|
|
|
{ &hf_fcels_rcptctl,
|
|
|
|
{"Recipient Ctl", "fcels.logi.rcptctl", FT_UINT16, BASE_HEX, NULL, 0x0, "",
|
|
|
|
HFILL}},
|
|
|
|
{ &hf_fcels_clsrcvsize,
|
|
|
|
{"Class Recv Size", "fcels.logi.clsrcvsize", FT_UINT16, BASE_DEC, NULL,
|
|
|
|
0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_conseq,
|
|
|
|
{"Total Concurrent Seq", "fcels.logi.totconseq", FT_UINT8, BASE_DEC, NULL,
|
|
|
|
0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_e2e,
|
|
|
|
{"End2End Credit", "fcels.logi.e2e", FT_UINT16, BASE_DEC, NULL, 0x0, "",
|
|
|
|
HFILL}},
|
|
|
|
{ &hf_fcels_openseq,
|
|
|
|
{"Open Seq Per Exchg", "fcels.logi.openseq", FT_UINT8, BASE_DEC, NULL, 0x0,
|
|
|
|
"", HFILL}},
|
|
|
|
{ &hf_fcels_nportid,
|
|
|
|
{"Originator S_ID", "fcels.portid", FT_STRING, BASE_HEX, NULL, 0x0,
|
|
|
|
"", HFILL}},
|
|
|
|
{ &hf_fcels_oxid,
|
|
|
|
{"OXID", "fcels.oxid", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_rxid,
|
|
|
|
{"RXID", "fcels.rxid", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_recovqual,
|
|
|
|
{"Recovery Qualifier", "fcels.rcovqual", FT_UINT8, BASE_HEX, NULL,
|
|
|
|
0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_fabricaddr,
|
|
|
|
{"Fabric Address", "fcels.faddr", FT_STRING, BASE_HEX, NULL, 0x0, "",
|
|
|
|
HFILL}},
|
|
|
|
{ &hf_fcels_fabricpname,
|
|
|
|
{"Fabric Port Name", "fcels.fpname", FT_STRING, BASE_HEX, NULL, 0x0,
|
|
|
|
"", HFILL}},
|
|
|
|
{ &hf_fcels_failedrcvr,
|
|
|
|
{"Failed Receiver AL_PA", "fcels.faildrcvr", FT_UINT8, BASE_HEX, NULL,
|
|
|
|
0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_flacompliance,
|
|
|
|
{"FC-FLA Compliance", "fcels.flacompliance", FT_UINT8, BASE_HEX,
|
|
|
|
VALS (fc_els_flacompliance_val), 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_loopstate,
|
|
|
|
{"Loop State", "fcels.loopstate", FT_UINT8, BASE_HEX,
|
|
|
|
VALS (fc_els_loopstate_val), 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_publicloop_bmap,
|
|
|
|
{"Public Loop Device Bitmap", "fcels.pubdev_bmap", FT_BYTES, BASE_HEX,
|
|
|
|
NULL, 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_pvtloop_bmap,
|
|
|
|
{"Private Loop Device Bitmap", "fcels.pvtdev_bmap", FT_BYTES,
|
|
|
|
BASE_HEX, NULL, 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_alpa_map,
|
|
|
|
{"AL_PA Map", "fcels.alpa", FT_BYTES, BASE_HEX, NULL, 0x0, "",
|
|
|
|
HFILL}},
|
|
|
|
{ &hf_fcels_scrregn,
|
|
|
|
{"Registration Function", "fcels.scr.regn", FT_UINT8, BASE_HEX,
|
|
|
|
VALS (fc_els_scr_reg_val), 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_farp_matchcodept,
|
|
|
|
{"Match Address Code Points", "fcels.matchcp", FT_UINT8, BASE_BIN,
|
|
|
|
NULL, 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_farp_respaction,
|
|
|
|
{"Responder Action", "fcels.respaction", FT_UINT8, BASE_HEX,
|
|
|
|
VALS (fc_els_farp_respaction_val), 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_resportid,
|
|
|
|
{"Responding Port ID", "fcels.resportid", FT_STRING, BASE_HEX,
|
|
|
|
NULL, 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_respname,
|
|
|
|
{"Responding Port Name", "fcels.respname", FT_STRING, BASE_HEX,
|
|
|
|
NULL, 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_respnname,
|
|
|
|
{"Responding Node Name", "fcels.respnname", FT_STRING, BASE_HEX,
|
|
|
|
NULL, 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_reqipaddr,
|
|
|
|
{"Requesting IP Address", "fcels.reqipaddr", FT_IPv6, BASE_DEC,
|
|
|
|
NULL, 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_respipaddr,
|
|
|
|
{"Responding IP Address", "fcels.respipaddr", FT_IPv6, BASE_DEC,
|
|
|
|
NULL, 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_hardaddr,
|
|
|
|
{"Hard Address of Originator", "fcels.hrdaddr", FT_STRING, BASE_HEX,
|
|
|
|
NULL, 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_rps_flag,
|
|
|
|
{"Flag", "fcels.flag", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_rps_portnum,
|
|
|
|
{"Physical Port Number", "fcels.portnum", FT_UINT32, BASE_HEX, NULL,
|
|
|
|
0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_rps_portstatus,
|
|
|
|
{"Port Status", "fcels.portstatus", FT_UINT16, BASE_HEX,
|
|
|
|
VALS(fc_els_portstatus_val), 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_rnft_fc4type,
|
|
|
|
{"FC-4 Type", "fcels.rnft.fc4type", FT_UINT8, BASE_HEX,
|
|
|
|
VALS (fc_fc4_val), 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_rscn_evqual,
|
|
|
|
{"Event Qualifier", "fcels.rscn.evqual", FT_UINT8, BASE_HEX,
|
|
|
|
VALS (fc_els_rscn_evqual_val), 0x3C, "", HFILL}},
|
|
|
|
{ &hf_fcels_rscn_addrfmt,
|
|
|
|
{"Address Format", "fcels.rscn.addrfmt", FT_UINT8, BASE_HEX,
|
|
|
|
VALS (fc_els_rscn_addrfmt_val), 0x03, "", HFILL}},
|
|
|
|
{ &hf_fcels_rscn_domain,
|
|
|
|
{"Affected Domain", "fcels.rscn.domain", FT_UINT8, BASE_HEX,
|
|
|
|
NULL, 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_rscn_area,
|
|
|
|
{"Affected Area", "fcels.rscn.area", FT_UINT8, BASE_HEX,
|
|
|
|
NULL, 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_rscn_port,
|
|
|
|
{"Affected Port", "fcels.rscn.port", FT_UINT8, BASE_HEX,
|
|
|
|
NULL, 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_nodeidfmt,
|
|
|
|
{"Node Identification Format", "fcels.rnid.nodeidfmt", FT_UINT8,
|
|
|
|
BASE_HEX, VALS (fc_els_nodeid_val), 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_spidlen,
|
|
|
|
{"Specific Id Length", "fcels.rnid.spidlen", FT_UINT8, BASE_DEC, NULL,
|
|
|
|
0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_vendoruniq,
|
|
|
|
{"Vendor Unique", "fcels.rnid.vendoruniq", FT_BYTES, BASE_HEX, NULL,
|
|
|
|
0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_vendorsp,
|
|
|
|
{"Vendor Specific", "fcels.rnid.vendorsp", FT_UINT16, BASE_HEX, NULL,
|
|
|
|
0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_asstype,
|
|
|
|
{"Associated Type", "fcels.rnid.asstype", FT_UINT32, BASE_HEX,
|
|
|
|
VALS (fc_els_rnid_asstype_val), 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_physport,
|
|
|
|
{"Physical Port Number", "fcels.rnid.physport", FT_UINT32, BASE_HEX,
|
|
|
|
NULL, 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_attnodes,
|
|
|
|
{"Number of Attached Nodes", "fcels.rnid.attnodes", FT_UINT32,
|
|
|
|
BASE_HEX, NULL, 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_nodemgmt,
|
|
|
|
{"Node Management", "fcels.rnid.nodemgmt", FT_UINT8, BASE_HEX,
|
|
|
|
VALS (fc_els_rnid_mgmt_val), 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_ipvers,
|
|
|
|
{"IP Version", "fcels.rnid.ipvers", FT_UINT8, BASE_HEX,
|
|
|
|
VALS (fc_els_rnid_ipvers_val), 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_tcpport,
|
|
|
|
{"TCP/UDP Port Number", "fcels.rnid.tcpport", FT_UINT16, BASE_DEC,
|
|
|
|
NULL, 0x0, "", HFILL}},
|
|
|
|
{ &hf_fcels_ip,
|
|
|
|
{"IP Address", "fcels.rnid.ip", FT_IPv6, BASE_HEX, NULL, 0x0, "",
|
|
|
|
HFILL}},
|
|
|
|
};
|
|
|
|
|
|
|
|
static gint *ett[] = {
|
|
|
|
&ett_fcels,
|
|
|
|
&ett_fcels,
|
|
|
|
&ett_fcels_lsrjt,
|
|
|
|
&ett_fcels_acc,
|
|
|
|
&ett_fcels_logi,
|
|
|
|
&ett_fcels_logi_cmnsvc,
|
|
|
|
&ett_fcels_logi_clssvc,
|
|
|
|
&ett_fcels_logo,
|
|
|
|
&ett_fcels_abtx,
|
|
|
|
&ett_fcels_rsi,
|
|
|
|
&ett_fcels_rrq,
|
|
|
|
&ett_fcels_prli,
|
|
|
|
&ett_fcels_prli_svcpg,
|
|
|
|
&ett_fcels_adisc,
|
|
|
|
&ett_fcels_farp,
|
|
|
|
&ett_fcels_rps,
|
|
|
|
&ett_fcels_rpl,
|
|
|
|
&ett_fcels_rplpb,
|
|
|
|
&ett_fcels_fan,
|
|
|
|
&ett_fcels_rscn,
|
|
|
|
&ett_fcels_rscn_rec,
|
|
|
|
&ett_fcels_scr,
|
|
|
|
&ett_fcels_rnft,
|
|
|
|
&ett_fcels_rnft_fc4,
|
|
|
|
&ett_fcels_lsts,
|
|
|
|
&ett_fcels_rnid,
|
|
|
|
&ett_fcels_rlir,
|
|
|
|
&ett_fcels_lirr,
|
|
|
|
&ett_fcels_srl,
|
|
|
|
&ett_fcels_rpsc,
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Register the protocol name and description */
|
|
|
|
proto_fcels = proto_register_protocol("FC Extended Link Svc", "FC ELS", "els");
|
|
|
|
|
|
|
|
/* Required function calls to register the header fields and subtrees used */
|
|
|
|
proto_register_field_array(proto_fcels, hf, array_length(hf));
|
|
|
|
proto_register_subtree_array(ett, array_length(ett));
|
|
|
|
register_init_routine (&fcels_init_protocol);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
proto_reg_handoff_fcels (void)
|
|
|
|
{
|
|
|
|
dissector_handle_t els_handle;
|
|
|
|
|
|
|
|
els_handle = create_dissector_handle (dissect_fcels, proto_fcels);
|
|
|
|
dissector_add("fc.ftype", FC_FTYPE_ELS, els_handle);
|
|
|
|
|
|
|
|
data_handle = find_dissector ("data");
|
|
|
|
}
|