Incorporate plugin dissector into build in collection.

svn path=/trunk/; revision=27502

1 files changed, 3153 insertions, 0 deletions

diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c
new file mode 100644
index 0000000000..c1b77a77b2
--- /dev/null
+++ b/epan/dissectors/packet-infiniband.c
@@ -0,0 +1,3153 @@
+/* packet-infiniband.c
+ * Routines for Infiniband/ERF Dissection
+ * Copyright 2008 Endace Technology Limited
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <glib.h>
+#include <epan/packet.h>
+#include <epan/proto.h>
+#include <epan/dissectors/packet-frame.h>
+#include "packet-infiniband.h"
+
+
+/* Protocol Registration */
+void proto_register_infiniband(void)
+{
+	proto_infiniband = proto_register_protocol("InfiniBand", "InfiniBand", "infiniband");
+	register_dissector("infiniband", dissect_infiniband, proto_infiniband);
+
+	proto_register_field_array(proto_infiniband, hf, array_length(hf));
+	proto_register_subtree_array(ett, array_length(ett));
+
+}
+
+/* Reg Handoff.  Register dissectors we'll need for IPoIB */
+void proto_reg_handoff_infiniband(void)
+{
+	ipv6_handle = find_dissector("ipv6");
+	data_handle = find_dissector("data");
+	ethertype_dissector_table = find_dissector_table("ethertype");
+}
+
+
+/* Main Dissector */
+/* Notes: */
+/* 1.) Floating "offset+=" statements should probably be "functionized" but they are inline */
+/* Offset is only passed by reference in specific places, so do not be confused when following code */
+/* In any code path, adding up "offset+=" statements will tell you what byte you are at */
+static void
+dissect_infiniband(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+	/* Top Level Item */
+	proto_item *infiniband_packet = NULL;
+
+	/* The Headers Subtree */
+	proto_tree *all_headers_tree = NULL;
+
+	/* LRH - Local Route Header */
+	proto_tree *local_route_header_tree = NULL;
+	proto_item *local_route_header_item = NULL;
+
+	/* GRH - Global Route Header */
+	proto_tree *global_route_header_tree = NULL;
+	proto_item *global_route_header_item = NULL;
+
+	/* BTH - Base Transport header */
+	proto_tree *base_transport_header_tree = NULL;
+	proto_item *base_transport_header_item = NULL;
+
+	/* Raw Data */
+	proto_tree *RAWDATA_header_tree;
+	proto_item *RAWDATA_header_item;
+	guint8 lnh_val = 0;		/* Link Next Header Value */
+	gint offset = 0;		/* Current Offset */
+
+	/* General Variables */
+	gboolean bthFollows = 0; /* Tracks if we are parsing a BTH.  This is a significant decision point */
+	guint8 virtualLane = 0; /* IB VirtualLane.  Keyed off of for detecting subnet admin/management */
+	guint8 opCode = 0;		/* OpCode from BTH header. */
+	gint32 nextHeaderSequence = -1; /* defined by this dissector. #define which indicates the upcoming header sequence from OpCode */
+	guint16 payloadLength = 0; /* Payload Length should it exist */
+	guint8 nxtHdr = 0;  /* Keyed off for header dissection order */
+	guint16 packetLength = 0; /* Packet Length.  We track this as tvb->length - offset.  It provides the parsing methods a known size */								  /* that must be available for that header. */
+	struct e_in6_addr SRCgid; /* Structures to hold GIDs should be need them */
+	struct e_in6_addr DSTgid;
+	gint crc_length = 0;
+
+	/* Mark the Packet type as Infiniband in the wireshark UI */
+	/* Clear other columns */
+	if(pinfo->cinfo)
+	{
+		if(check_col(pinfo->cinfo, COL_PROTOCOL))
+			col_set_str(pinfo->cinfo, COL_PROTOCOL, "InfiniBand");
+		if(check_col(pinfo->cinfo, COL_INFO))
+			col_clear(pinfo->cinfo, COL_INFO);
+	}
+
+	/* Get the parent tree from the ERF dissector.  We don't want to nest under ERF */
+	if(tree && tree->parent)
+	{
+		/* Set the normal tree outside of ERF */
+		tree = tree->parent;
+		/* Set a global reference for nested protocols */
+		top_tree = tree;
+	}
+
+	if(!tree)
+	{
+		/* If no packet details are being dissected, extract some high level info for the packet view */
+		/* Assigns column values rather than full tree population */
+		dissect_general_info(tvb, offset, pinfo);
+		return;
+	}
+
+	/* Top Level Packet */
+	infiniband_packet = proto_tree_add_item(tree, proto_infiniband, tvb, offset, -1, FALSE);
+
+	/* Headers Level Tree */
+	all_headers_tree = proto_item_add_subtree(infiniband_packet, ett_all_headers);
+
+	/* Local Route Header Subtree */
+	local_route_header_item = proto_tree_add_bytes(all_headers_tree, hf_infiniband_LRH, tvb, offset, 8, tvb->real_data);
+	proto_item_set_text(local_route_header_item, "%s", "Local Route Header");
+	local_route_header_tree = proto_item_add_subtree(local_route_header_item, ett_lrh);
+
+	proto_tree_add_item(local_route_header_tree, hf_infiniband_virtual_lane,			tvb, offset, 1, FALSE);
+
+
+	/* Get the Virtual Lane.  We'll use this to identify Subnet Management and Subnet Administration Packets. */
+	virtualLane =  tvb_get_guint8(tvb, offset);
+	virtualLane = virtualLane & 0xF0;
+
+
+	proto_tree_add_item(local_route_header_tree, hf_infiniband_link_version,			tvb, offset, 1, FALSE); offset+=1;
+	proto_tree_add_item(local_route_header_tree, hf_infiniband_service_level,			tvb, offset, 1, FALSE);
+
+	proto_tree_add_item(local_route_header_tree, hf_infiniband_reserved2,				tvb, offset, 1, FALSE);
+	proto_tree_add_item(local_route_header_tree, hf_infiniband_link_next_header,		tvb, offset, 1, FALSE);
+
+
+	/* Save Link Next Header... This tells us what the next header is. */
+	lnh_val =  tvb_get_guint8(tvb, offset);
+	lnh_val = lnh_val & 0x03;
+	offset+=1;
+
+
+	proto_tree_add_item(local_route_header_tree, hf_infiniband_destination_local_id,	tvb, offset, 2, FALSE);
+
+
+	/* Set destination in packet view. */
+	if (check_col(pinfo->cinfo, COL_DEF_DST))
+	{
+		col_add_fstr(pinfo->cinfo, COL_DEF_DST, "DLID: %s", tvb_bytes_to_str(tvb, offset, 2));
+	}
+	offset+=2;
+
+
+	proto_tree_add_item(local_route_header_tree, hf_infiniband_reserved5,				tvb, offset, 2, FALSE);
+
+	packetLength = tvb_get_ntohs(tvb, offset); /* Get the Packet Length. This will determine payload size later on. */
+	packetLength = packetLength & 0x07FF; /* Mask off top 5 bits, they are reserved */
+	packetLength = packetLength * 4; /* Multiply by 4 to get true byte length. This is by specification. PktLen is size in 4 byte words (byteSize /4). */
+
+	proto_tree_add_item(local_route_header_tree, hf_infiniband_packet_length,			tvb, offset, 2, FALSE); offset+=2;
+	proto_tree_add_item(local_route_header_tree, hf_infiniband_source_local_id,			tvb, offset, 2, FALSE);
+
+	/* Set Source in packet view. */
+	if (check_col(pinfo->cinfo, COL_DEF_SRC))
+	{
+		col_add_fstr(pinfo->cinfo, COL_DEF_SRC, "SLID: %s", tvb_bytes_to_str(tvb, offset, 2));
+	}
+
+	offset+=2;
+	packetLength -= 8; /* Shave 8 bytes for the LRH. */
+
+	/* Key off Link Next Header.  This tells us what High Level Data Format we have */
+	switch(lnh_val)
+	{
+		case IBA_GLOBAL:
+			global_route_header_item = proto_tree_add_item(all_headers_tree, hf_infiniband_GRH, tvb, offset, 40, FALSE);
+			proto_item_set_text(global_route_header_item, "%s", "Global Route Header");
+			global_route_header_tree = proto_item_add_subtree(global_route_header_item, ett_grh);
+
+			proto_tree_add_item(global_route_header_tree, hf_infiniband_ip_version,			tvb, offset, 1, FALSE);
+			proto_tree_add_item(global_route_header_tree, hf_infiniband_traffic_class,		tvb, offset, 2, FALSE);
+			proto_tree_add_item(global_route_header_tree, hf_infiniband_flow_label,			tvb, offset, 4, FALSE); offset += 4;
+
+			payloadLength = tvb_get_ntohs(tvb, offset);
+
+			proto_tree_add_item(global_route_header_tree, hf_infiniband_payload_length,		tvb, offset, 2, FALSE); offset += 2;
+
+			nxtHdr = tvb_get_guint8(tvb, offset);
+
+			proto_tree_add_item(global_route_header_tree, hf_infiniband_next_header,		tvb, offset, 1, FALSE); offset +=1;
+			proto_tree_add_item(global_route_header_tree, hf_infiniband_hop_limit,			tvb, offset, 1, FALSE); offset +=1;
+			proto_tree_add_item(global_route_header_tree, hf_infiniband_source_gid,			tvb, offset, 16, FALSE);
+
+			tvb_get_ipv6(tvb, offset, &SRCgid);
+			if (check_col(pinfo->cinfo, COL_DEF_SRC))
+			{
+				col_add_fstr(pinfo->cinfo, COL_DEF_SRC, "SGID: %s", ip6_to_str(&SRCgid));
+			}
+			offset += 16;
+
+			proto_tree_add_item(global_route_header_tree, hf_infiniband_destination_gid,	tvb, offset, 16, FALSE);
+
+			tvb_get_ipv6(tvb, offset, &DSTgid);
+			if (check_col(pinfo->cinfo, COL_DEF_DST))
+			{
+				col_add_fstr(pinfo->cinfo, COL_DEF_DST, "DGID: %s", ip6_to_str(&DSTgid));
+			}
+			offset += 16;
+			packetLength -= 40; /* Shave 40 bytes for GRH */
+
+			if(nxtHdr != 0x1B)
+			{
+				/* Some kind of packet being transported globally with IBA, but locally it is not IBA - no BTH following. */
+				break;
+			}
+			/* otherwise fall through and start parsing BTH */
+		case IBA_LOCAL:
+			bthFollows = TRUE;
+			base_transport_header_item = proto_tree_add_item(all_headers_tree, hf_infiniband_BTH, tvb, offset, 12, FALSE);
+			proto_item_set_text(base_transport_header_item, "%s", "Base Transport Header");
+			base_transport_header_tree = proto_item_add_subtree(base_transport_header_item, ett_bth);
+			proto_tree_add_item(base_transport_header_tree, hf_infiniband_opcode,						tvb, offset, 1, FALSE);
+
+			/* Get the OpCode - this tells us what headers are following */
+			opCode = tvb_get_guint8(tvb, offset);
+			if (check_col(pinfo->cinfo, COL_INFO))
+			{
+				col_append_str(pinfo->cinfo, COL_INFO, val_to_str((guint32)opCode, OpCodeMap, "Unknown OpCode"));
+			}
+			offset +=1;
+
+			proto_tree_add_item(base_transport_header_tree, hf_infiniband_solicited_event,				tvb, offset, 1, FALSE);
+			proto_tree_add_item(base_transport_header_tree, hf_infiniband_migreq,						tvb, offset, 1, FALSE);
+			proto_tree_add_item(base_transport_header_tree, hf_infiniband_pad_count,					tvb, offset, 1, FALSE);
+			proto_tree_add_item(base_transport_header_tree, hf_infiniband_transport_header_version,		tvb, offset, 1, FALSE); offset +=1;
+			proto_tree_add_item(base_transport_header_tree, hf_infiniband_partition_key,				tvb, offset, 2, FALSE); offset +=2;
+			proto_tree_add_item(base_transport_header_tree, hf_infiniband_reserved8,					tvb, offset, 1, FALSE); offset +=1;
+			proto_tree_add_item(base_transport_header_tree, hf_infiniband_destination_qp,				tvb, offset, 3, FALSE); offset +=3;
+			proto_tree_add_item(base_transport_header_tree, hf_infiniband_acknowledge_request,			tvb, offset, 1, FALSE);
+			proto_tree_add_item(base_transport_header_tree, hf_infiniband_reserved7,					tvb, offset, 1, FALSE); offset +=1;
+			proto_tree_add_item(base_transport_header_tree, hf_infiniband_packet_sequence_number,		tvb, offset, 3, FALSE); offset +=3;
+
+
+			packetLength -= 12; /* Shave 12 for Base Transport Header */
+
+		break;
+		case IP_NON_IBA:
+			/* Raw IPv6 Packet */
+			if (check_col(pinfo->cinfo, COL_DEF_DST))
+			{
+				col_set_str(pinfo->cinfo, COL_DEF_DST, "IPv6 over IB Packet");
+				col_set_fence(pinfo->cinfo, COL_DEF_DST);
+			}
+			parse_IPvSix(all_headers_tree, tvb, &offset, pinfo);
+			break;
+		case RAW:
+			parse_RWH(all_headers_tree, tvb, &offset, pinfo);
+			break;
+		default:
+			/* Unknown Packet */
+			RAWDATA_header_item = proto_tree_add_item(all_headers_tree, hf_infiniband_raw_data, tvb, offset, -1, FALSE);
+			proto_item_set_text(RAWDATA_header_item, "%s", "Unknown Raw Data - IB Encapsulated");
+			RAWDATA_header_tree = proto_item_add_subtree(RAWDATA_header_item, ett_rawdata);
+			break;
+	}
+
+	/* Base Transport header is hit quite often, however it is alone since it is the exception not the rule */
+	/* Only IBA Local packets use it */
+	if(bthFollows)
+	{
+		/* Find our next header sequence based on the Opcode
+		* Each case decrements the packetLength by the amount of bytes consumed by each header.
+		* The find_next_header_sequence method could be used to automate this.
+		* We need to keep track of this so we know much data to mark as payload/ICRC/VCRC values. */
+
+		nextHeaderSequence = find_next_header_sequence((guint32) opCode);
+
+		/* find_next_header_sequence gives us the DEFINE value corresponding to the header order following */
+		/* Enumerations are named intuitively, e.g. RDETH DETH PAYLOAD means there is an RDETH Header, DETH Header, and a packet payload */
+		switch(nextHeaderSequence)
+		{
+			case RDETH_DETH_PAYLD:
+				parse_RDETH(all_headers_tree, tvb, &offset);
+				parse_DETH(all_headers_tree, tvb, &offset);
+
+				packetLength -= 4; /* RDETH */
+				packetLength -= 8; /* DETH */
+
+				parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, virtualLane);
+				break;
+			case RDETH_DETH_RETH_PAYLD:
+				parse_RDETH(all_headers_tree, tvb, &offset);
+				parse_DETH(all_headers_tree, tvb, &offset);
+				parse_RETH(all_headers_tree, tvb, &offset);
+
+				packetLength -= 4; /* RDETH */
+				packetLength -= 8; /* DETH */
+				packetLength -= 16; /* RETH */
+
+				parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, virtualLane);
+				break;
+			case RDETH_DETH_IMMDT_PAYLD:
+				parse_RDETH(all_headers_tree, tvb, &offset);
+				parse_DETH(all_headers_tree, tvb, &offset);
+				parse_IMMDT(all_headers_tree, tvb, &offset);
+
+				packetLength -= 4; /* RDETH */
+				packetLength -= 8; /* DETH */
+				packetLength -= 4; /* IMMDT */
+
+				parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, virtualLane);
+				break;
+			case RDETH_DETH_RETH_IMMDT_PAYLD:
+				parse_RDETH(all_headers_tree, tvb, &offset);
+				parse_DETH(all_headers_tree, tvb, &offset);
+				parse_RETH(all_headers_tree, tvb, &offset);
+				parse_IMMDT(all_headers_tree, tvb, &offset);
+
+				packetLength -= 4; /* RDETH */
+				packetLength -= 8; /* DETH */
+				packetLength -= 16; /* RETH */
+				packetLength -= 4; /* IMMDT */
+
+				parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, virtualLane);
+				break;
+			case RDETH_DETH_RETH:
+				parse_RDETH(all_headers_tree, tvb, &offset);
+				parse_DETH(all_headers_tree, tvb, &offset);
+				parse_RETH(all_headers_tree, tvb, &offset);
+
+				packetLength -= 4; /* RDETH */
+				packetLength -= 8; /* DETH */
+				packetLength -= 16; /* RETH */
+
+				break;
+			case RDETH_AETH_PAYLD:
+				parse_RDETH(all_headers_tree, tvb, &offset);
+				parse_AETH(all_headers_tree, tvb, &offset);
+
+				packetLength -= 4; /* RDETH */
+				packetLength -= 4; /* AETH */
+
+				parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, virtualLane);
+				break;
+			case RDETH_PAYLD:
+				parse_RDETH(all_headers_tree, tvb, &offset);
+
+				packetLength -= 4; /* RDETH */
+
+				parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, virtualLane);
+				break;
+			case RDETH_AETH:
+				parse_AETH(all_headers_tree, tvb, &offset);
+
+				packetLength -= 4; /* RDETH */
+				packetLength -= 4; /* AETH */
+
+
+				break;
+			case RDETH_AETH_ATOMICACKETH:
+				parse_RDETH(all_headers_tree, tvb, &offset);
+				parse_AETH(all_headers_tree, tvb, &offset);
+				parse_ATOMICACKETH(all_headers_tree, tvb, &offset);
+
+				packetLength -= 4; /* RDETH */
+				packetLength -= 4; /* AETH */
+				packetLength -= 8; /* AtomicAckETH */
+
+
+				break;
+			case RDETH_DETH_ATOMICETH:
+				parse_RDETH(all_headers_tree, tvb, &offset);
+				parse_DETH(all_headers_tree, tvb, &offset);
+				parse_ATOMICETH(all_headers_tree, tvb, &offset);
+
+				packetLength -= 4; /* RDETH */
+				packetLength -= 8; /* DETH */
+				packetLength -= 28; /* AtomicETH */
+
+				break;
+			case RDETH_DETH:
+				parse_RDETH(all_headers_tree, tvb, &offset);
+				parse_DETH(all_headers_tree, tvb, &offset);
+
+				packetLength -= 4; /* RDETH */
+				packetLength -= 8; /* DETH */
+
+				break;
+			case DETH_PAYLD:
+				parse_DETH(all_headers_tree, tvb, &offset);
+
+				packetLength -= 8; /* DETH */
+
+				parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, virtualLane);
+				break;
+			case PAYLD:
+
+				parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, virtualLane);
+				break;
+			case IMMDT_PAYLD:
+				parse_IMMDT(all_headers_tree, tvb, &offset);
+
+				packetLength -= 4; /* IMMDT */
+
+				parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, virtualLane);
+				break;
+			case RETH_PAYLD:
+				parse_RETH(all_headers_tree, tvb, &offset);
+
+				packetLength -= 16; /* RETH */
+
+				parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, virtualLane);
+				break;
+			case RETH:
+				parse_RETH(all_headers_tree, tvb, &offset);
+
+				packetLength -= 16; /* RETH */
+
+				break;
+			case AETH_PAYLD:
+				parse_AETH(all_headers_tree, tvb, &offset);
+
+				packetLength -= 4; /* AETH */
+
+				parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, virtualLane);
+				break;
+			case AETH:
+				parse_AETH(all_headers_tree, tvb, &offset);
+
+				packetLength -= 4; /* AETH */
+
+				break;
+			case AETH_ATOMICACKETH:
+				parse_AETH(all_headers_tree, tvb, &offset);
+				parse_ATOMICACKETH(all_headers_tree, tvb, &offset);
+
+				packetLength -= 4; /* AETH */
+				packetLength -= 8; /* AtomicAckETH */
+
+				break;
+			case ATOMICETH:
+				parse_ATOMICETH(all_headers_tree, tvb, &offset);
+
+				packetLength -= 28; /* AtomicETH */
+
+				break;
+			case IETH_PAYLD:
+				parse_IETH(all_headers_tree, tvb, &offset);
+
+				packetLength -= 4; /* IETH */
+
+				parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, virtualLane);
+				break;
+			case DETH_IMMDT_PAYLD:
+				parse_DETH(all_headers_tree, tvb, &offset);
+				parse_IMMDT(all_headers_tree, tvb, &offset);
+
+				packetLength -= 8; /* DETH */
+				packetLength -= 4; /* IMMDT */
+
+				parse_PAYLOAD(all_headers_tree, pinfo, tvb, &offset, packetLength, virtualLane);
+				break;
+			default:
+				parse_VENDOR(all_headers_tree, tvb, &offset);
+				break;
+
+		}
+
+	}
+	/* Display the ICRC/VCRC */
+	/* Doing it this way rather than in a variety of places according to the specific packet */
+	/* If we've already displayed it crc_length comes out 0 */
+	crc_length = tvb_reported_length_remaining(tvb, offset);
+	if(crc_length == 6)
+	{
+		proto_tree_add_item(all_headers_tree, hf_infiniband_invariant_crc, tvb, offset, 4, FALSE); offset +=4;
+		proto_tree_add_item(all_headers_tree, hf_infiniband_variant_crc,   tvb, offset, 2, FALSE); offset+=2;
+	}
+	else if(crc_length == 4)
+	{
+		proto_tree_add_item(all_headers_tree, hf_infiniband_invariant_crc, tvb, offset, 4, FALSE); offset +=4;
+	}
+	else if(crc_length == 2)
+	{
+		proto_tree_add_item(all_headers_tree, hf_infiniband_variant_crc,   tvb, offset, 2, FALSE); offset+=2;
+	}
+	
+}
+
+/* Description: Finds the header sequence that follows the Base Transport Header.
+* Somwhat inefficient (should be using a single key,value pair data structure)
+* But uses pure probablity to take a stab at better efficiency.
+* Searches largest header sequence groups first, and then finally resorts to single matches for unique header sequences
+* IN: OpCode: The OpCode from the Base Transport Header.
+* OUT: The Header Sequence enumeration.  See Declarations for #defines from (0-22) */
+static gint32
+find_next_header_sequence(guint32 OpCode)
+{
+	if(contains(OpCode, &opCode_PAYLD[0], (gint32)sizeof(opCode_PAYLD)))
+		return PAYLD;
+
+	if(contains(OpCode, &opCode_IMMDT_PAYLD[0], (gint32)sizeof(opCode_IMMDT_PAYLD)))
+		return IMMDT_PAYLD;
+
+	if(contains(OpCode, &opCode_RDETH_DETH_PAYLD[0], (gint32)sizeof(opCode_RDETH_DETH_PAYLD)))
+		return RDETH_DETH_PAYLD;
+
+	if(contains(OpCode, &opCode_RETH_PAYLD[0], (gint32)sizeof(opCode_RETH_PAYLD)))
+		return RETH_PAYLD;
+
+	if(contains(OpCode, &opCode_RDETH_AETH_PAYLD[0], (gint32)sizeof(opCode_RDETH_AETH_PAYLD)))
+		return RDETH_AETH_PAYLD;
+
+	if(contains(OpCode, &opCode_AETH_PAYLD[0], (gint32)sizeof(opCode_AETH_PAYLD)))
+		return AETH_PAYLD;
+
+	if(contains(OpCode, &opCode_RDETH_DETH_IMMDT_PAYLD[0], (gint32)sizeof(opCode_RDETH_DETH_IMMDT_PAYLD)))
+		return RDETH_DETH_IMMDT_PAYLD;
+
+	if(contains(OpCode, &opCode_RETH_IMMDT_PAYLD[0], (gint32)sizeof(opCode_RETH_IMMDT_PAYLD)))
+		return RETH_IMMDT_PAYLD;
+
+	if(contains(OpCode, &opCode_RDETH_DETH_RETH_PAYLD[0], (gint32)sizeof(opCode_RDETH_DETH_RETH_PAYLD)))
+		return RDETH_DETH_RETH_PAYLD;
+
+	if(contains(OpCode, &opCode_ATOMICETH[0], (gint32)sizeof(opCode_ATOMICETH)))
+		return ATOMICETH;
+
+	if(contains(OpCode, &opCode_IETH_PAYLD[0], (gint32)sizeof(opCode_IETH_PAYLD)))
+		return IETH_PAYLD;
+
+	if(contains(OpCode, &opCode_RDETH_DETH_ATOMICETH[0], (gint32)sizeof(opCode_RDETH_DETH_ATOMICETH)))
+		return RDETH_DETH_ATOMICETH;
+
+	if((OpCode ^ RC_ACKNOWLEDGE) == 0)
+		return AETH;
+
+	if((OpCode ^ RC_RDMA_READ_REQUEST) == 0)
+		return RETH;
+
+	if((OpCode ^ RC_ATOMIC_ACKNOWLEDGE) == 0)
+		return AETH_ATOMICACKETH;
+
+	if((OpCode ^ RD_RDMA_READ_RESPONSE_MIDDLE) == 0)
+		return RDETH_PAYLD;
+
+	if((OpCode ^ RD_ACKNOWLEDGE) == 0)
+		return RDETH_AETH;
+
+	if((OpCode ^ RD_ATOMIC_ACKNOWLEDGE) == 0)
+		return RDETH_AETH_ATOMICACKETH;
+
+	if((OpCode ^ RD_RDMA_WRITE_ONLY_IMM) == 0)
+		return RDETH_DETH_RETH_IMMDT_PAYLD;
+
+	if((OpCode ^ RD_RDMA_READ_REQUEST) == 0)
+		return RDETH_DETH_RETH;
+
+	if((OpCode ^ RD_RESYNC) == 0)
+		return RDETH_DETH;
+
+	if((OpCode ^ UD_SEND_ONLY) == 0)
+		return DETH_PAYLD;
+
+	if((OpCode ^ UD_SEND_ONLY_IMM) == 0)
+		return DETH_IMMDT_PAYLD;
+
+	return -1;
+}
+
+/* Description: Finds if a given value is present in an array. This is probably in a standard library somewhere,
+* But I'd rather define my own.
+* IN: OpCode: The OpCode you are looking for
+* IN: Codes: The organized array of OpCodes to look through
+* IN: Array length, because we're in C++...
+* OUT: Boolean indicating if that OpCode was found in OpCodes */
+static gboolean
+contains(guint32 OpCode, guint32* Codes, gint32 length)
+{
+	gint32 i;
+	for(i = 0; i < length; i++)
+	{
+		if((OpCode ^ Codes[i]) == 0)
+			return TRUE;
+	}
+	return FALSE;
+}
+
+/* Parse RDETH - Reliable Datagram Extended Transport Header
+* IN: parentTree to add the dissection to - in this code the all_headers_tree
+* IN: tvb - the data buffer from wireshark
+* IN/OUT: The current and updated offset */
+static void
+parse_RDETH(proto_tree * parentTree, tvbuff_t *tvb, gint *offset)
+{
+	gint local_offset = *offset;
+	/* RDETH - Reliable Datagram Extended Transport Header */
+	proto_tree *RDETH_header_tree = NULL;
+	proto_item *RDETH_header_item = NULL;
+
+	RDETH_header_item = proto_tree_add_item(parentTree, hf_infiniband_RDETH, tvb, local_offset, 4, FALSE);
+	proto_item_set_text(RDETH_header_item, "%s", "RDETH - Reliable Datagram Extended Transport Header");
+	RDETH_header_tree = proto_item_add_subtree(RDETH_header_item, ett_rdeth);
+
+	proto_tree_add_item(RDETH_header_tree, hf_infiniband_reserved8_RDETH,	tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(RDETH_header_tree, hf_infiniband_ee_context,		tvb, local_offset, 3, FALSE); local_offset+=3;
+	*offset = local_offset;
+}
+
+/* Parse DETH - Datagram Extended Transport Header
+* IN: parentTree to add the dissection to - in this code the all_headers_tree
+* IN: tvb - the data buffer from wireshark
+* IN/OUT: The current and updated offset */
+static void
+parse_DETH(proto_tree * parentTree, tvbuff_t *tvb, gint *offset)
+{
+	gint local_offset = *offset;
+	/* DETH - Datagram Extended Transport Header */
+	proto_tree *DETH_header_tree = NULL;
+	proto_item *DETH_header_item = NULL;
+
+	DETH_header_item = proto_tree_add_item(parentTree, hf_infiniband_DETH, tvb, local_offset, 8, FALSE);
+	proto_item_set_text(DETH_header_item, "%s", "DETH - Datagram Extended Transport Header");
+	DETH_header_tree = proto_item_add_subtree(DETH_header_item, ett_deth);
+
+	proto_tree_add_item(DETH_header_tree, hf_infiniband_queue_key,					tvb, local_offset, 4, FALSE); local_offset+=4;
+	proto_tree_add_item(DETH_header_tree, hf_infiniband_reserved8_DETH,				tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(DETH_header_tree, hf_infiniband_source_qp,					tvb, local_offset, 3, FALSE); local_offset+=3;
+
+	*offset = local_offset;
+}
+
+/* Parse RETH - RDMA Extended Transport Header
+* IN: parentTree to add the dissection to - in this code the all_headers_tree
+* IN: tvb - the data buffer from wireshark
+* IN/OUT: The current and updated offset */
+static void
+parse_RETH(proto_tree * parentTree, tvbuff_t *tvb, gint *offset)
+{
+	gint local_offset = *offset;
+	/* RETH - RDMA Extended Transport Header */
+	proto_tree *RETH_header_tree = NULL;
+	proto_item *RETH_header_item = NULL;
+
+	RETH_header_item = proto_tree_add_item(parentTree, hf_infiniband_RETH, tvb, local_offset, 16, FALSE);
+	proto_item_set_text(RETH_header_item, "%s", "RETH - RDMA Extended Transport Header");
+	RETH_header_tree = proto_item_add_subtree(RETH_header_item, ett_reth);
+
+	proto_tree_add_item(RETH_header_tree, hf_infiniband_virtual_address,				tvb, local_offset, 8, FALSE); local_offset+=8;
+	proto_tree_add_item(RETH_header_tree, hf_infiniband_remote_key,						tvb, local_offset, 4, FALSE); local_offset+=4;
+	proto_tree_add_item(RETH_header_tree, hf_infiniband_dma_length,						tvb, local_offset, 4, FALSE); local_offset+=4;
+
+	*offset = local_offset;
+}
+
+/* Parse AtomicETH - Atomic Extended Transport Header
+* IN: parentTree to add the dissection to - in this code the all_headers_tree
+* IN: tvb - the data buffer from wireshark
+* IN/OUT: The current and updated offset */
+static void
+parse_ATOMICETH(proto_tree * parentTree, tvbuff_t *tvb, gint *offset)
+{
+	gint local_offset = *offset;
+	/* AtomicETH - Atomic Extended Transport Header */
+	proto_tree *ATOMICETH_header_tree = NULL;
+	proto_item *ATOMICETH_header_item = NULL;
+
+	ATOMICETH_header_item = proto_tree_add_item(parentTree, hf_infiniband_AtomicETH, tvb, local_offset, 28, FALSE);
+	proto_item_set_text(ATOMICETH_header_item, "%s", "AtomicETH - Atomic Extended Transport Header");
+	ATOMICETH_header_tree = proto_item_add_subtree(ATOMICETH_header_item, ett_atomiceth);
+
+	proto_tree_add_item(ATOMICETH_header_tree, hf_infiniband_virtual_address,				tvb, local_offset, 8, FALSE); local_offset+=8;
+	proto_tree_add_item(ATOMICETH_header_tree, hf_infiniband_remote_key,					tvb, local_offset, 4, FALSE); local_offset+=4;
+	proto_tree_add_item(ATOMICETH_header_tree, hf_infiniband_swap_or_add_data,				tvb, local_offset, 8, FALSE); local_offset+=8;
+	proto_tree_add_item(ATOMICETH_header_tree, hf_infiniband_compare_data,					tvb, local_offset, 8, FALSE); local_offset+=8;
+	*offset = local_offset;
+}
+
+/* Parse AETH - ACK Extended Transport Header
+* IN: parentTree to add the dissection to - in this code the all_headers_tree
+* IN: tvb - the data buffer from wireshark
+* IN/OUT: The current and updated offset */
+static void
+parse_AETH(proto_tree * parentTree, tvbuff_t *tvb, gint *offset)
+{
+	gint local_offset = *offset;
+	/* AETH - ACK Extended Transport Header */
+	proto_tree *AETH_header_tree = NULL;
+	proto_item *AETH_header_item = NULL;
+
+	AETH_header_item = proto_tree_add_item(parentTree, hf_infiniband_AETH, tvb, local_offset, 4, FALSE);
+	proto_item_set_text(AETH_header_item, "%s", "AETH - ACK Extended Transport Header");
+	AETH_header_tree = proto_item_add_subtree(AETH_header_item, ett_aeth);
+
+	proto_tree_add_item(AETH_header_tree, hf_infiniband_syndrome,						tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(AETH_header_tree, hf_infiniband_message_sequence_number,		tvb, local_offset, 3, FALSE); local_offset+=3;
+
+	*offset = local_offset;
+}
+
+/* Parse AtomicAckEth - Atomic ACK Extended Transport Header
+* IN: parentTree to add the dissection to - in this code the all_headers_tree
+* IN: tvb - the data buffer from wireshark
+* IN/OUT: The current and updated offset */
+static void
+parse_ATOMICACKETH(proto_tree * parentTree, tvbuff_t *tvb, gint *offset)
+{
+	gint local_offset = *offset;
+	/* AtomicAckEth - Atomic ACK Extended Transport Header */
+	proto_tree *ATOMICACKETH_header_tree = NULL;
+	proto_item *ATOMICACKETH_header_item = NULL;
+
+	ATOMICACKETH_header_item = proto_tree_add_item(parentTree, hf_infiniband_AtomicAckETH, tvb, local_offset, 8, FALSE);
+	proto_item_set_text(ATOMICACKETH_header_item, "%s", "ATOMICACKETH - Atomic ACK Extended Transport Header");
+	ATOMICACKETH_header_tree = proto_item_add_subtree(ATOMICACKETH_header_item, ett_atomicacketh);
+	proto_tree_add_item(ATOMICACKETH_header_tree, hf_infiniband_original_remote_data,	tvb, local_offset, 8, FALSE); local_offset+=8;
+	*offset = local_offset;
+}
+
+/* Parse IMMDT - Immediate Data Extended Transport Header
+* IN: parentTree to add the dissection to - in this code the all_headers_tree
+* IN: tvb - the data buffer from wireshark
+* IN/OUT: The current and updated offset */
+static void
+parse_IMMDT(proto_tree * parentTree, tvbuff_t *tvb, gint *offset)
+{
+	gint local_offset = *offset;
+	/* IMMDT - Immediate Data Extended Transport Header */
+	proto_tree *IMMDT_header_tree = NULL;
+	proto_item *IMMDT_header_item = NULL;
+
+	IMMDT_header_item = proto_tree_add_item(parentTree, hf_infiniband_IMMDT, tvb, local_offset, 4, FALSE);
+	proto_item_set_text(IMMDT_header_item, "%s", "IMMDT - Immediate Data Extended Transport Header");
+	IMMDT_header_tree = proto_item_add_subtree(IMMDT_header_item, ett_immdt);
+	proto_tree_add_item(IMMDT_header_tree, hf_infiniband_IMMDT,	tvb, local_offset, 4, FALSE); local_offset+=4;
+	*offset = local_offset;
+}
+
+/* Parse IETH - Invalidate Extended Transport Header
+* IN: parentTree to add the dissection to - in this code the all_headers_tree
+* IN: tvb - the data buffer from wireshark
+* IN/OUT: The current and updated offset */
+static void
+parse_IETH(proto_tree * parentTree, tvbuff_t *tvb, gint *offset)
+{
+	gint local_offset = *offset;
+	/* IETH - Invalidate Extended Transport Header */
+	proto_tree *IETH_header_tree = NULL;
+	proto_item *IETH_header_item = NULL;
+
+	IETH_header_item = proto_tree_add_item(parentTree, hf_infiniband_IETH, tvb, local_offset, 4, FALSE);
+	proto_item_set_text(IETH_header_item, "%s", "IETH - Invalidate Extended Transport Header");
+	IETH_header_tree = proto_item_add_subtree(IETH_header_item, ett_ieth);
+
+	proto_tree_add_item(IETH_header_tree, hf_infiniband_IETH,	tvb, local_offset, 4, FALSE); local_offset+=4;
+
+	*offset = local_offset;
+}
+
+/* Parse Payload - Packet Payload / Invariant CRC / Variant CRC
+* IN: parentTree to add the dissection to - in this code the all_headers_tree
+* IN: pinfo - packet info from wireshark
+* IN: tvb - the data buffer from wireshark
+* IN/OUT: The current and updated offset
+* IN: Length of Payload */
+static void parse_PAYLOAD(proto_tree *parentTree, packet_info *pinfo, tvbuff_t *tvb, gint *offset, gint length, guint8 virtualLane)
+{
+	gint local_offset = *offset;
+	/* Payload - Packet Payload */
+	proto_tree *PAYLOAD_header_tree = NULL;
+	proto_item *PAYLOAD_header_item = NULL;
+	guint8 management_class;
+	tvbuff_t *volatile next_tvb;
+	gint			captured_length, reported_length;
+	guint16 etype, reserved;
+	const char		*saved_proto;
+	volatile gboolean	dissector_found = FALSE;
+ 
+	if(!tvb_bytes_exist(tvb, *offset, length)) /* previously consumed bytes + offset was all the data - none or corrupt payload */
+	{
+		if (check_col(pinfo->cinfo, COL_INFO))
+		{
+			col_set_str(pinfo->cinfo, COL_INFO, "Invalid Packet Length from LRH! [Malformed Packet]");
+			col_set_fence(pinfo->cinfo, COL_INFO);
+		}
+		return;
+	}
+	if(virtualLane == 0xF0)
+	{
+		management_class =  tvb_get_guint8(tvb, (*offset) + 1);
+
+		if(((management_class >= (guint8)VENDOR_1_START) && (management_class <= (guint8)VENDOR_1_END))
+			|| ((management_class >= (guint8)VENDOR_2_START) && (management_class <= (guint8)VENDOR_2_END)))
+		{
+			/* parse vendor specific */
+			parse_VENDOR_MANAGEMENT(parentTree, tvb, offset);
+		}
+		else if((management_class >= (guint8)APPLICATION_START) && (management_class <= (guint8)APPLICATION_END))
+		{
+			/* parse application specific */
+			parse_APPLICATION_MANAGEMENT(parentTree, tvb, offset);
+		}
+		else if(((management_class == (guint8)0x00) || (management_class == (guint8)0x02))
+			|| ((management_class >= (guint8)0x50) && (management_class <= (guint8)0x80))
+			|| ((management_class >= (guint8)0x82)))
+		{
+			/* parse reserved classes */
+			parse_RESERVED_MANAGEMENT(parentTree, tvb, offset);
+		}
+		else /* we have a normal management_class */
+		{
+			switch(management_class)
+			{
+				case SUBN_LID_ROUTED:
+					/* parse subn man lid routed */
+					parse_SUBN_LID_ROUTED(parentTree, pinfo, tvb, &local_offset);
+				break;
+				case SUBN_DIRECTED_ROUTE:
+					/* parse subn directed route */
+					parse_SUBN_DIRECTED_ROUTE(parentTree, pinfo, tvb, &local_offset);
+				break;
+				case SUBNADMN:
+					/* parse sub admin */
+					parse_SUBNADMN(parentTree, pinfo, tvb, &local_offset);
+				break;
+				case PERF:
+					/* parse performance */
+					parse_PERF(parentTree, tvb, &local_offset);
+				break;
+				case BM:
+					/* parse baseboard mgmt */
+					parse_BM(parentTree, tvb, &local_offset);
+				break;
+				case DEV_MGT:
+					/* parse device management */
+					parse_DEV_MGT(parentTree, tvb, &local_offset);
+				break;
+				case COM_MGT:
+					/* parse communication management */
+					parse_COM_MGT(parentTree, tvb, &local_offset);
+				break;
+				case SNMP:
+					/* parse snmp tunneling */
+					parse_SNMP(parentTree, tvb, &local_offset);
+				break;
+				default:
+					break;
+			}
+		}
+	}
+	else /* Normal Data Packet - Parse as such */
+	{
+
+		/* Calculation for Payload:
+		* (tvb->length) Length of entire packet - (local_offset) Starting byte of Payload Data
+		* offset addition is more complex for the payload.
+		* We need the total length of the packet, - length of previous headers, + offset where payload started.
+		* We also need  to reserve 6 bytes for the CRCs which are not actually part of the payload.	 */
+
+		/* IBA packet data could be anything in principle, however it is common
+		 * practice to carry non-IBA data encapsulated with an EtherType header,
+		 * similar to the RWH header. There is no way to identify these frames
+		 * positively.
+		 *
+		 * We see if the first few bytes look like an EtherType header, and if so
+		 * call the appropriate dissector. If not we call the "data" dissector.
+		 */
+
+		etype = tvb_get_ntohs(tvb, local_offset);
+		reserved =  tvb_get_ntohs(tvb, local_offset + 2);
+
+		if (reserved == 0) {
+			
+			/* Get the captured length and reported length of the data
+			   after the Ethernet type. */
+			captured_length = tvb_length_remaining(tvb, local_offset+4);
+			reported_length = tvb_reported_length_remaining(tvb,
+									local_offset+4);
+			
+			next_tvb = tvb_new_subset(tvb, local_offset+4, captured_length,
+						  reported_length);
+			
+			pinfo->ethertype = etype;
+			
+			/* Look for sub-dissector, and call it if found.
+			   Catch exceptions, so that if the reported length of "next_tvb"
+			   was reduced by some dissector before an exception was thrown,
+			   we can still put in an item for the trailer. */
+			saved_proto = pinfo->current_proto;
+			TRY {
+				dissector_found = dissector_try_port(ethertype_dissector_table,
+								     etype, next_tvb, pinfo, top_tree);
+			}
+			CATCH(BoundsError) {
+				/* Somebody threw BoundsError, which means that:
+				   
+				1) a dissector was found, so we don't need to
+				dissect the payload as data or update the
+				protocol or info columns;
+				
+				2) dissecting the payload found that the packet was
+				cut off by a snapshot length before the end of
+				the payload.  The trailer comes after the payload,
+				so *all* of the trailer is cut off, and we'll
+				just get another BoundsError if we add the trailer.
+				
+				Therefore, we just rethrow the exception so it gets
+				reported; we don't dissect the trailer or do anything
+				else. */
+				RETHROW;
+			}
+			CATCH(OutOfMemoryError) {
+				RETHROW;
+			}
+			CATCH_ALL {
+				/* Somebody threw an exception other than BoundsError, which
+				   means that a dissector was found, so we don't need to
+				   dissect the payload as data or update the protocol or info
+				   columns.  We just show the exception and then drive on
+				   to show the trailer, after noting that a dissector was
+				   found and restoring the protocol value that was in effect
+				   before we called the subdissector. */
+				show_exception(next_tvb, pinfo, top_tree, EXCEPT_CODE, GET_MESSAGE);
+				dissector_found = TRUE;
+				pinfo->current_proto = saved_proto;
+			}
+			ENDTRY;
+			
+			if (dissector_found) {
+				/* now create payload entry to show Ethertype */
+				PAYLOAD_header_item = proto_tree_add_item(parentTree, hf_infiniband_payload, tvb, local_offset, tvb_reported_length_remaining(tvb, local_offset)-6, FALSE);
+				proto_item_set_text(PAYLOAD_header_item, "%s", "IBA Payload - appears to be EtherType encapsulated"); 
+				PAYLOAD_header_tree = proto_item_add_subtree(PAYLOAD_header_item, ett_payload);
+				proto_tree_add_uint(PAYLOAD_header_tree, hf_infiniband_etype, tvb,
+						    local_offset, 2,  tvb_get_ntohs(tvb, local_offset));
+
+				local_offset += 2;
+
+				proto_tree_add_uint(PAYLOAD_header_tree, hf_infiniband_reserved16_RWH, tvb,
+						    local_offset, 2, tvb_get_ntohs(tvb, local_offset));
+
+
+			} else {
+				tvb_free(next_tvb);
+			}
+				
+		}
+		
+		if (!dissector_found) {
+			/* No sub-dissector found.
+			   Label rest of packet as "Data" */
+			
+			captured_length = tvb_length_remaining(tvb, local_offset);
+			reported_length = tvb_reported_length_remaining(tvb,
+									local_offset);
+			
+			if (reported_length >= 6)
+				reported_length -= 6;
+			if (captured_length > reported_length)
+				captured_length = reported_length;
+
+			next_tvb = tvb_new_subset(tvb, local_offset,
+						  captured_length,
+						  reported_length);
+			
+			call_dissector(data_handle, next_tvb, pinfo, top_tree);
+			
+		}
+		
+
+		/*parse_RWH(parentTree, tvb, &local_offset, pinfo);*/
+		
+		/* Will contain ICRC and VCRC = 4+2 */
+		local_offset = tvb_reported_length(tvb) - 6;
+	}
+
+	*offset = local_offset;
+}
+
+/* Parse VENDOR - Parse a vendor specific or unknown header sequence
+* IN: parentTree to add the dissection to - in this code the all_headers_tree
+* IN: tvb - the data buffer from wireshark
+* IN/OUT: The current and updated offset */
+static void parse_VENDOR(proto_tree * parentTree, tvbuff_t *tvb, gint *offset)
+{
+	gint local_offset = *offset;
+	proto_tree *VENDOR_header_tree = NULL;
+	proto_item *VENDOR_header_item = NULL;
+
+	VENDOR_header_item = proto_tree_add_item(parentTree, hf_infiniband_vendor, tvb, local_offset, 4, FALSE);
+	proto_item_set_text(VENDOR_header_item, "%s", "Vendor Specific or Unknown Header Sequence");
+	VENDOR_header_tree = proto_item_add_subtree(VENDOR_header_item, ett_vendor);
+	proto_tree_add_item(VENDOR_header_tree, hf_infiniband_vendor,	tvb, local_offset, -1, FALSE);
+	*offset = local_offset;
+}
+
+/* Parse IPv6 - Parse an IPv6 Packet
+* IN: parentTree to add the dissection to - in this code the all_headers_tree
+* IN: tvb - the data buffer from wireshark
+* IN/OUT: The current and updated offset
+* IN: pinfo - packet info from wireshark */
+static void parse_IPvSix(proto_tree *parentTree, tvbuff_t *tvb, gint *offset, packet_info *pinfo)
+{
+	tvbuff_t *ipv6_tvb;
+
+	/* (- 2) for VCRC which lives at the end of the packet   */
+	ipv6_tvb = tvb_new_subset(tvb, *offset,
+				  tvb_length_remaining(tvb, *offset) - 2,
+				  tvb_reported_length_remaining(tvb, *offset) - 2);
+	call_dissector(ipv6_handle, ipv6_tvb, pinfo, parentTree);
+	*offset = tvb_reported_length(tvb) - 2;
+
+	/* Display the VCRC */
+	proto_tree_add_item(parentTree, hf_infiniband_variant_crc,	tvb, *offset, 2, FALSE);
+}
+
+/* Parse EtherType - Parse a generic IP packaet with an EtherType of IP or ARP
+* IN: parentTree to add the dissection to - in this code the all_headers_tree
+* IN: tvb - the data buffer from wireshark
+* IN/OUT: The current and updated offset
+* IN: pinfo - packet info from wireshark */
+static void parse_RWH(proto_tree *ah_tree, tvbuff_t *tvb, gint *offset, packet_info *pinfo)
+{
+	guint16 ether_type;
+
+	/* RWH - Raw Header */
+	proto_tree *RWH_header_tree = NULL;
+	proto_item *RWH_header_item = NULL;
+	
+	RWH_header_item = proto_tree_add_item(ah_tree, hf_infiniband_RWH, tvb, *offset, 4, FALSE);
+	proto_item_set_text(RWH_header_item, "%s", "RWH - Raw Header");
+	RWH_header_tree = proto_item_add_subtree(RWH_header_item, ett_rwh);
+
+	ether_type = tvb_get_ntohs(tvb, *offset);
+#if 0
+	ether_type = ether_type & 0x0F; /* mask off reserved bits just in case. */
+#endif
+	*offset += 2;
+
+	proto_tree_add_uint(RWH_header_tree, hf_infiniband_reserved16_RWH, tvb,
+		    *offset, 2, tvb_get_ntohs(tvb, *offset));
+
+	*offset += 2;
+
+	ethertype(ether_type, tvb, *offset, pinfo, top_tree, RWH_header_tree, hf_infiniband_etype, -1, 0);
+
+	*offset = tvb_reported_length(tvb) - 2;
+	/* Display the VCRC */
+	proto_tree_add_item(ah_tree, hf_infiniband_variant_crc, tvb, *offset, 2, FALSE);
+	
+}
+
+/* Parse Subnet Management (LID Routed)
+* IN: parentTree to add the dissection to
+* IN: pinfo - packet info from wireshark
+* IN: tvb - the data buffer from wireshark
+* IN/OUT: The current and updated offset */
+static void parse_SUBN_LID_ROUTED(proto_tree *parentTree, packet_info *pinfo, tvbuff_t *tvb, gint *offset)
+{
+	/* Parse the Common MAD Header */
+	MAD_Data MadData;
+	gint local_offset;
+	proto_tree *SUBN_LID_ROUTED_header_tree = NULL;
+	proto_item *SUBN_LID_ROUTED_header_item = NULL;
+
+	if(!parse_MAD_Common(parentTree, tvb, offset, &MadData))
+	{
+		/* TODO: Mark Corrupt Packet - Not enough bytes exist for at least the Common MAD header which is present in all MAD packets */
+		return;
+	}
+
+	local_offset = *offset;
+
+	/* local_offset - 24 here because when we come out of parse_MAD_Common, the offset it sitting at the data section. */
+	SUBN_LID_ROUTED_header_item = proto_tree_add_item(parentTree, hf_infiniband_SMP_LID, tvb, local_offset - 24, 256, FALSE);
+	proto_item_set_text(SUBN_LID_ROUTED_header_item, "%s", "SMP (LID Routed) ");
+	SUBN_LID_ROUTED_header_tree = proto_item_add_subtree(SUBN_LID_ROUTED_header_item, ett_subn_lid_routed);
+	proto_tree_add_item(SUBN_LID_ROUTED_header_tree, hf_infiniband_m_key,			tvb, local_offset, 8, FALSE); local_offset +=8;
+	proto_tree_add_item(SUBN_LID_ROUTED_header_tree, hf_infiniband_reserved256,		tvb, local_offset, 32, FALSE); local_offset +=32;
+
+	label_SUBM_Method(SUBN_LID_ROUTED_header_item, &MadData, pinfo);
+	label_SUBM_Attribute(SUBN_LID_ROUTED_header_item, &MadData, pinfo);
+
+	/* Try to do the detail parse of the attribute.  If there is an error, or the attribute is unknown, we'll just highlight the generic data. */
+	if(!parse_SUBM_Attribute(SUBN_LID_ROUTED_header_tree, tvb, &local_offset, &MadData))
+	{
+		proto_tree_add_item(SUBN_LID_ROUTED_header_tree, hf_infiniband_smp_data,	tvb, local_offset, 64, FALSE); local_offset +=64;
+	}
+
+	proto_tree_add_item(SUBN_LID_ROUTED_header_tree, hf_infiniband_reserved1024,	tvb, local_offset, 128, FALSE); local_offset +=128;
+	*offset = local_offset;
+}
+
+/* Parse Subnet Management (Directed Route)
+* IN: parentTree to add the dissection to
+* IN: tvb - the data buffer from wireshark
+* IN/OUT: The current and updated offset */
+static void parse_SUBN_DIRECTED_ROUTE(proto_tree *parentTree, packet_info *pinfo, tvbuff_t *tvb, gint *offset)
+{
+	/* Parse the Common MAD Header */
+	MAD_Data MadData;
+	gint local_offset;
+	proto_tree *SUBN_DIRECTED_ROUTE_header_tree = NULL;
+	proto_item *SUBN_DIRECTED_ROUTE_header_item = NULL;
+
+	if(!parse_MAD_Common(parentTree, tvb, offset, &MadData))
+	{
+		/* TODO: Mark Corrupt Packet - Not enough bytes exist for at least the Common MAD header which is present in all MAD packets */
+		return;
+	}
+
+	local_offset = *offset;
+
+	/* local_offset - 24 here because when we come out of parse_MAD_Common, the offset it sitting at the data section.
+	* We need to go backwards because this particular SMP uses the class specific portion of the Common MAD Header */
+	SUBN_DIRECTED_ROUTE_header_item = proto_tree_add_item(parentTree, hf_infiniband_SMP_DIRECTED, tvb, local_offset - 24, 256, FALSE);
+	proto_item_set_text(SUBN_DIRECTED_ROUTE_header_item, "%s", "SMP (Directed Route) ");
+	SUBN_DIRECTED_ROUTE_header_tree = proto_item_add_subtree(SUBN_DIRECTED_ROUTE_header_item, ett_subn_directed_route);
+
+	label_SUBM_Method(SUBN_DIRECTED_ROUTE_header_item, &MadData, pinfo);
+	label_SUBM_Attribute(SUBN_DIRECTED_ROUTE_header_item, &MadData, pinfo);
+
+	/* Place us at offset 4, the "D" Bit (Direction bit for Directed Route SMPs) */
+	local_offset -= 20;
+	proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_d,				tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_smp_status,		tvb, local_offset, 2, FALSE); local_offset +=2;
+	proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_hop_pointer,		tvb, local_offset, 1, FALSE); local_offset +=1;
+	proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_hop_count,		tvb, local_offset, 1, FALSE); local_offset +=1;
+	local_offset += 16; /* Skip over the rest of the Common MAD Header... It's already dissected by parse_MAD_Common */
+	proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_m_key,			tvb, local_offset, 8, FALSE); local_offset +=8;
+	proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_dr_slid,			tvb, local_offset, 2, FALSE); local_offset +=2;
+	proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_dr_dlid,			tvb, local_offset, 2, FALSE); local_offset +=2;
+	proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_reserved28,		tvb, local_offset, 28, FALSE); local_offset +=28;
+
+	/* Try to do the detail parse of the attribute.  If there is an error, or the attribute is unknown, we'll just highlight the generic data. */
+	if(!parse_SUBM_Attribute(SUBN_DIRECTED_ROUTE_header_tree, tvb, &local_offset, &MadData))
+	{
+		proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_smp_data,	tvb, local_offset, 64, FALSE); local_offset +=64;
+	}
+
+	proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_initial_path,		tvb, local_offset, 64, FALSE); local_offset +=64;
+	proto_tree_add_item(SUBN_DIRECTED_ROUTE_header_tree, hf_infiniband_return_path,		tvb, local_offset, 64, FALSE); local_offset +=64;
+	*offset = local_offset;
+}
+
+/* Parse Subnet Administration
+* IN: parentTree to add the dissection to
+* IN: pinfo - packet info from wireshark
+* IN: tvb - the data buffer from wireshark
+* IN/OUT: The current and updated offset */
+static void parse_SUBNADMN(proto_tree *parentTree, packet_info *pinfo, tvbuff_t *tvb, gint *offset)
+{
+	/* Parse the Common MAD Header */
+	MAD_Data MadData;
+	gint local_offset;
+	proto_tree *SUBNADMN_header_tree = NULL;
+	proto_item *SUBNADMN_header_item = NULL;
+
+	if(!parse_MAD_Common(parentTree, tvb, offset, &MadData))
+	{
+		/* TODO: Mark Corrupt Packet - Not enough bytes exist for at least the Common MAD header which is present in all MAD packets */
+		return;
+	}
+	if(!parse_RMPP(parentTree, tvb, offset))
+	{
+		/* TODO: Mark Corrupt Packet */
+		return;
+	}
+	local_offset = *offset;
+
+	SUBNADMN_header_item = proto_tree_add_item(parentTree, hf_infiniband_SA, tvb, local_offset - 36, 256, FALSE);
+	proto_item_set_text(SUBNADMN_header_item, "%s", "SMA");
+	SUBNADMN_header_tree = proto_item_add_subtree(SUBNADMN_header_item, ett_subnadmin);
+
+	proto_tree_add_item(SUBNADMN_header_tree, hf_infiniband_sm_key,				tvb, local_offset, 8, FALSE); local_offset+=8;
+	proto_tree_add_item(SUBNADMN_header_tree, hf_infiniband_attribute_offset,	tvb, local_offset, 2, FALSE); local_offset+=4;
+	proto_tree_add_item(SUBNADMN_header_tree, hf_infiniband_reserved16,			tvb, local_offset, 2, FALSE); local_offset+=4;
+	proto_tree_add_item(SUBNADMN_header_tree, hf_infiniband_component_mask,		tvb, local_offset, 8, FALSE); local_offset+=8;
+
+	label_SUBA_Method(SUBNADMN_header_item, &MadData, pinfo);
+	label_SUBA_Attribute(SUBNADMN_header_item, &MadData, pinfo);
+
+	if(!parse_SUBA_Attribute(SUBNADMN_header_tree, tvb, &local_offset, &MadData))
+	{
+		proto_tree_add_item(SUBNADMN_header_tree, hf_infiniband_subnet_admin_data,	tvb, local_offset, 200, FALSE); local_offset+=200;
+	}
+	*offset = local_offset;
+}
+
+/* Parse Performance Management
+* IN: parentTree to add the dissection to
+* IN: tvb - the data buffer from wireshark
+* IN/OUT: The current and updated offset */
+static void parse_PERF(proto_tree *parentTree, tvbuff_t *tvb, gint *offset)
+{
+	/* Parse the Common MAD Header */
+	MAD_Data MadData;
+	gint local_offset;
+	proto_item *PERF_header_item = NULL;
+
+	if(!parse_MAD_Common(parentTree, tvb, offset, &MadData))
+	{
+		/* TODO: Mark Corrupt Packet - Not enough bytes exist for at least the Common MAD header which is present in all MAD packets */
+		return;
+	}
+	local_offset = *offset;
+	PERF_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 256, FALSE); local_offset += 256;
+	proto_item_set_text(PERF_header_item, "%s", "PERF - Performance Management MAD (Dissector Not Implemented)");
+	*offset = local_offset;
+}
+
+/* Parse Baseboard Management
+* IN: parentTree to add the dissection to
+* IN: tvb - the data buffer from wireshark
+* IN/OUT: The current and updated offset */
+static void parse_BM(proto_tree *parentTree, tvbuff_t *tvb, gint *offset)
+{
+	/* Parse the Common MAD Header */
+	MAD_Data MadData;
+	gint local_offset;
+	proto_item *PERF_header_item = NULL;
+
+	if(!parse_MAD_Common(parentTree, tvb, offset, &MadData))
+	{
+		/* TODO: Mark Corrupt Packet - Not enough bytes exist for at least the Common MAD header which is present in all MAD packets */
+		return;
+	}
+	local_offset = *offset;
+
+	PERF_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 256, FALSE); local_offset += 256;
+	proto_item_set_text(PERF_header_item, "%s", "BM - Baseboard Management MAD (Dissector Not Implemented)");
+	*offset = local_offset;
+}
+
+/* Parse Device Management
+* IN: parentTree to add the dissection to
+* IN: tvb - the data buffer from wireshark
+* IN/OUT: The current and updated offset */
+static void parse_DEV_MGT(proto_tree *parentTree, tvbuff_t *tvb, gint *offset)
+{
+	/* Parse the Common MAD Header */
+	MAD_Data MadData;
+	gint local_offset;
+	proto_item *PERF_header_item = NULL;
+
+	if(!parse_MAD_Common(parentTree, tvb, offset, &MadData))
+	{
+		/* TODO: Mark Corrupt Packet - Not enough bytes exist for at least the Common MAD header which is present in all MAD packets */
+		return;
+	}
+	local_offset = *offset;
+	PERF_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 256, FALSE); local_offset += 256;
+	proto_item_set_text(PERF_header_item, "%s", "DEV_MGT - Device Management MAD (Dissector Not Implemented)");
+	*offset = local_offset;
+}
+
+/* Parse Communications Management
+* IN: parentTree to add the dissection to
+* IN: tvb - the data buffer from wireshark
+* IN/OUT: The current and updated offset */
+static void parse_COM_MGT(proto_tree *parentTree, tvbuff_t *tvb, gint *offset)
+{
+	/* Parse the Common MAD Header */
+	MAD_Data MadData;
+	gint local_offset;
+	proto_item *PERF_header_item = NULL;
+
+	if(!parse_MAD_Common(parentTree, tvb, offset, &MadData))
+	{
+		/* TODO: Mark Corrupt Packet - Not enough bytes exist for at least the Common MAD header which is present in all MAD packets */
+		return;
+	}
+	local_offset = *offset;
+	PERF_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 256, FALSE); local_offset += 256;
+	proto_item_set_text(PERF_header_item, "%s", "COMM - Communication Management MAD (Dissector Not Implemented)");
+	*offset = local_offset;
+}
+
+/* Parse SNMP Tunneling
+* IN: parentTree to add the dissection to
+* IN: tvb - the data buffer from wireshark
+* IN/OUT: The current and updated offset */
+static void parse_SNMP(proto_tree *parentTree, tvbuff_t *tvb, gint *offset)
+{
+		/* Parse the Common MAD Header */
+	MAD_Data MadData;
+	gint local_offset;
+	proto_item *PERF_header_item = NULL;
+
+	if(!parse_MAD_Common(parentTree, tvb, offset, &MadData))
+	{
+		/* TODO: Mark Corrupt Packet - Not enough bytes exist for at least the Common MAD header which is present in all MAD packets */
+		return;
+	}
+	local_offset = *offset;
+
+	PERF_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 256, FALSE); local_offset += 256;
+	proto_item_set_text(PERF_header_item, "%s", "SNMP - SNMP Tunneling MAD (Dissector Not Implemented)");
+	*offset = local_offset;
+}
+
+/* Parse Vendor Specific Management Packets
+* IN: parentTree to add the dissection to
+* IN: tvb - the data buffer from wireshark
+* IN/OUT: The current and updated offset */
+static void parse_VENDOR_MANAGEMENT(proto_tree *parentTree, tvbuff_t *tvb, gint *offset)
+{
+	/* Parse the Common MAD Header */
+	MAD_Data MadData;
+	gint local_offset;
+	proto_item *PERF_header_item = NULL;
+
+	if(!parse_MAD_Common(parentTree, tvb, offset, &MadData))
+	{
+		/* TODO: Mark Corrupt Packet - Not enough bytes exist for at least the Common MAD header which is present in all MAD packets */
+		return;
+	}
+	local_offset = *offset;
+
+	PERF_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 256, FALSE); local_offset += 256;
+	proto_item_set_text(PERF_header_item, "%s", "VENDOR - Vendor Specific Management MAD (Dissector Not Implemented)");
+	*offset = local_offset;
+}
+
+/* Parse Application Specific Management Packets
+* IN: parentTree to add the dissection to
+* IN: tvb - the data buffer from wireshark
+* IN/OUT: The current and updated offset */
+static void parse_APPLICATION_MANAGEMENT(proto_tree *parentTree, tvbuff_t *tvb, gint *offset)
+{
+	/* Parse the Common MAD Header */
+	MAD_Data MadData;
+	gint local_offset;
+	proto_item *PERF_header_item = NULL;
+
+	if(!parse_MAD_Common(parentTree, tvb, offset, &MadData))
+	{
+		/* TODO: Mark Corrupt Packet - Not enough bytes exist for at least the Common MAD header which is present in all MAD packets */
+		return;
+	}
+	local_offset = *offset;
+	PERF_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 256, FALSE); local_offset += 256;
+	proto_item_set_text(PERF_header_item, "%s", "APP - Application Specific MAD (Dissector Not Implemented)");
+	*offset = local_offset;
+}
+
+/* Parse Reserved Management Packets.
+
+* This is an !ERROR CONDITION!
+* It means that the Management Class value used was defined as a reserved value for furture use.
+* This method is here since we will want to report this information directly to the UI without blowing up Wireshark.
+
+* IN: parentTree to add the dissection to
+* IN: tvb - the data buffer from wireshark
+* IN/OUT: The current and updated offset */
+static void parse_RESERVED_MANAGEMENT(proto_tree *parentTree, tvbuff_t *tvb, gint *offset)
+{
+	/* Parse the Common MAD Header */
+	MAD_Data MadData;
+	gint local_offset;
+	proto_item *PERF_header_item = NULL;
+
+	if(!parse_MAD_Common(parentTree, tvb, offset, &MadData))
+	{
+		/* TODO: Mark Corrupt Packet - Not enough bytes exist for at least the Common MAD header which is present in all MAD packets */
+		return;
+	}
+	local_offset = *offset;
+	PERF_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 256, FALSE); local_offset += 256;
+	proto_item_set_text(PERF_header_item, "%s", "RESERVED - Reserved MAD Type (Possible Device Error)");
+	*offset = local_offset;
+}
+
+/* Parse the common MAD Header
+* IN: parentTree to add the dissection to
+* IN: tvb - the data buffer from wireshark
+* IN/OUT: The current and updated offset
+* IN/OUT: MadData - the data from the MAD header */
+static gboolean parse_MAD_Common(proto_tree *parentTree, tvbuff_t *tvb, gint *offset, MAD_Data* MadData)
+{
+	gint local_offset = *offset;
+	proto_tree *MAD_header_tree = NULL;
+	proto_item *MAD_header_item = NULL;
+
+	if(MadData == NULL)
+		return FALSE;
+	if(!tvb_bytes_exist(tvb, *offset, 256))
+		return FALSE;
+
+	/* Get the Management Class to decide between LID Routed and Direct Route */
+	MadData->managementClass =		tvb_get_guint8(tvb, local_offset + 1);
+	MadData->classVersion =			tvb_get_guint8(tvb, local_offset + 2);
+	MadData->method =				tvb_get_guint8(tvb, local_offset + 3);
+	MadData->status =				tvb_get_guint8(tvb, local_offset + 4);
+	MadData->classSpecific =		tvb_get_ntohs(tvb, local_offset + 6);
+	MadData->transactionID =		tvb_get_ntoh64(tvb, local_offset + 8);
+	MadData->attributeID =			tvb_get_ntohs(tvb, local_offset + 16);
+	MadData->attributeModifier =	tvb_get_ntohl(tvb, local_offset + 20);
+	tvb_memcpy(tvb, MadData->data, local_offset + 24, 232);
+
+	/* Populate the Dissector Tree */
+
+	MAD_header_item = proto_tree_add_item(parentTree, hf_infiniband_MAD, tvb, local_offset, 256, FALSE);
+	proto_item_set_text(MAD_header_item, "%s", "MAD Header - Common Management Datagram");
+	MAD_header_tree = proto_item_add_subtree(MAD_header_item, ett_mad);
+
+	proto_tree_add_item(MAD_header_tree, hf_infiniband_base_version,		tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(MAD_header_tree, hf_infiniband_mgmt_class,			tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(MAD_header_tree, hf_infiniband_class_version,		tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(MAD_header_tree, hf_infiniband_method,				tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(MAD_header_tree, hf_infiniband_status,				tvb, local_offset, 2, FALSE); local_offset+=2;
+	proto_tree_add_item(MAD_header_tree, hf_infiniband_class_specific,		tvb, local_offset, 2, FALSE); local_offset+=2;
+	proto_tree_add_item(MAD_header_tree, hf_infiniband_transaction_id,		tvb, local_offset, 8, FALSE); local_offset+=8;
+	proto_tree_add_item(MAD_header_tree, hf_infiniband_attribute_id,		tvb, local_offset, 2, FALSE); local_offset+=2;
+	proto_tree_add_item(MAD_header_tree, hf_infiniband_reserved16,			tvb, local_offset, 2, FALSE); local_offset+=2;
+	proto_tree_add_item(MAD_header_tree, hf_infiniband_attribute_modifier,	tvb, local_offset, 4, FALSE); local_offset+=4;
+	proto_tree_add_item(MAD_header_tree, hf_infiniband_data,				tvb, local_offset, 232, FALSE); local_offset+=232;
+	*offset = (local_offset - 232); /* Move the offset back to the start of the Data field - this will be where the other parsers start. */
+
+	return TRUE;
+}
+
+/* Parse the RMPP (Reliable Multi-Packet Transaction Protocol
+* IN: parentTree to add the dissection to
+* IN: tvb - the data buffer from wireshark
+* IN/OUT: The current and updated offset */
+static gboolean parse_RMPP(proto_tree *parentTree, tvbuff_t *tvb, gint *offset)
+{
+	gint local_offset = *offset;
+	guint8 RMPP_Type = tvb_get_guint8(tvb, local_offset + 1);
+	proto_tree *RMPP_header_tree = NULL;
+	proto_item *RMPP_header_item = NULL;
+
+	RMPP_header_item = proto_tree_add_item(parentTree, hf_infiniband_RMPP, tvb, local_offset, 12, FALSE);
+	proto_item_set_text(RMPP_header_item, "%s", val_to_str(RMPP_Type, RMPP_Packet_Types, "Reserved RMPP Type! (0x%02x)"));
+	RMPP_header_tree = proto_item_add_subtree(RMPP_header_item, ett_rmpp);
+
+	proto_tree_add_item(RMPP_header_tree, hf_infiniband_rmpp_version,	tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(RMPP_header_tree, hf_infiniband_rmpp_type,		tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(RMPP_header_tree, hf_infiniband_r_resp_time,	tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(RMPP_header_tree, hf_infiniband_rmpp_flags,		tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(RMPP_header_tree, hf_infiniband_rmpp_status,	tvb, local_offset, 1, FALSE); local_offset+=1;
+	switch(RMPP_Type)
+	{
+		case RMPP_ILLEGAL:
+			proto_tree_add_item(RMPP_header_tree, hf_infiniband_rmpp_data1,		tvb, local_offset, 32, FALSE); local_offset+=32;
+			proto_tree_add_item(RMPP_header_tree, hf_infiniband_rmpp_data2,		tvb, local_offset, 32, FALSE); local_offset+=32;
+			break;
+		case RMPP_DATA:
+			proto_tree_add_item(RMPP_header_tree, hf_infiniband_segment_number,		tvb, local_offset, 4, FALSE); local_offset+=4;
+			proto_tree_add_item(RMPP_header_tree, hf_infiniband_payload_length32,	tvb, local_offset, 4, FALSE); local_offset+=4;
+			proto_tree_add_item(RMPP_header_tree, hf_infiniband_transferred_data,	tvb, local_offset, 220, FALSE);
+			break;
+		case RMPP_ACK:
+			proto_tree_add_item(RMPP_header_tree, hf_infiniband_segment_number,		tvb, local_offset, 4, FALSE); local_offset+=4;
+			proto_tree_add_item(RMPP_header_tree, hf_infiniband_new_window_last,	tvb, local_offset, 4, FALSE); local_offset+=4;
+			proto_tree_add_item(RMPP_header_tree, hf_infiniband_reserved220,		tvb, local_offset, 220, FALSE);
+			break;
+		case RMPP_STOP:
+		case RMPP_ABORT:
+			proto_tree_add_item(RMPP_header_tree, hf_infiniband_reserved32,						tvb, local_offset, 4, FALSE); local_offset+=4;
+			proto_tree_add_item(RMPP_header_tree, hf_infiniband_reserved32,						tvb, local_offset, 4, FALSE); local_offset+=4;
+			proto_tree_add_item(RMPP_header_tree, hf_infiniband_optional_extended_error_data,	tvb, local_offset, 220, FALSE);
+			break;
+		default:
+			break;
+	}
+	*offset = local_offset;
+	return TRUE;
+}
+
+/* Parse the Method from the MAD Common Header.
+* Simply used to generate the identifier.
+* IN: SubMItem - the item to append the method label to.
+* IN: MadHeader - the MadData structure that contains the information from the Common MAD header.
+* IN: pinfo - packet info from wireshark. */
+static void label_SUBM_Method(proto_item *SubMItem, MAD_Data *MadHeader, packet_info *pinfo)
+{
+	const char *label = val_to_str(MadHeader->method, SUBM_Methods, "(Unknown SubManagement Method!)");
+
+	proto_item_append_text(SubMItem, "%s", label);
+	if (check_col(pinfo->cinfo, COL_INFO))
+		col_append_str(pinfo->cinfo, COL_INFO, label);
+}
+
+/* Parse the SA Method from the MAD Common Header.
+* Simply used to generate the identifier.
+* IN: SubAItem - the item to append the method label to.
+* IN: MadHeader - the MadData structure that contains the information from the Common MAD header.
+* IN: pinfo - packet info from wireshark. */
+static void label_SUBA_Method(proto_item *SubAItem, MAD_Data *MadHeader, packet_info *pinfo)
+{
+	const char *label = val_to_str(MadHeader->method, SUBA_Methods, "(Unknown SubAdministration Method!)");
+
+	proto_item_append_text(SubAItem, "%s", label);
+	if (check_col(pinfo->cinfo, COL_INFO))
+		col_append_str(pinfo->cinfo, COL_INFO, label);
+}
+
+/* Parse the Attribute from the MAD Common Header
+* Simply used to generate the identifier.
+* IN: SubMItem - the item to append the Attribute label to.
+* IN: MadHeader - the MadData structure that contains the information from the Common MAD header.
+* IN: pinfo - packet info from wireshark. */
+static void label_SUBM_Attribute(proto_item *SubMItem, MAD_Data *MadHeader, packet_info *pinfo)
+{
+	const char *label = val_to_str(MadHeader->attributeID, SUBM_Attributes, "(Unknown SubManagement Attribute!)");
+
+	proto_item_append_text(SubMItem, "%s", &label[11]);
+	if (check_col(pinfo->cinfo, COL_INFO))
+		col_append_str(pinfo->cinfo, COL_INFO, &label[11]);
+}
+
+/* Parse the SA Attribute from the MAD Common Header
+* Simply used to generate the identifier.
+* IN: SubAItem - the item to append the Attribute label to.
+* IN: MadHeader - the MadData structure that contains the information from the Common MAD header.
+* IN: pinfo - packet info from wireshark. */
+static void label_SUBA_Attribute(proto_item *SubAItem, MAD_Data *MadHeader, packet_info *pinfo)
+{
+	const char *label = val_to_str(MadHeader->attributeID, SUBA_Attributes, "(Unknown SubAdministration Attribute!)");
+
+	proto_item_append_text(SubAItem, "%s", &label[11]);
+	if (check_col(pinfo->cinfo, COL_INFO))
+		col_append_str(pinfo->cinfo, COL_INFO, &label[11]);
+}
+
+/* Parse the attribute from a Subnet Management Packet.
+* IN: Parent Tree to add the item to in the dissection tree
+* IN: tvbuff, offset - the data and where it is.
+* IN: MAD_Data the data from the Common MAD Header that provides the information we need */
+static gboolean parse_SUBM_Attribute(proto_tree *parentTree, tvbuff_t *tvb, gint *offset, MAD_Data *MadHeader)
+{
+	guint16 attributeID = MadHeader->attributeID;
+	proto_tree *SUBM_Attribute_header_tree = NULL;
+	proto_item *SUBM_Attribute_header_item = NULL;
+
+	SUBM_Attribute_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, *offset, 64, FALSE);
+	proto_item_set_text(SUBM_Attribute_header_item, "%s", val_to_str(attributeID, SUBM_Attributes, "Unknown Attribute Type! (0x%02x)"));
+	SUBM_Attribute_header_tree = proto_item_add_subtree(SUBM_Attribute_header_item, ett_subm_attribute);
+
+
+	switch(attributeID)
+	{
+		case 0x0002:
+			parse_NoticesAndTraps(SUBM_Attribute_header_tree , tvb, offset);
+			break;
+		case 0x0010:
+			 parse_NodeDescription(SUBM_Attribute_header_tree , tvb, offset);
+			break;
+		case 0x0011:
+			parse_NodeInfo(SUBM_Attribute_header_tree , tvb, offset);
+			break;
+		case 0x0012:
+			parse_SwitchInfo(SUBM_Attribute_header_tree , tvb, offset);
+			break;
+		case 0x0014:
+			parse_GUIDInfo(SUBM_Attribute_header_tree , tvb, offset);
+			break;
+		case 0x0015:
+			parse_PortInfo(SUBM_Attribute_header_tree , tvb, offset);
+			break;
+		case 0x0016:
+			parse_P_KeyTable(SUBM_Attribute_header_tree , tvb, offset);
+			break;
+		case 0x0017:
+			parse_SLtoVLMappingTable(SUBM_Attribute_header_tree , tvb, offset);
+			break;
+		case 0x0018:
+			parse_VLArbitrationTable(SUBM_Attribute_header_tree , tvb, offset);
+			break;
+		case 0x0019:
+			parse_LinearForwardingTable(SUBM_Attribute_header_tree , tvb, offset);
+			break;
+		case 0x001A:
+			parse_RandomForwardingTable(SUBM_Attribute_header_tree , tvb, offset);
+			break;
+		case 0x001B:
+			parse_MulticastForwardingTable(SUBM_Attribute_header_tree , tvb, offset);
+			break;
+		case 0x001C:
+			parse_SMInfo(SUBM_Attribute_header_tree , tvb, offset);
+			break;
+		case 0x0020:
+			parse_VendorDiag(SUBM_Attribute_header_tree , tvb, offset);
+			break;
+		case 0x0030:
+			parse_LedInfo(SUBM_Attribute_header_tree , tvb, offset);
+			break;
+		case 0x0031:
+			parse_LinkSpeedWidthPairsTable(SUBM_Attribute_header_tree , tvb, offset);
+			break;
+		default:
+			break;
+	}
+
+
+	*offset += 64;
+	return TRUE;
+
+}
+/* Parse the attribute from a Subnet Administration Packet.
+* IN: Parent Tree to add the item to in the dissection tree
+* IN: tvbuff, offset - the data and where it is.
+* IN: MAD_Data the data from the Common MAD Header that provides the information we need */
+static gboolean parse_SUBA_Attribute(proto_tree *parentTree, tvbuff_t *tvb, gint *offset, MAD_Data *MadHeader)
+{
+	guint16 attributeID = MadHeader->attributeID;
+	proto_tree *SUBA_Attribute_header_tree = NULL;
+	proto_item *SUBA_Attribute_header_item = NULL;
+
+	SUBA_Attribute_header_item = proto_tree_add_item(parentTree, hf_infiniband_SA, tvb, *offset, 200, FALSE);
+	proto_item_set_text(SUBA_Attribute_header_item, "%s", val_to_str(attributeID, SUBA_Attributes, "Unknown Attribute Type! (0x%02x)"));
+	SUBA_Attribute_header_tree = proto_item_add_subtree(SUBA_Attribute_header_item, ett_suba_attribute);
+
+	/* Skim off the RID fields should they be present */
+	parse_RID(SUBA_Attribute_header_tree, tvb, offset, MadHeader);
+
+	/* Parse the rest of the attributes */
+	switch(MadHeader->attributeID)
+	{
+		case 0x0001: /* (ClassPortInfo) */
+			parse_PortInfo(SUBA_Attribute_header_tree, tvb, offset);
+			break;
+		case 0x0002: /* (Notice) */
+			parse_NoticesAndTraps(SUBA_Attribute_header_tree, tvb, offset);
+			break;
+		case 0x0003: /* (InformInfo) */
+			parse_InformInfo(SUBA_Attribute_header_tree, tvb, offset);
+			break;
+		case 0x0011: /* (NodeRecord) */
+			parse_NodeInfo(SUBA_Attribute_header_tree, tvb, offset);
+			*offset += 40;
+			parse_NodeDescription(SUBA_Attribute_header_tree, tvb, offset);
+			break;
+		case 0x0012: /* (PortInfoRecord) */
+			parse_PortInfo(SUBA_Attribute_header_tree, tvb, offset);
+			break;
+		case 0x0013: /* (SLtoVLMappingTableRecord) */
+			parse_SLtoVLMappingTable(SUBA_Attribute_header_tree, tvb, offset);
+			break;
+		case 0x0014: /* (SwitchInfoRecord) */
+			parse_SwitchInfo(SUBA_Attribute_header_tree, tvb, offset);
+			break;
+		case 0x0015: /*(LinearForwardingTableRecord) */
+			parse_LinearForwardingTable(SUBA_Attribute_header_tree, tvb, offset);
+			break;
+		case 0x0016: /* (RandomForwardingTableRecord) */
+			parse_RandomForwardingTable(SUBA_Attribute_header_tree, tvb, offset);
+			break;
+		case 0x0017: /* (MulticastForwardingTableRecord) */
+			parse_MulticastForwardingTable(SUBA_Attribute_header_tree, tvb, offset);
+			break;
+		case 0x0018: /* (SMInfoRecord) */
+			parse_SMInfo(SUBA_Attribute_header_tree, tvb, offset);
+			break;
+		case 0x0019: /* (LinkSpeedWidthPairsTableRecord) */
+			parse_LinkSpeedWidthPairsTable(SUBA_Attribute_header_tree, tvb, offset);
+			break;
+		case 0x00F3: /*(InformInfoRecord) */
+			parse_InformInfo(SUBA_Attribute_header_tree, tvb, offset);
+			break;
+		case 0x0020: /* (LinkRecord) */
+			parse_LinkRecord(SUBA_Attribute_header_tree, tvb, offset);
+			break;
+		case 0x0030: /* (GuidInforecord) */
+			parse_GUIDInfo(SUBA_Attribute_header_tree, tvb, offset);
+			break;
+		case 0x0031: /*(ServiceRecord) */
+			parse_ServiceRecord(SUBA_Attribute_header_tree, tvb, offset);
+			break;
+		case 0x0033: /* (P_KeyTableRecord) */
+			parse_P_KeyTable(SUBA_Attribute_header_tree, tvb, offset);
+			break;
+		case 0x0035: /* (PathRecord) */
+			parse_PathRecord(SUBA_Attribute_header_tree, tvb, offset);
+			break;
+		case 0x0036: /* (VLArbitrationTableRecord) */
+			parse_VLArbitrationTable(SUBA_Attribute_header_tree, tvb, offset);
+			break;
+		case 0x0038: /* (MCMemberRecord) */
+			parse_MCMemberRecord(SUBA_Attribute_header_tree, tvb, offset);
+			break;
+		case 0x0039: /* (TraceRecord) */
+			parse_TraceRecord(SUBA_Attribute_header_tree, tvb, offset);
+			break;
+		case 0x003A: /* (MultiPathRecord) */
+			parse_MultiPathRecord(SUBA_Attribute_header_tree, tvb, offset);
+			break;
+		case 0x003B: /* (ServiceAssociationRecord) */
+			parse_ServiceAssociationRecord(SUBA_Attribute_header_tree, tvb, offset);
+			break;
+		default: /* (Unknown SubAdministration Attribute!) */
+			/* We've already labeled as unknown in item construction */
+			break;
+	}
+
+	*offset += 200;
+	return TRUE;
+}
+
+/* Subnet Management Attribute Parsing Methods.
+*  Also Parsing for Attributes common to both SM/SA.
+* The Subnet Admin Parsing methods will call some of these methods when an attribute is present within an SA MAD
+*/
+
+
+/* Parse NoticeDataDetails Attribute Field
+* IN:	parentTree - The tree to add the dissection to
+*		tvb - The tvbbuff of packet data
+*		offset - The offset in TVB where the attribute begins
+*		trapNumber - The Trap ID of the Trap Data being Dissected  */
+
+static void parse_NoticeDataDetails(proto_tree* parentTree, tvbuff_t* tvb, gint *offset, guint16 trapNumber)
+{
+	gint local_offset = *offset;
+	proto_tree *DataDetails_header_tree = NULL;
+	proto_item *DataDetails_header_item = NULL;
+
+	if(!parentTree)
+		return;
+
+	DataDetails_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 54, FALSE);
+	DataDetails_header_tree = proto_item_add_subtree(DataDetails_header_item, ett_datadetails);
+
+
+	switch(trapNumber)
+	{
+		case 64:
+			proto_item_set_text(DataDetails_header_item, "%s", "Trap 64 DataDetails");
+			local_offset +=6;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR,	tvb, local_offset, 16, FALSE);  local_offset+=16;
+		break;
+		case 65:
+			proto_item_set_text(DataDetails_header_item, "%s", "Trap 65 DataDetails");
+			local_offset +=6;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR,	tvb, local_offset, 16, FALSE);  local_offset+=16;
+		break;
+		case 66:
+			proto_item_set_text(DataDetails_header_item, "%s", "Trap 66 DataDetails");
+			local_offset +=6;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR,	tvb, local_offset, 16, FALSE);  local_offset+=16;
+		break;
+		case 67:
+			proto_item_set_text(DataDetails_header_item, "%s", "Trap 67 DataDetails");
+			local_offset +=6;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR,	tvb, local_offset, 16, FALSE);  local_offset+=16;
+		break;
+		case 68:
+			proto_item_set_text(DataDetails_header_item, "%s", "Trap 68 DataDetails");
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_COMP_MASK,			tvb, local_offset, 8, FALSE);  local_offset+=8;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_WAIT_FOR_REPATH,	tvb, local_offset, 1, FALSE);
+		break;
+		case 69:
+			proto_item_set_text(DataDetails_header_item, "%s", "Trap 69 DataDetails");
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_COMP_MASK,			tvb, local_offset, 8, FALSE);  local_offset+=8;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_WAIT_FOR_REPATH,	tvb, local_offset, 1, FALSE);
+		break;
+		case 128:
+			proto_item_set_text(DataDetails_header_item, "%s", "Trap 128 DataDetails");
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR,		tvb, local_offset, 2, FALSE);  local_offset+=2;
+		break;
+		case 129:
+			proto_item_set_text(DataDetails_header_item, "%s", "Trap 129 DataDetails");
+			local_offset += 2;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR,		tvb, local_offset, 2, FALSE);  local_offset+=2;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_PORTNO,			tvb, local_offset, 1, FALSE);  local_offset+=1;
+		break;
+		case 130:
+			proto_item_set_text(DataDetails_header_item, "%s", "Trap 130 DataDetails");
+			local_offset += 2;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR,		tvb, local_offset, 2, FALSE);  local_offset+=2;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_PORTNO,			tvb, local_offset, 1, FALSE);  local_offset+=1;
+		break;
+		case 131:
+			proto_item_set_text(DataDetails_header_item, "%s", "Trap 131 DataDetails");
+			local_offset += 2;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR,		tvb, local_offset, 2, FALSE);  local_offset+=2;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_PORTNO,			tvb, local_offset, 1, FALSE);  local_offset+=1;
+		break;
+		case 144:
+			proto_item_set_text(DataDetails_header_item, "%s", "Trap 144 DataDetails");
+			local_offset +=2;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR,		tvb, local_offset, 2, FALSE);  local_offset+=2;
+			local_offset +=1;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_OtherLocalChanges,		tvb, local_offset, 1, FALSE);  local_offset+=1;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_CAPABILITYMASK,		tvb, local_offset, 4, FALSE);  local_offset+=4;
+			local_offset +=1;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LinkSpeecEnabledChange,		tvb, local_offset, 1, FALSE);
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LinkWidthEnabledChange,		tvb, local_offset, 1, FALSE);
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_NodeDescriptionChange,		tvb, local_offset, 1, FALSE);
+		break;
+		case 145:
+			proto_item_set_text(DataDetails_header_item, "%s", "Trap 145 DataDetails");
+			local_offset +=2;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR,		tvb, local_offset, 2, FALSE);  local_offset+=2;
+			local_offset +=2;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_SYSTEMIMAGEGUID,		tvb, local_offset, 8, FALSE);  local_offset+=8;
+		break;
+		case 256:
+			proto_item_set_text(DataDetails_header_item, "%s", "Trap 256 DataDetails");
+			local_offset +=2;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR,			tvb, local_offset, 2, FALSE);  local_offset+=2;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_DRSLID,				tvb, local_offset, 2, FALSE);  local_offset+=2;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_METHOD,				tvb, local_offset, 1, FALSE);  local_offset+=1;
+			local_offset +=1;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_ATTRIBUTEID,		tvb, local_offset, 2, FALSE);  local_offset+=2;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_ATTRIBUTEMODIFIER,	tvb, local_offset, 4, FALSE);  local_offset+=4;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_MKEY,				tvb, local_offset, 8, FALSE);  local_offset+=8;
+			local_offset +=1;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_DRNotice,			tvb, local_offset, 1, FALSE);
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_DRPathTruncated,	tvb, local_offset, 1, FALSE);
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_DRHopCount,			tvb, local_offset, 1, FALSE);  local_offset+=1;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_DRNoticeReturnPath,	tvb, local_offset, 30, FALSE);  local_offset+=30;
+		break;
+		case 257:
+			proto_item_set_text(DataDetails_header_item, "%s", "Trap 257 DataDetails");
+			local_offset+=2;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR1,	tvb, local_offset, 2, FALSE);  local_offset+=2;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR2,	tvb, local_offset, 2, FALSE);  local_offset+=2;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_KEY,		tvb, local_offset, 4, FALSE);  local_offset+=4;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_SL,			tvb, local_offset, 1, FALSE);
+			local_offset +=1;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_QP1,		tvb, local_offset, 3, FALSE);  local_offset+=3;
+			local_offset +=1;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_QP2,		tvb, local_offset, 3, FALSE);  local_offset+=3;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR1,	tvb, local_offset, 16, FALSE);  local_offset+=16;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR2,	tvb, local_offset, 16, FALSE);  local_offset+=16;
+		break;
+		case 258:
+			proto_item_set_text(DataDetails_header_item, "%s", "Trap 258 DataDetails");
+			local_offset+=2;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR1,	tvb, local_offset, 2, FALSE);  local_offset+=2;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR2,	tvb, local_offset, 2, FALSE);  local_offset+=2;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_KEY,		tvb, local_offset, 4, FALSE);  local_offset+=4;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_SL,			tvb, local_offset, 1, FALSE);
+			local_offset +=1;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_QP1,		tvb, local_offset, 3, FALSE);  local_offset+=3;
+			local_offset +=1;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_QP2,		tvb, local_offset, 3, FALSE);  local_offset+=3;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR1,	tvb, local_offset, 16, FALSE);  local_offset+=16;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR2,	tvb, local_offset, 16, FALSE);  local_offset+=16;
+		break;
+		case 259:
+			proto_item_set_text(DataDetails_header_item, "%s", "Trap 259 DataDetails");
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_DataValid,	tvb, local_offset, 2, FALSE);  local_offset+=2;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR1,	tvb, local_offset, 2, FALSE);  local_offset+=2;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_LIDADDR2,	tvb, local_offset, 2, FALSE);  local_offset+=2;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_PKEY,		tvb, local_offset, 4, FALSE);  local_offset+=4;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_SL,			tvb, local_offset, 1, FALSE);
+			local_offset +=1;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_QP1,		tvb, local_offset, 3, FALSE);  local_offset+=3;
+			local_offset +=1;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_QP2,		tvb, local_offset, 3, FALSE);  local_offset+=3;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR1,	tvb, local_offset, 16, FALSE);  local_offset+=16;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_GIDADDR2,	tvb, local_offset, 16, FALSE);  local_offset+=16;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_SWLIDADDR,	tvb, local_offset, 2, FALSE);  local_offset+=2;
+			proto_tree_add_item(DataDetails_header_tree, hf_infiniband_Trap_PORTNO,		tvb, local_offset, 1, FALSE);  local_offset+=1;
+		break;
+		default:
+			proto_item_set_text(DataDetails_header_item, "%s", "Vendor Specific Subnet Management Trap"); local_offset +=54;
+			break;
+	}
+
+}
+
+/* Parse NoticesAndTraps Attribute
+* IN:	parentTree - The tree to add the dissection to
+*		tvb - The tvbbuff of packet data
+*		offset - The offset in TVB where the attribute begins
+*		MadHeader - The common MAD header of the current SMP/SMA  */
+static void parse_NoticesAndTraps(proto_tree* parentTree, tvbuff_t* tvb, gint *offset)
+{
+	gint local_offset = *offset;
+	proto_tree *NoticesAndTraps_header_tree = NULL;
+	proto_item *NoticesAndTraps_header_item = NULL;
+	guint16 trapNumber = tvb_get_ntohs(tvb, local_offset + 4);
+
+	if(!parentTree)
+		return;
+
+	NoticesAndTraps_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 64, FALSE);
+	proto_item_set_text(NoticesAndTraps_header_item, "%s", val_to_str(trapNumber, Trap_Description, "Unknown or Vendor Specific Trap Number! (0x%02x)"));
+	NoticesAndTraps_header_tree = proto_item_add_subtree(NoticesAndTraps_header_item, ett_noticestraps);
+
+	proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_IsGeneric,				tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_Type,						tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_ProducerTypeVendorID,		tvb, local_offset, 3, FALSE); local_offset+=3;
+	proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_TrapNumberDeviceID,		tvb, local_offset, 2, FALSE); local_offset+=2;
+	proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_IssuerLID,				tvb, local_offset, 2, FALSE); local_offset+=2;
+	proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_NoticeToggle,				tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_NoticeCount,				tvb, local_offset, 2, FALSE); local_offset+=2;
+
+	parse_NoticeDataDetails(NoticesAndTraps_header_tree, tvb, &local_offset, trapNumber);
+	proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_DataDetails,				tvb, local_offset, 54, FALSE); local_offset+=54;
+
+	/* Only Defined For GMPs not SMPs which is not part of this dissector phase
+	*proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_IssuerGID,				tvb, local_offset, 16, FALSE); local_offset+=16;
+	*proto_tree_add_item(NoticesAndTraps_header_tree, hf_infiniband_Notice_ClassTrapSpecificData,	tvb, local_offset, 1, FALSE); local_offset+=1; */
+
+}
+
+/* Parse NodeDescription Attribute
+* IN:	parentTree - The tree to add the dissection to
+*		tvb - The tvbbuff of packet data
+*		offset - The offset in TVB where the attribute begins
+*		MadHeader - The common MAD header of the current SMP/SMA  */
+static void parse_NodeDescription(proto_tree* parentTree, tvbuff_t* tvb, gint *offset)
+{
+	gint local_offset = *offset;
+	proto_tree *NodeDescription_header_tree = NULL;
+
+	if(!parentTree)
+		return;
+
+	NodeDescription_header_tree = parentTree;
+	proto_tree_add_item(NodeDescription_header_tree, hf_infiniband_NodeDescription_NodeString,	tvb, local_offset, 64, FALSE);
+}
+
+/* Parse NodeInfo Attribute
+* IN:	parentTree - The tree to add the dissection to
+*		tvb - The tvbbuff of packet data
+*		offset - The offset in TVB where the attribute begins
+*		MadHeader - The common MAD header of the current SMP/SMA  */
+static void parse_NodeInfo(proto_tree* parentTree, tvbuff_t* tvb, gint *offset)
+{
+	gint local_offset = *offset;
+	proto_tree *NodeInfo_header_tree = NULL;
+
+	if(!parentTree)
+		return;
+
+	NodeInfo_header_tree = parentTree;
+
+	proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_BaseVersion,		tvb, local_offset, 1, FALSE); local_offset +=1;
+	proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_ClassVersion,		tvb, local_offset, 1, FALSE); local_offset +=1;
+	proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_NodeType,			tvb, local_offset, 1, FALSE); local_offset +=1;
+	proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_NumPorts,			tvb, local_offset, 1, FALSE); local_offset +=1;
+	proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_SystemImageGUID,	tvb, local_offset, 8, FALSE); local_offset +=8;
+	proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_NodeGUID,			tvb, local_offset, 8, FALSE); local_offset +=8;
+	proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_PortGUID,			tvb, local_offset, 8, FALSE); local_offset +=8;
+	proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_PartitionCap,		tvb, local_offset, 2, FALSE); local_offset +=2;
+	proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_DeviceID,			tvb, local_offset, 2, FALSE); local_offset +=2;
+	proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_Revision,			tvb, local_offset, 4, FALSE); local_offset +=4;
+	proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_LocalPortNum,		tvb, local_offset, 1, FALSE); local_offset +=1;
+	proto_tree_add_item(NodeInfo_header_tree, hf_infiniband_NodeInfo_VendorID,			tvb, local_offset, 3, FALSE); local_offset +=3;
+
+}
+
+/* Parse SwitchInfo Attribute
+* IN:	parentTree - The tree to add the dissection to
+*		tvb - The tvbbuff of packet data
+*		offset - The offset in TVB where the attribute begins
+*		MadHeader - The common MAD header of the current SMP/SMA  */
+static void parse_SwitchInfo(proto_tree* parentTree, tvbuff_t* tvb, gint *offset)
+{
+	gint local_offset = *offset;
+	proto_tree *SwitchInfo_header_tree = NULL;
+
+	if(!parentTree)
+		return;
+
+	SwitchInfo_header_tree = parentTree;
+
+	proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_LinearFDBCap,						tvb, local_offset, 2, FALSE); local_offset +=2;
+	proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_RandomFDBCap,						tvb, local_offset, 2, FALSE); local_offset +=2;
+	proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_MulticastFDBCap,					tvb, local_offset, 2, FALSE); local_offset +=2;
+	proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_LinearFDBTop,						tvb, local_offset, 2, FALSE); local_offset +=2;
+	proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_DefaultPort,						tvb, local_offset, 1, FALSE); local_offset +=1;
+	proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_DefaultMulticastPrimaryPort,		tvb, local_offset, 1, FALSE); local_offset +=1;
+	proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_DefaultMulticastNotPrimaryPort,	tvb, local_offset, 1, FALSE); local_offset +=1;
+	proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_LifeTimeValue,						tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_PortStateChange,					tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_OptimizedSLtoVLMappingProgramming,	tvb, local_offset, 1, FALSE); local_offset +=1;
+	proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_LIDsPerPort,						tvb, local_offset, 2, FALSE); local_offset +=2;
+	proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_PartitionEnforcementCap,			tvb, local_offset, 2, FALSE); local_offset +=2;
+	proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_InboundEnforcementCap,				tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_OutboundEnforcementCap,			tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_FilterRawInboundCap,				tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_FilterRawOutboundCap,				tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(SwitchInfo_header_tree, hf_infiniband_SwitchInfo_EnhancedPortZero,					tvb, local_offset, 1, FALSE); local_offset +=1;
+}
+
+/* Parse GUIDInfo Attribute
+* IN:	parentTree - The tree to add the dissection to
+*		tvb - The tvbbuff of packet data
+*		offset - The offset in TVB where the attribute begins
+*		MadHeader - The common MAD header of the current SMP/SMA  */
+static void parse_GUIDInfo(proto_tree* parentTree, tvbuff_t* tvb, gint *offset)
+{
+	gint local_offset = *offset;
+	proto_tree *GUIDInfo_header_tree = NULL;
+	proto_item *tempItemLow = NULL;
+	gint i = 0;
+
+	if(!parentTree)
+		return;
+
+	GUIDInfo_header_tree = parentTree;
+
+	for(i = 0; i < 8; i++)
+	{
+		proto_tree_add_item(GUIDInfo_header_tree, hf_infiniband_GUIDInfo_GUID, tvb, local_offset, 8, FALSE); local_offset +=8;
+		proto_item_append_text(tempItemLow, "(%u)", i);
+	}
+
+}
+
+/* Parse PortInfo Attribute
+* IN:	parentTree - The tree to add the dissection to
+*		tvb - The tvbbuff of packet data
+*		offset - The offset in TVB where the attribute begins
+*		MadHeader - The common MAD header of the current SMP/SMA  */
+static void parse_PortInfo(proto_tree* parentTree, tvbuff_t* tvb, gint *offset)
+{
+	gint local_offset = *offset;
+	proto_tree *PortInfo_header_tree = NULL;
+	proto_tree *PortInfo_CapabilityMask_tree = NULL;
+	proto_item *PortInfo_CapabilityMask_item = NULL;
+	proto_item *temp_item = NULL;
+	guint16 temp_val = 0;
+
+	if(!parentTree)
+		return;
+
+	PortInfo_header_tree = parentTree;
+
+	proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_M_Key,					tvb, local_offset, 8, FALSE); local_offset +=8;
+	proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_GidPrefix,				tvb, local_offset, 8, FALSE); local_offset +=8;
+	proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LID,					tvb, local_offset, 2, FALSE); local_offset +=2;
+	proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_MasterSMLID,			tvb, local_offset, 2, FALSE); local_offset +=2;
+
+	/* Capability Mask Flags */
+	PortInfo_CapabilityMask_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_CapabilityMask,		tvb, local_offset, 4, FALSE);
+	PortInfo_CapabilityMask_tree = proto_item_add_subtree(PortInfo_CapabilityMask_item, ett_portinfo_capmask);
+
+	proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_SM,								tvb, local_offset, 4, FALSE);
+	proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_NoticeSupported,				tvb, local_offset, 4, FALSE);
+	proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_TrapSupported,					tvb, local_offset, 4, FALSE);
+	proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_OptionalPDSupported,			tvb, local_offset, 4, FALSE);
+	proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_AutomaticMigrationSupported,	tvb, local_offset, 4, FALSE);
+	proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_SLMappingSupported,				tvb, local_offset, 4, FALSE);
+	proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_MKeyNVRAM,						tvb, local_offset, 4, FALSE);
+	proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_PKeyNVRAM,						tvb, local_offset, 4, FALSE);
+	proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_LEDInfoSupported,				tvb, local_offset, 4, FALSE);
+	proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_SMdisabled,						tvb, local_offset, 4, FALSE);
+	proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_SystemImageGUIDSupported,		tvb, local_offset, 4, FALSE);
+	proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_PKeySwitchExternalPortTrapSupported,	tvb, local_offset, 4, FALSE);
+	proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_CommunicationsManagementSupported,		tvb, local_offset, 4, FALSE);
+	proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_SNMPTunnelingSupported,					tvb, local_offset, 4, FALSE);
+	proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_ReinitSupported,				tvb, local_offset, 4, FALSE);
+	proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_DeviceManagementSupported,		tvb, local_offset, 4, FALSE);
+	proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_VendorClassSupported,			tvb, local_offset, 4, FALSE);
+	proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_DRNoticeSupported,				tvb, local_offset, 4, FALSE);
+	proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_CapabilityMaskNoticeSupported,	tvb, local_offset, 4, FALSE);
+	proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_BootManagementSupported,		tvb, local_offset, 4, FALSE);
+	proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_LinkRoundTripLatencySupported,	tvb, local_offset, 4, FALSE);
+	proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_ClientRegistrationSupported,	tvb, local_offset, 4, FALSE);
+	proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_OtherLocalChangesNoticeSupported,	tvb, local_offset, 4, FALSE);
+	proto_tree_add_item(PortInfo_CapabilityMask_tree, hf_infiniband_PortInfo_CapabilityMask_LinkSpeedWIdthPairsTableSupported,	tvb, local_offset, 4, FALSE);
+	local_offset+=4;
+	/* End Capability Mask Flags */
+
+	/* Diag Code */
+	temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_DiagCode,				tvb, local_offset, 2, FALSE);
+	temp_val = tvb_get_ntohs(tvb, local_offset);
+
+	proto_item_append_text(temp_item, ", %s", val_to_str(temp_val, DiagCode, "Reserved DiagCode! Possible Error"));
+	local_offset +=2;
+	/* End Diag Code */
+
+	proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_M_KeyLeasePeriod,		tvb, local_offset, 2, FALSE); local_offset +=2;
+	proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LocalPortNum,			tvb, local_offset, 1, FALSE); local_offset +=1;
+
+	/* LinkWidthEnabled */
+	temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LinkWidthEnabled,		tvb, local_offset, 1, FALSE);
+	temp_val = (guint16)tvb_get_guint8(tvb, local_offset);
+
+	proto_item_append_text(temp_item, ", %s", val_to_str(temp_val, LinkWidthEnabled, "Reserved LinkWidthEnabled Value! Possible Error"));
+	local_offset +=1;
+	/* End LinkWidthEnabled */
+
+	/* LinkWidthSupported */
+	temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LinkWidthSupported,	tvb, local_offset, 1, FALSE);
+	temp_val = (guint16)tvb_get_guint8(tvb, local_offset);
+
+	proto_item_append_text(temp_item, ", %s", val_to_str(temp_val, LinkWidthSupported, "Reserved LinkWidthSupported Value! Possible Error"));
+	local_offset +=1;
+	/* End LinkWidthSupported */
+
+	/* LinkWidthActive */
+	temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LinkWidthActive,		tvb, local_offset, 1, FALSE);
+	temp_val = (guint16)tvb_get_guint8(tvb, local_offset);
+
+	proto_item_append_text(temp_item, ", %s", val_to_str(temp_val, LinkWidthActive, "Reserved LinkWidthActive Value! Possible Error"));
+	local_offset +=1;
+	/* End LinkWidthActive */
+
+	/* LinkSpeedSupported */
+	temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LinkSpeedSupported,	tvb, local_offset, 1, FALSE);
+	temp_val = (guint16)tvb_get_guint8(tvb, local_offset);
+
+	/* 4 bit values = mask and shift */
+	temp_val = temp_val & 0x00F0;
+	temp_val = temp_val >> 4;
+
+	proto_item_append_text(temp_item, ", %s", val_to_str(temp_val, LinkSpeedSupported, "Reserved LinkWidthSupported Value! Possible Error"));
+	/* End LinkSpeedSupported */
+
+	/* PortState */
+	temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_PortState,				tvb, local_offset, 1, FALSE);
+	temp_val = (guint16)tvb_get_guint8(tvb, local_offset);
+
+	/* 4 bit values = mask and shift */
+	temp_val = temp_val & 0x000F;
+	/*temp_val = temp_val >> 4 */
+
+	proto_item_append_text(temp_item, ", %s", val_to_str(temp_val, PortState, "Reserved PortState Value! Possible Error"));
+	local_offset +=1;
+	/* End PortState */
+
+	/* PortPhysicalState */
+	temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_PortPhysicalState,		tvb, local_offset, 1, FALSE);
+	temp_val = (guint16)tvb_get_guint8(tvb, local_offset);
+
+	/* 4 bit values = mask and shift */
+	temp_val = temp_val & 0x00F0;
+	temp_val = temp_val >> 4;
+
+	proto_item_append_text(temp_item, ", %s", val_to_str(temp_val, PortPhysicalState, "Reserved PortPhysicalState Value! Possible Error"));
+	/* End PortPhysicalState */
+
+	/* LinkDownDefaultState */
+	temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LinkDownDefaultState,	tvb, local_offset, 1, FALSE);
+	temp_val = (guint16)tvb_get_guint8(tvb, local_offset);
+
+	/* 4 bit values = mask and shift */
+	temp_val = temp_val & 0x000F;
+	/*temp_val = temp_val >> 4 */
+
+	proto_item_append_text(temp_item, ", %s", val_to_str(temp_val, LinkDownDefaultState, "Reserved LinkDownDefaultState Value! Possible Error"));
+	local_offset +=1;
+	/* End LinkDownDefaultState */
+
+	proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_M_KeyProtectBits,		tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LMC,					tvb, local_offset, 1, FALSE); local_offset +=1;
+
+	/* LinkSpeedActive */
+	temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LinkSpeedActive,		tvb, local_offset, 1, FALSE);
+	temp_val = (guint16)tvb_get_guint8(tvb, local_offset);
+
+	/* 4 bit values = mask and shift */
+	temp_val = temp_val & 0x00F0;
+	temp_val = temp_val >> 4;
+
+	proto_item_append_text(temp_item, ", %s", val_to_str(temp_val, LinkSpeedActive, "Reserved LinkSpeedActive Value! Possible Error"));
+	/* End LinkSpeedActive */
+
+	/* LinkSpeedEnabled */
+	temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LinkSpeedEnabled,		tvb, local_offset, 1, FALSE);
+	temp_val = (guint16)tvb_get_guint8(tvb, local_offset);
+
+	/* 4 bit values = mask and shift */
+	temp_val = temp_val & 0x000F;
+	/*temp_val = temp_val >> 4 */
+
+	proto_item_append_text(temp_item, ", %s", val_to_str(temp_val, LinkSpeedEnabled, "Reserved LinkSpeedEnabled Value! Possible Error"));
+	local_offset +=1;
+	/* End LinkSpeedEnabled */
+
+	/* NeighborMTU */
+	temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_NeighborMTU,			tvb, local_offset, 1, FALSE);
+	temp_val = (guint16)tvb_get_guint8(tvb, local_offset);
+
+	/* 4 bit values = mask and shift */
+	temp_val = temp_val & 0x00F0;
+	temp_val = temp_val >> 4;
+
+	proto_item_append_text(temp_item, ", %s", val_to_str(temp_val, NeighborMTU, "Reserved NeighborMTU Value! Possible Error"));
+
+	/* End NeighborMTU */
+
+	proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_MasterSMSL,			tvb, local_offset, 1, FALSE); local_offset +=1;
+
+	/* VLCap */
+	temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_VLCap,					tvb, local_offset, 1, FALSE);
+	temp_val = (guint16)tvb_get_guint8(tvb, local_offset);
+
+	/* 4 bit values = mask and shift */
+	temp_val = temp_val & 0x00F0;
+	temp_val = temp_val >> 4;
+
+	proto_item_append_text(temp_item, ", %s", val_to_str(temp_val, VLCap, "Reserved VLCap Value! Possible Error"));
+
+	/* End VLCap */
+
+	proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_InitType,				tvb, local_offset, 1, FALSE); local_offset +=1;
+	proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_VLHighLimit,			tvb, local_offset, 1, FALSE); local_offset +=1;
+	proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_VLArbitrationHighCap,	tvb, local_offset, 1, FALSE); local_offset +=1;
+	proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_VLArbitrationLowCap,	tvb, local_offset, 1, FALSE); local_offset +=1;
+	proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_InitTypeReply,			tvb, local_offset, 1, FALSE);
+
+	/* MTUCap */
+	temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_MTUCap,				tvb, local_offset, 1, FALSE);
+	temp_val = (guint16)tvb_get_guint8(tvb, local_offset);
+
+	/* 4 bit values = mask and shift */
+	temp_val = temp_val & 0x000F;
+	/*temp_val = temp_val >> 4 */
+
+	proto_item_append_text(temp_item, ", %s", val_to_str(temp_val, MTUCap, "Reserved MTUCap Value! Possible Error"));
+	local_offset +=1;
+	/* End MTUCap */
+
+	proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_VLStallCount,			tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_HOQLife,				tvb, local_offset, 1, FALSE); local_offset +=1;
+
+	/* OperationalVLs */
+	temp_item = proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_OperationalVLs,		tvb, local_offset, 1, FALSE);
+	temp_val = (guint16)tvb_get_guint8(tvb, local_offset);
+
+	/* 4 bit values = mask and shift */
+	temp_val = temp_val & 0x00F0;
+	temp_val = temp_val >> 4;
+
+	proto_item_append_text(temp_item, ", %s", val_to_str(temp_val, OperationalVLs, "Reserved OperationalVLs Value! Possible Error"));
+	/* End OperationalVLs */
+
+	proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_PartitionEnforcementInbound,		tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_PartitionEnforcementOutbound,		tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_FilterRawInbound,		tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_FilterRawOutbound,		tvb, local_offset, 1, FALSE); local_offset +=1;
+	proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_M_KeyViolations,		tvb, local_offset, 2, FALSE); local_offset +=2;
+	proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_P_KeyViolations,		tvb, local_offset, 2, FALSE); local_offset +=2;
+	proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_Q_KeyViolations,		tvb, local_offset, 2, FALSE); local_offset +=2;
+	proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_GUIDCap,				tvb, local_offset, 1, FALSE); local_offset +=1;
+	proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_ClientReregister,		tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_SubnetTimeOut,			tvb, local_offset, 1, FALSE); local_offset +=1;
+	proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_RespTimeValue,			tvb, local_offset, 1, FALSE); local_offset +=1;
+	proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LocalPhyErrors,		tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_OverrunErrors,			tvb, local_offset, 1, FALSE); local_offset +=1;
+	proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_MaxCreditHint,			tvb, local_offset, 2, FALSE); local_offset +=3; /* 2 + 1 Reserved */
+	proto_tree_add_item(PortInfo_header_tree, hf_infiniband_PortInfo_LinkRoundTripLatency,	tvb, local_offset, 3, FALSE); local_offset +=3;
+}
+
+/* Parse P_KeyTable Attribute
+* IN:	parentTree - The tree to add the dissection to
+*		tvb - The tvbbuff of packet data
+*		offset - The offset in TVB where the attribute begins
+*		MadHeader - The common MAD header of the current SMP/SMA  */
+static void parse_P_KeyTable(proto_tree* parentTree, tvbuff_t* tvb, gint *offset)
+{
+	gint local_offset = *offset;
+	gint i = 0;
+	proto_tree *P_KeyTable_header_tree = NULL;
+	proto_item *P_KeyTable_header_item = NULL;
+	proto_item *tempItemLow = NULL;
+	proto_item *tempItemHigh = NULL;
+
+	if(!parentTree)
+		return;
+
+	P_KeyTable_header_item = proto_tree_add_item(parentTree, hf_infiniband_P_KeyTable_P_KeyTableBlock, tvb, local_offset, 64, FALSE);
+	proto_item_set_text(P_KeyTable_header_item, "%s", "P_KeyTable");
+	P_KeyTable_header_tree = proto_item_add_subtree(P_KeyTable_header_item, ett_pkeytable);
+
+	for(i = 0; i < 32; i++)
+	{
+		tempItemLow = proto_tree_add_item(P_KeyTable_header_tree, hf_infiniband_P_KeyTable_MembershipType,	tvb, local_offset, 1, FALSE);
+		tempItemHigh = proto_tree_add_item(P_KeyTable_header_tree, hf_infiniband_P_KeyTable_P_KeyBase,			tvb, local_offset, 2, FALSE); local_offset +=2;
+		proto_item_append_text(tempItemLow, "(%u)", i);
+		proto_item_append_text(tempItemHigh,"(%u)", i+1);
+	}
+}
+
+/* Parse SLtoVLMappingTable Attribute
+* IN:	parentTree - The tree to add the dissection to
+*		tvb - The tvbbuff of packet data
+*		offset - The offset in TVB where the attribute begins
+*		MadHeader - The common MAD header of the current SMP/SMA  */
+static void parse_SLtoVLMappingTable(proto_tree* parentTree, tvbuff_t* tvb, gint *offset)
+{
+	gint local_offset = *offset;
+	proto_tree *SLtoVLMappingTable_header_tree = NULL;
+	proto_item *SLtoVLMappingTable_header_item = NULL;
+	proto_item *tempItemLow = NULL;
+	proto_item *tempItemHigh = NULL;
+	gint i = 0;
+
+	if(!parentTree)
+		return;
+
+	SLtoVLMappingTable_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 64, FALSE);
+	proto_item_set_text(SLtoVLMappingTable_header_item, "%s", "SLtoVLMappingTable");
+	SLtoVLMappingTable_header_tree = proto_item_add_subtree(SLtoVLMappingTable_header_item, ett_sltovlmapping);
+
+	for(i = 0; i < 8; i++)
+	{
+		tempItemLow = proto_tree_add_item(SLtoVLMappingTable_header_tree, hf_infiniband_SLtoVLMappingTable_SLtoVL_HighBits,	 tvb, local_offset, 1, FALSE);
+		tempItemHigh = proto_tree_add_item(SLtoVLMappingTable_header_tree, hf_infiniband_SLtoVLMappingTable_SLtoVL_LowBits,	 tvb, local_offset, 1, FALSE); local_offset +=1;
+		proto_item_append_text(tempItemLow, "(%u)", i);
+		proto_item_append_text(tempItemHigh,"(%u)", i+1);
+	}
+}
+
+/* Parse VLArbitrationTable Attribute
+* IN:	parentTree - The tree to add the dissection to
+*		tvb - The tvbbuff of packet data
+*		offset - The offset in TVB where the attribute begins
+*		MadHeader - The common MAD header of the current SMP/SMA  */
+static void parse_VLArbitrationTable(proto_tree* parentTree, tvbuff_t* tvb, gint *offset)
+{
+	gint local_offset = *offset;
+	gint i = 0;
+	proto_tree *VLArbitrationTable_header_tree = NULL;
+	proto_item *VLArbitrationTable_header_item = NULL;
+	proto_item *tempItemLow = NULL;
+	proto_item *tempItemHigh = NULL;
+
+	if(!parentTree)
+		return;
+
+	VLArbitrationTable_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 64, FALSE);
+	proto_item_set_text(VLArbitrationTable_header_item, "%s", "VLArbitrationTable");
+	VLArbitrationTable_header_tree = proto_item_add_subtree(VLArbitrationTable_header_item, ett_vlarbitrationtable);
+
+	for(i = 0; i < 32; i++)
+	{
+		tempItemLow = proto_tree_add_item(VLArbitrationTable_header_tree, hf_infiniband_VLArbitrationTable_VL,		tvb, local_offset, 1, FALSE); local_offset +=1;
+		tempItemHigh = proto_tree_add_item(VLArbitrationTable_header_tree, hf_infiniband_VLArbitrationTable_Weight,	tvb, local_offset, 1, FALSE); local_offset +=1;
+		proto_item_append_text(tempItemLow, "(%u)", i);
+		proto_item_append_text(tempItemHigh,"(%u)", i);
+	}
+}
+
+/* Parse LinearForwardingTable Attribute
+* IN:	parentTree - The tree to add the dissection to
+*		tvb - The tvbbuff of packet data
+*		offset - The offset in TVB where the attribute begins
+*		MadHeader - The common MAD header of the current SMP/SMA  */
+static void parse_LinearForwardingTable(proto_tree* parentTree, tvbuff_t* tvb, gint *offset)
+{
+	gint i = 0;
+	gint local_offset = *offset;
+	proto_tree *LinearForwardingTable_header_tree = NULL;
+	proto_item *LinearForwardingTable_header_item = NULL;
+	proto_item *tempItemLow = NULL;
+
+	if(!parentTree)
+		return;
+
+	LinearForwardingTable_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 64, FALSE);
+	proto_item_set_text(LinearForwardingTable_header_item, "%s", "LinearForwardingTable");
+	LinearForwardingTable_header_tree = proto_item_add_subtree(LinearForwardingTable_header_item, ett_linearforwardingtable);
+
+	for(i = 0; i < 64; i++)
+	{
+		tempItemLow = proto_tree_add_item(LinearForwardingTable_header_tree, hf_infiniband_LinearForwardingTable_Port, tvb, local_offset, 1, FALSE); local_offset +=1;
+		proto_item_append_text(tempItemLow, "(%u)", i);
+	}
+}
+
+/* Parse RandomForwardingTable Attribute
+* IN:	parentTree - The tree to add the dissection to
+*		tvb - The tvbbuff of packet data
+*		offset - The offset in TVB where the attribute begins
+*		MadHeader - The common MAD header of the current SMP/SMA  */
+static void parse_RandomForwardingTable(proto_tree* parentTree, tvbuff_t* tvb, gint *offset)
+{
+	gint i = 0;
+	gint local_offset = *offset;
+	proto_tree *RandomForwardingTable_header_tree = NULL;
+	proto_item *RandomForwardingTable_header_item = NULL;
+	proto_item *tempItemLow = NULL;
+
+	if(!parentTree)
+		return;
+
+	RandomForwardingTable_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 64, FALSE);
+	proto_item_set_text(RandomForwardingTable_header_item, "%s", "RandomForwardingTable");
+	RandomForwardingTable_header_tree = proto_item_add_subtree(RandomForwardingTable_header_item, ett_randomforwardingtable);
+
+	for(i = 0; i < 16; i++)
+	{
+		tempItemLow = proto_tree_add_item(RandomForwardingTable_header_tree, hf_infiniband_RandomForwardingTable_LID,	tvb, local_offset, 2, FALSE); local_offset +=2;
+		proto_item_append_text(tempItemLow, "(%u)", i);
+		tempItemLow = proto_tree_add_item(RandomForwardingTable_header_tree, hf_infiniband_RandomForwardingTable_Valid, tvb, local_offset, 1, FALSE);
+		proto_item_append_text(tempItemLow, "(%u)", i);
+		tempItemLow = proto_tree_add_item(RandomForwardingTable_header_tree, hf_infiniband_RandomForwardingTable_LMC,	tvb, local_offset, 1, FALSE); local_offset +=1;
+		proto_item_append_text(tempItemLow, "(%u)", i);
+		tempItemLow = proto_tree_add_item(RandomForwardingTable_header_tree, hf_infiniband_RandomForwardingTable_Port,	tvb, local_offset, 1, FALSE); local_offset +=1;
+		proto_item_append_text(tempItemLow, "(%u)", i);
+	}
+}
+
+/* Parse NoticesAndTraps Attribute
+* IN:	parentTree - The tree to add the dissection to
+*		tvb - The tvbbuff of packet data
+*		offset - The offset in TVB where the attribute begins
+*		MadHeader - The common MAD header of the current SMP/SMA  */
+static void parse_MulticastForwardingTable(proto_tree* parentTree, tvbuff_t* tvb, gint *offset)
+{
+	gint i = 0;
+	gint local_offset = *offset;
+	proto_tree *MulticastForwardingTable_header_tree = NULL;
+	proto_item *MulticastForwardingTable_header_item = NULL;
+	proto_item *tempItemLow = NULL;
+
+	if(!parentTree)
+		return;
+
+	MulticastForwardingTable_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 64, FALSE);
+	proto_item_set_text(MulticastForwardingTable_header_item, "%s", "MulticastForwardingTable");
+	MulticastForwardingTable_header_tree = proto_item_add_subtree(MulticastForwardingTable_header_item, ett_multicastforwardingtable);
+
+	for(i = 0; i < 16; i++)
+	{
+		tempItemLow = proto_tree_add_item(MulticastForwardingTable_header_tree, hf_infiniband_MulticastForwardingTable_PortMask, tvb, local_offset, 2, FALSE); local_offset +=2;
+		proto_item_append_text(tempItemLow, "(%u)", i);
+	}
+
+}
+
+/* Parse SMInfo Attribute
+* IN:	parentTree - The tree to add the dissection to
+*		tvb - The tvbbuff of packet data
+*		offset - The offset in TVB where the attribute begins
+*		MadHeader - The common MAD header of the current SMP/SMA  */
+static void parse_SMInfo(proto_tree* parentTree, tvbuff_t* tvb, gint *offset)
+{
+	gint local_offset = *offset;
+	proto_tree *SMInfo_header_tree = NULL;
+	proto_item *SMInfo_header_item = NULL;
+
+	if(!parentTree)
+		return;
+
+	SMInfo_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 64, FALSE);
+	proto_item_set_text(SMInfo_header_item, "%s", "SMInfo");
+	SMInfo_header_tree = proto_item_add_subtree(SMInfo_header_item, ett_sminfo);
+
+	proto_tree_add_item(SMInfo_header_tree, hf_infiniband_SMInfo_GUID,		tvb, local_offset, 8, FALSE); local_offset +=8;
+	proto_tree_add_item(SMInfo_header_tree, hf_infiniband_SMInfo_SM_Key,	tvb, local_offset, 8, FALSE); local_offset +=8;
+	proto_tree_add_item(SMInfo_header_tree, hf_infiniband_SMInfo_ActCount,	tvb, local_offset, 4, FALSE); local_offset +=4;
+	proto_tree_add_item(SMInfo_header_tree, hf_infiniband_SMInfo_Priority,	tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(SMInfo_header_tree, hf_infiniband_SMInfo_SMState,	tvb, local_offset, 1, FALSE); local_offset +=1;
+}
+
+/* Parse VendorDiag Attribute
+* IN:	parentTree - The tree to add the dissection to
+*		tvb - The tvbbuff of packet data
+*		offset - The offset in TVB where the attribute begins
+*		MadHeader - The common MAD header of the current SMP/SMA  */
+static void parse_VendorDiag(proto_tree* parentTree, tvbuff_t* tvb, gint *offset)
+{
+	gint local_offset = *offset;
+	proto_tree *VendorDiag_header_tree = NULL;
+	proto_item *VendorDiag_header_item = NULL;
+
+	if(!parentTree)
+		return;
+
+	VendorDiag_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 64, FALSE);
+	proto_item_set_text(VendorDiag_header_item, "%s", "VendorDiag");
+	VendorDiag_header_tree = proto_item_add_subtree(VendorDiag_header_item, ett_vendordiag);
+
+	proto_tree_add_item(VendorDiag_header_tree, hf_infiniband_VendorDiag_NextIndex,		tvb, local_offset, 2, FALSE); local_offset +=2;
+	proto_tree_add_item(VendorDiag_header_tree, hf_infiniband_VendorDiag_DiagData,		tvb, local_offset, 62, FALSE); local_offset +=62;
+}
+
+/* Parse LedInfo Attribute
+* IN:	parentTree - The tree to add the dissection to
+*		tvb - The tvbbuff of packet data
+*		offset - The offset in TVB where the attribute begins
+*		MadHeader - The common MAD header of the current SMP/SMA  */
+static void parse_LedInfo(proto_tree* parentTree, tvbuff_t* tvb, gint *offset)
+{
+	gint local_offset = *offset;
+	proto_tree *LedInfo_header_tree = NULL;
+	proto_item *LedInfo_header_item = NULL;
+
+	if(!parentTree)
+		return;
+
+	LedInfo_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 64, FALSE);
+	proto_item_set_text(LedInfo_header_item, "%s", "LedInfo");
+	LedInfo_header_tree = proto_item_add_subtree(LedInfo_header_item, ett_ledinfo);
+
+	proto_tree_add_item(LedInfo_header_tree, hf_infiniband_LedInfo_LedMask,		tvb, local_offset, 1, FALSE);
+}
+
+/* Parse LinkSpeedWidthPairsTable Attribute
+* IN:	parentTree - The tree to add the dissection to
+*		tvb - The tvbbuff of packet data
+*		offset - The offset in TVB where the attribute begins
+*		MadHeader - The common MAD header of the current SMP/SMA  */
+static void parse_LinkSpeedWidthPairsTable(proto_tree* parentTree, tvbuff_t* tvb, gint *offset)
+{
+	gint local_offset = *offset;
+	proto_tree *LinkSpeedWidthPairsTable_header_tree = NULL;
+	proto_item *LinkSpeedWidthPairsTable_header_item = NULL;
+
+	if(!parentTree)
+		return;
+
+	LinkSpeedWidthPairsTable_header_item = proto_tree_add_item(parentTree, hf_infiniband_smp_data, tvb, local_offset, 64, FALSE);
+	proto_item_set_text(LinkSpeedWidthPairsTable_header_item, "%s", "LinkSpeedWidthPairsTable");
+	LinkSpeedWidthPairsTable_header_tree = proto_item_add_subtree(LinkSpeedWidthPairsTable_header_item, ett_linkspeedwidthpairs);
+
+	proto_tree_add_item(LinkSpeedWidthPairsTable_header_tree, hf_infiniband_LinkSpeedWidthPairsTable_NumTables,		tvb, local_offset, 1, FALSE); local_offset +=1;
+	proto_tree_add_item(LinkSpeedWidthPairsTable_header_tree, hf_infiniband_LinkSpeedWidthPairsTable_PortMask,		tvb, local_offset, 32, FALSE); local_offset +=32;
+	proto_tree_add_item(LinkSpeedWidthPairsTable_header_tree, hf_infiniband_LinkSpeedWidthPairsTable_SpeedTwoFive,	tvb, local_offset, 1, FALSE); local_offset +=1;
+	proto_tree_add_item(LinkSpeedWidthPairsTable_header_tree, hf_infiniband_LinkSpeedWidthPairsTable_SpeedFive,		tvb, local_offset, 1, FALSE); local_offset +=1;
+	proto_tree_add_item(LinkSpeedWidthPairsTable_header_tree, hf_infiniband_LinkSpeedWidthPairsTable_SpeedTen,		tvb, local_offset, 1, FALSE); local_offset +=1;
+}
+
+/* Parse RID Field from Subnet Administraiton Packets.
+* IN: SA_header_tree - the dissection tree of the subnet admin attribute.
+*     tvb - the packet buffer
+*	   MadHeader - the Common MAD header from this packet.
+* IN/OUT:  offset - the current and updated offset in the packet buffer */
+static void parse_RID(proto_tree* SA_header_tree, tvbuff_t* tvb, gint *offset, MAD_Data* MadHeader)
+{
+	gint local_offset = *offset;
+	if(!SA_header_tree)
+	{
+		return;
+	}
+		switch(MadHeader->attributeID)
+		{
+			case 0x0011:
+				/* NodeRecord */
+				proto_tree_add_item(SA_header_tree, hf_infiniband_SA_LID,	tvb, local_offset, 2, FALSE); local_offset+=2;
+				local_offset+=2; /* Reserved bits */
+				break;
+			case 0x0012:
+				/* PortInfoRecord */
+				proto_tree_add_item(SA_header_tree, hf_infiniband_SA_EndportLID,	tvb, local_offset, 2, FALSE); local_offset+=2;
+				proto_tree_add_item(SA_header_tree, hf_infiniband_SA_PortNum,		tvb, local_offset, 1, FALSE); local_offset+=1;
+				local_offset+=1; /* Reserved bits */
+				break;
+			case 0x0013:
+				/* SLtoVLMappingTableRecord */
+				proto_tree_add_item(SA_header_tree, hf_infiniband_SA_LID,			tvb, local_offset, 2, FALSE); local_offset+=2;
+				proto_tree_add_item(SA_header_tree, hf_infiniband_SA_InputPortNum,	tvb, local_offset, 1, FALSE); local_offset+=1;
+				proto_tree_add_item(SA_header_tree, hf_infiniband_SA_OutputPortNum,	tvb, local_offset, 1, FALSE); local_offset+=1;
+				local_offset+=4; /* Reserved bits */
+				break;
+			case 0x0014:
+				/* SwitchInfoRecord */
+				proto_tree_add_item(SA_header_tree, hf_infiniband_SA_LID,			tvb, local_offset, 2, FALSE); local_offset+=2;
+				local_offset+=2; /* Reserved bits */
+				break;
+			case 0x0015:
+				/* LinearForwardingTableRecord */
+				proto_tree_add_item(SA_header_tree, hf_infiniband_SA_LID,					tvb, local_offset, 2, FALSE); local_offset+=2;
+				proto_tree_add_item(SA_header_tree, hf_infiniband_SA_BlockNum_SixteenBit,	tvb, local_offset, 2, FALSE); local_offset+=2;
+				local_offset+=4; /* Reserved bits */
+				break;
+			case 0x0016:
+				/* RandomForwardingTableRecord */
+				proto_tree_add_item(SA_header_tree, hf_infiniband_SA_LID,					tvb, local_offset, 2, FALSE); local_offset+=2;
+				proto_tree_add_item(SA_header_tree, hf_infiniband_SA_BlockNum_SixteenBit,	tvb, local_offset, 2, FALSE); local_offset+=2;
+				local_offset+=4; /* Reserved bits */
+				break;
+			case 0x0017:
+				/* MulticastForwardingTableRecord */
+				proto_tree_add_item(SA_header_tree, hf_infiniband_SA_LID,				tvb, local_offset, 2, FALSE); local_offset+=2;
+				proto_tree_add_item(SA_header_tree, hf_infiniband_SA_Position,			tvb, local_offset, 1, FALSE);
+				proto_tree_add_item(SA_header_tree, hf_infiniband_SA_BlockNum_NineBit,	tvb, local_offset, 2, FALSE); local_offset+=2;
+				local_offset+=4; /* Reserved bits */
+				break;
+			case 0x0036:
+				/*VLArbitrationTableRecord */
+				proto_tree_add_item(SA_header_tree, hf_infiniband_SA_LID,			tvb, local_offset, 2, FALSE); local_offset+=2;
+				proto_tree_add_item(SA_header_tree, hf_infiniband_SA_OutputPortNum,	tvb, local_offset, 1, FALSE); local_offset+=1;
+				proto_tree_add_item(SA_header_tree, hf_infiniband_SA_BlockNum_EightBit,		tvb, local_offset, 1, FALSE); local_offset+=1;
+				local_offset+=4; /* Reserved bits */
+				break;
+			case 0x0018:
+				/* SMInfoRecord */
+				proto_tree_add_item(SA_header_tree, hf_infiniband_SA_LID,				tvb, local_offset, 2, FALSE); local_offset+=2;
+				local_offset+=2; /* Reserved bits */
+				break;
+			case 0x0033:
+				/* P_KeyTableRecord */
+				proto_tree_add_item(SA_header_tree, hf_infiniband_SA_LID,					tvb, local_offset, 2, FALSE); local_offset+=2;
+				proto_tree_add_item(SA_header_tree, hf_infiniband_SA_BlockNum_SixteenBit,	tvb, local_offset, 2, FALSE); local_offset+=2;
+				proto_tree_add_item(SA_header_tree, hf_infiniband_SA_PortNum,				tvb, local_offset, 1, FALSE); local_offset+=1;
+				local_offset+=3; /* Reserved bits */
+				break;
+			case 0x00F3:
+				/* InformInfoRecord */
+				proto_tree_add_item(SA_header_tree, hf_infiniband_InformInfoRecord_SubscriberGID,	tvb, local_offset, 16, FALSE); local_offset+=16;
+				proto_tree_add_item(SA_header_tree, hf_infiniband_InformInfoRecord_Enum,			tvb, local_offset, 2, FALSE); local_offset+=2;
+				local_offset+=6; /* Reserved bits */
+				break;
+			case 0x0020:
+				/* LinkRecord */
+				proto_tree_add_item(SA_header_tree, hf_infiniband_LinkRecord_FromLID,	tvb, local_offset, 2, FALSE); local_offset+=2;
+				proto_tree_add_item(SA_header_tree, hf_infiniband_LinkRecord_FromPort,	tvb, local_offset, 1, FALSE); local_offset+=1;
+				break;
+			case 0x0031:
+				/* ServiceRecord */
+				proto_tree_add_item(SA_header_tree, hf_infiniband_ServiceRecord_ServiceID,		tvb, local_offset, 8, FALSE); local_offset+=8;
+				proto_tree_add_item(SA_header_tree, hf_infiniband_ServiceRecord_ServiceGID,		tvb, local_offset, 16, FALSE); local_offset+=16;
+				proto_tree_add_item(SA_header_tree, hf_infiniband_ServiceRecord_ServiceP_Key,	tvb, local_offset, 2, FALSE); local_offset+=2;
+				local_offset+=2;
+				break;
+			case 0x0038:
+				/* MCMemberRecord */
+				proto_tree_add_item(SA_header_tree, hf_infiniband_MCMemberRecord_MGID,		tvb, local_offset, 16, FALSE); local_offset+=16;
+				proto_tree_add_item(SA_header_tree, hf_infiniband_MCMemberRecord_PortGID,	tvb, local_offset, 16, FALSE); local_offset+=16;
+				break;
+			case 0x0030:
+				/* GuidInfoRecord */
+				proto_tree_add_item(SA_header_tree, hf_infiniband_SA_LID,				tvb, local_offset, 2, FALSE); local_offset+=2;
+				proto_tree_add_item(SA_header_tree, hf_infiniband_SA_BlockNum_EightBit,	tvb, local_offset, 1, FALSE); local_offset+=2;
+				local_offset+=4;
+				break;
+			default:
+				break;
+		}
+
+	*offset = local_offset;
+}
+
+/* Parse InformInfo Attribute
+* IN:	parentTree - The tree to add the dissection to
+*		tvb - The tvbbuff of packet data
+*		offset - The offset in TVB where the attribute begins
+*		MadHeader - The common MAD header of the current SMP/SMA  */
+static void parse_InformInfo(proto_tree* parentTree, tvbuff_t* tvb, gint *offset)
+{
+	gint local_offset = *offset;
+	proto_tree *InformInfo_header_tree = NULL;
+	proto_item *InformInfo_header_item = NULL;
+	if(!parentTree)
+	{
+		return;
+	}
+	InformInfo_header_item = proto_tree_add_item(parentTree, hf_infiniband_SA, tvb, local_offset, 36, FALSE);
+	proto_item_set_text(InformInfo_header_item, "%s", "InformInfo");
+	InformInfo_header_tree = proto_item_add_subtree(InformInfo_header_item, ett_informinfo);
+
+	proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_GID,					tvb, local_offset, 16, FALSE); local_offset+=16;
+	proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_LIDRangeBegin,			tvb, local_offset, 2, FALSE); local_offset+=2;
+	proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_LIDRangeEnd,			tvb, local_offset, 2, FALSE); local_offset+=2;
+	local_offset+=2; /* Reserved Bits */
+	proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_IsGeneric,				tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_Subscribe,				tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_Type,					tvb, local_offset, 2, FALSE); local_offset+=2;
+	proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_TrapNumberDeviceID,	tvb, local_offset, 2, FALSE); local_offset+=2;
+	proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_QPN,					tvb, local_offset, 3, FALSE); local_offset+=3;
+	proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_RespTimeValue,			tvb, local_offset, 1, FALSE); local_offset+=1;
+	local_offset+=1;
+	proto_tree_add_item(InformInfo_header_tree, hf_infiniband_InformInfo_ProducerTypeVendorID,	tvb, local_offset, 3, FALSE); local_offset+=3;
+
+}
+/* Parse LinkRecord Attribute
+* IN:	parentTree - The tree to add the dissection to
+*		tvb - The tvbbuff of packet data
+*		offset - The offset in TVB where the attribute begins
+*		MadHeader - The common MAD header of the current SMP/SMA  */
+static void parse_LinkRecord(proto_tree* parentTree, tvbuff_t* tvb, gint *offset)
+{
+	gint local_offset = *offset;
+	proto_tree *LinkRecord_header_tree = NULL;
+	proto_item *LinkRecord_header_item = NULL;
+
+	if(!parentTree)
+	{
+		return;
+	}
+
+	LinkRecord_header_item = proto_tree_add_item(parentTree, hf_infiniband_SA, tvb, local_offset, 3, FALSE);
+	proto_item_set_text(LinkRecord_header_item, "%s", "LinkRecord");
+	LinkRecord_header_tree = proto_item_add_subtree(LinkRecord_header_item, ett_linkrecord);
+
+	proto_tree_add_item(LinkRecord_header_tree, hf_infiniband_LinkRecord_ToPort,	tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(LinkRecord_header_tree, hf_infiniband_LinkRecord_ToLID,		tvb, local_offset, 2, FALSE); local_offset +=2;
+
+}
+/* Parse ServiceRecord Attribute
+* IN:	parentTree - The tree to add the dissection to
+*		tvb - The tvbbuff of packet data
+*		offset - The offset in TVB where the attribute begins
+*		MadHeader - The common MAD header of the current SMP/SMA  */
+static void parse_ServiceRecord(proto_tree* parentTree, tvbuff_t* tvb, gint *offset)
+{
+	gint local_offset = *offset;
+	proto_tree *ServiceRecord_header_tree = NULL;
+	proto_item *ServiceRecord_header_item = NULL;
+	proto_item *tempData = NULL;
+
+	if(!parentTree)
+	{
+		return;
+	}
+
+	ServiceRecord_header_item = proto_tree_add_item(parentTree, hf_infiniband_SA, tvb, local_offset, 176, FALSE);
+	proto_item_set_text(ServiceRecord_header_item, "%s", "ServiceRecord");
+	ServiceRecord_header_tree = proto_item_add_subtree(ServiceRecord_header_item, ett_servicerecord);
+
+	proto_tree_add_item(ServiceRecord_header_tree, hf_infiniband_ServiceRecord_ServiceLease,	tvb, local_offset, 4, FALSE); local_offset+=4;
+	proto_tree_add_item(ServiceRecord_header_tree, hf_infiniband_ServiceRecord_ServiceKey,		tvb, local_offset, 16, FALSE); local_offset+=16;
+	proto_tree_add_item(ServiceRecord_header_tree, hf_infiniband_ServiceRecord_ServiceName,		tvb, local_offset, 64, FALSE); local_offset+=64;
+
+	tempData = proto_tree_add_item(ServiceRecord_header_tree, hf_infiniband_ServiceRecord_ServiceData,		tvb, local_offset, 16, FALSE); local_offset+=16;
+	proto_item_append_text(tempData, "%s", "(ServiceData 8.1, 8.16)");
+	tempData = proto_tree_add_item(ServiceRecord_header_tree, hf_infiniband_ServiceRecord_ServiceData,		tvb, local_offset, 16, FALSE); local_offset+=16;
+	proto_item_append_text(tempData, "%s", "(ServiceData 16.1, 16.8)");
+	tempData = proto_tree_add_item(ServiceRecord_header_tree, hf_infiniband_ServiceRecord_ServiceData,		tvb, local_offset, 16, FALSE); local_offset+=16;
+	proto_item_append_text(tempData, "%s", "(ServiceData 32.1, 32.4)");
+	tempData = proto_tree_add_item(ServiceRecord_header_tree, hf_infiniband_ServiceRecord_ServiceData,		tvb, local_offset, 16, FALSE); local_offset+=16;
+	proto_item_append_text(tempData, "%s", "(ServiceData 64.1, 64.2)");
+
+}
+/* Parse PathRecord Attribute
+* IN:	parentTree - The tree to add the dissection to
+*		tvb - The tvbbuff of packet data
+*		offset - The offset in TVB where the attribute begins
+*		MadHeader - The common MAD header of the current SMP/SMA  */
+static void parse_PathRecord(proto_tree* parentTree, tvbuff_t* tvb, gint *offset)
+{
+	gint local_offset = *offset;
+	proto_tree *PathRecord_header_tree = NULL;
+	proto_item *PathRecord_header_item = NULL;
+
+	if(!parentTree)
+	{
+		return;
+	}
+
+	PathRecord_header_item = proto_tree_add_item(parentTree, hf_infiniband_SA, tvb, local_offset, 64, FALSE);
+	proto_item_set_text(PathRecord_header_item, "%s", "PathRecord");
+	PathRecord_header_tree = proto_item_add_subtree(PathRecord_header_item, ett_pathrecord);
+	local_offset += 8; /* Reserved Bits */
+
+	proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_DGID,			tvb, local_offset, 16, FALSE); local_offset+=16;
+	proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_SGID,			tvb, local_offset, 16, FALSE); local_offset+=16;
+	proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_DLID,			tvb, local_offset, 2, FALSE); local_offset+=2;
+	proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_SLID,			tvb, local_offset, 2, FALSE); local_offset+=2;
+	proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_RawTraffic,	tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_FlowLabel,		tvb, local_offset, 3, FALSE); local_offset+=3;
+	proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_HopLimit,		tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_TClass,		tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_Reversible,	tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_NumbPath,		tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_P_Key,			tvb, local_offset, 2, FALSE); local_offset+=2;
+	proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_SL,			tvb, local_offset, 2, FALSE); local_offset+=2;
+	proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_MTUSelector,	tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_MTU,			tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_RateSelector,	tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_Rate,			tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_PacketLifeTimeSelector,	tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_PacketLifeTime,			tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(PathRecord_header_tree, hf_infiniband_PathRecord_Preference,				tvb, local_offset, 1, FALSE); local_offset+=1;
+}
+/* Parse MCMemberRecord Attribute
+* IN:	parentTree - The tree to add the dissection to
+*		tvb - The tvbbuff of packet data
+*		offset - The offset in TVB where the attribute begins
+*		MadHeader - The common MAD header of the current SMP/SMA  */
+static void parse_MCMemberRecord(proto_tree* parentTree, tvbuff_t* tvb, gint *offset)
+{
+	gint local_offset = *offset;
+	proto_tree *MCMemberRecord_header_tree = NULL;
+	proto_item *MCMemberRecord_header_item = NULL;
+
+	if(!parentTree)
+	{
+		return;
+	}
+
+	MCMemberRecord_header_item = proto_tree_add_item(parentTree, hf_infiniband_SA, tvb, local_offset, 64, FALSE);
+	proto_item_set_text(MCMemberRecord_header_item, "%s", "MCMemberRecord");
+	MCMemberRecord_header_tree = proto_item_add_subtree(MCMemberRecord_header_item, ett_mcmemberrecord);
+
+	proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_Q_Key,			tvb, local_offset, 4, FALSE); local_offset+=4;
+	proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_MLID,			tvb, local_offset, 2, FALSE); local_offset+=2;
+	proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_MTUSelector,	tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_MTU,			tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_TClass,		tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_P_Key,			tvb, local_offset, 2, FALSE); local_offset+=2;
+	proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_RateSelector,	tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_Rate,			tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_PacketLifeTimeSelector,	tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_PacketLifeTime,			tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_SL,			tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_FlowLabel,		tvb, local_offset, 3, FALSE); local_offset+=3;
+	proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_HopLimit,		tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_Scope,			tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_JoinState,		tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(MCMemberRecord_header_tree, hf_infiniband_MCMemberRecord_ProxyJoin,		tvb, local_offset, 1, FALSE); local_offset+=3;
+
+}
+/* Parse TraceRecord Attribute
+* IN:	parentTree - The tree to add the dissection to
+*		tvb - The tvbbuff of packet data
+*		offset - The offset in TVB where the attribute begins
+*		MadHeader - The common MAD header of the current SMP/SMA  */
+static void parse_TraceRecord(proto_tree* parentTree, tvbuff_t* tvb, gint *offset)
+{
+	gint local_offset = *offset;
+	proto_tree *TraceRecord_header_tree = NULL;
+	proto_item *TraceRecord_header_item = NULL;
+
+	if(!parentTree)
+	{
+		return;
+	}
+
+	TraceRecord_header_item = proto_tree_add_item(parentTree, hf_infiniband_SA, tvb, local_offset, 46, FALSE);
+	proto_item_set_text(TraceRecord_header_item, "%s", "TraceRecord");
+	TraceRecord_header_tree = proto_item_add_subtree(TraceRecord_header_item, ett_tracerecord);
+
+	proto_tree_add_item(TraceRecord_header_tree, hf_infiniband_TraceRecord_GIDPrefix,		tvb, local_offset, 8, FALSE); local_offset+=8;
+	proto_tree_add_item(TraceRecord_header_tree, hf_infiniband_TraceRecord_IDGeneration,	tvb, local_offset, 2, FALSE); local_offset+=2;
+	local_offset+=1; /* Reserved Bits */
+	proto_tree_add_item(TraceRecord_header_tree, hf_infiniband_TraceRecord_NodeType,		tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(TraceRecord_header_tree, hf_infiniband_TraceRecord_NodeID,			tvb, local_offset, 8, FALSE); local_offset+=8;
+	proto_tree_add_item(TraceRecord_header_tree, hf_infiniband_TraceRecord_ChassisID,		tvb, local_offset, 8, FALSE); local_offset+=8;
+	proto_tree_add_item(TraceRecord_header_tree, hf_infiniband_TraceRecord_EntryPortID,		tvb, local_offset, 8, FALSE); local_offset+=8;
+	proto_tree_add_item(TraceRecord_header_tree, hf_infiniband_TraceRecord_ExitPortID,		tvb, local_offset, 8, FALSE); local_offset+=8;
+	proto_tree_add_item(TraceRecord_header_tree, hf_infiniband_TraceRecord_EntryPort,		tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(TraceRecord_header_tree, hf_infiniband_TraceRecord_ExitPort,		tvb, local_offset, 1, FALSE); local_offset+=1;
+}
+/* Parse MultiPathRecord Attribute
+* IN:	parentTree - The tree to add the dissection to
+*		tvb - The tvbbuff of packet data
+*		offset - The offset in TVB where the attribute begins
+*		MadHeader - The common MAD header of the current SMP/SMA  */
+static void parse_MultiPathRecord(proto_tree* parentTree, tvbuff_t* tvb, gint *offset)
+{
+	gint local_offset = *offset;
+	proto_tree *MultiPathRecord_header_tree = NULL;
+	proto_item *MultiPathRecord_header_item = NULL;
+	proto_item *SDGID = NULL;
+	guint8 SDGIDCount = 0;
+	guint8 DGIDCount = 0;
+	guint32 i = 0;
+
+	if(!parentTree)
+	{
+		return;
+	}
+
+	MultiPathRecord_header_item = proto_tree_add_item(parentTree, hf_infiniband_SA, tvb, local_offset, 200, FALSE);
+	proto_item_set_text(MultiPathRecord_header_item, "%s", "MultiPathRecord");
+	MultiPathRecord_header_tree = proto_item_add_subtree(MultiPathRecord_header_item, ett_multipathrecord);
+
+	proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_RawTraffic,		tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_FlowLabel,		tvb, local_offset, 3, FALSE); local_offset+=3;
+	proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_HopLimit,		tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_TClass,			tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_Reversible,		tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_NumbPath,		tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_P_Key,			tvb, local_offset, 2, FALSE); local_offset+=2;
+	proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_SL,				tvb, local_offset, 2, FALSE); local_offset+=2;
+	proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_MTUSelector,		tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_MTU,				tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_RateSelector,	tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_Rate,			tvb, local_offset, 1, FALSE); local_offset+=1;
+	proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_PacketLifeTimeSelector,	tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_PacketLifeTime,			tvb, local_offset, 1, FALSE); local_offset+=1;
+	local_offset+=1; /* Reserved Bits */
+	proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_IndependenceSelector,	tvb, local_offset, 1, FALSE);
+	proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_GIDScope,				tvb, local_offset, 1, FALSE); local_offset+=1;
+
+	SDGIDCount = tvb_get_guint8(tvb, local_offset);
+	proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_SGIDCount,		tvb, local_offset, 1, FALSE); local_offset+=1;
+	DGIDCount = tvb_get_guint8(tvb, local_offset);
+	proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_DGIDCount,		tvb, local_offset, 1, FALSE); local_offset+=1;
+	local_offset+=7; /*Reserved Bits */
+
+	for(i = 0; i < SDGIDCount; i++)
+	{
+		SDGID = proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_SDGID,		tvb, local_offset, 16, FALSE); local_offset+=16;
+		proto_item_set_text(SDGID, "(%s%u)","SGID", i);
+	}
+	for(i = 0; i < DGIDCount; i++)
+	{
+		SDGID = proto_tree_add_item(MultiPathRecord_header_tree, hf_infiniband_MultiPathRecord_SDGID,		tvb, local_offset, 16, FALSE); local_offset+=16;
+		proto_item_set_text(SDGID, "(%s%u)","DGID", i);
+	}
+}
+/* Parse ServiceAssociationRecord Attribute
+* IN:	parentTree - The tree to add the dissection to
+*		tvb - The tvbbuff of packet data
+*		offset - The offset in TVB where the attribute begins
+*		MadHeader - The common MAD header of the current SMP/SMA  */
+static void parse_ServiceAssociationRecord(proto_tree* parentTree, tvbuff_t* tvb, gint *offset)
+{
+	gint local_offset = *offset;
+	proto_tree *ServiceAssociationRecord_header_tree = NULL;
+	proto_item *ServiceAssociationRecord_header_item = NULL;
+
+	if(!parentTree)
+	{
+		return;
+	}
+
+	ServiceAssociationRecord_header_item = proto_tree_add_item(parentTree, hf_infiniband_SA, tvb, local_offset, 80, FALSE);
+	proto_item_set_text(ServiceAssociationRecord_header_item, "%s", "ServiceAssociationRecord");
+	ServiceAssociationRecord_header_tree = proto_item_add_subtree(ServiceAssociationRecord_header_item, ett_serviceassocrecord);
+
+	proto_tree_add_item(ServiceAssociationRecord_header_tree, hf_infiniband_ServiceAssociationRecord_ServiceKey,		tvb, local_offset, 16, FALSE); local_offset +=16;
+	proto_tree_add_item(ServiceAssociationRecord_header_tree, hf_infiniband_ServiceAssociationRecord_ServiceName,		tvb, local_offset, 64, FALSE); local_offset +=64;
+}
+
+/* dissect_general_info
+* Used to extract very few values from the packet in the case that full dissection is disabled by the user.
+* IN:
+*		tvb - The tvbbuff of packet data
+*		offset - The offset in TVB where the attribute begins
+*		pinfo - The packet info structure with column information */
+static void dissect_general_info(tvbuff_t *tvb, gint offset, packet_info *pinfo)
+{
+	guint8 lnh_val = 0;				/* The Link Next Header Value.  Tells us which headers are coming */
+	gboolean bthFollows = 0;		/* Tracks if we are parsing a BTH.  This is a significant decision point */
+	guint8 virtualLane = 0;			/* The Virtual Lane of the current Packet */
+	guint8 opCode = 0;				/* OpCode from BTH header. */
+	gint32 nextHeaderSequence = -1;	/* defined by this dissector. #define which indicates the upcoming header sequence from OpCode */
+	guint8 nxtHdr = 0;  			/* that must be available for that header. */
+	struct e_in6_addr SRCgid;		/* Struct to display ipv6 Address */
+	struct e_in6_addr DSTgid;		/* Struct to display ipv6 Address */
+	guint8 management_class = 0;
+	MAD_Data MadData;
+
+
+	virtualLane =  tvb_get_guint8(tvb, offset);
+	virtualLane = virtualLane & 0xF0;
+	offset+=1;
+
+	/* Save Link Next Header... This tells us what the next header is. */
+	lnh_val =  tvb_get_guint8(tvb, offset);
+	lnh_val = lnh_val & 0x03;
+	offset+=1;
+
+	/* Set destination in packet view. */
+	if (check_col(pinfo->cinfo, COL_DEF_DST))
+	{
+		col_add_fstr(pinfo->cinfo, COL_DEF_DST, "DLID: %s", tvb_bytes_to_str(tvb, offset, 2));
+	}
+	offset+=4;
+
+	/* Set Source in packet view. */
+	if (check_col(pinfo->cinfo, COL_DEF_SRC))
+	{
+		col_add_fstr(pinfo->cinfo, COL_DEF_SRC, "SLID: %s", tvb_bytes_to_str(tvb, offset, 2));
+	}
+	offset+=2;
+
+	switch(lnh_val)
+	{
+		case IBA_GLOBAL:
+			offset +=6;
+			nxtHdr = tvb_get_guint8(tvb, offset);
+			offset += 2;
+
+			tvb_get_ipv6(tvb, offset, &SRCgid);
+			if (check_col(pinfo->cinfo, COL_DEF_SRC))
+			{
+				col_add_fstr(pinfo->cinfo, COL_DEF_SRC, "SGID: %s", ip6_to_str(&SRCgid));
+			}
+			offset += 16;
+
+			tvb_get_ipv6(tvb, offset, &DSTgid);
+			if (check_col(pinfo->cinfo, COL_DEF_DST))
+			{
+				col_add_fstr(pinfo->cinfo, COL_DEF_DST, "DGID: %s", ip6_to_str(&DSTgid));
+			}
+			offset += 16;
+
+			if(nxtHdr != 0x1B)
+			{
+				/* Some kind of packet being transported globally with IBA, but locally it is not IBA - no BTH following. */
+				break;
+			}
+			/* else
+			 * {
+			 *		Fall through switch and start parsing Local Headers and BTH
+			 * }
+			 */
+		case IBA_LOCAL:
+			bthFollows = TRUE;
+
+			/* Get the OpCode - this tells us what headers are following */
+			opCode = tvb_get_guint8(tvb, offset);
+			if (check_col(pinfo->cinfo, COL_INFO))
+			{
+				col_append_str(pinfo->cinfo, COL_INFO, val_to_str((guint32)opCode, OpCodeMap, "Unknown OpCode"));
+			}
+			offset +=12;
+			break;
+		case IP_NON_IBA:
+			/* Raw IPv6 Packet */
+			if (check_col(pinfo->cinfo, COL_DEF_DST))
+			{
+				col_set_str(pinfo->cinfo, COL_DEF_DST, "IPv6 over IB Packet");
+				col_set_fence(pinfo->cinfo, COL_DEF_DST);
+			}
+			break;
+		case RAW:
+			break;
+		default:
+			break;
+	}
+
+	if(bthFollows)
+	{
+		/* Find our next header sequence based on the Opcode
+		 * Since we're not doing dissection here, we just need the proper offsets to get our labels in packet view */
+
+		nextHeaderSequence = find_next_header_sequence((guint32) opCode);
+		switch(nextHeaderSequence)
+		{
+			case RDETH_DETH_PAYLD:
+				offset += 4; /* RDETH */
+				offset += 8; /* DETH */
+				break;
+			case RDETH_DETH_RETH_PAYLD:
+				offset += 4; /* RDETH */
+				offset += 8; /* DETH */
+				offset += 16; /* RETH */
+				break;
+			case RDETH_DETH_IMMDT_PAYLD:
+				offset += 4; /* RDETH */
+				offset += 8; /* DETH */
+				offset += 4; /* IMMDT */
+				break;
+			case RDETH_DETH_RETH_IMMDT_PAYLD:
+				offset += 4; /* RDETH */
+				offset += 8; /* DETH */
+				offset += 16; /* RETH */
+				offset += 4; /* IMMDT */
+				break;
+			case RDETH_DETH_RETH:
+				offset += 4; /* RDETH */
+				offset += 8; /* DETH */
+				offset += 16; /* RETH */
+				break;
+			case RDETH_AETH_PAYLD:
+				offset += 4; /* RDETH */
+				offset += 4; /* AETH */
+				break;
+			case RDETH_PAYLD:
+				offset += 4; /* RDETH */
+				break;
+			case RDETH_AETH:
+				offset += 4; /* RDETH */
+				offset += 4; /* AETH */
+				break;
+			case RDETH_AETH_ATOMICACKETH:
+				offset += 4; /* RDETH */
+				offset += 4; /* AETH */
+				offset += 8; /* AtomicAckETH */
+				break;
+			case RDETH_DETH_ATOMICETH:
+				offset += 4; /* RDETH */
+				offset += 8; /* DETH */
+				offset += 28; /* AtomicETH */
+				break;
+			case RDETH_DETH:
+				offset += 4; /* RDETH */
+				offset += 8; /* DETH */
+				break;
+			case DETH_PAYLD:
+				offset += 8; /* DETH */
+				break;
+			case PAYLD:
+				break;
+			case IMMDT_PAYLD:
+				offset += 4; /* IMMDT */
+				break;
+			case RETH_PAYLD:
+				offset += 16; /* RETH */
+				break;
+			case RETH:
+				offset += 16; /* RETH */
+				break;
+			case AETH_PAYLD:
+				offset += 4; /* AETH */
+				break;
+			case AETH:
+				offset += 4; /* AETH */
+				break;
+			case AETH_ATOMICACKETH:
+				offset += 4; /* AETH */
+				offset += 8; /* AtomicAckETH */
+				break;
+			case ATOMICETH:
+				offset += 28; /* AtomicETH */
+				break;
+			case IETH_PAYLD:
+				offset += 4; /* IETH */
+				break;
+			case DETH_IMMDT_PAYLD:
+				offset += 8; /* DETH */
+				offset += 4; /* IMMDT */
+				break;
+			default:
+				break;
+		}
+	}
+	if(virtualLane == 0xF0)
+	{
+		management_class =  tvb_get_guint8(tvb, offset + 1);
+		if(((management_class >= (guint8)VENDOR_1_START) && (management_class <= (guint8)VENDOR_1_END))
+		|| ((management_class >= (guint8)VENDOR_2_START) && (management_class <= (guint8)VENDOR_2_END)))
+		{
+			return;
+		}
+		else if((management_class >= (guint8)APPLICATION_START) && (management_class <= (guint8)APPLICATION_END))
+		{
+			return;
+		}
+		else if(((management_class == (guint8)0x00) || (management_class == (guint8)0x02))
+			|| ((management_class >= (guint8)0x50) && (management_class <= (guint8)0x80))
+			|| ((management_class >= (guint8)0x82)))
+		{
+			return;
+		}
+		else /* we have a normal management_class */
+		{
+			parse_MAD_Common(NULL, tvb, &offset, &MadData);
+			label_SUBM_Method(NULL, &MadData, pinfo);
+			label_SUBM_Attribute(NULL, &MadData, pinfo);
+		}
+	}
+
+	return;
+}