diff options
author | Bill Meier <wmeier@newsguy.com> | 2014-03-03 13:27:24 -0500 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2014-03-03 18:36:29 +0000 |
commit | 1795b4021c43c3a8bfc90a4303fb9ce17f5f26bd (patch) | |
tree | 8fd8a76d94157b3f8f35ce6090f4c64818a5b14e /epan/dissectors/packet-fcels.h | |
parent | 1f2f2ba5fa54586cfaa858004bfe021394be9c19 (diff) |
Move value_string defs from .h file; create/use extended value_string; Other minor changes.
- Multiple value string arrays were defined in packet-fcels.h (which was included
in two differnt .c files). Only one of the arrays was actually used in two
different .c files. All the value_string arrays (and most of the #defines)
moved to packet-fcels.c.
- Other:
Use -1 instead of tvb_length() for the length param of several proto_tree_add...() calls.
Add editor modelines.
Change-Id: Idc642caf1c8d62b658147a234d5560b8f2fd0630
Reviewed-on: https://code.wireshark.org/review/479
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/packet-fcels.h')
-rw-r--r-- | epan/dissectors/packet-fcels.h | 277 |
1 files changed, 1 insertions, 276 deletions
diff --git a/epan/dissectors/packet-fcels.h b/epan/dissectors/packet-fcels.h index b61054f42a..43f951bd50 100644 --- a/epan/dissectors/packet-fcels.h +++ b/epan/dissectors/packet-fcels.h @@ -66,281 +66,6 @@ #define FC_ELS_CBIND 0xE0 #define FC_ELS_UNBIND 0xE4 -static const value_string fc_els_proto_val[] = { - {FC_ELS_LSRJT , "LS_RJT"}, - {FC_ELS_ACC , "ACC"}, - {FC_ELS_PLOGI , "PLOGI"}, - {FC_ELS_FLOGI , "FLOGI"}, - {FC_ELS_LOGOUT , "LOGO"}, - {FC_ELS_ABTX , "ABTX"}, - {FC_ELS_RSI , "RSI"}, - {FC_ELS_RTV , "RTV"}, - {FC_ELS_RLS , "RLS"}, - {FC_ELS_ECHO , "ECHO"}, - {FC_ELS_TEST , "TEST"}, - {FC_ELS_RRQ , "RRQ"}, - {FC_ELS_REC , "REC"}, - {FC_ELS_SRR , "SRR"}, - {FC_ELS_PRLI , "PRLI"}, - {FC_ELS_PRLO , "PRLO"}, - {FC_ELS_TPRLO , "TPRLO"}, - {FC_ELS_PDISC , "PDISC"}, - {FC_ELS_FDISC , "FDISC"}, - {FC_ELS_ADISC , "ADISC"}, - {FC_ELS_FARP_REQ , "FARP-REQ"}, - {FC_ELS_FARP_RPLY , "FARP-REPLY"}, - {FC_ELS_RPS , "RPS"}, - {FC_ELS_RPL , "RPL"}, - {FC_ELS_FAN , "FAN"}, - {FC_ELS_RSCN , "RSCN"}, - {FC_ELS_SCR , "SCR"}, - {FC_ELS_RNFT , "RNFT"}, - {FC_ELS_LINIT , "LINIT"}, - {FC_ELS_LSTS , "LSTS"}, - {FC_ELS_RNID , "RNID"}, - {FC_ELS_RLIR , "RLIR"}, - {FC_ELS_LIRR , "LIRR"}, - {FC_ELS_SRL , "SRL"}, - {FC_ELS_RPSC , "RPSC"}, - {FC_ELS_LKA , "LKA"}, - {FC_ELS_AUTH , "AUTH"}, - {FC_ELS_CBIND , "CBIND"}, - {FC_ELS_UNBIND , "UNBIND"}, - {0, NULL} -}; - -/* Reject Reason Codes */ -#define FC_ELS_RJT_INVCMDCODE 0x01 -#define FC_ELS_RJT_LOGERR 0x03 -#define FC_ELS_RJT_LOGBSY 0x05 -#define FC_ELS_RJT_PROTERR 0x07 -#define FC_ELS_RJT_GENFAIL 0x09 -#define FC_ELS_RJT_CMDNOTSUPP 0x0B -#define FC_ELS_RJT_GENFAIL2 0x0D -#define FC_ELS_RJT_CMDINPROG 0x0E -#define FC_ELS_RJT_FIP 0x20 -#define FC_ELS_RJT_VENDOR 0xFF - -static const value_string fc_els_rjt_val[] = { - {FC_ELS_RJT_INVCMDCODE, "Invalid Cmd Code"}, - {FC_ELS_RJT_LOGERR , "Logical Error"}, - {FC_ELS_RJT_LOGBSY , "Logical Busy"}, - {FC_ELS_RJT_PROTERR , "Protocol Error"}, - {FC_ELS_RJT_GENFAIL , "Unable to Perform Cmd"}, - {FC_ELS_RJT_CMDNOTSUPP, "Command Not Supported"}, - {FC_ELS_RJT_GENFAIL2 , "Unable to Perform Cmd"}, - {FC_ELS_RJT_CMDINPROG , "Command in Progress Already"}, - {FC_ELS_RJT_FIP , "FIP Error"}, - {FC_ELS_RJT_VENDOR , "Vendor Unique Error"}, - {0, NULL} -}; - -#define FC_ELS_RJT_DET_NODET 0x00 -#define FC_ELS_RJT_DET_SVCPARM_OPT 0x01 -#define FC_ELS_RJT_DET_SVCPARM_INITCTL 0x03 -#define FC_ELS_RJT_DET_SVCPARM_RCPTCTL 0x05 -#define FC_ELS_RJT_DET_SVCPARM_RCVSZE 0x07 -#define FC_ELS_RJT_DET_SVCPARM_CSEQ 0x09 -#define FC_ELS_RJT_DET_SVCPARM_CREDIT 0x0B -#define FC_ELS_RJT_DET_INV_PFNAME 0x0D -#define FC_ELS_RJT_DET_INV_NFNAME 0x0E -#define FC_ELS_RJT_DET_INV_CMNSVCPARM 0x0F -#define FC_ELS_RJT_DET_INV_ASSOCHDR 0x11 -#define FC_ELS_RJT_DET_ASSOCHDR_REQD 0x13 -#define FC_ELS_RJT_DET_INV_OSID 0x15 -#define FC_ELS_RJT_DET_EXCHG_COMBO 0x17 -#define FC_ELS_RJT_DET_CMDINPROG 0x19 -#define FC_ELS_RJT_DET_PLOGI_REQ 0x1E -#define FC_ELS_RJT_DET_INV_NPID 0x1F -#define FC_ELS_RJT_DET_INV_SEQID 0x21 -#define FC_ELS_RJT_DET_INV_EXCHG 0x23 -#define FC_ELS_RJT_DET_INACTIVE_EXCHG 0x25 -#define FC_ELS_RJT_DET_RQUAL_REQD 0x27 -#define FC_ELS_RJT_DET_OORSRC 0x29 -#define FC_ELS_RJT_DET_SUPPLYFAIL 0x2A -#define FC_ELS_RJT_DET_REQNOTSUPP 0x2C -#define FC_ELS_RJT_DET_INV_PLEN 0x2D -#define FC_ELS_RJT_DET_INV_ALIASID 0x30 -#define FC_ELS_RJT_DET_OORSRC_ALIASID 0x31 -#define FC_ELS_RJT_DET_INACTIVE_ALIASID 0x32 -#define FC_ELS_RJT_DET_DEACT_ALIAS_FAIL1 0x33 -#define FC_ELS_RJT_DET_DEACT_ALIAS_FAIL2 0x34 -#define FC_ELS_RJT_DET_SVCPARM_CONFLICT 0x35 -#define FC_ELS_RJT_DET_INV_ALIASTOK 0x36 -#define FC_ELS_RJT_DET_UNSUPP_ALIASTOK 0x37 -#define FC_ELS_RJT_DET_GRPFORM_FAIL 0x38 -#define FC_ELS_RJT_DET_QOSPARM_ERR 0x40 -#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 -#define FC_ELS_RJT_DET_NOT_NEIGHBOR 0x62 - -static const value_string fc_els_rjt_det_val[] = { - {FC_ELS_RJT_DET_NODET , "No further details"}, - {FC_ELS_RJT_DET_SVCPARM_OPT , "Svc Param - Options Error"}, - {FC_ELS_RJT_DET_SVCPARM_INITCTL , "Svc Param - Initiator Ctl Error"}, - {FC_ELS_RJT_DET_SVCPARM_RCPTCTL , "Svc Param - Recipient Ctl Error"}, - {FC_ELS_RJT_DET_SVCPARM_RCVSZE , "Svc Param - Recv Size Error"}, - {FC_ELS_RJT_DET_SVCPARM_CSEQ , "Svc Param - Concurrent Seq Error"}, - {FC_ELS_RJT_DET_SVCPARM_CREDIT , "Svc Param - Credit Error"}, - {FC_ELS_RJT_DET_INV_PFNAME , "Invalid N_/F_Port Name"}, - {FC_ELS_RJT_DET_INV_NFNAME , "Invalid Node/Fabric Name"}, - {FC_ELS_RJT_DET_INV_CMNSVCPARM , "Invalid Common Svc Param"}, - {FC_ELS_RJT_DET_INV_ASSOCHDR , "Invalid Association Header"}, - {FC_ELS_RJT_DET_ASSOCHDR_REQD , "Association Header Reqd"}, - {FC_ELS_RJT_DET_INV_OSID , "Invalid Orig S_ID"}, - {FC_ELS_RJT_DET_EXCHG_COMBO , "Invalid OXID-RXID Combo"}, - {FC_ELS_RJT_DET_CMDINPROG , "Cmd Already in Progress"}, - {FC_ELS_RJT_DET_PLOGI_REQ , "N_Port Login Required"}, - {FC_ELS_RJT_DET_INV_NPID , "Invalid N_Port Id"}, - {FC_ELS_RJT_DET_INV_SEQID , "Invalid SeqID"}, - {FC_ELS_RJT_DET_INV_EXCHG , "Attempt to Abort Invalid Exchg"}, - {FC_ELS_RJT_DET_INACTIVE_EXCHG , "Attempt to Abort Inactive Exchg"}, - {FC_ELS_RJT_DET_RQUAL_REQD , "Resource Qualifier Required"}, - {FC_ELS_RJT_DET_OORSRC , "Insufficient Resources for Login"}, - {FC_ELS_RJT_DET_SUPPLYFAIL , "Unable to Supply Req Data"}, - {FC_ELS_RJT_DET_REQNOTSUPP , "Command Not Supported"}, - {FC_ELS_RJT_DET_INV_PLEN , "Invalid Payload Length"}, - {FC_ELS_RJT_DET_INV_ALIASID , "No Alias IDs available"}, - {FC_ELS_RJT_DET_OORSRC_ALIASID , "Alias_ID Cannot be Activated (Out of Rsrc)"}, - {FC_ELS_RJT_DET_INACTIVE_ALIASID , "Alias_ID Cannot be Activated (Inv AID)"}, - {FC_ELS_RJT_DET_DEACT_ALIAS_FAIL1, "Alias_ID Cannot be Deactivated"}, - {FC_ELS_RJT_DET_DEACT_ALIAS_FAIL2, "Alias_ID Cannot be Deactivated"}, - {FC_ELS_RJT_DET_SVCPARM_CONFLICT , "Svc Parameter Conflict"}, - {FC_ELS_RJT_DET_INV_ALIASTOK , "Invalid Alias Token"}, - {FC_ELS_RJT_DET_UNSUPP_ALIASTOK , "Unsupported Alias Token"}, - {FC_ELS_RJT_DET_GRPFORM_FAIL , "Alias Grp Cannot be Formed"}, - {FC_ELS_RJT_DET_QOSPARM_ERR , "QoS Param Error"}, - {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"}, - {FC_ELS_RJT_DET_NOT_NEIGHBOR , "VN2VN_Port not in Neighbor Set"}, - {0, NULL} -}; - -static const value_string fc_els_flacompliance_val[] = { - {1, "FC-FLA Level 1"}, - {2, "FC-FLA Level 2"}, - {0, NULL} -}; - -static const value_string fc_els_loopstate_val[] = { - {1, "Online"}, - {2, "Loop Failure"}, - {3, "Initialization Failure"}, - {4, "Initializing"}, - {0, NULL} -}; - -static const value_string fc_els_scr_reg_val[] = { - {1, "Fabric Detected Regn"}, - {2, "N_Port Detected Regn"}, - {3, "Full Regn"}, - {255, "Clear All Regn"}, - {0, NULL} -}; - -static const value_string fc_els_farp_respaction_val[] = { - {0, "No Action"}, - {1, "Login Using Requesting Port ID"}, - {2, "Respond with FARP-REPLY"}, - {3, "Login & send FARP-REPLY"}, - {0, NULL} -}; - -static const value_string fc_els_portstatus_val[] = { - {0x20, "Point-to-Point Connection | No Fabric"}, - {0x10, "AL Connection | No Fabric"}, - {0x28, "Point-to-Point Connection | Fabric Detected"}, - {0x2C, "Point-to-Point Connection | Fabric Detected | Loss of Signal"}, - {0x24, "Point-to-Point Connection | Loss of Signal"}, - {0x18, "AL Connection | Fabric Detected"}, - {0x14, "AL Connection | Loss of Signal"}, - {0x1C, "AL Connection | Fabric Detected | Loss of Signal"}, - {0x04, "Loss of Signal"}, - {0x02, "Loss of Synchronization"}, - {0x01, "Link Reset Protocol in Progress"}, - {0, NULL} -}; - -static const value_string fc_els_portspeed_val[] = { - {0x8000, "1 Gb"}, - {0x4000, "2 Gb"}, - {0x2000, "4 Gb"}, - {0x1000, "10 Gb"}, - {0x0002, "Unknown"}, - {0x0001, "Speed Not Estd."}, - {0, NULL} -}; - -static const value_string fc_els_lirr_regfunc_val[] = { - {0x1, "Set Reg: Conditionally Receive"}, - {0x2, "Set Reg: Always Receive"}, - {0xFF, "Clear Reg"}, - {0, NULL} -}; - -static const value_string fc_els_rscn_evqual_val[] = { - {0x00, "Event is not specified"}, - {0x01, "Changed Name Server Object"}, - {0x02, "Changed Port Attribute"}, - {0x03, "Changed Service Object"}, - {0x04, "Changed Switch Config"}, - {0, NULL} -}; - -static const value_string fc_els_rscn_addrfmt_val[] = { - {0, "Port Addr (single N/L Port or service)"}, - {1, "Area Addr Group (area of E/L/N Port addresses)"}, - {2, "Domain Addr Group"}, - {3, "Fabric Addr Group"}, - {0, NULL} -}; - -static const value_string fc_els_nodeid_val[] = { - {0x00, "Common Identification Data Only"}, - {0x05, "IP Specific Data"}, - {0x08, "FCP-Specific Data"}, - {0x20, "FC_CT Specific Data"}, - {0x22, "SW_ILS Specific Data"}, - {0x23, "AL Specific Data"}, - {0x24, "SNMP Specific Data"}, - {0xDF, "Common ID Data + General Topology Discovery Format"}, - {0, NULL} -}; - -static const value_string fc_els_rnid_asstype_val[] = { - {0x0, "Reserved"}, - {0x1, "Unknown"}, - {0x2, "Other"}, - {0x3, "Hub"}, - {0x4, "Switch"}, - {0x5, "Gateway"}, - {0x6, "Converter"}, - {0x7, "HBA"}, - {0x9, "Storage Device"}, - {0xA, "Host"}, - {0xB, "Storage Subsystem"}, - {0xE, "Storage Access Device"}, - {0x11, "NAS Device"}, - {0, NULL} -}; - -static const value_string fc_els_rnid_mgmt_val[] = { - {0, "IP/UDP/SNMP"}, - {1, "IP/TCP/Telnet"}, - {2, "IP/TCP/HTTP"}, - {3, "IP/TCP/HTTPS"}, - {0, NULL} -}; - -static const value_string fc_els_rnid_ipvers_val[] = { - {0, "None"}, - {1, "IPv4"}, - {2, "IPv6"}, - {0, NULL} -}; +extern value_string_ext fc_els_proto_val_ext; #endif |