From Dinesh Dutt:

- Added support for displaying support for Multicast/Broadcast supported
      bits in *LOGI common service params
    - Removed restriction for "Random Relative Offset" & its alternate to be in
      PLOGI or PDISC only. Some HBAs set it even in FLOGI.

svn path=/trunk/; revision=8907
This commit is contained in:
Guy Harris 2003-11-07 08:50:44 +00:00
parent f84d72f5fb
commit 5e06fef2a2
2 changed files with 30 additions and 14 deletions

View File

@ -2,7 +2,7 @@
* Routines for FC Extended Link Services
* Copyright 2001, Dinesh G Dutt <ddutt@cisco.com>
*
* $Id: packet-fcels.c,v 1.5 2003/10/30 02:06:11 guy Exp $
* $Id: packet-fcels.c,v 1.6 2003/11/07 08:50:43 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -244,17 +244,15 @@ construct_cmnsvc_string (guint16 flag, gchar *flagstr, guint8 opcode)
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 & 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) {
@ -271,7 +269,7 @@ construct_cmnsvc_string (guint16 flag, gchar *flagstr, guint8 opcode)
else {
sprintf (&flagstr[stroff], "%sNormal B2B Credit Mgmt", punc);
strcpy (punc, ", ");
stroff += 21;
stroff += 22;
}
if ((opcode == FC_ELS_PLOGI) || (opcode == FC_ELS_PDISC)) {
@ -288,6 +286,21 @@ construct_cmnsvc_string (guint16 flag, gchar *flagstr, guint8 opcode)
stroff += 34;
}
}
if (flag & 0x0200) {
strcpy (&flagstr[stroff], ", Multicast Supported");
stroff += 21;
}
if (flag & 0x0100) {
strcpy (&flagstr[stroff], ", Broadcast Supported");
stroff += 21;
}
if (flag & 0x0020) {
strcpy (&flagstr[stroff], ", Security Bit");
stroff += 14;
}
if (flag & 0x0010) {
strcpy (&flagstr[stroff], ", Clk Sync Prim Capable");

View File

@ -2,7 +2,7 @@
* Fibre Channel Extended Link Services Definitions (ddutt@cisco.com)
* Copyright 2001, Dinesh G Dutt <ddutt@cisco.com>
*
* $Id: packet-fcels.h,v 1.2 2003/10/30 02:06:11 guy Exp $
* $Id: packet-fcels.h,v 1.3 2003/11/07 08:50:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -155,6 +155,7 @@ static const value_string fc_els_rjt_val[] = {
#define FC_ELS_RJT_DET_INV_VCID 0x41
#define FC_ELS_RJT_DET_OORSRC_C4 0x42
#define FC_ELS_RJT_DET_INV_PNNAME 0x44
#define FC_ELS_RJT_DET_AUTH_REQD 0x48
static const value_string fc_els_rjt_det_val[] = {
{FC_ELS_RJT_DET_NODET , "No further details"},
@ -195,6 +196,8 @@ static const value_string fc_els_rjt_det_val[] = {
{FC_ELS_RJT_DET_INV_VCID , "VC_ID Not Found"},
{FC_ELS_RJT_DET_OORSRC_C4 , "No Resources to Support Class 4 Conn"},
{FC_ELS_RJT_DET_INV_PNNAME , "Invalid Port/Node Name"},
{FC_ELS_RJT_DET_AUTH_REQD , "Authentication Required"},
{0, NULL},
};
static const value_string fc_els_flacompliance_val[] = {