osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

infiniband: Fix various issues mostly relating to protocol field display: 

- Conform display of fields to Infiniband spec (1.2.1): E.G.: use correct bitmasks in hf[];
  (The verification/correction process is not complete: see packet-inifiniband.h);
- Comment out unused hf[] & related elements;
- hf[]: FT_BOOLEAN entries with bitmask: "BASE" should be "bitwidth of parent bitfield";
- packet-infiniband.c: Use consistent indentation;
-                      Move proto_register & proto_reg_handoff to the end of the file.

svn path=/trunk/; revision=28105
This commit is contained in:
Bill Meier 2009-04-21 13:52:00 +00:00
parent 9efe4d12f1
commit c5783e32df
2 changed files with 2505 additions and 2501 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4802
epan/dissectors/packet-infiniband.c
View File

File diff suppressed because it is too large Load Diff

204
epan/dissectors/packet-infiniband.h
View File

@ -33,7 +33,7 @@
static int proto_infiniband = -1; static int proto_infiniband = -1;
/* Variables to hold expansion values between packets */ /* Variables to hold expansion values between packets */
static gint ett_infiniband = -1; /* static gint ett_infiniband = -1; */
static gint ett_all_headers = -1; static gint ett_all_headers = -1;
static gint ett_lrh = -1; static gint ett_lrh = -1;
static gint ett_grh = -1; static gint ett_grh = -1;
@ -59,11 +59,11 @@ static gint ett_subm_attribute = -1;
static gint ett_suba_attribute = -1; static gint ett_suba_attribute = -1;
static gint ett_datadetails = -1; static gint ett_datadetails = -1;
static gint ett_noticestraps = -1; static gint ett_noticestraps = -1;
static gint ett_nodedesc = -1; /* static gint ett_nodedesc = -1; */
static gint ett_nodeinfo = -1; /* static gint ett_nodeinfo = -1; */
static gint ett_switchinfo = -1; /* static gint ett_switchinfo = -1; */
static gint ett_guidinfo = -1; /* static gint ett_guidinfo = -1; */
static gint ett_portinfo = -1; /* static gint ett_portinfo = -1; */
static gint ett_portinfo_capmask = -1; static gint ett_portinfo_capmask = -1;
static gint ett_pkeytable = -1; static gint ett_pkeytable = -1;
static gint ett_sltovlmapping = -1; static gint ett_sltovlmapping = -1;
@ -479,8 +479,8 @@ static int hf_infiniband_remote_key = -1;
static int hf_infiniband_dma_length = -1; static int hf_infiniband_dma_length = -1;
/* Atomic Extended Transport Header (AtomicETH) */ /* Atomic Extended Transport Header (AtomicETH) */
static int hf_infiniband_AtomicETH = -1; static int hf_infiniband_AtomicETH = -1;
static int hf_infiniband_virtual_address_AtomicETH = -1; /* static int hf_infiniband_virtual_address_AtomicETH = -1; */
static int hf_infiniband_remote_key_AtomicETH = -1; /* static int hf_infiniband_remote_key_AtomicETH = -1; */
static int hf_infiniband_swap_or_add_data = -1; static int hf_infiniband_swap_or_add_data = -1;
static int hf_infiniband_compare_data = -1; static int hf_infiniband_compare_data = -1;
/* ACK Extended Transport Header (AETH) */ /* ACK Extended Transport Header (AETH) */
@ -506,7 +506,7 @@ static int hf_infiniband_MAD = -1;
static int hf_infiniband_base_version = -1; static int hf_infiniband_base_version = -1;
static int hf_infiniband_mgmt_class = -1; static int hf_infiniband_mgmt_class = -1;
static int hf_infiniband_class_version = -1; static int hf_infiniband_class_version = -1;
static int hf_infiniband_reserved1 = -1; /* static int hf_infiniband_reserved1 = -1; */
static int hf_infiniband_method = -1; static int hf_infiniband_method = -1;
static int hf_infiniband_status = -1; static int hf_infiniband_status = -1;
static int hf_infiniband_class_specific = -1; static int hf_infiniband_class_specific = -1;
@ -525,7 +525,7 @@ static int hf_infiniband_rmpp_status = -1;
static int hf_infiniband_rmpp_data1 = -1; static int hf_infiniband_rmpp_data1 = -1;
static int hf_infiniband_rmpp_data2 = -1; static int hf_infiniband_rmpp_data2 = -1;
/* RMPP Data */ /* RMPP Data */
static int hf_infiniband_RMPP_DATA = -1; /* static int hf_infiniband_RMPP_DATA = -1; */
static int hf_infiniband_segment_number = -1; static int hf_infiniband_segment_number = -1;
static int hf_infiniband_payload_length32 = -1; static int hf_infiniband_payload_length32 = -1;
static int hf_infiniband_transferred_data = -1; static int hf_infiniband_transferred_data = -1;
@ -600,7 +600,7 @@ static int hf_infiniband_SwitchInfo_FilterRawInboundCap = -1;
static int hf_infiniband_SwitchInfo_FilterRawOutboundCap = -1; static int hf_infiniband_SwitchInfo_FilterRawOutboundCap = -1;
static int hf_infiniband_SwitchInfo_EnhancedPortZero = -1; static int hf_infiniband_SwitchInfo_EnhancedPortZero = -1;
/* GUIDInfo */ /* GUIDInfo */
static int hf_infiniband_GUIDInfo_GUIDBlock = -1; /* static int hf_infiniband_GUIDInfo_GUIDBlock = -1; */
static int hf_infiniband_GUIDInfo_GUID = -1; static int hf_infiniband_GUIDInfo_GUID = -1;
/* PortInfo */ /* PortInfo */
static int hf_infiniband_PortInfo_GidPrefix = -1; static int hf_infiniband_PortInfo_GidPrefix = -1;
@ -609,7 +609,7 @@ static int hf_infiniband_PortInfo_MasterSMLID = -1;
static int hf_infiniband_PortInfo_CapabilityMask = -1; static int hf_infiniband_PortInfo_CapabilityMask = -1;
/* Capability Mask Flags */ /* Capability Mask Flags */
static int hf_infiniband_PortInfo_CapabilityMask_SM; static int hf_infiniband_PortInfo_CapabilityMask_SM = -1;
static int hf_infiniband_PortInfo_CapabilityMask_NoticeSupported = -1; static int hf_infiniband_PortInfo_CapabilityMask_NoticeSupported = -1;
static int hf_infiniband_PortInfo_CapabilityMask_TrapSupported = -1; static int hf_infiniband_PortInfo_CapabilityMask_TrapSupported = -1;
static int hf_infiniband_PortInfo_CapabilityMask_OptionalPDSupported = -1; static int hf_infiniband_PortInfo_CapabilityMask_OptionalPDSupported = -1;
@ -689,23 +689,23 @@ static int hf_infiniband_SLtoVLMappingTable_SLtoVL_HighBits = -1;
static int hf_infiniband_SLtoVLMappingTable_SLtoVL_LowBits = -1; static int hf_infiniband_SLtoVLMappingTable_SLtoVL_LowBits = -1;
/* VLArbitrationTable */ /* VLArbitrationTable */
static int hf_infiniband_VLArbitrationTable_VLWeightPairs = -1; /* static int hf_infiniband_VLArbitrationTable_VLWeightPairs = -1; */
static int hf_infiniband_VLArbitrationTable_VL = -1; static int hf_infiniband_VLArbitrationTable_VL = -1;
static int hf_infiniband_VLArbitrationTable_Weight = -1; static int hf_infiniband_VLArbitrationTable_Weight = -1;
/* LinearForwardingTable */ /* LinearForwardingTable */
static int hf_infiniband_LinearForwardingTable_LinearForwardingTableBlock = -1; /* static int hf_infiniband_LinearForwardingTable_LinearForwardingTableBlock = -1; */
static int hf_infiniband_LinearForwardingTable_Port = -1; static int hf_infiniband_LinearForwardingTable_Port = -1;
/* RandomForwardingTable */ /* RandomForwardingTable */
static int hf_infiniband_RandomForwardingTable_RandomForwardingTableBlock = -1; /* static int hf_infiniband_RandomForwardingTable_RandomForwardingTableBlock = -1; */
static int hf_infiniband_RandomForwardingTable_LID = -1; static int hf_infiniband_RandomForwardingTable_LID = -1;
static int hf_infiniband_RandomForwardingTable_Valid = -1; static int hf_infiniband_RandomForwardingTable_Valid = -1;
static int hf_infiniband_RandomForwardingTable_LMC = -1; static int hf_infiniband_RandomForwardingTable_LMC = -1;
static int hf_infiniband_RandomForwardingTable_Port = -1; static int hf_infiniband_RandomForwardingTable_Port = -1;
/* MulticastForwardingTable */ /* MulticastForwardingTable */
static int hf_infiniband_MulticastForwardingTable_MulticastForwardingTableBlock = -1; /* static int hf_infiniband_MulticastForwardingTable_MulticastForwardingTableBlock = -1; */
static int hf_infiniband_MulticastForwardingTable_PortMask = -1; static int hf_infiniband_MulticastForwardingTable_PortMask = -1;
/* SMInfo */ /* SMInfo */
@ -751,7 +751,7 @@ static int hf_infiniband_SA_BlockNum_EightBit = -1;
static int hf_infiniband_SA_BlockNum_NineBit = -1; static int hf_infiniband_SA_BlockNum_NineBit = -1;
static int hf_infiniband_SA_BlockNum_SixteenBit = -1; static int hf_infiniband_SA_BlockNum_SixteenBit = -1;
static int hf_infiniband_SA_Position = -1; static int hf_infiniband_SA_Position = -1;
static int hf_infiniband_SA_Index = -1; /* static int hf_infiniband_SA_Index = -1; */
/* InformInfoRecord */ /* InformInfoRecord */
static int hf_infiniband_InformInfoRecord_SubscriberGID = -1; static int hf_infiniband_InformInfoRecord_SubscriberGID = -1;
@ -870,8 +870,8 @@ static int hf_infiniband_Notice_IssuerLID = -1;
static int hf_infiniband_Notice_NoticeToggle = -1; static int hf_infiniband_Notice_NoticeToggle = -1;
static int hf_infiniband_Notice_NoticeCount = -1; static int hf_infiniband_Notice_NoticeCount = -1;
static int hf_infiniband_Notice_DataDetails = -1; static int hf_infiniband_Notice_DataDetails = -1;
static int hf_infiniband_Notice_IssuerGID = -1; /* static int hf_infiniband_Notice_IssuerGID = -1; */
static int hf_infiniband_Notice_ClassTrapSpecificData = -1; /* static int hf_infiniband_Notice_ClassTrapSpecificData = -1; */
/* Notice DataDetails and ClassTrapSpecific Data for certain traps /* Notice DataDetails and ClassTrapSpecific Data for certain traps
* Note that traps reuse many fields, so they are only declared once under the first trap that they appear. * Note that traps reuse many fields, so they are only declared once under the first trap that they appear.
@ -888,7 +888,7 @@ static int hf_infiniband_Trap_GIDADDR = -1;
static int hf_infiniband_Trap_COMP_MASK = -1; static int hf_infiniband_Trap_COMP_MASK = -1;
static int hf_infiniband_Trap_WAIT_FOR_REPATH = -1; static int hf_infiniband_Trap_WAIT_FOR_REPATH = -1;
/* ClassTrapSpecificData */ /* ClassTrapSpecificData */
static int hf_infiniband_Trap_PATH_REC = -1; /* static int hf_infiniband_Trap_PATH_REC = -1; */
/* Trap 128 */ /* Trap 128 */
static int hf_infiniband_Trap_LIDADDR = -1; static int hf_infiniband_Trap_LIDADDR = -1;
@ -1308,6 +1308,8 @@ static guint32 opCode_PAYLD[] = {
* So for instance, to filter packets for a given virtual lane, * So for instance, to filter packets for a given virtual lane,
* The filter (infiniband.LRH.vl == 3) or something similar would be used. */ * The filter (infiniband.LRH.vl == 3) or something similar would be used. */
/* XXX: ToDo: Verify against Infiniband 1.2.1 Specification */
/* Note that all starting with VendorDiag have been verified/corrected */
static hf_register_info hf[] = { static hf_register_info hf[] = {
/* Local Route Header (LRH) */ /* Local Route Header (LRH) */
@ -1365,10 +1367,10 @@ static hf_register_info hf[] = {
{"Hop Limit", "infiniband.grh.hoplmt", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL} {"Hop Limit", "infiniband.grh.hoplmt", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}
}, },
{&hf_infiniband_source_gid, {&hf_infiniband_source_gid,
{"Source GID", "infiniband.grh.sgid", FT_IPv6, BASE_DEC, NULL, 0x0, NULL, HFILL} {"Source GID", "infiniband.grh.sgid", FT_IPv6, BASE_HEX, NULL, 0x0, NULL, HFILL}
}, },
{&hf_infiniband_destination_gid, {&hf_infiniband_destination_gid,
{"Destination GID", "infiniband.grh.dgid", FT_IPv6, BASE_DEC, NULL, 0x0, NULL, HFILL} {"Destination GID", "infiniband.grh.dgid", FT_IPv6, BASE_HEX, NULL, 0x0, NULL, HFILL}
}, },
/* Base Transport Header (BTH) */ /* Base Transport Header (BTH) */
@ -1379,10 +1381,10 @@ static hf_register_info hf[] = {
{"Opcode", "infiniband.bth.opcode", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL} {"Opcode", "infiniband.bth.opcode", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}
}, },
{&hf_infiniband_solicited_event, {&hf_infiniband_solicited_event,
{"Solicited Event", "infiniband.bth.se", FT_BOOLEAN, BASE_DEC, NULL, 0x80, NULL, HFILL} {"Solicited Event", "infiniband.bth.se", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL}
}, },
{&hf_infiniband_migreq, {&hf_infiniband_migreq,
{"MigReq", "infiniband.bth.m", FT_BOOLEAN, BASE_DEC, NULL, 0x40, NULL, HFILL} {"MigReq", "infiniband.bth.m", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL}
}, },
{&hf_infiniband_pad_count, {&hf_infiniband_pad_count,
{"Pad Count", "infiniband.bth.padcnt", FT_UINT8, BASE_DEC, NULL, 0x30, NULL, HFILL} {"Pad Count", "infiniband.bth.padcnt", FT_UINT8, BASE_DEC, NULL, 0x30, NULL, HFILL}
@ -1400,7 +1402,7 @@ static hf_register_info hf[] = {
{"Destination Queue Pair", "infiniband.bth.destqp", FT_UINT24, BASE_HEX, NULL, 0x0, NULL, HFILL} {"Destination Queue Pair", "infiniband.bth.destqp", FT_UINT24, BASE_HEX, NULL, 0x0, NULL, HFILL}
}, },
{&hf_infiniband_acknowledge_request, {&hf_infiniband_acknowledge_request,
{"Acknowledge Request", "infiniband.bth.a", FT_BOOLEAN, BASE_DEC, NULL, 0x80, NULL, HFILL} {"Acknowledge Request", "infiniband.bth.a", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL}
}, },
{&hf_infiniband_reserved7, {&hf_infiniband_reserved7,
{"Reserved (7 bits)", "infiniband.bth.reserved7", FT_UINT8, BASE_DEC, NULL, 0x7F, NULL, HFILL} {"Reserved (7 bits)", "infiniband.bth.reserved7", FT_UINT8, BASE_DEC, NULL, 0x7F, NULL, HFILL}
@ -1463,12 +1465,12 @@ static hf_register_info hf[] = {
{&hf_infiniband_AtomicETH, {&hf_infiniband_AtomicETH,
{"Atomic Extended Transport Header", "infiniband.atomiceth", FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL} {"Atomic Extended Transport Header", "infiniband.atomiceth", FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL}
}, },
{&hf_infiniband_virtual_address_AtomicETH, /* {&hf_infiniband_virtual_address_AtomicETH, */
{"Virtual Address", "infiniband.atomiceth.va", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL} /* {"Virtual Address", "infiniband.atomiceth.va", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL} */
}, /* }, */
{&hf_infiniband_remote_key_AtomicETH, /* {&hf_infiniband_remote_key_AtomicETH, */
{"Remote Key", "infiniband.atomiceth.r_key", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} /* {"Remote Key", "infiniband.atomiceth.r_key", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} */
}, /* }, */
{&hf_infiniband_swap_or_add_data, {&hf_infiniband_swap_or_add_data,
{"Swap (Or Add) Data", "infiniband.atomiceth.swapdt", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL} {"Swap (Or Add) Data", "infiniband.atomiceth.swapdt", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL}
}, },
@ -1535,9 +1537,9 @@ static hf_register_info hf[] = {
{&hf_infiniband_class_version, {&hf_infiniband_class_version,
{"Class Version", "infiniband.mad.classversion", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} {"Class Version", "infiniband.mad.classversion", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}
}, },
{&hf_infiniband_reserved1, /* {&hf_infiniband_reserved1, */
{"Reserved", "infiniband.mad.reserved1", FT_UINT8, BASE_HEX, NULL, 0x80, NULL, HFILL} /* {"Reserved", "infiniband.mad.reserved1", FT_UINT8, BASE_HEX, NULL, 0x80, NULL, HFILL} */
}, /* }, */
{&hf_infiniband_method, {&hf_infiniband_method,
{"Method", "infiniband.mad.method", FT_UINT8, BASE_HEX, NULL, 0x7F, NULL, HFILL} {"Method", "infiniband.mad.method", FT_UINT8, BASE_HEX, NULL, 0x7F, NULL, HFILL}
}, },
@ -1587,10 +1589,10 @@ static hf_register_info hf[] = {
{&hf_infiniband_rmpp_data2, {&hf_infiniband_rmpp_data2,
{"RMPP Data 2", "infiniband.rmpp.data2", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL} {"RMPP Data 2", "infiniband.rmpp.data2", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}
}, },
/* RMPP Data */ /* RMPP Data */
{&hf_infiniband_RMPP_DATA, /* {&hf_infiniband_RMPP_DATA, */
{"RMPP Data (Reliable Multi-Packet Transaction Protocol)", "infiniband.rmpp.data", FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL} /* {"RMPP Data (Reliable Multi-Packet Transaction Protocol)", "infiniband.rmpp.data", FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL} */
}, /* }, */
{&hf_infiniband_segment_number, {&hf_infiniband_segment_number,
{"Segment Number", "infiniband.rmpp.segmentnumber", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL} {"Segment Number", "infiniband.rmpp.segmentnumber", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}
}, },
@ -1768,9 +1770,9 @@ static hf_register_info hf[] = {
{"EnhancedPortZero", "infiniband.switchinfo.enhancedportzero", FT_UINT8, BASE_HEX, NULL, 0x08, NULL, HFILL} {"EnhancedPortZero", "infiniband.switchinfo.enhancedportzero", FT_UINT8, BASE_HEX, NULL, 0x08, NULL, HFILL}
}, },
/* GUIDInfo */ /* GUIDInfo */
{&hf_infiniband_GUIDInfo_GUIDBlock, /* {&hf_infiniband_GUIDInfo_GUIDBlock, */
{"GUIDBlock", "infiniband.switchinfo.guidblock", FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL} /* {"GUIDBlock", "infiniband.switchinfo.guidblock", FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL} */
}, /* }, */
{&hf_infiniband_GUIDInfo_GUID, {&hf_infiniband_GUIDInfo_GUID,
{"GUID", "infiniband.switchinfo.guid", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL} {"GUID", "infiniband.switchinfo.guid", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL}
}, },
@ -2007,9 +2009,9 @@ static hf_register_info hf[] = {
{"SL(x)toVL", "infiniband.sltovlmappingtable.sltovllowbits", FT_UINT8, BASE_HEX, NULL, 0x0F, NULL, HFILL} {"SL(x)toVL", "infiniband.sltovlmappingtable.sltovllowbits", FT_UINT8, BASE_HEX, NULL, 0x0F, NULL, HFILL}
}, },
/* VLArbitrationTable */ /* VLArbitrationTable */
{&hf_infiniband_VLArbitrationTable_VLWeightPairs, /* {&hf_infiniband_VLArbitrationTable_VLWeightPairs, */
{"VLWeightPairs", "infiniband.vlarbitrationtable.vlweightpairs", FT_BYTES, BASE_HEX, NULL, 0x7FFF, NULL, HFILL} /* {"VLWeightPairs", "infiniband.vlarbitrationtable.vlweightpairs", FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL} */
}, /* }, */
{&hf_infiniband_VLArbitrationTable_VL, {&hf_infiniband_VLArbitrationTable_VL,
{"VL", "infiniband.vlarbitrationtable.vl", FT_UINT8, BASE_HEX, NULL, 0x0F, NULL, HFILL} {"VL", "infiniband.vlarbitrationtable.vl", FT_UINT8, BASE_HEX, NULL, 0x0F, NULL, HFILL}
}, },
@ -2017,16 +2019,16 @@ static hf_register_info hf[] = {
{"Weight", "infiniband.vlarbitrationtable.weight", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} {"Weight", "infiniband.vlarbitrationtable.weight", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}
}, },
/* LinearForwardingTable */ /* LinearForwardingTable */
{&hf_infiniband_LinearForwardingTable_LinearForwardingTableBlock, /* {&hf_infiniband_LinearForwardingTable_LinearForwardingTableBlock, */
{"LinearForwardingTableBlock", "infiniband.linearforwardingtable.linearforwardingtableblock", FT_BYTES, BASE_HEX, NULL, 0x0F, NULL, HFILL} /* {"LinearForwardingTableBlock", "infiniband.linearforwardingtable.linearforwardingtableblock", FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL} */
}, /* }, */
{&hf_infiniband_LinearForwardingTable_Port, {&hf_infiniband_LinearForwardingTable_Port,
{"Port", "infiniband.linearforwardingtable.port", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} {"Port", "infiniband.linearforwardingtable.port", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}
}, },
/* RandomForwardingTable */ /* RandomForwardingTable */
{&hf_infiniband_RandomForwardingTable_RandomForwardingTableBlock, /* {&hf_infiniband_RandomForwardingTable_RandomForwardingTableBlock, */
{"RandomForwardingTableBlock", "infiniband.randomforwardingtable.randomforwardingtableblock", FT_BYTES, BASE_HEX, NULL, 0x7FFF, NULL, HFILL} /* {"RandomForwardingTableBlock", "infiniband.randomforwardingtable.randomforwardingtableblock", FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL} */
}, /* }, */
{&hf_infiniband_RandomForwardingTable_LID, {&hf_infiniband_RandomForwardingTable_LID,
{"LID", "infiniband.randomforwardingtable.lid", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL} {"LID", "infiniband.randomforwardingtable.lid", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}
}, },
@ -2034,15 +2036,15 @@ static hf_register_info hf[] = {
{"Valid", "infiniband.randomforwardingtable.valid", FT_UINT8, BASE_HEX, NULL, 0x80, NULL, HFILL} {"Valid", "infiniband.randomforwardingtable.valid", FT_UINT8, BASE_HEX, NULL, 0x80, NULL, HFILL}
}, },
{&hf_infiniband_RandomForwardingTable_LMC, {&hf_infiniband_RandomForwardingTable_LMC,
{"LMC", "infiniband.randomforwardingtable.lmc", FT_UINT16, BASE_HEX, NULL, 0x70, NULL, HFILL} {"LMC", "infiniband.randomforwardingtable.lmc", FT_UINT8, BASE_HEX, NULL, 0x70, NULL, HFILL}
}, },
{&hf_infiniband_RandomForwardingTable_Port, {&hf_infiniband_RandomForwardingTable_Port,
{"Port", "infiniband.randomforwardingtable.port", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} {"Port", "infiniband.randomforwardingtable.port", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}
}, },
/* MulticastForwardingTable */ /* MulticastForwardingTable */
{&hf_infiniband_MulticastForwardingTable_MulticastForwardingTableBlock , /* {&hf_infiniband_MulticastForwardingTable_MulticastForwardingTableBlock , */
{"MulticastForwardingTableBlock ", "infiniband.multicastforwardingtable.multicastforwardingtableblock", FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL} /* {"MulticastForwardingTableBlock ", "infiniband.multicastforwardingtable.multicastforwardingtableblock", FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL} */
}, /* }, */
{&hf_infiniband_MulticastForwardingTable_PortMask, {&hf_infiniband_MulticastForwardingTable_PortMask,
{"PortMask", "infiniband.multicastforwardingtable.portmask", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL} {"PortMask", "infiniband.multicastforwardingtable.portmask", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}
}, },
@ -2062,6 +2064,8 @@ static hf_register_info hf[] = {
{&hf_infiniband_SMInfo_SMState, {&hf_infiniband_SMInfo_SMState,
{"SMState", "infiniband.sminfo.smstate", FT_UINT8, BASE_HEX, NULL, 0x0F, NULL, HFILL} {"SMState", "infiniband.sminfo.smstate", FT_UINT8, BASE_HEX, NULL, 0x0F, NULL, HFILL}
}, },
/* XX: All following verified/corrected against Infiniband 1.2.1 Specification */
/* VendorDiag */ /* VendorDiag */
{&hf_infiniband_VendorDiag_NextIndex, {&hf_infiniband_VendorDiag_NextIndex,
{"NextIndex", "infiniband.vendordiag.nextindex", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL} {"NextIndex", "infiniband.vendordiag.nextindex", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}
@ -2124,9 +2128,9 @@ static hf_register_info hf[] = {
{&hf_infiniband_SA_Position, {&hf_infiniband_SA_Position,
{"Position", "infiniband.sa.position", FT_UINT8, BASE_HEX, NULL, 0xF0, NULL, HFILL} {"Position", "infiniband.sa.position", FT_UINT8, BASE_HEX, NULL, 0xF0, NULL, HFILL}
}, },
{&hf_infiniband_SA_Index, /* {&hf_infiniband_SA_Index, */
{"Index", "infiniband.sa.index", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} /* {"Index", "infiniband.sa.index", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} */
}, /* }, */
/* InformInfoRecord */ /* InformInfoRecord */
{&hf_infiniband_InformInfoRecord_SubscriberGID, {&hf_infiniband_InformInfoRecord_SubscriberGID,
{"SubscriberGID", "infiniband.informinforecord.subscribergid", FT_IPv6, BASE_HEX, NULL, 0x0, NULL, HFILL} {"SubscriberGID", "infiniband.informinforecord.subscribergid", FT_IPv6, BASE_HEX, NULL, 0x0, NULL, HFILL}
@ -2224,7 +2228,7 @@ static hf_register_info hf[] = {
{"RawTraffic", "infiniband.pathrecord.rawtraffic", FT_UINT8, BASE_HEX, NULL, 0x80, NULL, HFILL} {"RawTraffic", "infiniband.pathrecord.rawtraffic", FT_UINT8, BASE_HEX, NULL, 0x80, NULL, HFILL}
}, },
{&hf_infiniband_PathRecord_FlowLabel, {&hf_infiniband_PathRecord_FlowLabel,
{"FlowLabel", "infiniband.pathrecord.flowlabel", FT_UINT24, BASE_HEX, NULL, 0xFFFFF0, NULL, HFILL} {"FlowLabel", "infiniband.pathrecord.flowlabel", FT_UINT24, BASE_HEX, NULL, 0x0FFFFF, NULL, HFILL}
}, },
{&hf_infiniband_PathRecord_HopLimit, {&hf_infiniband_PathRecord_HopLimit,
{"HopLimit", "infiniband.pathrecord.hoplimit", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} {"HopLimit", "infiniband.pathrecord.hoplimit", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}
@ -2254,13 +2258,13 @@ static hf_register_info hf[] = {
{"RateSelector", "infiniband.pathrecord.rateselector", FT_UINT8, BASE_HEX, NULL, 0xC0, NULL, HFILL} {"RateSelector", "infiniband.pathrecord.rateselector", FT_UINT8, BASE_HEX, NULL, 0xC0, NULL, HFILL}
}, },
{&hf_infiniband_PathRecord_Rate, {&hf_infiniband_PathRecord_Rate,
{"Rate", "infiniband.pathrecord.rate", FT_UINT8, BASE_HEX, NULL, 0xFC, NULL, HFILL} {"Rate", "infiniband.pathrecord.rate", FT_UINT8, BASE_HEX, NULL, 0x3F, NULL, HFILL}
}, },
{&hf_infiniband_PathRecord_PacketLifeTimeSelector, {&hf_infiniband_PathRecord_PacketLifeTimeSelector,
{"PacketLifeTimeSelector", "infiniband.pathrecord.packetlifetimeselector", FT_UINT8, BASE_HEX, NULL, 0x03, NULL, HFILL} {"PacketLifeTimeSelector", "infiniband.pathrecord.packetlifetimeselector", FT_UINT8, BASE_HEX, NULL, 0xC0, NULL, HFILL}
}, },
{&hf_infiniband_PathRecord_PacketLifeTime, {&hf_infiniband_PathRecord_PacketLifeTime,
{"PacketLifeTime", "infiniband.pathrecord.packetlifetime", FT_UINT8, BASE_HEX, NULL, 0xFC, NULL, HFILL} {"PacketLifeTime", "infiniband.pathrecord.packetlifetime", FT_UINT8, BASE_HEX, NULL, 0x3F, NULL, HFILL}
}, },
{&hf_infiniband_PathRecord_Preference, {&hf_infiniband_PathRecord_Preference,
{"Preference", "infiniband.pathrecord.preference", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL} {"Preference", "infiniband.pathrecord.preference", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}
@ -2318,7 +2322,7 @@ static hf_register_info hf[] = {
{"JoinState", "infiniband.mcmemberrecord.joinstate", FT_UINT8, BASE_HEX, NULL, 0xF0, NULL, HFILL} {"JoinState", "infiniband.mcmemberrecord.joinstate", FT_UINT8, BASE_HEX, NULL, 0xF0, NULL, HFILL}
}, },
{&hf_infiniband_MCMemberRecord_ProxyJoin, {&hf_infiniband_MCMemberRecord_ProxyJoin,
{"ProxyJoin", "infiniband.mcmemberrecord.proxyjoin", FT_UINT8, BASE_HEX, NULL, 0x08, NULL, HFILL} {"ProxyJoin", "infiniband.mcmemberrecord.proxyjoin", FT_UINT8, BASE_HEX, NULL, 0x80, NULL, HFILL}
}, },
/* MultiPathRecord */ /* MultiPathRecord */
{&hf_infiniband_MultiPathRecord_RawTraffic, {&hf_infiniband_MultiPathRecord_RawTraffic,
@ -2352,10 +2356,10 @@ static hf_register_info hf[] = {
{"MTU", "infiniband.multipathrecord.mtu", FT_UINT8, BASE_HEX, NULL, 0x3F, NULL, HFILL} {"MTU", "infiniband.multipathrecord.mtu", FT_UINT8, BASE_HEX, NULL, 0x3F, NULL, HFILL}
}, },
{&hf_infiniband_MultiPathRecord_RateSelector, {&hf_infiniband_MultiPathRecord_RateSelector,
{"RateSelector", "infiniband.multipathrecord.rateselector", FT_UINT8, BASE_HEX, NULL, 0x03, NULL, HFILL} {"RateSelector", "infiniband.multipathrecord.rateselector", FT_UINT8, BASE_HEX, NULL, 0xC0, NULL, HFILL}
}, },
{&hf_infiniband_MultiPathRecord_Rate, {&hf_infiniband_MultiPathRecord_Rate,
{"Rate", "infiniband.multipathrecord.rate", FT_UINT8, BASE_HEX, NULL, 0xFC, NULL, HFILL} {"Rate", "infiniband.multipathrecord.rate", FT_UINT8, BASE_HEX, NULL, 0x3F, NULL, HFILL}
}, },
{&hf_infiniband_MultiPathRecord_PacketLifeTimeSelector, {&hf_infiniband_MultiPathRecord_PacketLifeTimeSelector,
{"PacketLifeTimeSelector", "infiniband.multipathrecord.packetlifetimeselector", FT_UINT8, BASE_HEX, NULL, 0xC0, NULL, HFILL} {"PacketLifeTimeSelector", "infiniband.multipathrecord.packetlifetimeselector", FT_UINT8, BASE_HEX, NULL, 0xC0, NULL, HFILL}
@ -2403,12 +2407,12 @@ static hf_register_info hf[] = {
{&hf_infiniband_Notice_DataDetails, {&hf_infiniband_Notice_DataDetails,
{"DataDetails", "infiniband.notice.datadetails", FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL} {"DataDetails", "infiniband.notice.datadetails", FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL}
}, },
{&hf_infiniband_Notice_IssuerGID, /* {&hf_infiniband_Notice_IssuerGID, */
{"IssuerGID", "infiniband.notice.issuergid", FT_IPv6, BASE_HEX, NULL, 0x0, NULL, HFILL} /* {"IssuerGID", "infiniband.notice.issuergid", FT_IPv6, BASE_HEX, NULL, 0x0, NULL, HFILL} */
}, /* }, */
{&hf_infiniband_Notice_ClassTrapSpecificData, /* {&hf_infiniband_Notice_ClassTrapSpecificData, */
{"ClassTrapSpecificData", "infiniband.notice.classtrapspecificdata", FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL} /* {"ClassTrapSpecificData", "infiniband.notice.classtrapspecificdata", FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL} */
}, /* }, */
/* Traps 64,65,66,67 */ /* Traps 64,65,66,67 */
{&hf_infiniband_Trap_GIDADDR, {&hf_infiniband_Trap_GIDADDR,
{"GIDADDR", "infiniband.trap.gidaddr", FT_IPv6, BASE_HEX, NULL, 0x0, NULL, HFILL} {"GIDADDR", "infiniband.trap.gidaddr", FT_IPv6, BASE_HEX, NULL, 0x0, NULL, HFILL}
@ -2420,9 +2424,9 @@ static hf_register_info hf[] = {
{&hf_infiniband_Trap_WAIT_FOR_REPATH, {&hf_infiniband_Trap_WAIT_FOR_REPATH,
{"WAIT_FOR_REPATH", "infiniband.trap.wait_for_repath", FT_UINT8, BASE_HEX, NULL, 0x80, NULL, HFILL} {"WAIT_FOR_REPATH", "infiniband.trap.wait_for_repath", FT_UINT8, BASE_HEX, NULL, 0x80, NULL, HFILL}
}, },
{&hf_infiniband_Trap_PATH_REC, /* {&hf_infiniband_Trap_PATH_REC, */
{"PATH_REC", "infiniband.trap.path_rec", FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL} /* {"PATH_REC", "infiniband.trap.path_rec", FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL} */
}, /* }, */
/* Trap 128 */ /* Trap 128 */
{&hf_infiniband_Trap_LIDADDR, {&hf_infiniband_Trap_LIDADDR,
{"LIDADDR", "infiniband.trap.lidaddr", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL} {"LIDADDR", "infiniband.trap.lidaddr", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}
@ -2449,76 +2453,76 @@ static hf_register_info hf[] = {
}, },
/* Trap 145 */ /* Trap 145 */
{&hf_infiniband_Trap_SYSTEMIMAGEGUID, {&hf_infiniband_Trap_SYSTEMIMAGEGUID,
{"SYSTEMIMAGEGUID", "infiniband.trap.systemimageguid", FT_UINT64, BASE_HEX, NULL, 0x01, NULL, HFILL} {"SYSTEMIMAGEGUID", "infiniband.trap.systemimageguid", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL}
}, },
/* Trap 256 */ /* Trap 256 */
{&hf_infiniband_Trap_DRSLID, {&hf_infiniband_Trap_DRSLID,
{"DRSLID", "infiniband.trap.drslid", FT_UINT16, BASE_HEX, NULL, 0x01, NULL, HFILL} {"DRSLID", "infiniband.trap.drslid", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}
}, },
{&hf_infiniband_Trap_METHOD, {&hf_infiniband_Trap_METHOD,
{"METHOD", "infiniband.trap.method", FT_UINT8, BASE_HEX, NULL, 0x01, NULL, HFILL} {"METHOD", "infiniband.trap.method", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}
}, },
{&hf_infiniband_Trap_ATTRIBUTEID, {&hf_infiniband_Trap_ATTRIBUTEID,
{"ATTRIBUTEID", "infiniband.trap.attributeid", FT_UINT16, BASE_HEX, NULL, 0x01, NULL, HFILL} {"ATTRIBUTEID", "infiniband.trap.attributeid", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}
}, },
{&hf_infiniband_Trap_ATTRIBUTEMODIFIER, {&hf_infiniband_Trap_ATTRIBUTEMODIFIER,
{"ATTRIBUTEMODIFIER", "infiniband.trap.attributemodifier", FT_UINT32, BASE_HEX, NULL, 0x01, NULL, HFILL} {"ATTRIBUTEMODIFIER", "infiniband.trap.attributemodifier", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}
}, },
{&hf_infiniband_Trap_MKEY, {&hf_infiniband_Trap_MKEY,
{"MKEY", "infiniband.trap.mkey", FT_UINT64, BASE_HEX, NULL, 0x01, NULL, HFILL} {"MKEY", "infiniband.trap.mkey", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL}
}, },
{&hf_infiniband_Trap_DRNotice, {&hf_infiniband_Trap_DRNotice,
{"DRNotice", "infiniband.trap.drnotice", FT_UINT8, BASE_HEX, NULL, 0x01, NULL, HFILL} {"DRNotice", "infiniband.trap.drnotice", FT_UINT8, BASE_HEX, NULL, 0x80, NULL, HFILL}
}, },
{&hf_infiniband_Trap_DRPathTruncated, {&hf_infiniband_Trap_DRPathTruncated,
{"DRPathTruncated", "infiniband.trap.drpathtruncated", FT_UINT8, BASE_HEX, NULL, 0x01, NULL, HFILL} {"DRPathTruncated", "infiniband.trap.drpathtruncated", FT_UINT8, BASE_HEX, NULL, 0x40, NULL, HFILL}
}, },
{&hf_infiniband_Trap_DRHopCount, {&hf_infiniband_Trap_DRHopCount,
{"DRHopCount", "infiniband.trap.drhopcount", FT_UINT8, BASE_HEX, NULL, 0x01, NULL, HFILL} {"DRHopCount", "infiniband.trap.drhopcount", FT_UINT8, BASE_HEX, NULL, 0x3F, NULL, HFILL}
}, },
{&hf_infiniband_Trap_DRNoticeReturnPath, {&hf_infiniband_Trap_DRNoticeReturnPath,
{"DRNoticeReturnPath", "infiniband.trap.drnoticereturnpath", FT_BYTES, BASE_HEX, NULL, 0x01, NULL, HFILL} {"DRNoticeReturnPath", "infiniband.trap.drnoticereturnpath", FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL}
}, },
/* Trap 257, 258 */ /* Trap 257, 258 */
{&hf_infiniband_Trap_LIDADDR1, {&hf_infiniband_Trap_LIDADDR1,
{"LIDADDR1", "infiniband.trap.lidaddr1", FT_UINT16, BASE_HEX, NULL, 0x01, NULL, HFILL} {"LIDADDR1", "infiniband.trap.lidaddr1", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}
}, },
{&hf_infiniband_Trap_LIDADDR2, {&hf_infiniband_Trap_LIDADDR2,
{"LIDADDR2", "infiniband.trap.lidaddr2", FT_UINT16, BASE_HEX, NULL, 0x01, NULL, HFILL} {"LIDADDR2", "infiniband.trap.lidaddr2", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}
}, },
{&hf_infiniband_Trap_KEY, {&hf_infiniband_Trap_KEY,
{"KEY", "infiniband.trap.key", FT_UINT32, BASE_HEX, NULL, 0x01, NULL, HFILL} {"KEY", "infiniband.trap.key", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}
}, },
{&hf_infiniband_Trap_SL, {&hf_infiniband_Trap_SL,
{"SL", "infiniband.trap.sl", FT_UINT8, BASE_HEX, NULL, 0x01, NULL, HFILL} {"SL", "infiniband.trap.sl", FT_UINT8, BASE_HEX, NULL, 0xF0, NULL, HFILL}
}, },
{&hf_infiniband_Trap_QP1, {&hf_infiniband_Trap_QP1,
{"QP1", "infiniband.trap.qp1", FT_UINT24, BASE_HEX, NULL, 0x01, NULL, HFILL} {"QP1", "infiniband.trap.qp1", FT_UINT24, BASE_HEX, NULL, 0x0, NULL, HFILL}
}, },
{&hf_infiniband_Trap_QP2, {&hf_infiniband_Trap_QP2,
{"QP2", "infiniband.trap.qp2", FT_UINT24, BASE_HEX, NULL, 0x01, NULL, HFILL} {"QP2", "infiniband.trap.qp2", FT_UINT24, BASE_HEX, NULL, 0x0, NULL, HFILL}
}, },
{&hf_infiniband_Trap_GIDADDR1, {&hf_infiniband_Trap_GIDADDR1,
{"GIDADDR1", "infiniband.trap.gidaddr1", FT_IPv6, BASE_HEX, NULL, 0x01, NULL, HFILL} {"GIDADDR1", "infiniband.trap.gidaddr1", FT_IPv6, BASE_HEX, NULL, 0x0, NULL, HFILL}
}, },
{&hf_infiniband_Trap_GIDADDR2, {&hf_infiniband_Trap_GIDADDR2,
{"GIDADDR2", "infiniband.trap.gidaddr2", FT_IPv6, BASE_HEX, NULL, 0x01, NULL, HFILL} {"GIDADDR2", "infiniband.trap.gidaddr2", FT_IPv6, BASE_HEX, NULL, 0x0, NULL, HFILL}
}, },
/* Trap 259 */ /* Trap 259 */
{&hf_infiniband_Trap_DataValid, {&hf_infiniband_Trap_DataValid,
{"DataValid", "infiniband.trap.datavalid", FT_IPv6, BASE_HEX, NULL, 0x01, NULL, HFILL} {"DataValid", "infiniband.trap.datavalid", FT_IPv6, BASE_HEX, NULL, 0x0, NULL, HFILL}
}, },
{&hf_infiniband_Trap_PKEY, {&hf_infiniband_Trap_PKEY,
{"PKEY", "infiniband.trap.pkey", FT_IPv6, BASE_HEX, NULL, 0x01, NULL, HFILL} {"PKEY", "infiniband.trap.pkey", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}
}, },
{&hf_infiniband_Trap_SWLIDADDR, {&hf_infiniband_Trap_SWLIDADDR,
{"SWLIDADDR", "infiniband.trap.swlidaddr", FT_IPv6, BASE_HEX, NULL, 0x01, NULL, HFILL} {"SWLIDADDR", "infiniband.trap.swlidaddr", FT_IPv6, BASE_HEX, NULL, 0x0, NULL, HFILL}
} }
}; };
/* Array to hold expansion options between dissections */ /* Array to hold expansion options between dissections */
static gint *ett[] = { static gint *ett[] = {
&ett_infiniband, /* &ett_infiniband, */
&ett_all_headers, &ett_all_headers,
&ett_lrh, &ett_lrh,
&ett_grh, &ett_grh,
@ -2544,11 +2548,11 @@ static gint *ett[] = {
&ett_suba_attribute, &ett_suba_attribute,
&ett_datadetails, &ett_datadetails,
&ett_noticestraps, &ett_noticestraps,
&ett_nodedesc, /* &ett_nodedesc, */
&ett_nodeinfo, /* &ett_nodeinfo, */
&ett_switchinfo, /* &ett_switchinfo, */
&ett_guidinfo, /* &ett_guidinfo, */
&ett_portinfo, /* &ett_portinfo, */
&ett_portinfo_capmask, &ett_portinfo_capmask,
&ett_pkeytable, &ett_pkeytable,
&ett_sltovlmapping, &ett_sltovlmapping,