Do one or more of the following:

- Convert "4 space tabs" to spaces;
- Remove some unneeded initializers;
- 'offset++' --> 'offset += 1' for consistency;
- Reformat hf[] entries;
- Rework/add whitespace;
- Adjust editor modelines (set tab-width to 8).

svn path=/trunk/; revision=54005

19 files changed, 13269 insertions, 11342 deletions

diff --git a/epan/dissectors/packet-cisco-sm.c b/epan/dissectors/packet-cisco-sm.c
index 7427143683..898a0b1e5a 100644
--- a/epan/dissectors/packet-cisco-sm.c
+++ b/epan/dissectors/packet-cisco-sm.c
@@ -59,171 +59,171 @@ void proto_register_sm(void);
 void proto_reg_handoff_sm(void);
 
 static const value_string sm_message_type_value[] = {
-	{ MESSAGE_TYPE_START,			"Start Message" },
-	{ MESSAGE_TYPE_STOP,			"Stop Message" },
-	{ MESSAGE_TYPE_ACTIVE,			"Active Message" },
-	{ MESSAGE_TYPE_STANDBY,			"Standby Message" },
-	{ MESSAGE_TYPE_Q_HOLD_INVOKE,  		"Q_HOLD Invoke Message" },
-	{ MESSAGE_TYPE_Q_HOLD_RESPONSE,  	"Q_HOLD Response Message" },
-	{ MESSAGE_TYPE_Q_RESUME_INVOKE,  	"Q_RESUME Invoke Message" },
-	{ MESSAGE_TYPE_Q_RESUME_RESPONSE,	"Q_RESUME Response Message" },
-	{ MESSAGE_TYPE_Q_RESET_INVOKE,    	"Q_RESET Invoke Message" },
-	{ MESSAGE_TYPE_Q_RESET_RESPONSE,  	"Q_RESET Response Message" },
-	{ MESSAGE_TYPE_PDU,                	"PDU Message" },
-	{ 0,                                  	NULL }
+    { MESSAGE_TYPE_START,             "Start Message" },
+    { MESSAGE_TYPE_STOP,              "Stop Message" },
+    { MESSAGE_TYPE_ACTIVE,            "Active Message" },
+    { MESSAGE_TYPE_STANDBY,           "Standby Message" },
+    { MESSAGE_TYPE_Q_HOLD_INVOKE,     "Q_HOLD Invoke Message" },
+    { MESSAGE_TYPE_Q_HOLD_RESPONSE,   "Q_HOLD Response Message" },
+    { MESSAGE_TYPE_Q_RESUME_INVOKE,   "Q_RESUME Invoke Message" },
+    { MESSAGE_TYPE_Q_RESUME_RESPONSE, "Q_RESUME Response Message" },
+    { MESSAGE_TYPE_Q_RESET_INVOKE,    "Q_RESET Invoke Message" },
+    { MESSAGE_TYPE_Q_RESET_RESPONSE,  "Q_RESET Response Message" },
+    { MESSAGE_TYPE_PDU,               "PDU Message" },
+    { 0, NULL }
 };
 
 static const value_string sm_message_type_value_info[] = {
-	{ MESSAGE_TYPE_START,                   "Start" },
-	{ MESSAGE_TYPE_STOP,                    "Stop" },
-	{ MESSAGE_TYPE_ACTIVE,                  "Active" },
-	{ MESSAGE_TYPE_STANDBY,                 "Standby" },
-	{ MESSAGE_TYPE_Q_HOLD_INVOKE,           "Q_HOLD Invoke" },
-	{ MESSAGE_TYPE_Q_HOLD_RESPONSE,         "Q_HOLD Response" },
-	{ MESSAGE_TYPE_Q_RESUME_INVOKE,         "Q_RESUME Invoke" },
-	{ MESSAGE_TYPE_Q_RESUME_RESPONSE,       "Q_RESUME Response" },
-	{ MESSAGE_TYPE_Q_RESET_INVOKE,          "Q_RESET Invoke" },
-	{ MESSAGE_TYPE_Q_RESET_RESPONSE,        "Q_RESET Response" },
-	{ MESSAGE_TYPE_PDU,                     "PDU" },
-	{ 0,                                    NULL }
+    { MESSAGE_TYPE_START,             "Start" },
+    { MESSAGE_TYPE_STOP,              "Stop" },
+    { MESSAGE_TYPE_ACTIVE,            "Active" },
+    { MESSAGE_TYPE_STANDBY,           "Standby" },
+    { MESSAGE_TYPE_Q_HOLD_INVOKE,     "Q_HOLD Invoke" },
+    { MESSAGE_TYPE_Q_HOLD_RESPONSE,   "Q_HOLD Response" },
+    { MESSAGE_TYPE_Q_RESUME_INVOKE,   "Q_RESUME Invoke" },
+    { MESSAGE_TYPE_Q_RESUME_RESPONSE, "Q_RESUME Response" },
+    { MESSAGE_TYPE_Q_RESET_INVOKE,    "Q_RESET Invoke" },
+    { MESSAGE_TYPE_Q_RESET_RESPONSE,  "Q_RESET Response" },
+    { MESSAGE_TYPE_PDU,               "PDU" },
+    { 0, NULL }
 };
 
 static const value_string sm_alignment_type[] = {
-	{ 0x00, "Unknown (probably linkset was already up)"},
-	{ 0x03, "Emergency alignment"},
-	{ 0x04, "Normal alignment"},
-	{ 0x05, "Power On MTP2"},
-	{ 0x06, "Start MTP2"},
-	{ 0, NULL}
+    { 0x00, "Unknown (probably linkset was already up)"},
+    { 0x03, "Emergency alignment"},
+    { 0x04, "Normal alignment"},
+    { 0x05, "Power On MTP2"},
+    { 0x06, "Start MTP2"},
+    { 0, NULL}
 };
 
 static const value_string sm_backhaul_reason_code[] = {
-	{ 0x00, "Layer management request"},
-	{ 0x01, "SUERM (Signal Unit Error Monitor) failure"},
-	{ 0x02, "Excessively long alignment period"},
-	{ 0x03, "T7 timer expired"},
-	{ 0x04, "Physical interface failure"},
-	{ 0x05, "Two or three invalid BSNs"},
-	{ 0x06, "Two or three invalid FIBs"},
-	{ 0x07, "LSSU (Link Status Signal Unit) condition"},
-	{ 0x13, "SIOs (Service Information Octets) received "
-	        "in Link State Control (LSC)"},
-	{ 0x14, "Timer T2 expired waiting for SIO"},
-	{ 0x15, "Timer T3 expired waiting for SIE/SIN "},
-	{ 0x16, "SIO received in initial alignment control (IAC)"},
-	{ 0x17, "Proving period failure"},
-	{ 0x18, "Timer T1 expired waiting for FISU (Fill-In Signal Unit)"},
-	{ 0x19, "SIN received in the in-service state"},
-	{ 0x20, "CTS lost"},
-	{ 0x25, "No resources"},
-	{    0, NULL}
+    { 0x00, "Layer management request"},
+    { 0x01, "SUERM (Signal Unit Error Monitor) failure"},
+    { 0x02, "Excessively long alignment period"},
+    { 0x03, "T7 timer expired"},
+    { 0x04, "Physical interface failure"},
+    { 0x05, "Two or three invalid BSNs"},
+    { 0x06, "Two or three invalid FIBs"},
+    { 0x07, "LSSU (Link Status Signal Unit) condition"},
+    { 0x13, "SIOs (Service Information Octets) received "
+            "in Link State Control (LSC)"},
+    { 0x14, "Timer T2 expired waiting for SIO"},
+    { 0x15, "Timer T3 expired waiting for SIE/SIN "},
+    { 0x16, "SIO received in initial alignment control (IAC)"},
+    { 0x17, "Proving period failure"},
+    { 0x18, "Timer T1 expired waiting for FISU (Fill-In Signal Unit)"},
+    { 0x19, "SIN received in the in-service state"},
+    { 0x20, "CTS lost"},
+    { 0x25, "No resources"},
+    {    0, NULL}
 };
 
 static const value_string sm_backhaul_event_code[] = {
-	{ 0x00, "Local processor outage"},
-	{ 0x01, "Local processor outage recovered"},
-	{ 0x02, "Entered a congested state"},
-	{ 0x03, "Exited a congested state"},
-	{ 0x04, "Physical layer up"},
-	{ 0x05, "Physical layer down"},
-	{ 0x06, "Protocol error"},
-	{ 0x07, "Link is aligned"},
-	{ 0x08, "Link alignment lost"},
-	{ 0x09, "Retransmit buffer full"},
-	{ 0x0a, "Retransmit buffer no longer full"},
-	{ 0x0b, "Negative acknowledgment"},
-	{ 0x0c, "Remote entered congestion"},
-	{ 0x0d, "Remote exited congestion"},
-	{ 0x0e, "Remote entered processor outage"},
-	{ 0x0f, "Remote exited processor outage"},
-	{    0, NULL}
+    { 0x00, "Local processor outage"},
+    { 0x01, "Local processor outage recovered"},
+    { 0x02, "Entered a congested state"},
+    { 0x03, "Exited a congested state"},
+    { 0x04, "Physical layer up"},
+    { 0x05, "Physical layer down"},
+    { 0x06, "Protocol error"},
+    { 0x07, "Link is aligned"},
+    { 0x08, "Link alignment lost"},
+    { 0x09, "Retransmit buffer full"},
+    { 0x0a, "Retransmit buffer no longer full"},
+    { 0x0b, "Negative acknowledgment"},
+    { 0x0c, "Remote entered congestion"},
+    { 0x0d, "Remote exited congestion"},
+    { 0x0e, "Remote entered processor outage"},
+    { 0x0f, "Remote exited processor outage"},
+    {    0, NULL}
 };
 
 static const value_string sm_backhaul_cause_code[] = {
-	{ 0x00, "Unknown (default)"},
-	{ 0x01, "Management initiated"},
-	{ 0x02, "Abnormal BSN (backward sequence number)"},
-	{ 0x03, "Abnormal FIB (Forward Indicator Bit)"},
-	{ 0x04, "Congestion discard"},
-	{    0, NULL}
+    { 0x00, "Unknown (default)"},
+    { 0x01, "Management initiated"},
+    { 0x02, "Abnormal BSN (backward sequence number)"},
+    { 0x03, "Abnormal FIB (Forward Indicator Bit)"},
+    { 0x04, "Congestion discard"},
+    {    0, NULL}
 };
 
 static const value_string sm_linkdown_cause_code[] = {
-	{ 0x00, "Unknown (default)"},
-	{ 0x01, "Management initiated"},
-	{ 0x03, "Congestion ended"},
-	{    0, NULL}
+    { 0x00, "Unknown (default)"},
+    { 0x01, "Management initiated"},
+    { 0x03, "Congestion ended"},
+    {    0, NULL}
 };
 
 static const value_string sm_retrieval_type[] = {
-	{ 0x01, "Request for BSN"},
-	{ 0x02, "Request for MSUs"},
-	{ 0x03, "Request to drop MSUs"},
-	{    0, NULL}
+    { 0x01, "Request for BSN"},
+    { 0x02, "Request for MSUs"},
+    { 0x03, "Request to drop MSUs"},
+    {    0, NULL}
 };
 
 static const value_string sm_lsc_state_type[] = {
-	{ 0x00, "Set LPO"},
-	{ 0x01, "Clear LPO"},
-	{ 0x02, "Set Emergency"},
-	{ 0x03, "Clear Emergency"},
-	{ 0x04, "Clear Buffers"},
-	{ 0x05, "Clear Transmit Buffer"},
-	{ 0x06, "Clear ReTransmission Buffer"},
-	{ 0x07, "Clear Receive Buffer"},
-	{ 0x08, "Continue"},
-	{ 0x09, "Power On"},
-	{ 0x0a, "Start"},
-	{ 0x0b, "Stop"},
-	{    0, NULL}
+    { 0x00, "Set LPO"},
+    { 0x01, "Clear LPO"},
+    { 0x02, "Set Emergency"},
+    { 0x03, "Clear Emergency"},
+    { 0x04, "Clear Buffers"},
+    { 0x05, "Clear Transmit Buffer"},
+    { 0x06, "Clear ReTransmission Buffer"},
+    { 0x07, "Clear Receive Buffer"},
+    { 0x08, "Continue"},
+    { 0x09, "Power On"},
+    { 0x0a, "Start"},
+    { 0x0b, "Stop"},
+    {    0, NULL}
 };
 
 static const value_string sm_stat_request_type[] = {
-	{ 0x00, "Reset"},
-	{ 0x01, "Send & Reset"},
-	{ 0x02, "Send"},
-	{    0, NULL}
+    { 0x00, "Reset"},
+    { 0x01, "Send & Reset"},
+    { 0x02, "Send"},
+    {    0, NULL}
 };
 
-#define PDU_CONNECT_REQUEST             0x06
-#define PDU_CONNECT_CONFIRM             0x07
-#define PDU_DISCONNECT_CONFIRM          0x0b
-#define PDU_DISCONNECT_INDICATION       0x0c
-#define PDU_MTP3_TO_SLT			0x10
-#define PDU_MTP3_FROM_SLT		0x11
-#define PDU_RETRIEVAL_REQUEST           0x12
-#define PDU_RETRIEVAL_CONFIRM           0x13
-#define PDU_LSC_REQUEST                 0x20
-#define PDU_LSC_CONFIRM                 0x21
-#define PDU_LSC_INDICATION              0x22
-#define PDU_STAT_REQUEST                0x44
+#define PDU_CONNECT_REQUEST       0x06
+#define PDU_CONNECT_CONFIRM       0x07
+#define PDU_DISCONNECT_CONFIRM    0x0b
+#define PDU_DISCONNECT_INDICATION 0x0c
+#define PDU_MTP3_TO_SLT           0x10
+#define PDU_MTP3_FROM_SLT         0x11
+#define PDU_RETRIEVAL_REQUEST     0x12
+#define PDU_RETRIEVAL_CONFIRM     0x13
+#define PDU_LSC_REQUEST           0x20
+#define PDU_LSC_CONFIRM           0x21
+#define PDU_LSC_INDICATION        0x22
+#define PDU_STAT_REQUEST          0x44
 
 static const value_string sm_pdu_type_value[] = {
-	{ PDU_CONNECT_REQUEST,		"Connect Request"},
-	{ PDU_CONNECT_CONFIRM,		"Connect Confirm"},
-	{ 0x0a,                           "Disconnect Request"},
-	{ PDU_DISCONNECT_CONFIRM,		"Disconnect Confirm"},
-	{ PDU_DISCONNECT_INDICATION,	"Disconnect Indication Message"},
-	{ PDU_MTP3_TO_SLT,		"MSU Request (message to MTP2 link)"},
-	{ PDU_MTP3_FROM_SLT, 		"MSU Indication (message from MTP2 link)"},
-	{ PDU_RETRIEVAL_REQUEST,          "Retrieval Request"},
-	{ PDU_RETRIEVAL_CONFIRM,          "Retrieval Confirm"},
-	{ 0x14,                           "Retrieval Indication"},
-	{ 0x15,                           "Retrieval Message"},
-	{ PDU_LSC_REQUEST,                "Link State Controller Request"},
-	{ PDU_LSC_CONFIRM,                "Link State Controller Confirm"},
-	{ PDU_LSC_INDICATION,             "Link State Controller Indication"},
-	{ 0x40,                           "Configuration Request"},
-	{ 0x41,                           "Configuration Confirm"},
-	{ 0x42,                           "Status Request"},
-	{ 0x43,                           "Status Confirm"},
-	{ PDU_STAT_REQUEST,               "Statistic Request"},
-	{ 0x45,                           "Statistic Confirm"},
-	{ 0x46,                           "Control Request"},
-	{ 0x47,                           "Control Confirm"},
-	{ 0x50,                           "Flow Control Request"},
-	{ 0x51,                           "Flow Control Indication"},
-	{ 0,                    NULL }
+    { PDU_CONNECT_REQUEST,       "Connect Request"},
+    { PDU_CONNECT_CONFIRM,       "Connect Confirm"},
+    { 0x0a,                      "Disconnect Request"},
+    { PDU_DISCONNECT_CONFIRM,    "Disconnect Confirm"},
+    { PDU_DISCONNECT_INDICATION, "Disconnect Indication Message"},
+    { PDU_MTP3_TO_SLT,           "MSU Request (message to MTP2 link)"},
+    { PDU_MTP3_FROM_SLT,         "MSU Indication (message from MTP2 link)"},
+    { PDU_RETRIEVAL_REQUEST,     "Retrieval Request"},
+    { PDU_RETRIEVAL_CONFIRM,     "Retrieval Confirm"},
+    { 0x14,                      "Retrieval Indication"},
+    { 0x15,                      "Retrieval Message"},
+    { PDU_LSC_REQUEST,           "Link State Controller Request"},
+    { PDU_LSC_CONFIRM,           "Link State Controller Confirm"},
+    { PDU_LSC_INDICATION,        "Link State Controller Indication"},
+    { 0x40,                      "Configuration Request"},
+    { 0x41,                      "Configuration Confirm"},
+    { 0x42,                      "Status Request"},
+    { 0x43,                      "Status Confirm"},
+    { PDU_STAT_REQUEST,          "Statistic Request"},
+    { 0x45,                      "Statistic Confirm"},
+    { 0x46,                      "Control Request"},
+    { 0x47,                      "Control Confirm"},
+    { 0x50,                      "Flow Control Request"},
+    { 0x51,                      "Flow Control Indication"},
+    { 0,                    NULL }
 };
 
 /* TODO: Change to useful name once known */
@@ -271,355 +271,355 @@ static dissector_handle_t data_handle;
 static void
 dissect_sm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-	proto_item *ti;
-	proto_tree *sm_tree;
-	tvbuff_t *next_tvb = NULL;
-	guint32 sm_message_type;
-	guint32 bh_event_code = 0;
-	guint16 protocol;
-	guint16 msg_type = 0;
-	guint16 length;
-	guint16 tag;
-	int     offset = 0;
-
-	sm_message_type = tvb_get_ntohl(tvb,offset);
-
-	col_set_str(pinfo->cinfo, COL_PROTOCOL, "SM");
-
-	col_add_fstr(pinfo->cinfo, COL_INFO, "Cisco SM Packet (%s)",
-		val_to_str_const(sm_message_type, sm_message_type_value_info,"reserved"));
-
-	ti = proto_tree_add_item(tree, proto_sm, tvb, offset, 0, ENC_NA);
-	sm_tree = proto_item_add_subtree(ti, ett_sm);
-
-	proto_tree_add_uint_format_value(sm_tree, hf_sm_sm_msg_type, tvb, offset, 4, sm_message_type,
-		"%s (0x%0x)", val_to_str_const(sm_message_type, sm_message_type_value, "reserved"), sm_message_type);
-
-	offset = offset + 4;
-	if (sm_message_type ==  MESSAGE_TYPE_PDU) {
-		proto_tree_add_item(sm_tree, hf_sm_protocol, tvb, offset, 2, ENC_BIG_ENDIAN);
-		protocol = tvb_get_ntohs(tvb,offset);
-		offset = offset + 2;
-		switch(protocol){
-		/* start case RUDP BSM v.1  ---------------------------------------------------------- */
-		case SM_PROTOCOL_X004:
-			if (!tree)
-				return;
-
-			proto_tree_add_item(sm_tree, hf_sm_msg_id, tvb, offset, 2, ENC_BIG_ENDIAN);
-			offset = offset +2;
-			msg_type = tvb_get_ntohs(tvb,offset);
-			proto_tree_add_uint_format_value(sm_tree, hf_sm_msg_type, tvb, offset, 2, msg_type,
-				"%s (0x%0x)", val_to_str_const(msg_type, sm_pdu_type_value, "reserved"),
-				msg_type);
-			msg_type = tvb_get_ntohs(tvb,offset);
-			offset = offset + 2;
-			proto_tree_add_item(sm_tree, hf_sm_channel, tvb, offset, 2, ENC_BIG_ENDIAN);
-			offset = offset + 2;
-			proto_tree_add_item(sm_tree, hf_sm_bearer, tvb, offset, 2, ENC_BIG_ENDIAN);
-			offset = offset +2;
-			proto_tree_add_item(sm_tree, hf_sm_len, tvb, offset, 2, ENC_BIG_ENDIAN);
-			length = tvb_get_ntohs(tvb,offset);
-			offset = offset +2;
-			proto_item_set_len(ti, 16);
-
-			if (length > 0) {
-				next_tvb = tvb_new_subset(tvb, offset, length, length);
-
-				if ((msg_type == PDU_MTP3_TO_SLT || msg_type == PDU_MTP3_FROM_SLT)) {
-					call_dissector(q931_handle, next_tvb, pinfo, tree);
-				} else {
-					call_dissector(data_handle, next_tvb, pinfo, tree);
-				}
-			}
-
-			break;
-			/* end case RUDP BSM v.1 ---------------------------------------------------------- */
-
-		case SM_PROTOCOL_X100:
-		case SM_PROTOCOL_X122:
-			if (!tree)
-				return;
-			/* Protocol 0x100/0x122 only contains a length and then an EISUP packet */
-			proto_tree_add_item(sm_tree, hf_sm_len, tvb, offset, 2, ENC_BIG_ENDIAN);
-			length = tvb_get_ntohs(tvb,offset);
-			offset = offset + 2;
-			proto_item_set_len(ti, 8);
-
-			/* This should be the EISUP dissector but we havent got one
-			 * right now - so decode it as data for now ... */
-			next_tvb = tvb_new_subset(tvb, offset, length, length);
-			call_dissector(data_handle, next_tvb, pinfo, sm_tree);
-
-			break;
-		case SM_PROTOCOL_X101:
-			if (!tree)
-				return;
-			/* XXX Reverse enginered so this may not be correct!!!
-			 * EISUP - used between Cisco HSI and Cisco PGW devices,
-			 * uses RUDP with default port number 8003.
-			 * Protocol stack is RUDP->Cisco SM->SDP.
-			 * This implementation is PROPRIETARY
-			 */
-			proto_tree_add_item(sm_tree, hf_sm_len, tvb, offset, 2, ENC_BIG_ENDIAN);
-			length = tvb_get_ntohs(tvb,offset);
-			offset = offset + 2;
-			proto_item_set_len(ti, length + offset);
-			/* The next stuff seems to be IP addr */
-			proto_tree_add_item(sm_tree, hf_sm_ip_addr, tvb, offset, 4, ENC_BIG_ENDIAN);
-			offset = offset + 4;
-			/* This part looks to be the same per session */
-			proto_tree_add_item(sm_tree, hf_sm_context, tvb, offset, 4, ENC_BIG_ENDIAN);
-			offset = offset +4;
-			/* Some sort of message type? */
-			proto_tree_add_item(sm_tree, hf_sm_eisup_msg_id, tvb, offset, 1, ENC_BIG_ENDIAN);
-			offset = offset + 1;
-			/* XXX Problem are tags 1 or two bytes???*/
-			proto_tree_add_item(sm_tree, hf_sm_tag, tvb, offset, 2, ENC_BIG_ENDIAN);
-
-			tag = tvb_get_ntohs(tvb,offset);
-			offset = offset +2;
-			if (tag== 0x01ac) {
-				proto_tree_add_item(sm_tree, hf_sm_len, tvb, offset, 2, ENC_BIG_ENDIAN);
-				length = tvb_get_ntohs(tvb,offset);
-				offset = offset +2;
-				next_tvb = tvb_new_subset(tvb, offset, length, length);
-				call_dissector(sdp_handle, next_tvb, pinfo, sm_tree);
-				/*offset = offset+length;*/
-
-			}
-			/*return;*/
-			break;
-		case SM_PROTOCOL_X114:
-			if (!tree)
-				return;
-			/* XXX Reverse enginered so this may not be correct!!! */
-			proto_tree_add_item(sm_tree, hf_sm_len, tvb, offset, 2, ENC_BIG_ENDIAN);
-			length = tvb_get_ntohs(tvb,offset);
-			offset = offset + 2;
-			proto_item_set_len(ti, length + offset);
-			/* The next stuff seems to be IP addr */
-			proto_tree_add_item(sm_tree, hf_sm_ip_addr, tvb, offset, 4, ENC_BIG_ENDIAN);
-			offset = offset + 4;
-			proto_tree_add_item(sm_tree, hf_sm_context, tvb, offset, 4, ENC_BIG_ENDIAN);
-			offset = offset +4;
-			/* Some sort of message type? */
-			proto_tree_add_item(sm_tree, hf_sm_eisup_msg_id, tvb, offset, 1, ENC_BIG_ENDIAN);
-			offset = offset + 1;
-			/* XXX Problem are tags 1 or two bytes???*/
-			proto_tree_add_item(sm_tree, hf_sm_tag, tvb, offset, 2, ENC_BIG_ENDIAN);
-
-			tag = tvb_get_ntohs(tvb,offset);
-			offset = offset +2;
-			if (tag== 0x01ac) {
-				proto_tree_add_item(sm_tree, hf_sm_len, tvb, offset, 2, ENC_BIG_ENDIAN);
-				length = tvb_get_ntohs(tvb,offset);
-				offset = offset +2;
-				next_tvb = tvb_new_subset(tvb, offset, length, length);
-				call_dissector(sdp_handle, next_tvb, pinfo, sm_tree);
-				/*offset = offset+length;*/
-
-			}
-			break;
-		default:
-			proto_tree_add_item(sm_tree, hf_sm_msg_id, tvb, offset, 2, ENC_BIG_ENDIAN);
-			offset = offset +2;
-			msg_type = tvb_get_ntohs(tvb,offset);
-			proto_tree_add_uint_format_value(sm_tree, hf_sm_msg_type, tvb, offset, 2, msg_type,
-				"%s (0x%0x)", val_to_str_const(msg_type, sm_pdu_type_value, "reserved"),
-				msg_type);
-			msg_type = tvb_get_ntohs(tvb,offset);
-			offset = offset + 2;
-			proto_tree_add_item(sm_tree, hf_sm_channel, tvb, offset, 2, ENC_BIG_ENDIAN);
-			offset = offset + 2;
-			proto_tree_add_item(sm_tree, hf_sm_bearer, tvb, offset, 2, ENC_BIG_ENDIAN);
-			offset = offset +2;
-			proto_tree_add_item(sm_tree, hf_sm_len, tvb, offset, 2, ENC_BIG_ENDIAN);
-			length = tvb_get_ntohs(tvb,offset);
-			offset = offset +2;
-			proto_item_set_len(ti, 16);
-
-			if (length > 0) {
-				next_tvb = tvb_new_subset(tvb, offset, length, length);
-
-				switch (msg_type) {
-				case PDU_MTP3_TO_SLT:
-				case PDU_MTP3_FROM_SLT:
-					call_dissector(mtp3_handle, next_tvb, pinfo, tree);
-					break;
-				case PDU_CONNECT_REQUEST:
-				case PDU_CONNECT_CONFIRM:
-					proto_tree_add_item(sm_tree, hf_sm_alignment_type, tvb, offset, 4, ENC_BIG_ENDIAN);
-					break;
-				case PDU_DISCONNECT_CONFIRM:
-				case PDU_DISCONNECT_INDICATION:
-					proto_tree_add_item(sm_tree, hf_sm_backhaul_reason_code, tvb, offset, 4, ENC_BIG_ENDIAN);
-					break;
-				case PDU_RETRIEVAL_REQUEST:
-				case PDU_RETRIEVAL_CONFIRM:
-					proto_tree_add_item(sm_tree, hf_sm_retrieval_type, tvb, offset, 4, ENC_BIG_ENDIAN);
-					if (msg_type == PDU_RETRIEVAL_CONFIRM && tvb_get_ntohl(tvb,offset) == 0x01) {
-						offset += 4;
-						proto_tree_add_item(sm_tree, hf_sm_bsn_num, tvb, offset, 4, ENC_BIG_ENDIAN);
-					}
-					break;
-				case PDU_LSC_REQUEST:
-				case PDU_LSC_CONFIRM:
-					proto_tree_add_item(sm_tree, hf_sm_lsc_state_type, tvb, offset, 4, ENC_BIG_ENDIAN);
-					break;
-				case PDU_LSC_INDICATION:
-					proto_tree_add_item(sm_tree, hf_sm_backhaul_event_code, tvb, offset, 4, ENC_BIG_ENDIAN);
-					bh_event_code = tvb_get_ntohl(tvb,offset);
-					if (bh_event_code == 0x02 || bh_event_code == 0x04) {
-						offset += 4;
-						proto_tree_add_item(sm_tree, hf_sm_linkdown_cause_code, tvb, offset, 4, ENC_BIG_ENDIAN);
-					} else if (bh_event_code == 0x06) {
-						offset += 4;
-						proto_tree_add_item(sm_tree, hf_sm_backhaul_cause_code, tvb, offset, 4, ENC_BIG_ENDIAN);
-					}
-					break;
-				case PDU_STAT_REQUEST:
-					proto_tree_add_item(sm_tree, hf_sm_stat_request_type, tvb, offset, 4, ENC_BIG_ENDIAN);
-					break;
-				default:
-					call_dissector(data_handle, next_tvb, pinfo, tree);
-				}
-			}
-		}
-	}
+    proto_item *ti;
+    proto_tree *sm_tree;
+    tvbuff_t   *next_tvb      = NULL;
+    guint32     sm_message_type;
+    guint32     bh_event_code = 0;
+    guint16     protocol;
+    guint16     msg_type      = 0;
+    guint16     length;
+    guint16     tag;
+    int         offset        = 0;
+
+    sm_message_type = tvb_get_ntohl(tvb,offset);
+
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "SM");
+
+    col_add_fstr(pinfo->cinfo, COL_INFO, "Cisco SM Packet (%s)",
+        val_to_str_const(sm_message_type, sm_message_type_value_info,"reserved"));
+
+    ti = proto_tree_add_item(tree, proto_sm, tvb, offset, 0, ENC_NA);
+    sm_tree = proto_item_add_subtree(ti, ett_sm);
+
+    proto_tree_add_uint_format_value(sm_tree, hf_sm_sm_msg_type, tvb, offset, 4, sm_message_type,
+        "%s (0x%0x)", val_to_str_const(sm_message_type, sm_message_type_value, "reserved"), sm_message_type);
+
+    offset = offset + 4;
+    if (sm_message_type ==  MESSAGE_TYPE_PDU) {
+        proto_tree_add_item(sm_tree, hf_sm_protocol, tvb, offset, 2, ENC_BIG_ENDIAN);
+        protocol = tvb_get_ntohs(tvb,offset);
+        offset = offset + 2;
+        switch(protocol){
+        /* start case RUDP BSM v.1  ---------------------------------------------------------- */
+        case SM_PROTOCOL_X004:
+            if (!tree)
+                return;
+
+            proto_tree_add_item(sm_tree, hf_sm_msg_id, tvb, offset, 2, ENC_BIG_ENDIAN);
+            offset = offset +2;
+            msg_type = tvb_get_ntohs(tvb,offset);
+            proto_tree_add_uint_format_value(sm_tree, hf_sm_msg_type, tvb, offset, 2, msg_type,
+                "%s (0x%0x)", val_to_str_const(msg_type, sm_pdu_type_value, "reserved"),
+                msg_type);
+            msg_type = tvb_get_ntohs(tvb,offset);
+            offset = offset + 2;
+            proto_tree_add_item(sm_tree, hf_sm_channel, tvb, offset, 2, ENC_BIG_ENDIAN);
+            offset = offset + 2;
+            proto_tree_add_item(sm_tree, hf_sm_bearer, tvb, offset, 2, ENC_BIG_ENDIAN);
+            offset = offset +2;
+            proto_tree_add_item(sm_tree, hf_sm_len, tvb, offset, 2, ENC_BIG_ENDIAN);
+            length = tvb_get_ntohs(tvb,offset);
+            offset = offset +2;
+            proto_item_set_len(ti, 16);
+
+            if (length > 0) {
+                next_tvb = tvb_new_subset(tvb, offset, length, length);
+
+                if ((msg_type == PDU_MTP3_TO_SLT || msg_type == PDU_MTP3_FROM_SLT)) {
+                    call_dissector(q931_handle, next_tvb, pinfo, tree);
+                } else {
+                    call_dissector(data_handle, next_tvb, pinfo, tree);
+                }
+            }
+
+            break;
+            /* end case RUDP BSM v.1 ---------------------------------------------------------- */
+
+        case SM_PROTOCOL_X100:
+        case SM_PROTOCOL_X122:
+            if (!tree)
+                return;
+            /* Protocol 0x100/0x122 only contains a length and then an EISUP packet */
+            proto_tree_add_item(sm_tree, hf_sm_len, tvb, offset, 2, ENC_BIG_ENDIAN);
+            length = tvb_get_ntohs(tvb,offset);
+            offset = offset + 2;
+            proto_item_set_len(ti, 8);
+
+            /* This should be the EISUP dissector but we havent got one
+             * right now - so decode it as data for now ... */
+            next_tvb = tvb_new_subset(tvb, offset, length, length);
+            call_dissector(data_handle, next_tvb, pinfo, sm_tree);
+
+            break;
+        case SM_PROTOCOL_X101:
+            if (!tree)
+                return;
+            /* XXX Reverse enginered so this may not be correct!!!
+             * EISUP - used between Cisco HSI and Cisco PGW devices,
+             * uses RUDP with default port number 8003.
+             * Protocol stack is RUDP->Cisco SM->SDP.
+             * This implementation is PROPRIETARY
+             */
+            proto_tree_add_item(sm_tree, hf_sm_len, tvb, offset, 2, ENC_BIG_ENDIAN);
+            length = tvb_get_ntohs(tvb,offset);
+            offset = offset + 2;
+            proto_item_set_len(ti, length + offset);
+            /* The next stuff seems to be IP addr */
+            proto_tree_add_item(sm_tree, hf_sm_ip_addr, tvb, offset, 4, ENC_BIG_ENDIAN);
+            offset = offset + 4;
+            /* This part looks to be the same per session */
+            proto_tree_add_item(sm_tree, hf_sm_context, tvb, offset, 4, ENC_BIG_ENDIAN);
+            offset = offset +4;
+            /* Some sort of message type? */
+            proto_tree_add_item(sm_tree, hf_sm_eisup_msg_id, tvb, offset, 1, ENC_BIG_ENDIAN);
+            offset = offset + 1;
+            /* XXX Problem are tags 1 or two bytes???*/
+            proto_tree_add_item(sm_tree, hf_sm_tag, tvb, offset, 2, ENC_BIG_ENDIAN);
+
+            tag = tvb_get_ntohs(tvb,offset);
+            offset = offset +2;
+            if (tag== 0x01ac) {
+                proto_tree_add_item(sm_tree, hf_sm_len, tvb, offset, 2, ENC_BIG_ENDIAN);
+                length = tvb_get_ntohs(tvb,offset);
+                offset = offset +2;
+                next_tvb = tvb_new_subset(tvb, offset, length, length);
+                call_dissector(sdp_handle, next_tvb, pinfo, sm_tree);
+                /*offset = offset+length;*/
+
+            }
+            /*return;*/
+            break;
+        case SM_PROTOCOL_X114:
+            if (!tree)
+                return;
+            /* XXX Reverse enginered so this may not be correct!!! */
+            proto_tree_add_item(sm_tree, hf_sm_len, tvb, offset, 2, ENC_BIG_ENDIAN);
+            length = tvb_get_ntohs(tvb,offset);
+            offset = offset + 2;
+            proto_item_set_len(ti, length + offset);
+            /* The next stuff seems to be IP addr */
+            proto_tree_add_item(sm_tree, hf_sm_ip_addr, tvb, offset, 4, ENC_BIG_ENDIAN);
+            offset = offset + 4;
+            proto_tree_add_item(sm_tree, hf_sm_context, tvb, offset, 4, ENC_BIG_ENDIAN);
+            offset = offset +4;
+            /* Some sort of message type? */
+            proto_tree_add_item(sm_tree, hf_sm_eisup_msg_id, tvb, offset, 1, ENC_BIG_ENDIAN);
+            offset = offset + 1;
+            /* XXX Problem are tags 1 or two bytes???*/
+            proto_tree_add_item(sm_tree, hf_sm_tag, tvb, offset, 2, ENC_BIG_ENDIAN);
+
+            tag = tvb_get_ntohs(tvb,offset);
+            offset = offset +2;
+            if (tag== 0x01ac) {
+                proto_tree_add_item(sm_tree, hf_sm_len, tvb, offset, 2, ENC_BIG_ENDIAN);
+                length = tvb_get_ntohs(tvb,offset);
+                offset = offset +2;
+                next_tvb = tvb_new_subset(tvb, offset, length, length);
+                call_dissector(sdp_handle, next_tvb, pinfo, sm_tree);
+                /*offset = offset+length;*/
+
+            }
+            break;
+        default:
+            proto_tree_add_item(sm_tree, hf_sm_msg_id, tvb, offset, 2, ENC_BIG_ENDIAN);
+            offset = offset +2;
+            msg_type = tvb_get_ntohs(tvb,offset);
+            proto_tree_add_uint_format_value(sm_tree, hf_sm_msg_type, tvb, offset, 2, msg_type,
+                "%s (0x%0x)", val_to_str_const(msg_type, sm_pdu_type_value, "reserved"),
+                msg_type);
+            msg_type = tvb_get_ntohs(tvb,offset);
+            offset = offset + 2;
+            proto_tree_add_item(sm_tree, hf_sm_channel, tvb, offset, 2, ENC_BIG_ENDIAN);
+            offset = offset + 2;
+            proto_tree_add_item(sm_tree, hf_sm_bearer, tvb, offset, 2, ENC_BIG_ENDIAN);
+            offset = offset +2;
+            proto_tree_add_item(sm_tree, hf_sm_len, tvb, offset, 2, ENC_BIG_ENDIAN);
+            length = tvb_get_ntohs(tvb,offset);
+            offset = offset +2;
+            proto_item_set_len(ti, 16);
+
+            if (length > 0) {
+                next_tvb = tvb_new_subset(tvb, offset, length, length);
+
+                switch (msg_type) {
+                case PDU_MTP3_TO_SLT:
+                case PDU_MTP3_FROM_SLT:
+                    call_dissector(mtp3_handle, next_tvb, pinfo, tree);
+                    break;
+                case PDU_CONNECT_REQUEST:
+                case PDU_CONNECT_CONFIRM:
+                    proto_tree_add_item(sm_tree, hf_sm_alignment_type, tvb, offset, 4, ENC_BIG_ENDIAN);
+                    break;
+                case PDU_DISCONNECT_CONFIRM:
+                case PDU_DISCONNECT_INDICATION:
+                    proto_tree_add_item(sm_tree, hf_sm_backhaul_reason_code, tvb, offset, 4, ENC_BIG_ENDIAN);
+                    break;
+                case PDU_RETRIEVAL_REQUEST:
+                case PDU_RETRIEVAL_CONFIRM:
+                    proto_tree_add_item(sm_tree, hf_sm_retrieval_type, tvb, offset, 4, ENC_BIG_ENDIAN);
+                    if (msg_type == PDU_RETRIEVAL_CONFIRM && tvb_get_ntohl(tvb,offset) == 0x01) {
+                        offset += 4;
+                        proto_tree_add_item(sm_tree, hf_sm_bsn_num, tvb, offset, 4, ENC_BIG_ENDIAN);
+                    }
+                    break;
+                case PDU_LSC_REQUEST:
+                case PDU_LSC_CONFIRM:
+                    proto_tree_add_item(sm_tree, hf_sm_lsc_state_type, tvb, offset, 4, ENC_BIG_ENDIAN);
+                    break;
+                case PDU_LSC_INDICATION:
+                    proto_tree_add_item(sm_tree, hf_sm_backhaul_event_code, tvb, offset, 4, ENC_BIG_ENDIAN);
+                    bh_event_code = tvb_get_ntohl(tvb,offset);
+                    if (bh_event_code == 0x02 || bh_event_code == 0x04) {
+                        offset += 4;
+                        proto_tree_add_item(sm_tree, hf_sm_linkdown_cause_code, tvb, offset, 4, ENC_BIG_ENDIAN);
+                    } else if (bh_event_code == 0x06) {
+                        offset += 4;
+                        proto_tree_add_item(sm_tree, hf_sm_backhaul_cause_code, tvb, offset, 4, ENC_BIG_ENDIAN);
+                    }
+                    break;
+                case PDU_STAT_REQUEST:
+                    proto_tree_add_item(sm_tree, hf_sm_stat_request_type, tvb, offset, 4, ENC_BIG_ENDIAN);
+                    break;
+                default:
+                    call_dissector(data_handle, next_tvb, pinfo, tree);
+                }
+            }
+        }
+    }
 }
 
 void
 proto_register_sm(void)
 {
-	static hf_register_info hf[] = {
-		{ &hf_sm_sm_msg_type,
-			{ "SM Message Type",           "sm.sm_msg_type",
-			FT_UINT32, BASE_HEX, NULL, 0x0,
-			NULL, HFILL }
-		},
-		{ &hf_sm_protocol,
-			{ "Protocol Type",           "sm.protocol",
-			FT_UINT16, BASE_HEX, NULL, 0x0,
-			NULL, HFILL }
-		},
-		{ &hf_sm_msg_id,
-			{ "Message ID",           "sm.msgid",
-			FT_UINT16, BASE_HEX, NULL, 0x0,
-			NULL, HFILL }
-		},
-		{ &hf_sm_msg_type,
-			{ "Message Type",           "sm.msg_type",
-			FT_UINT16, BASE_HEX, NULL, 0x0,
-			NULL, HFILL }
-		},
-		{ &hf_sm_channel,
-			{ "Channel ID",           "sm.channel",
-			FT_UINT16, BASE_HEX, NULL, 0x0,
-			NULL, HFILL }
-		},
-		{ &hf_sm_bearer,
-			{ "Bearer ID",           "sm.bearer",
-			FT_UINT16, BASE_HEX, NULL, 0x0,
-			NULL, HFILL }
-		},
-		{ &hf_sm_len,
-			{ "Length",           "sm.len",
-			FT_UINT16, BASE_DEC, NULL, 0x0,
-			NULL, HFILL }
-		},
-		{ &hf_sm_ip_addr,
-			{ "IPv4 address","sm.ip_addr",
-			FT_IPv4,BASE_NONE,  NULL, 0x0,
-			NULL, HFILL }
-		},
-		{ &hf_sm_context,
-			{ "Context","sm.context",
-			FT_UINT32, BASE_DEC, NULL, 0x0,
-			"Context(guesswork!)", HFILL }
-		},
-		{ &hf_sm_eisup_msg_id,
-			{ "Message id","sm.eisup_message_id",
-			FT_UINT8, BASE_DEC, NULL, 0x0,
-			"Message id(guesswork!)", HFILL }
-		},
-		{ &hf_sm_tag,
-			{ "Tag","sm.tag",
-			FT_UINT16, BASE_DEC, NULL, 0x0,
-			"Tag(guesswork!)", HFILL }
-		},
-		{ &hf_sm_alignment_type,
-		  { "Alignment type","sm.connect_type",
-		    FT_UINT32, BASE_HEX, VALS(sm_alignment_type), 0x0,
-		    NULL, HFILL }
-		},
-		{ &hf_sm_backhaul_reason_code,
-		  { "Backhaul reason code","sm.backhaul_reason",
-			FT_UINT32, BASE_HEX, VALS(sm_backhaul_reason_code), 0x0,
-			NULL, HFILL }
-		},
-		{ &hf_sm_backhaul_event_code,
-		  { "Backhaul event code","sm.backhaul_event",
-			FT_UINT32, BASE_HEX, VALS(sm_backhaul_event_code), 0x0,
-						NULL, HFILL }
-		},
-		{ &hf_sm_backhaul_cause_code,
-		  { "Backhaul cause code","sm.backhaul_cause",
-			FT_UINT32, BASE_HEX, VALS(sm_backhaul_cause_code), 0x0,
-			NULL, HFILL }
-		},
-		{ &hf_sm_linkdown_cause_code,
-		  { "Link down cause","sm.linkdown_reason",
-			FT_UINT32, BASE_HEX, VALS(sm_linkdown_cause_code), 0x0,
-			NULL, HFILL }
-		},
-
-		{ &hf_sm_retrieval_type,
-		  { "Retrieval type","sm.retrieval_type",
-			FT_UINT32, BASE_HEX, VALS(sm_retrieval_type), 0x0,
-			NULL, HFILL }
-		},
-		{ &hf_sm_lsc_state_type,
-		  { "LSC Request type","sm.lsc_state_type",
-			FT_UINT32, BASE_HEX, VALS(sm_lsc_state_type), 0x0,
-			NULL, HFILL }
-		},
-		{ &hf_sm_stat_request_type,
-		  { "Statistic request type","sm.stat_request_type",
-			FT_UINT32, BASE_HEX, VALS(sm_stat_request_type), 0x0,
-			NULL, HFILL }
-		},
-		{ &hf_sm_bsn_num,
-		  { "BSN","sm.bsn_num",
-			FT_UINT32, BASE_DEC, NULL, 0x0,
-			NULL, HFILL }
-		},
-
-	};
+    static hf_register_info hf[] = {
+        { &hf_sm_sm_msg_type,
+            { "SM Message Type",           "sm.sm_msg_type",
+            FT_UINT32, BASE_HEX, NULL, 0x0,
+            NULL, HFILL }
+        },
+        { &hf_sm_protocol,
+            { "Protocol Type",           "sm.protocol",
+            FT_UINT16, BASE_HEX, NULL, 0x0,
+            NULL, HFILL }
+        },
+        { &hf_sm_msg_id,
+            { "Message ID",           "sm.msgid",
+            FT_UINT16, BASE_HEX, NULL, 0x0,
+            NULL, HFILL }
+        },
+        { &hf_sm_msg_type,
+            { "Message Type",           "sm.msg_type",
+            FT_UINT16, BASE_HEX, NULL, 0x0,
+            NULL, HFILL }
+        },
+        { &hf_sm_channel,
+            { "Channel ID",           "sm.channel",
+            FT_UINT16, BASE_HEX, NULL, 0x0,
+            NULL, HFILL }
+        },
+        { &hf_sm_bearer,
+            { "Bearer ID",           "sm.bearer",
+            FT_UINT16, BASE_HEX, NULL, 0x0,
+            NULL, HFILL }
+        },
+        { &hf_sm_len,
+            { "Length",           "sm.len",
+            FT_UINT16, BASE_DEC, NULL, 0x0,
+            NULL, HFILL }
+        },
+        { &hf_sm_ip_addr,
+            { "IPv4 address","sm.ip_addr",
+            FT_IPv4,BASE_NONE,  NULL, 0x0,
+            NULL, HFILL }
+        },
+        { &hf_sm_context,
+            { "Context","sm.context",
+            FT_UINT32, BASE_DEC, NULL, 0x0,
+            "Context(guesswork!)", HFILL }
+        },
+        { &hf_sm_eisup_msg_id,
+            { "Message id","sm.eisup_message_id",
+            FT_UINT8, BASE_DEC, NULL, 0x0,
+            "Message id(guesswork!)", HFILL }
+        },
+        { &hf_sm_tag,
+            { "Tag","sm.tag",
+            FT_UINT16, BASE_DEC, NULL, 0x0,
+            "Tag(guesswork!)", HFILL }
+        },
+        { &hf_sm_alignment_type,
+          { "Alignment type","sm.connect_type",
+            FT_UINT32, BASE_HEX, VALS(sm_alignment_type), 0x0,
+            NULL, HFILL }
+        },
+        { &hf_sm_backhaul_reason_code,
+          { "Backhaul reason code","sm.backhaul_reason",
+            FT_UINT32, BASE_HEX, VALS(sm_backhaul_reason_code), 0x0,
+            NULL, HFILL }
+        },
+        { &hf_sm_backhaul_event_code,
+          { "Backhaul event code","sm.backhaul_event",
+            FT_UINT32, BASE_HEX, VALS(sm_backhaul_event_code), 0x0,
+                        NULL, HFILL }
+        },
+        { &hf_sm_backhaul_cause_code,
+          { "Backhaul cause code","sm.backhaul_cause",
+            FT_UINT32, BASE_HEX, VALS(sm_backhaul_cause_code), 0x0,
+            NULL, HFILL }
+        },
+        { &hf_sm_linkdown_cause_code,
+          { "Link down cause","sm.linkdown_reason",
+            FT_UINT32, BASE_HEX, VALS(sm_linkdown_cause_code), 0x0,
+            NULL, HFILL }
+        },
+
+        { &hf_sm_retrieval_type,
+          { "Retrieval type","sm.retrieval_type",
+            FT_UINT32, BASE_HEX, VALS(sm_retrieval_type), 0x0,
+            NULL, HFILL }
+        },
+        { &hf_sm_lsc_state_type,
+          { "LSC Request type","sm.lsc_state_type",
+            FT_UINT32, BASE_HEX, VALS(sm_lsc_state_type), 0x0,
+            NULL, HFILL }
+        },
+        { &hf_sm_stat_request_type,
+          { "Statistic request type","sm.stat_request_type",
+            FT_UINT32, BASE_HEX, VALS(sm_stat_request_type), 0x0,
+            NULL, HFILL }
+        },
+        { &hf_sm_bsn_num,
+          { "BSN","sm.bsn_num",
+            FT_UINT32, BASE_DEC, NULL, 0x0,
+            NULL, HFILL }
+        },
+
+    };
 
 /* Setup protocol subtree array */
-	static gint *ett[] = {
-		&ett_sm,
-	};
+    static gint *ett[] = {
+        &ett_sm,
+    };
 
 /* Register the protocol name and description */
-	proto_sm = proto_register_protocol("Cisco Session Management",
-	    "SM", "sm");
+    proto_sm = proto_register_protocol("Cisco Session Management",
+        "SM", "sm");
 
-	register_dissector("sm", dissect_sm, proto_sm);
+    register_dissector("sm", dissect_sm, proto_sm);
 
 /* Required function calls to register the header fields and subtrees used */
-	proto_register_field_array(proto_sm, hf, array_length(hf));
-	proto_register_subtree_array(ett, array_length(ett));
+    proto_register_field_array(proto_sm, hf, array_length(hf));
+    proto_register_subtree_array(ett, array_length(ett));
 }
 
 void
 proto_reg_handoff_sm(void)
 {
-	sdp_handle  = find_dissector("sdp");
-	mtp3_handle = find_dissector("mtp3");
-	q931_handle = find_dissector("q931");
-	data_handle = find_dissector("data");
+    sdp_handle  = find_dissector("sdp");
+    mtp3_handle = find_dissector("mtp3");
+    q931_handle = find_dissector("q931");
+    data_handle = find_dissector("data");
 }
 
 /*
@@ -627,10 +627,10 @@ proto_reg_handoff_sm(void)
  *
  * Local variables:
  * c-basic-offset: 4
- * tab-width: 4
- * indent-tabs-mode: t
+ * tab-width: 8
+ * indent-tabs-mode: nil
  * End:
  *
  * vi: set shiftwidth=4 tabstop=8 expandtab:
- * :indentSize=4:tabSize=8:noTabs=false:
+ * :indentSize=4:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-finger.c b/epan/dissectors/packet-finger.c
index 464862b7f3..aac57767c2 100644
--- a/epan/dissectors/packet-finger.c
+++ b/epan/dissectors/packet-finger.c
@@ -46,8 +46,8 @@ static expert_field ei_finger_nocrlf = EI_INIT;
 static gint ett_finger = -1;
 
 typedef struct _finger_transaction_t {
-    guint32 req_frame;
-    guint32 rep_frame;
+    guint32  req_frame;
+    guint32  rep_frame;
     nstime_t req_time;
 } finger_transaction_t;
 
@@ -55,12 +55,12 @@ static int
 dissect_finger(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     void *data _U_)
 {
-    proto_item *ti, *expert_ti;
-    proto_tree *finger_tree;
-    conversation_t *conversation;
+    proto_item           *ti, *expert_ti;
+    proto_tree           *finger_tree;
+    conversation_t       *conversation;
     finger_transaction_t *finger_trans;
-    gboolean is_query;
-    guint len;
+    gboolean              is_query;
+    guint                 len;
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "FINGER");
 
@@ -213,11 +213,11 @@ proto_reg_handoff_finger(void)
  *
  * Local variables:
  * c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
  * indent-tabs-mode: nil
  * End:
  *
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
  */
 
diff --git a/epan/dissectors/packet-fmtp.c b/epan/dissectors/packet-fmtp.c
index 700e06ba04..9fe2f8e92d 100644
--- a/epan/dissectors/packet-fmtp.c
+++ b/epan/dissectors/packet-fmtp.c
@@ -211,11 +211,11 @@ proto_reg_handoff_fmtp(void)
  *
  * Local variables:
  * c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
  * indent-tabs-mode: nil
  * End:
  *
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
  */
 
diff --git a/epan/dissectors/packet-ftp.c b/epan/dissectors/packet-ftp.c
index 762b64b324..0c9c66ecf4 100644
--- a/epan/dissectors/packet-ftp.c
+++ b/epan/dissectors/packet-ftp.c
@@ -526,8 +526,8 @@ static void
 dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
     gboolean        is_request;
-    proto_tree     *ftp_tree          = NULL;
-    proto_tree     *reqresp_tree      = NULL;
+    proto_tree     *ftp_tree;
+    proto_tree     *reqresp_tree;
     proto_item     *ti, *hidden_item;
     gint            offset;
     const guchar   *line;
@@ -1080,10 +1080,10 @@ proto_reg_handoff_ftp(void)
  *
  * Local variables:
  * c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
  * indent-tabs-mode: nil
  * End:
  *
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-hartip.c b/epan/dissectors/packet-hartip.c
index 7aab582c57..61543522b8 100644
--- a/epan/dissectors/packet-hartip.c
+++ b/epan/dissectors/packet-hartip.c
@@ -325,7 +325,7 @@ dissect_session_init(proto_tree *body_tree, tvbuff_t *tvb, gint offset,
 {
   if (bodylen == 5) {
     proto_tree_add_item(body_tree, hf_hartip_master_type, tvb, offset, 1, ENC_BIG_ENDIAN);
-    offset++;
+    offset += 1;
 
     proto_tree_add_item(body_tree, hf_hartip_inactivity_close_timer, tvb, offset, 4, ENC_BIG_ENDIAN);
   } else {
@@ -736,8 +736,8 @@ dissect_pass_through(proto_tree *body_tree, tvbuff_t *tvb, gint offset,
     delimiter = tvb_get_guint8(tvb, offset);
     ti = proto_tree_add_uint(body_tree, hf_hartip_pt_delimiter, tvb, offset, 1,
                              delimiter);
-    offset++;
-    length--;
+    offset += 1;
+    length -= 1;
 
     if ((delimiter & 0x7) == 2) {
       frame_type_str = "STX";
@@ -759,8 +759,8 @@ dissect_pass_through(proto_tree *body_tree, tvbuff_t *tvb, gint offset,
   if (is_short == 1) {
     if (length > 0) {
       proto_tree_add_item(body_tree, hf_hartip_pt_short_addr, tvb, offset, 1, ENC_BIG_ENDIAN);
-      offset++;
-      length--;
+      offset += 1;
+      length -= 1;
     }
   } else {
     if (length > 4) {
@@ -776,25 +776,25 @@ dissect_pass_through(proto_tree *body_tree, tvbuff_t *tvb, gint offset,
   if (length > 0) {
     cmd = tvb_get_guint8(tvb, offset);
     proto_tree_add_item(body_tree, hf_hartip_pt_command, tvb, offset, 1, ENC_BIG_ENDIAN);
-    offset++;
-    length--;
+    offset += 1;
+    length -= 1;
   }
   if (length > 0) {
     proto_tree_add_item(body_tree, hf_hartip_pt_length, tvb, offset, 1, ENC_BIG_ENDIAN);
-    offset++;
-    length--;
+    offset += 1;
+    length -= 1;
   }
 
   if (is_rsp == 1) {
     if (length > 0) {
       proto_tree_add_item(body_tree, hf_hartip_pt_response_code, tvb, offset, 1, ENC_BIG_ENDIAN);
-      offset++;
-      length--;
+      offset += 1;
+      length -= 1;
     }
     if (length > 0) {
       proto_tree_add_item(body_tree, hf_hartip_pt_device_status, tvb, offset, 1, ENC_BIG_ENDIAN);
-      offset++;
-      length--;
+      offset += 1;
+      length -= 1;
     }
   }
 
@@ -868,17 +868,17 @@ dissect_hartip_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
   hdr_tree = proto_item_add_subtree(ti, ett_hartip_hdr);
 
   proto_tree_add_item(hdr_tree, hf_hartip_hdr_version, tvb, offset, 1, ENC_BIG_ENDIAN);
-  offset++;
+  offset += 1;
 
   message_type = tvb_get_guint8(tvb, offset);
   msg_type_str = val_to_str(message_type, hartip_message_type_values, "Unknown message type %d");
   proto_tree_add_item(hdr_tree, hf_hartip_hdr_message_type, tvb, offset, 1, ENC_BIG_ENDIAN);
-  offset++;
+  offset += 1;
 
   message_id = tvb_get_guint8(tvb, offset);
   msg_id_str = val_to_str(message_id, hartip_message_id_values, "Unknown message %d");
   proto_tree_add_item(hdr_tree, hf_hartip_hdr_message_id, tvb, offset, 1, ENC_BIG_ENDIAN);
-  offset++;
+  offset += 1;
 
   /* Setup statistics for tap. */
   tapinfo = wmem_new(wmem_packet_scope(), hartip_tap_info);
@@ -891,7 +891,7 @@ dissect_hartip_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
   }
 
   proto_tree_add_item(hdr_tree, hf_hartip_hdr_status, tvb, offset, 1, ENC_BIG_ENDIAN);
-  offset++;
+  offset += 1;
 
   transaction_id = tvb_get_ntohs(tvb, offset);
   proto_tree_add_item(hdr_tree, hf_hartip_hdr_transaction_id, tvb, offset, 2, ENC_BIG_ENDIAN);
@@ -947,37 +947,37 @@ dissect_hartip_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 static guint
 get_dissect_hartip_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset)
 {
-   return tvb_get_ntohs(tvb, offset+6);
+  return tvb_get_ntohs(tvb, offset+6);
 }
 
 static int
 dissect_hartip_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
-    return dissect_hartip_common(tvb, pinfo, tree, 0);
+  return dissect_hartip_common(tvb, pinfo, tree, 0);
 }
 
 static int
 dissect_hartip_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
                    void *data)
 {
-   if (!tvb_bytes_exist(tvb, 0, HARTIP_HEADER_LENGTH))
-      return 0;
+  if (!tvb_bytes_exist(tvb, 0, HARTIP_HEADER_LENGTH))
+    return 0;
 
-   tcp_dissect_pdus(tvb, pinfo, tree, hartip_desegment, HARTIP_HEADER_LENGTH,
-                    get_dissect_hartip_len, dissect_hartip_pdu, data);
-   return tvb_reported_length(tvb);
+  tcp_dissect_pdus(tvb, pinfo, tree, hartip_desegment, HARTIP_HEADER_LENGTH,
+                   get_dissect_hartip_len, dissect_hartip_pdu, data);
+  return tvb_reported_length(tvb);
 }
 
 static int
 dissect_hartip_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
                    void *data _U_)
 {
-    gint offset = 0;
+  gint offset = 0;
 
-    while (tvb_reported_length_remaining(tvb, offset) >= HARTIP_HEADER_LENGTH)
-        offset += dissect_hartip_common(tvb, pinfo, tree, offset);
+  while (tvb_reported_length_remaining(tvb, offset) >= HARTIP_HEADER_LENGTH)
+    offset += dissect_hartip_common(tvb, pinfo, tree, offset);
 
-    return offset;
+  return offset;
 }
 
 void
@@ -1560,11 +1560,11 @@ proto_reg_handoff_hartip(void)
  *
  * Local variables:
  * c-basic-offset: 2
- * tab-width: 2
+ * tab-width: 8
  * indent-tabs-mode: nil
  * End:
  *
- * vi: set shiftwidth=2 tabstop=2 expandtab:
- * :indentSize=2:tabSize=2:noTabs=true:
+ * vi: set shiftwidth=2 tabstop=8 expandtab:
+ * :indentSize=2:tabSize=8:noTabs=true:
  */
 
diff --git a/epan/dissectors/packet-idrp.c b/epan/dissectors/packet-idrp.c
index 228b77ebae..f9790ea4b1 100644
--- a/epan/dissectors/packet-idrp.c
+++ b/epan/dissectors/packet-idrp.c
@@ -125,41 +125,45 @@ static int hf_idrp_rib_refresh_rib_attr_security_reg_id = -1;
 static int hf_idrp_rib_refresh_rib_attr_security_info = -1;
 
 /* flags */
-#define IDRP_UPDATE_PATH_FLAG_OPTIONAL 0x80
-#define IDRP_UPDATE_PATH_FLAG_OPTIONAL_TRANSITIVE 0xc0
+#define IDRP_UPDATE_PATH_FLAG_OPTIONAL                    0x80
+#define IDRP_UPDATE_PATH_FLAG_OPTIONAL_TRANSITIVE         0xc0
 #define IDRP_UPDATE_PATH_FLAG_OPTIONAL_TRANSITIVE_PARTIAL 0xe0
-#define IDRP_UPDATE_PATH_FLAG_TRANSITIVE 0x40
-#define IDRP_UPDATE_PATH_FLAG_PARTIAL 0x20
+#define IDRP_UPDATE_PATH_FLAG_TRANSITIVE                  0x40
+#define IDRP_UPDATE_PATH_FLAG_PARTIAL                     0x20
 static const value_string idrp_path_attr_flags[] = {
-    {IDRP_UPDATE_PATH_FLAG_OPTIONAL, "Optional"},
-    {IDRP_UPDATE_PATH_FLAG_TRANSITIVE, "Transitive"},
-    {IDRP_UPDATE_PATH_FLAG_PARTIAL, "Partial"},
-    {IDRP_UPDATE_PATH_FLAG_OPTIONAL_TRANSITIVE, "Optional, Transitive"},
+    {IDRP_UPDATE_PATH_FLAG_OPTIONAL,
+     "Optional"},
+    {IDRP_UPDATE_PATH_FLAG_TRANSITIVE,
+     "Transitive"},
+    {IDRP_UPDATE_PATH_FLAG_PARTIAL,
+     "Partial"},
+    {IDRP_UPDATE_PATH_FLAG_OPTIONAL_TRANSITIVE,
+     "Optional, Transitive"},
     {IDRP_UPDATE_PATH_FLAG_OPTIONAL_TRANSITIVE_PARTIAL,
-        "Optional, Transitive, Partial"},
+     "Optional, Transitive, Partial"},
     {0, NULL}
 };
 
   /* BISPDU Type Codes */
-#define IDRP_TYPE_OPEN 1
-#define IDRP_TYPE_UPDATE 2
-#define IDRP_TYPE_ERROR 3
-#define IDRP_TYPE_KEEPALIVE 4
-#define IDRP_TYPE_CEASE 5
+#define IDRP_TYPE_OPEN        1
+#define IDRP_TYPE_UPDATE      2
+#define IDRP_TYPE_ERROR       3
+#define IDRP_TYPE_KEEPALIVE   4
+#define IDRP_TYPE_CEASE       5
 #define IDRP_TYPE_RIB_REFRESH 6
 static const value_string idrp_pdu_types[] = {
-    {IDRP_TYPE_OPEN, "OPEN"},
-    {IDRP_TYPE_UPDATE, "UPDATE"},
-    {IDRP_TYPE_ERROR, "ERROR"},
-    {IDRP_TYPE_KEEPALIVE, "KEEPALIVE"},
-    {IDRP_TYPE_CEASE, "CEASE"},
+    {IDRP_TYPE_OPEN,        "OPEN"},
+    {IDRP_TYPE_UPDATE,      "UPDATE"},
+    {IDRP_TYPE_ERROR,       "ERROR"},
+    {IDRP_TYPE_KEEPALIVE,   "KEEPALIVE"},
+    {IDRP_TYPE_CEASE,       "CEASE"},
     {IDRP_TYPE_RIB_REFRESH, "RIB REFRESH"},
     {0, NULL}
 };
 
-#define IDRP_OPEN_AUTHENTICATION_CODE_INTEGRITY_ONLY 0
+#define IDRP_OPEN_AUTHENTICATION_CODE_INTEGRITY_ONLY                0
 #define IDRP_OPEN_AUTHENTICATION_CODE_INTEGRITY_PLUS_AUTHENTICATION 1
-#define IDRP_OPEN_AUTHENTICATION_CODE_INTEGRITY_PLUS_SECRET_TEXT 2
+#define IDRP_OPEN_AUTHENTICATION_CODE_INTEGRITY_PLUS_SECRET_TEXT    2
 static const value_string idrp_pdu_open_authentication_codes[] = {
     {IDRP_OPEN_AUTHENTICATION_CODE_INTEGRITY_ONLY,
         "Integrity Only"},
@@ -171,49 +175,49 @@ static const value_string idrp_pdu_open_authentication_codes[] = {
 };
 
 
-#define IDRP_PATH_ATTR_TYPE_ROUTE_SEPARATOR 1
-#define IDRP_PATH_ATTR_TYPE_EXT_INFO 2
-#define IDRP_PATH_ATTR_TYPE_RD_PATH 3
-#define IDRP_PATH_ATTR_TYPE_NEXT_HOP 4
-#define IDRP_PATH_ATTR_TYPE_DIST_LIST_INCL 5
-#define IDRP_PATH_ATTR_TYPE_DIST_LIST_EXCL 6
-#define IDRP_PATH_ATTR_TYPE_MULTI_EXIT_DISC 7
-#define IDRP_PATH_ATTR_TYPE_TRANSIT_DELAY 8
-#define IDRP_PATH_ATTR_TYPE_RESIDUAL_ERROR 9
-#define IDRP_PATH_ATTR_TYPE_EXPENSE 10
-#define IDRP_PATH_ATTR_TYPE_LOCALLY_DEFINED_QOS 11
+#define IDRP_PATH_ATTR_TYPE_ROUTE_SEPARATOR        1
+#define IDRP_PATH_ATTR_TYPE_EXT_INFO               2
+#define IDRP_PATH_ATTR_TYPE_RD_PATH                3
+#define IDRP_PATH_ATTR_TYPE_NEXT_HOP               4
+#define IDRP_PATH_ATTR_TYPE_DIST_LIST_INCL         5
+#define IDRP_PATH_ATTR_TYPE_DIST_LIST_EXCL         6
+#define IDRP_PATH_ATTR_TYPE_MULTI_EXIT_DISC        7
+#define IDRP_PATH_ATTR_TYPE_TRANSIT_DELAY          8
+#define IDRP_PATH_ATTR_TYPE_RESIDUAL_ERROR         9
+#define IDRP_PATH_ATTR_TYPE_EXPENSE               10
+#define IDRP_PATH_ATTR_TYPE_LOCALLY_DEFINED_QOS   11
 #define IDRP_PATH_ATTR_TYPE_HIERARCHICALRECORDING 12
-#define IDRP_PATH_ATTR_TYPE_RD_HOP_COUNT 13
-#define IDRP_PATH_ATTR_TYPE_SECURITY 14
-#define IDRP_PATH_ATTR_TYPE_CAPACITY 15
-#define IDRP_PATH_ATTR_TYPE_PRIORITY 16
+#define IDRP_PATH_ATTR_TYPE_RD_HOP_COUNT          13
+#define IDRP_PATH_ATTR_TYPE_SECURITY              14
+#define IDRP_PATH_ATTR_TYPE_CAPACITY              15
+#define IDRP_PATH_ATTR_TYPE_PRIORITY              16
 static const value_string path_attr_types[] = {
-    {IDRP_PATH_ATTR_TYPE_ROUTE_SEPARATOR, "Route Separator"},
-    {IDRP_PATH_ATTR_TYPE_EXT_INFO, "Ext Info"},
-    {IDRP_PATH_ATTR_TYPE_RD_PATH, "RD Path"},
-    {IDRP_PATH_ATTR_TYPE_NEXT_HOP, "Next Hop"},
-    {IDRP_PATH_ATTR_TYPE_DIST_LIST_INCL, "Dist List Incl"},
-    {IDRP_PATH_ATTR_TYPE_DIST_LIST_EXCL, "Dist List Excl"},
-    {IDRP_PATH_ATTR_TYPE_MULTI_EXIT_DISC, "Multi Exit Disc"},
-    {IDRP_PATH_ATTR_TYPE_TRANSIT_DELAY, "Transit Delay"},
-    {IDRP_PATH_ATTR_TYPE_RESIDUAL_ERROR, "Residual Error"},
-    {IDRP_PATH_ATTR_TYPE_EXPENSE, "Expense"},
-    {IDRP_PATH_ATTR_TYPE_LOCALLY_DEFINED_QOS, "Locally Ddefined Qos"},
+    {IDRP_PATH_ATTR_TYPE_ROUTE_SEPARATOR,       "Route Separator"},
+    {IDRP_PATH_ATTR_TYPE_EXT_INFO,              "Ext Info"},
+    {IDRP_PATH_ATTR_TYPE_RD_PATH,               "RD Path"},
+    {IDRP_PATH_ATTR_TYPE_NEXT_HOP,              "Next Hop"},
+    {IDRP_PATH_ATTR_TYPE_DIST_LIST_INCL,        "Dist List Incl"},
+    {IDRP_PATH_ATTR_TYPE_DIST_LIST_EXCL,        "Dist List Excl"},
+    {IDRP_PATH_ATTR_TYPE_MULTI_EXIT_DISC,       "Multi Exit Disc"},
+    {IDRP_PATH_ATTR_TYPE_TRANSIT_DELAY,         "Transit Delay"},
+    {IDRP_PATH_ATTR_TYPE_RESIDUAL_ERROR,        "Residual Error"},
+    {IDRP_PATH_ATTR_TYPE_EXPENSE,               "Expense"},
+    {IDRP_PATH_ATTR_TYPE_LOCALLY_DEFINED_QOS,   "Locally Ddefined Qos"},
     {IDRP_PATH_ATTR_TYPE_HIERARCHICALRECORDING, "Hierarchical Recording"},
-    {IDRP_PATH_ATTR_TYPE_RD_HOP_COUNT, "RD Hop Count"},
-    {IDRP_PATH_ATTR_TYPE_SECURITY, "Security"},
-    {IDRP_PATH_ATTR_TYPE_CAPACITY, "Capacity"},
-    {IDRP_PATH_ATTR_TYPE_PRIORITY, "Priority"},
+    {IDRP_PATH_ATTR_TYPE_RD_HOP_COUNT,          "RD Hop Count"},
+    {IDRP_PATH_ATTR_TYPE_SECURITY,              "Security"},
+    {IDRP_PATH_ATTR_TYPE_CAPACITY,              "Capacity"},
+    {IDRP_PATH_ATTR_TYPE_PRIORITY,              "Priority"},
     {0, NULL}
 };
 
-#define IDRP_RD_PATH_RD_SET 1
-#define IDRP_RD_PATH_RD_SEQ 2
+#define IDRP_RD_PATH_RD_SET    1
+#define IDRP_RD_PATH_RD_SEQ    2
 #define IDRP_RD_PATH_ENTRY_SEQ 3
 #define IDRP_RD_PATH_ENTRY_SET 4
 static const value_string path_rd_segment_types[] = {
-    {IDRP_RD_PATH_RD_SET, "RD_SET"},
-    {IDRP_RD_PATH_RD_SEQ, "RD_SEQ"},
+    {IDRP_RD_PATH_RD_SET,    "RD_SET"},
+    {IDRP_RD_PATH_RD_SEQ,    "RD_SEQ"},
     {IDRP_RD_PATH_ENTRY_SEQ, "ENTRY_SEQ"},
     {IDRP_RD_PATH_ENTRY_SET, "ENTRY_SET"},
     {0, NULL}
@@ -223,78 +227,93 @@ static const value_string path_rd_segment_types[] = {
 #define IDRP_PROTO_TYPE_8802 2
 static const value_string idrp_proto_type[] = {
     {IDRP_PROTO_TYPE_TR_9577, "ISO TR 9577 IPI/SPI"},
-    {IDRP_PROTO_TYPE_8802, "ISO 8802 LSAP"},
+    {IDRP_PROTO_TYPE_8802,    "ISO 8802 LSAP"},
     {0, NULL}
 };
 
 
 /* ERROR PDU error codes: */
-#define IDRP_ERROR_OPEN 1
-#define IDRP_ERROR_UPDATE 2
-#define IDRP_ERROR_HOLD_TIMER 3
-#define IDRP_ERROR_FSM 4
+#define IDRP_ERROR_OPEN        1
+#define IDRP_ERROR_UPDATE      2
+#define IDRP_ERROR_HOLD_TIMER  3
+#define IDRP_ERROR_FSM         4
 #define IDRP_ERROR_RIB_REFRESH 5
 static const value_string idrp_error_codes[] = {
-    {IDRP_ERROR_OPEN, "OPEN PDU_Error"},
-    {IDRP_ERROR_UPDATE, "UPDATE PDU_Error"},
-    {IDRP_ERROR_HOLD_TIMER, "Hold Timer_Expired"},
-    {IDRP_ERROR_FSM, "FSM Error"},
+    {IDRP_ERROR_OPEN,        "OPEN PDU_Error"},
+    {IDRP_ERROR_UPDATE,      "UPDATE PDU_Error"},
+    {IDRP_ERROR_HOLD_TIMER,  "Hold Timer_Expired"},
+    {IDRP_ERROR_FSM,         "FSM Error"},
     {IDRP_ERROR_RIB_REFRESH, "RIB REFRESH PDU Error"},
     {0, NULL}
 };
 
 /* ERROR PDU sub error codes: OPEN */
-#define IDRP_ERROR_OPEN_UNSUPPORTED_VERSION_NUMBER 1
-#define IDRP_ERROR_OPEN_BAD_MAXPDU_SIZE 2
-#define IDRP_ERROR_OPEN_BAD_PEER_RD 3
+#define IDRP_ERROR_OPEN_UNSUPPORTED_VERSION_NUMBER      1
+#define IDRP_ERROR_OPEN_BAD_MAXPDU_SIZE                 2
+#define IDRP_ERROR_OPEN_BAD_PEER_RD                     3
 #define IDRP_ERROR_OPEN_UNSUPPORTED_AUTHENTICATION_CODE 4
-#define IDRP_ERROR_OPEN_AUTHENTICATION_FAILURE 5
-#define IDRP_ERROR_OPEN_BAD_RIB_ATTRSSET 6
-#define IDRP_ERROR_RDC_MISMATCH 7
+#define IDRP_ERROR_OPEN_AUTHENTICATION_FAILURE          5
+#define IDRP_ERROR_OPEN_BAD_RIB_ATTRSSET                6
+#define IDRP_ERROR_RDC_MISMATCH                         7
 static const value_string idrp_error_open_subcodes[] = {
-    {IDRP_ERROR_OPEN_UNSUPPORTED_VERSION_NUMBER, "Unsupported Version Number"},
-    {IDRP_ERROR_OPEN_BAD_MAXPDU_SIZE, "Bad Maximum PDU Size"},
-    {IDRP_ERROR_OPEN_BAD_PEER_RD, "Bad Peer RD"},
+    {IDRP_ERROR_OPEN_UNSUPPORTED_VERSION_NUMBER,
+     "Unsupported Version Number"},
+    {IDRP_ERROR_OPEN_BAD_MAXPDU_SIZE,
+     "Bad Maximum PDU Size"},
+    {IDRP_ERROR_OPEN_BAD_PEER_RD,
+     "Bad Peer RD"},
     {IDRP_ERROR_OPEN_UNSUPPORTED_AUTHENTICATION_CODE,
-        "Unsupported Authentication Code"},
-    {IDRP_ERROR_OPEN_AUTHENTICATION_FAILURE, "Authentication Failure"},
-    {IDRP_ERROR_OPEN_BAD_RIB_ATTRSSET, "Bad RIB Attribute Set"},
-    {IDRP_ERROR_RDC_MISMATCH, "RDC Mismatch"},
+     "Unsupported Authentication Code"},
+    {IDRP_ERROR_OPEN_AUTHENTICATION_FAILURE,
+     "Authentication Failure"},
+    {IDRP_ERROR_OPEN_BAD_RIB_ATTRSSET,
+     "Bad RIB Attribute Set"},
+    {IDRP_ERROR_RDC_MISMATCH,
+     "RDC Mismatch"},
     {0, NULL}
 };
 
 /* ERROR PDU sub error codes: UPDATE */
-#define IDRP_ERROR_UPDATE_MALFORMED_ATTRIBUTE_LIST 1
-#define IDRP_ERROR_UPDATE_UNRECOGNIZED_WELL_KNOWN_ATTRIBUTE 2
-#define IDRP_ERROR_UPDATE_MISSING_WELL_KNOWN_ATTRIBUTE 3
-#define IDRP_ERROR_UPDATE_ATTRIBUTE_FLAGS_ERROR 4
-#define IDRP_ERROR_UPDATE_ATTRIBUTE_LENGTH_ERROR 5
-#define IDRP_ERROR_UPDATE_RD_ROUTEING_LOOP 6
-#define IDRP_ERROR_UPDATE_INVALID_NEXT_HOP_ATTRIBUTE 7
-#define IDRP_ERROR_UPDATE_OPTIONAL_ATTRIBUTE_ERROR 8
-#define IDRP_ERROR_UPDATE_INVALID_REACHABILITY_INFORMATION 9
-#define IDRP_ERROR_UPDATE_MISCONFIGURED_RDCS 10
-#define IDRP_ERROR_UPDATE_MALFORMED_NLRI 11
-#define IDRP_ERROR_UPDATE_DUPLICATED_ATTRIBUTES 12
-#define IDRP_ERROR_UPDATE_ILLEGAL_RD_PATH_SEGMENT 13
+#define IDRP_ERROR_UPDATE_MALFORMED_ATTRIBUTE_LIST           1
+#define IDRP_ERROR_UPDATE_UNRECOGNIZED_WELL_KNOWN_ATTRIBUTE  2
+#define IDRP_ERROR_UPDATE_MISSING_WELL_KNOWN_ATTRIBUTE       3
+#define IDRP_ERROR_UPDATE_ATTRIBUTE_FLAGS_ERROR              4
+#define IDRP_ERROR_UPDATE_ATTRIBUTE_LENGTH_ERROR             5
+#define IDRP_ERROR_UPDATE_RD_ROUTEING_LOOP                   6
+#define IDRP_ERROR_UPDATE_INVALID_NEXT_HOP_ATTRIBUTE         7
+#define IDRP_ERROR_UPDATE_OPTIONAL_ATTRIBUTE_ERROR           8
+#define IDRP_ERROR_UPDATE_INVALID_REACHABILITY_INFORMATION   9
+#define IDRP_ERROR_UPDATE_MISCONFIGURED_RDCS                10
+#define IDRP_ERROR_UPDATE_MALFORMED_NLRI                    11
+#define IDRP_ERROR_UPDATE_DUPLICATED_ATTRIBUTES             12
+#define IDRP_ERROR_UPDATE_ILLEGAL_RD_PATH_SEGMENT           13
 static const value_string idrp_error_update_subcodes[] = {
-    {IDRP_ERROR_UPDATE_MALFORMED_ATTRIBUTE_LIST, "Malformed Attribute List"},
+    {IDRP_ERROR_UPDATE_MALFORMED_ATTRIBUTE_LIST,
+     "Malformed Attribute List"},
     {IDRP_ERROR_UPDATE_UNRECOGNIZED_WELL_KNOWN_ATTRIBUTE,
-        "Unrecognized Well-known Attribute"},
+     "Unrecognized Well-known Attribute"},
     {IDRP_ERROR_UPDATE_MISSING_WELL_KNOWN_ATTRIBUTE,
-        "Missing Well-known Attribute"},
-    {IDRP_ERROR_UPDATE_ATTRIBUTE_FLAGS_ERROR, "Attribute Flags Error"},
-    {IDRP_ERROR_UPDATE_ATTRIBUTE_LENGTH_ERROR, "Attribute Length Error"},
-    {IDRP_ERROR_UPDATE_RD_ROUTEING_LOOP, "RD Routing Loop"},
+     "Missing Well-known Attribute"},
+    {IDRP_ERROR_UPDATE_ATTRIBUTE_FLAGS_ERROR,
+     "Attribute Flags Error"},
+    {IDRP_ERROR_UPDATE_ATTRIBUTE_LENGTH_ERROR,
+     "Attribute Length Error"},
+    {IDRP_ERROR_UPDATE_RD_ROUTEING_LOOP,
+     "RD Routing Loop"},
     {IDRP_ERROR_UPDATE_INVALID_NEXT_HOP_ATTRIBUTE,
-        "Invalid NEXT HOP Attribute"},
-    {IDRP_ERROR_UPDATE_OPTIONAL_ATTRIBUTE_ERROR, "Optional Attribute error"},
+     "Invalid NEXT HOP Attribute"},
+    {IDRP_ERROR_UPDATE_OPTIONAL_ATTRIBUTE_ERROR,
+     "Optional Attribute error"},
     {IDRP_ERROR_UPDATE_INVALID_REACHABILITY_INFORMATION,
-        "Invalid Reachability Information"},
-    {IDRP_ERROR_UPDATE_MISCONFIGURED_RDCS, "Misconfigured RDCs"},
-    {IDRP_ERROR_UPDATE_MALFORMED_NLRI, "Malformed NLRI"},
-    {IDRP_ERROR_UPDATE_DUPLICATED_ATTRIBUTES, "Duplicated_Attributes"},
-    {IDRP_ERROR_UPDATE_ILLEGAL_RD_PATH_SEGMENT, "Illegal RD Path Segment"},
+     "Invalid Reachability Information"},
+    {IDRP_ERROR_UPDATE_MISCONFIGURED_RDCS,
+     "Misconfigured RDCs"},
+    {IDRP_ERROR_UPDATE_MALFORMED_NLRI,
+     "Malformed NLRI"},
+    {IDRP_ERROR_UPDATE_DUPLICATED_ATTRIBUTES,
+     "Duplicated_Attributes"},
+    {IDRP_ERROR_UPDATE_ILLEGAL_RD_PATH_SEGMENT,
+     "Illegal RD Path Segment"},
     {0, NULL}
 };
 
@@ -305,22 +324,22 @@ static const value_string idrp_error_hold_timer_subcodes[] = {
 };
 
 /* ERROR PDU sub error codes: FSM */
-#define IDRP_ERROR_FSM_CLOSED 1
-#define IDRP_ERROR_FSM_OPEN_RCVD 2
-#define IDRP_ERROR_FSM_OPEN_SENT 3
-#define IDRP_ERROR_FSM_CLOSE_WAIT 4
+#define IDRP_ERROR_FSM_CLOSED      1
+#define IDRP_ERROR_FSM_OPEN_RCVD   2
+#define IDRP_ERROR_FSM_OPEN_SENT   3
+#define IDRP_ERROR_FSM_CLOSE_WAIT  4
 #define IDRP_ERROR_FSM_ESTABLISHED 5
 static const value_string idrp_error_fsm_subcodes[] = {
-    {IDRP_ERROR_FSM_CLOSED, "CLOSED"},
-    {IDRP_ERROR_FSM_OPEN_RCVD, "OPEN-RCVD"},
-    {IDRP_ERROR_FSM_OPEN_SENT, "OPEN-SENT"},
-    {IDRP_ERROR_FSM_CLOSE_WAIT, "CLOSE-WAIT"},
+    {IDRP_ERROR_FSM_CLOSED,      "CLOSED"},
+    {IDRP_ERROR_FSM_OPEN_RCVD,   "OPEN-RCVD"},
+    {IDRP_ERROR_FSM_OPEN_SENT,   "OPEN-SENT"},
+    {IDRP_ERROR_FSM_CLOSE_WAIT,  "CLOSE-WAIT"},
     {IDRP_ERROR_FSM_ESTABLISHED, "ESTABLISHED"},
     {0, NULL}
 };
 
 
-#define IDRP_ERROR_RIB_REFRESH_INVALID_OPCODE 1
+#define IDRP_ERROR_RIB_REFRESH_INVALID_OPCODE       1
 #define IDRP_ERROR_RIB_REFRESH_UNSUPPORTED_RIB_ATTS 2
 static const value_string idrp_error_rib_refresh_subcodes[] = {
     {IDRP_ERROR_RIB_REFRESH_INVALID_OPCODE, "Invalid OpCode"},
@@ -336,8 +355,8 @@ static const value_string idrp_error_rib_refresh_subcodes[] = {
 #define IDRP_RIB_REFRESH_END 3
 static const value_string idrp_rib_refresh_opcodes[] = {
     {IDRP_RIB_REFRESH_REQUEST, "RIB Refresh Request"},
-    {IDRP_RIB_REFRESH_START, "RIB Refresh Start"},
-    {IDRP_RIB_REFRESH_END, "RIB Refresh End"},
+    {IDRP_RIB_REFRESH_START,   "RIB Refresh Start"},
+    {IDRP_RIB_REFRESH_END,     "RIB Refresh End"},
     {0, NULL}
 };
 #endif
@@ -351,12 +370,12 @@ static int dissect_BISPDU_OPEN(tvbuff_t * tvb, int offset, proto_tree * tree)
     guint8 rib_attribute_type;
     guint8 number_of_rdcs;
     guint8 length_indicator_guint8;
-    gint i;
-    gint j;
+    gint   i;
+    gint   j;
 
     /* 1 octet idrp version */
     proto_tree_add_item(tree, hf_idrp_open_version, tvb, offset,1, ENC_BIG_ENDIAN);
-    offset++;
+    offset += 1;
 
     /* Hold Time (2 octets) */
     proto_tree_add_item(tree, hf_idrp_open_hold_time, tvb, offset, 2, ENC_BIG_ENDIAN);
@@ -368,7 +387,7 @@ static int dissect_BISPDU_OPEN(tvbuff_t * tvb, int offset, proto_tree * tree)
 
     /* Source RDI Length Indicator (1 octet) */
     rdi_len = tvb_get_guint8(tvb, offset);
-    offset++;
+    offset += 1;
 
     /* Source RDI */
     proto_tree_add_item(tree, hf_idrp_open_src_rdi, tvb, offset, rdi_len, ENC_ASCII | ENC_NA);
@@ -376,20 +395,20 @@ static int dissect_BISPDU_OPEN(tvbuff_t * tvb, int offset, proto_tree * tree)
 
     /* Number of Non-empty RIB-Atts */
     number_of_non_empty_rib_attributes = tvb_get_guint8(tvb, offset);
-    offset++;
+    offset += 1;
 
     /* process Nth non-empty RIB-Atts */
     for (i = number_of_non_empty_rib_attributes; i > 0; i--) {
         /* 1 octet number of distinguishing attributes that are contained in
            the Nth RIB-Att. */
         number_of_distinguishing_attributes = tvb_get_guint8(tvb, offset);
-        offset++;
+        offset += 1;
 
         /* process Nth RIB-Att */
         for (j = number_of_distinguishing_attributes; j > 0; j--) {
             /* 1 octet Type of RIB-Att */
             rib_attribute_type = tvb_get_guint8(tvb, offset);
-            offset++;
+            offset += 1;
 
             switch (rib_attribute_type) {
                 case IDRP_PATH_ATTR_TYPE_ROUTE_SEPARATOR:
@@ -409,7 +428,7 @@ static int dissect_BISPDU_OPEN(tvbuff_t * tvb, int offset, proto_tree * tree)
                 case IDRP_PATH_ATTR_TYPE_LOCALLY_DEFINED_QOS:
                     /* 1 octet Nsap prefix length */
                     length_indicator_guint8 = tvb_get_guint8(tvb, offset);
-                    offset++;
+                    offset += 1;
                     /* process Nsap prefix */
                     proto_tree_add_item(
                             tree,
@@ -422,7 +441,7 @@ static int dissect_BISPDU_OPEN(tvbuff_t * tvb, int offset, proto_tree * tree)
 
                     /* 1 octet Qos length */
                     length_indicator_guint8 = tvb_get_guint8(tvb, offset);
-                    offset++;
+                    offset += 1;
                     /* process Qos */
                     proto_tree_add_item(
                             tree,
@@ -436,7 +455,7 @@ static int dissect_BISPDU_OPEN(tvbuff_t * tvb, int offset, proto_tree * tree)
                     /* 1 octet Metric length */
                     /* note: metric  always absent in OPEN BISPDU */
                     length_indicator_guint8 = tvb_get_guint8(tvb, offset);
-                    offset++;
+                    offset += 1;
                     /* process Metric */
                     proto_tree_add_item(
                             tree,
@@ -453,7 +472,7 @@ static int dissect_BISPDU_OPEN(tvbuff_t * tvb, int offset, proto_tree * tree)
 
                     /* length of Security Registration ID */
                     length_indicator_guint8 = tvb_get_guint8(tvb, offset);
-                    offset++;
+                    offset += 1;
                     /* value of Security Registration ID */
                     proto_tree_add_item(
                             tree,
@@ -467,7 +486,7 @@ static int dissect_BISPDU_OPEN(tvbuff_t * tvb, int offset, proto_tree * tree)
                     /* length of Security Information */
                     /* note: always absent for OPEN BISPDU*/
                     length_indicator_guint8 = tvb_get_guint8(tvb, offset);
-                    offset++;
+                    offset += 1;
                     /* value of Security Information */
                     proto_tree_add_item(
                             tree,
@@ -490,13 +509,13 @@ static int dissect_BISPDU_OPEN(tvbuff_t * tvb, int offset, proto_tree * tree)
     number_of_rdcs = tvb_get_guint8(tvb, offset);
     proto_tree_add_item(tree, hf_idrp_open_number_of_confederations, tvb,
             offset, 1, ENC_BIG_ENDIAN);
-    offset++;
+    offset += 1;
 
     /* process Nth Confederation RDI */
     for (i = number_of_rdcs; i > 0; i--) {
         /* 1 octet of RDI length */
         length_indicator_guint8 = tvb_get_guint8(tvb, offset);
-        offset++;
+        offset += 1;
 
         /* process Nth RDI */
         proto_tree_add_item(tree, hf_idrp_open_confederation, tvb,
@@ -507,7 +526,7 @@ static int dissect_BISPDU_OPEN(tvbuff_t * tvb, int offset, proto_tree * tree)
     /* Authentication Code */
     proto_tree_add_item(tree, hf_idrp_open_authentication_code, tvb, offset, 1,
             ENC_BIG_ENDIAN);
-    offset++;
+    offset += 1;
 
     /* Authentication Data */
     proto_tree_add_item(tree, hf_idrp_open_authentication_data, tvb, offset,
@@ -521,19 +540,19 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree)
 {
     guint16 nb_unfeasible_routes;
     guint16 path_attrs_len;
-    int path_attrs_start_offset;
-    guint8 path_attr_type;
+    int     path_attrs_start_offset;
+    guint8  path_attr_type;
     guint16 path_attr_len;
-    int start_offset;
+    int     start_offset;
     guint16 rdi_len;
-    guint8 proto_len;
+    guint8  proto_len;
     guint16 net_len;
-    int path_segment_rdi_offset;
+    int     path_segment_rdi_offset;
     guint16 length_indicator_guint16;
-    guint8 length_indicator_guint8;
-    guint8 nb_of_snpa;
-    guint8 dist_list_count;
-    int i;
+    guint8  length_indicator_guint8;
+    guint8  nb_of_snpa;
+    guint8  dist_list_count;
+    int     i;
 
     /* 2 octet withdrawn ("Unfeasible") Route Count */
     nb_unfeasible_routes = tvb_get_ntohs(tvb, offset);
@@ -558,12 +577,12 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree)
         /* Path attribute flag */
         proto_tree_add_item(tree, hf_idrp_update_path_attr_flag, tvb,
                 offset, 1, ENC_BIG_ENDIAN);
-        offset++;
+        offset += 1;
         /* Path attribute type */
         path_attr_type = tvb_get_guint8(tvb, offset);
         proto_tree_add_item(tree, hf_idrp_update_path_attr_type, tvb,
                 offset, 1, ENC_BIG_ENDIAN);
-        offset++;
+        offset += 1;
         /* Path attribute length */
         path_attr_len = tvb_get_ntohs(tvb, offset);
         proto_tree_add_item(tree, hf_idrp_update_path_attr_length, tvb,
@@ -607,7 +626,7 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree)
                             offset,
                             1,
                             ENC_BIG_ENDIAN);
-                    offset++;
+                    offset += 1;
 
                     /* 2 octets of path segment length */
                     length_indicator_guint16 = tvb_get_ntohs(tvb, offset);
@@ -624,7 +643,7 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree)
                     while (offset < (path_segment_rdi_offset + length_indicator_guint16)) {
                         /* 1 octet rdi length */
                         length_indicator_guint8 = tvb_get_guint8(tvb, offset);
-                        offset++;
+                        offset += 1;
                         /* print N times path RDI */
                         proto_tree_add_item(tree,
                                 hf_idrp_update_path_attr_rd_path_rdi,
@@ -644,7 +663,7 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree)
                         offset,
                         1,
                         ENC_BIG_ENDIAN);
-                offset++;
+                offset += 1;
 
                 start_offset = offset;
                 /* process Nth next hop */
@@ -656,10 +675,10 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree)
                             offset,
                             1,
                             ENC_BIG_ENDIAN);
-                    offset++;
+                    offset += 1;
                     /* 1 octet Proto len */
                     length_indicator_guint8 = tvb_get_guint8(tvb, offset);
-                    offset++;
+                    offset += 1;
                     /* N octets Proto: in case of ISO 8473 one octet with the value 0x81 */
                     proto_tree_add_item(tree,
                             hf_idrp_update_path_attr_next_hop_proto,
@@ -671,7 +690,7 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree)
 
                     /* length of NET of Next HOP */
                     length_indicator_guint8 = tvb_get_guint8(tvb, offset);
-                    offset++;
+                    offset += 1;
                     /* NET of Next HOP */
                     proto_tree_add_item(tree,
                             hf_idrp_update_path_attr_next_hop_rdi,
@@ -689,13 +708,13 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree)
                             offset,
                             1,
                             ENC_BIG_ENDIAN);
-                    offset++;
+                    offset += 1;
                     /* process Nth SNPA */
                     for (i = nb_of_snpa; i > 0; i--) {
                         /* SNPS length in multiples of 4 bit */
                         length_indicator_guint8 =
                             (guint8) ceil((float)tvb_get_guint8(tvb, offset) / (float)2.0);
-                        offset++;
+                        offset += 1;
                         proto_tree_add_item(tree,
                                 hf_idrp_update_path_attr_next_hop_snpa,
                                 tvb,
@@ -715,13 +734,13 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree)
                         offset,
                         1 ,
                         ENC_BIG_ENDIAN);
-                offset++;
+                offset += 1;
 
                 /* process RDI's/Confederations's in DIST list */
                 for (i = dist_list_count; i > 0; i--) {
                     /* 1 octet RDI/Confed length indicator */
                     length_indicator_guint8 = tvb_get_guint8(tvb, offset);
-                    offset++;
+                    offset += 1;
                     /* variable size RDI/Conderation */
                     proto_tree_add_item(tree,
                             hf_idrp_update_path_attr_dist_list_excl_rdi ,
@@ -741,13 +760,13 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree)
                         offset,
                         1 ,
                         ENC_BIG_ENDIAN);
-                offset++;
+                offset += 1;
 
                 /* process RDI's/Confederations's in DIST list */
                 for (i = dist_list_count; i > 0; i--) {
                     /* 1 octet RDI/Confed length indicator */
                     length_indicator_guint8 = tvb_get_guint8(tvb, offset);
-                    offset++;
+                    offset += 1;
                     /* variable size RDI/Conderation */
                     proto_tree_add_item(tree,
                             hf_idrp_update_path_attr_dist_list_incl_rdi ,
@@ -766,7 +785,7 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree)
                         offset,
                         1 ,
                         ENC_BIG_ENDIAN);
-                offset++;
+                offset += 1;
                 break;
             case IDRP_PATH_ATTR_TYPE_TRANSIT_DELAY:
                 /* 2 octets of transit delay */
@@ -801,7 +820,7 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree)
             case IDRP_PATH_ATTR_TYPE_LOCALLY_DEFINED_QOS:
                 /* 1 octet Nsap prefix length */
                 length_indicator_guint8 = tvb_get_guint8(tvb, offset);
-                offset++;
+                offset += 1;
                 /* process Nsap prefix */
                 proto_tree_add_item(tree,
                         hf_idrp_update_path_attr_locally_defined_qos_nsap ,
@@ -812,7 +831,7 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree)
                 offset += length_indicator_guint8;
                 /* 1 octet Qoslength */
                 length_indicator_guint8 = tvb_get_guint8(tvb, offset);
-                offset++;
+                offset += 1;
                 /* process Qos */
                 proto_tree_add_item(tree,
                         hf_idrp_update_path_attr_locally_defined_qos_value,
@@ -823,7 +842,7 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree)
                 offset += length_indicator_guint8;
                 /* 1 octet Metric length */
                 length_indicator_guint8  = tvb_get_guint8(tvb, offset);
-                offset++;
+                offset += 1;
                 /* process Metric */
                 proto_tree_add_item(tree,
                         hf_idrp_update_path_attr_locally_defined_qos_metric,
@@ -841,7 +860,7 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree)
                         offset,
                         1 ,
                         ENC_BIG_ENDIAN);
-                offset++;
+                offset += 1;
                 break;
             case IDRP_PATH_ATTR_TYPE_RD_HOP_COUNT:
                 proto_tree_add_item(tree,
@@ -850,12 +869,12 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree)
                         offset,
                         1 ,
                         ENC_BIG_ENDIAN);
-                offset++;
+                offset += 1;
                 break;
             case IDRP_PATH_ATTR_TYPE_SECURITY:
                 /* length of Security Registration ID */
                 length_indicator_guint8 = tvb_get_guint8(tvb, offset);
-                offset++;
+                offset += 1;
 
                 /* value of Security Registration ID */
                 proto_tree_add_item(tree,
@@ -868,7 +887,7 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree)
 
                 /* length of Security Information */
                 length_indicator_guint8 = tvb_get_guint8(tvb, offset);
-                offset++;
+                offset += 1;
                 /* value of Security Information */
                 proto_tree_add_item(tree,
                         hf_idrp_update_path_attr_security_info,
@@ -885,7 +904,7 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree)
                         offset,
                         1 ,
                         ENC_BIG_ENDIAN);
-                offset++;
+                offset += 1;
                 break;
             case IDRP_PATH_ATTR_TYPE_PRIORITY:
                 proto_tree_add_item(tree,
@@ -894,7 +913,7 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree)
                         offset,
                         1 ,
                         ENC_BIG_ENDIAN);
-                offset++;
+                offset += 1;
                 break;
             default:
                 break;
@@ -904,11 +923,11 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree)
     /* 1 octet Proto type */
     proto_tree_add_item(tree, hf_idrp_update_nlri_proto_type, tvb, offset,
             1, ENC_BIG_ENDIAN);
-    offset++;
+    offset += 1;
 
     /* 1 octet Proto len */
     proto_len = tvb_get_guint8(tvb, offset);
-    offset++;
+    offset += 1;
 
     /* N octets Proto identity: in case of ISO 8473 one octet with the value 0x81 */
     proto_tree_add_item(tree, hf_idrp_update_nlri_proto_id, tvb, offset,
@@ -928,7 +947,7 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree)
         rdi_len = tvb_get_guint8(tvb, offset) / 8;
         proto_tree_add_item(tree, hf_idrp_update_nlri_addr_info_nb_bits, tvb,
                 offset, 1, ENC_BIG_ENDIAN);
-        offset++;
+        offset += 1;
 
         proto_tree_add_item(tree, hf_idrp_update_nlri_addr_info, tvb,
                 offset, rdi_len, ENC_ASCII | ENC_NA);
@@ -940,12 +959,12 @@ static int dissect_BISPDU_UPDATE(tvbuff_t * tvb, int offset, proto_tree * tree)
 static int dissect_BISPDU_ERROR(tvbuff_t * tvb, int offset, proto_tree * tree)
 {
     guint8 error_code = 0;
-    gint data_length;
+    gint   data_length;
 
     /* Error Code (1 octet) */
     error_code = tvb_get_guint8(tvb, offset);
     proto_tree_add_item(tree, hf_idrp_error_code, tvb, offset, 1, ENC_BIG_ENDIAN);
-    offset++;
+    offset += 1;
 
     switch (error_code) {
         case IDRP_ERROR_OPEN:
@@ -971,7 +990,7 @@ static int dissect_BISPDU_ERROR(tvbuff_t * tvb, int offset, proto_tree * tree)
         default:
             break;
     }
-    offset++;
+    offset += 1;
 
     /* data : zero or more octets of data to be used in diagnosing the reason
        for the IDRP ERROR PDU. The contents of the Data field depends upon the
@@ -990,17 +1009,17 @@ static int dissect_BISPDU_RIB_REFRESH(tvbuff_t * tvb, int offset, proto_tree * t
 {
     proto_tree *sub_tree;
     proto_item *ti;
-    guint8 number_of_non_empty_rib_attributes;
-    guint8 number_of_distinguishing_attributes;
-    guint8 rib_attribute_type;
-    guint8 length_indicator_guint8;
-    int i;
-    int j;
+    guint8      number_of_non_empty_rib_attributes;
+    guint8      number_of_distinguishing_attributes;
+    guint8      rib_attribute_type;
+    guint8      length_indicator_guint8;
+    int         i;
+    int         j;
 
     /* 1 octet Opcode */
     proto_tree_add_item(tree, hf_idrp_rib_refresh_opcode, tvb, offset, 1,
             ENC_BIG_ENDIAN);
-    offset++;
+    offset += 1;
 
     /* Path Attributes subtree */
     ti = proto_tree_add_text(tree, tvb, offset, 0, "Path Attributes");
@@ -1008,7 +1027,7 @@ static int dissect_BISPDU_RIB_REFRESH(tvbuff_t * tvb, int offset, proto_tree * t
 
     /* Number of Non-empty RIB-Atts */
     number_of_non_empty_rib_attributes = tvb_get_guint8(tvb, offset);
-    offset++;
+    offset += 1;
 
     if (!number_of_non_empty_rib_attributes)
         proto_tree_add_text(sub_tree, tvb, offset, 0, "none");
@@ -1019,13 +1038,13 @@ static int dissect_BISPDU_RIB_REFRESH(tvbuff_t * tvb, int offset, proto_tree * t
         /* 1 octet number of distinguishing attributes that are contained in
            the Nth RIB-Att. */
         number_of_distinguishing_attributes = tvb_get_guint8(tvb, offset);
-        offset++;
+        offset += 1;
 
         /* process Nth RIB-Att */
         for (j = number_of_distinguishing_attributes; j > 0; j--) {
             /* 1 octet Type of RIB-Att */
             rib_attribute_type = tvb_get_guint8(tvb, offset);
-            offset++;
+            offset += 1;
 
             switch (rib_attribute_type) {
                 case IDRP_PATH_ATTR_TYPE_ROUTE_SEPARATOR:
@@ -1045,7 +1064,7 @@ static int dissect_BISPDU_RIB_REFRESH(tvbuff_t * tvb, int offset, proto_tree * t
                 case IDRP_PATH_ATTR_TYPE_LOCALLY_DEFINED_QOS:
                     /* 1 octet Nsap prefix length */
                     length_indicator_guint8 = tvb_get_guint8(tvb, offset);
-                    offset++;
+                    offset += 1;
                     /* process Nsap prefix */
                     proto_tree_add_item(
                             sub_tree,
@@ -1058,7 +1077,7 @@ static int dissect_BISPDU_RIB_REFRESH(tvbuff_t * tvb, int offset, proto_tree * t
 
                     /* 1 octet Qos length */
                     length_indicator_guint8 = tvb_get_guint8(tvb, offset);
-                    offset++;
+                    offset += 1;
                     /* process Qos */
                     proto_tree_add_item(
                             sub_tree,
@@ -1072,7 +1091,7 @@ static int dissect_BISPDU_RIB_REFRESH(tvbuff_t * tvb, int offset, proto_tree * t
                     /* 1 octet Metric length */
                     /* note: metric  always absent in OPEN BISPDU */
                     length_indicator_guint8 = tvb_get_guint8(tvb, offset);
-                    offset++;
+                    offset += 1;
                     /* process Metric */
                     proto_tree_add_item(
                             sub_tree,
@@ -1089,7 +1108,7 @@ static int dissect_BISPDU_RIB_REFRESH(tvbuff_t * tvb, int offset, proto_tree * t
 
                     /* length of Security Registration ID */
                     length_indicator_guint8 = tvb_get_guint8(tvb, offset);
-                    offset++;
+                    offset += 1;
                     /* value of Security Registration ID */
                     proto_tree_add_item(
                             sub_tree,
@@ -1103,7 +1122,7 @@ static int dissect_BISPDU_RIB_REFRESH(tvbuff_t * tvb, int offset, proto_tree * t
                     /* length of Security Information */
                     /* note: always absent for OPEN BISPDU*/
                     length_indicator_guint8 = tvb_get_guint8(tvb, offset);
-                    offset++;
+                    offset += 1;
                     /* value of Security Information */
                     proto_tree_add_item(
                             sub_tree,
@@ -1134,7 +1153,7 @@ dissect_idrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
 
     if (tvb_get_guint8(tvb, offset) != NLPID_ISO10747_IDRP)
         return 0;  /* no idrp packet */
-    offset++;
+    offset += 1;
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "IDRP");
     col_clear(pinfo->cinfo, COL_INFO);
@@ -1151,7 +1170,7 @@ dissect_idrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
     pdu_type = tvb_get_guint8(tvb, offset);
     proto_tree_add_item(idrp_tree, hf_idrp_type,
             tvb, offset, 1, ENC_BIG_ENDIAN);
-    offset++;
+    offset += 1;
 
     /* 4 octets Sequence */
     proto_tree_add_item(idrp_tree, hf_idrp_sequence,
@@ -1166,12 +1185,12 @@ dissect_idrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
     /* 1 octets credits offered */
     proto_tree_add_item(idrp_tree, hf_idrp_credit_offered,
             tvb, offset, 1, ENC_BIG_ENDIAN);
-    offset++;
+    offset += 1;
 
     /* 1 octets credits offered */
     proto_tree_add_item(idrp_tree, hf_idrp_credit_avail,
             tvb, offset, 1, ENC_BIG_ENDIAN);
-    offset++;
+    offset += 1;
 
     /* 16 octets validation */
     proto_tree_add_item(idrp_tree, hf_idrp_validation_pattern,
@@ -1579,10 +1598,10 @@ void proto_register_idrp(void)
  *
  * Local variables:
  * c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
  * indent-tabs-mode: nil
  * End:
  *
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-mq-base.c b/epan/dissectors/packet-mq-base.c
index 19c23e272b..7eecacd9e8 100644
--- a/epan/dissectors/packet-mq-base.c
+++ b/epan/dissectors/packet-mq-base.c
@@ -33,5234 +33,5235 @@
 
 guint64 tvb_get_guint64_endian(tvbuff_t *a_tvb, gint a_iOffset, gint a_rep)
 {
-	guint64 iResult;
-	if (a_rep & ENC_LITTLE_ENDIAN)
-		iResult = tvb_get_letoh64(a_tvb, a_iOffset);
-	else
-		iResult =  tvb_get_ntoh64(a_tvb, a_iOffset);
-	return iResult;
+    guint64 iResult;
+    if (a_rep & ENC_LITTLE_ENDIAN)
+        iResult = tvb_get_letoh64(a_tvb, a_iOffset);
+    else
+        iResult =  tvb_get_ntoh64(a_tvb, a_iOffset);
+    return iResult;
 };
 guint32 tvb_get_guint32_endian(tvbuff_t *a_tvb, gint a_iOffset, gint a_rep)
 {
-	guint32 iResult;
-	if (a_rep & ENC_LITTLE_ENDIAN)
-		iResult = tvb_get_letohl(a_tvb, a_iOffset);
-	else
-		iResult =  tvb_get_ntohl(a_tvb, a_iOffset);
-	return iResult;
+    guint32 iResult;
+    if (a_rep & ENC_LITTLE_ENDIAN)
+        iResult = tvb_get_letohl(a_tvb, a_iOffset);
+    else
+        iResult =  tvb_get_ntohl(a_tvb, a_iOffset);
+    return iResult;
 };
 guint16 tvb_get_guint16_endian(tvbuff_t *a_tvb, gint a_iOffset, gint a_rep)
 {
-	guint16 sResult;
-	if (a_rep & ENC_LITTLE_ENDIAN)
-		sResult = tvb_get_letohs(a_tvb, a_iOffset);
-	else
-		sResult =  tvb_get_ntohs(a_tvb, a_iOffset);
-	return sResult;
+    guint16 sResult;
+    if (a_rep & ENC_LITTLE_ENDIAN)
+        sResult = tvb_get_letohs(a_tvb, a_iOffset);
+    else
+        sResult =  tvb_get_ntohs(a_tvb, a_iOffset);
+    return sResult;
 };
 /* This routine truncates the string at the first blank space */
 gint32 strip_trailing_blanks(guint8* a_str, guint32 a_size)
 {
-	gint32 i = 0;
-	if (a_str != NULL)
-	{
-		for (i = a_size-1; i >=0; i--)
-		{
-			if (a_str[i] != ' ' && a_str[i] != '\0')
-				break;
-			else
-				a_str[i]='\0';
-		}
-	}
-	return i;
+    gint32 i = 0;
+    if (a_str != NULL)
+    {
+        for (i = a_size-1; i >=0; i--)
+        {
+            if (a_str[i] != ' ' && a_str[i] != '\0')
+                break;
+            else
+                a_str[i]='\0';
+        }
+    }
+    return i;
 }
 
 DEF_VALRB(ccsid)
-	DEF_VALR3(MQCCSI_UNDEFINED   , MQCCSI_UNDEFINED, "UNDEFINED/DEFAULT/Q_MGR"),
-	DEF_VALR1(MQCCSI_EMBEDDED    ),
-	DEF_VALR1(MQCCSI_INHERIT     ),
-	DEF_VALR1(MQCCSI_APPL        ),
-	DEF_VALR1(MQCCSI_AS_PUBLISHED),
-	DEF_VALR3(MQCCSI_1           ,MQCCSI_65535, ""),
+    DEF_VALR3(MQCCSI_UNDEFINED   , MQCCSI_UNDEFINED, "UNDEFINED/DEFAULT/Q_MGR"),
+    DEF_VALR1(MQCCSI_EMBEDDED    ),
+    DEF_VALR1(MQCCSI_INHERIT     ),
+    DEF_VALR1(MQCCSI_APPL        ),
+    DEF_VALR1(MQCCSI_AS_PUBLISHED),
+    DEF_VALR3(MQCCSI_1           ,MQCCSI_65535, ""),
 DEF_VALRE;
 
 DEF_VALSBX(mqat)
-	DEF_VALS1(MQAT_UNKNOWN          ),
-	DEF_VALS1(MQAT_NO_CONTEXT       ),
-	DEF_VALS1(MQAT_CICS             ),
-	DEF_VALS2(MQAT_ZOS,"MQAT_MVS/MQAT_OS390/MQAT_ZOS"),
-	DEF_VALS1(MQAT_IMS              ),
-	DEF_VALS1(MQAT_OS2              ),
-	DEF_VALS1(MQAT_DOS              ),
-	DEF_VALS2(MQAT_UNIX,"MQAT_AIX/MQAT_UNIX"),
-	DEF_VALS1(MQAT_QMGR             ),
-	DEF_VALS1(MQAT_OS400            ),
-	DEF_VALS1(MQAT_WINDOWS          ),
-	DEF_VALS1(MQAT_CICS_VSE         ),
-	DEF_VALS1(MQAT_WINDOWS_NT       ),
-	DEF_VALS1(MQAT_VMS              ),
-	DEF_VALS2(MQAT_GUARDIAN,"MQAT_NSK/MQAT_GUARDIAN"),
-	DEF_VALS1(MQAT_VOS              ),
-	DEF_VALS1(MQAT_OPEN_TP1         ),
-	DEF_VALS1(MQAT_VM               ),
-	DEF_VALS1(MQAT_IMS_BRIDGE       ),
-	DEF_VALS1(MQAT_XCF              ),
-	DEF_VALS1(MQAT_CICS_BRIDGE      ),
-	DEF_VALS1(MQAT_NOTES_AGENT      ),
-	DEF_VALS1(MQAT_TPF              ),
-	DEF_VALS1(MQAT_USER             ),
-	DEF_VALS2(MQAT_QMGR_PUBLISH,"MQAT_QMGR_PUBLISH/MQAT_BROKER"),
-	DEF_VALS1(MQAT_JAVA             ),
-	DEF_VALS1(MQAT_DQM              ),
-	DEF_VALS1(MQAT_CHANNEL_INITIATOR),
-	DEF_VALS1(MQAT_WLM              ),
-	DEF_VALS1(MQAT_BATCH            ),
-	DEF_VALS1(MQAT_RRS_BATCH        ),
-	DEF_VALS1(MQAT_SIB              ),
-	DEF_VALS1(MQAT_SYSTEM_EXTENSION ),
-	DEF_VALS1(MQAT_MCAST_PUBLISH    ),
-	DEF_VALS1(MQAT_UNKNOWN          ),
+    DEF_VALS1(MQAT_UNKNOWN          ),
+    DEF_VALS1(MQAT_NO_CONTEXT       ),
+    DEF_VALS1(MQAT_CICS             ),
+    DEF_VALS2(MQAT_ZOS,"MQAT_MVS/MQAT_OS390/MQAT_ZOS"),
+    DEF_VALS1(MQAT_IMS              ),
+    DEF_VALS1(MQAT_OS2              ),
+    DEF_VALS1(MQAT_DOS              ),
+    DEF_VALS2(MQAT_UNIX,"MQAT_AIX/MQAT_UNIX"),
+    DEF_VALS1(MQAT_QMGR             ),
+    DEF_VALS1(MQAT_OS400            ),
+    DEF_VALS1(MQAT_WINDOWS          ),
+    DEF_VALS1(MQAT_CICS_VSE         ),
+    DEF_VALS1(MQAT_WINDOWS_NT       ),
+    DEF_VALS1(MQAT_VMS              ),
+    DEF_VALS2(MQAT_GUARDIAN,"MQAT_NSK/MQAT_GUARDIAN"),
+    DEF_VALS1(MQAT_VOS              ),
+    DEF_VALS1(MQAT_OPEN_TP1         ),
+    DEF_VALS1(MQAT_VM               ),
+    DEF_VALS1(MQAT_IMS_BRIDGE       ),
+    DEF_VALS1(MQAT_XCF              ),
+    DEF_VALS1(MQAT_CICS_BRIDGE      ),
+    DEF_VALS1(MQAT_NOTES_AGENT      ),
+    DEF_VALS1(MQAT_TPF              ),
+    DEF_VALS1(MQAT_USER             ),
+    DEF_VALS2(MQAT_QMGR_PUBLISH,"MQAT_QMGR_PUBLISH/MQAT_BROKER"),
+    DEF_VALS1(MQAT_JAVA             ),
+    DEF_VALS1(MQAT_DQM              ),
+    DEF_VALS1(MQAT_CHANNEL_INITIATOR),
+    DEF_VALS1(MQAT_WLM              ),
+    DEF_VALS1(MQAT_BATCH            ),
+    DEF_VALS1(MQAT_RRS_BATCH        ),
+    DEF_VALS1(MQAT_SIB              ),
+    DEF_VALS1(MQAT_SYSTEM_EXTENSION ),
+    DEF_VALS1(MQAT_MCAST_PUBLISH    ),
+    DEF_VALS1(MQAT_UNKNOWN          ),
 DEF_VALSE;
 
 DEF_VALSBX(mqcc)
-	DEF_VALS1(MQCC_OK     ),
-	DEF_VALS1(MQCC_WARNING),
-	DEF_VALS1(MQCC_FAILED ),
-	DEF_VALS1(MQCC_UNKNOWN),
+    DEF_VALS1(MQCC_OK     ),
+    DEF_VALS1(MQCC_WARNING),
+    DEF_VALS1(MQCC_FAILED ),
+    DEF_VALS1(MQCC_UNKNOWN),
 DEF_VALSE;
 
 DEF_VALSBX(mqrc)
-	DEF_VALS1(MQRC_NONE                      ),
-	DEF_VALS1(MQRC_ALIAS_BASE_Q_TYPE_ERROR   ),
-	DEF_VALS1(MQRC_ALREADY_CONNECTED         ),
-	DEF_VALS1(MQRC_BACKED_OUT                ),
-	DEF_VALS1(MQRC_BUFFER_ERROR              ),
-	DEF_VALS1(MQRC_BUFFER_LENGTH_ERROR       ),
-	DEF_VALS1(MQRC_CHAR_ATTR_LENGTH_ERROR    ),
-	DEF_VALS1(MQRC_CHAR_ATTRS_ERROR          ),
-	DEF_VALS1(MQRC_CHAR_ATTRS_TOO_SHORT      ),
-	DEF_VALS1(MQRC_CONNECTION_BROKEN         ),
-	DEF_VALS1(MQRC_DATA_LENGTH_ERROR         ),
-	DEF_VALS1(MQRC_DYNAMIC_Q_NAME_ERROR      ),
-	DEF_VALS1(MQRC_ENVIRONMENT_ERROR         ),
-	DEF_VALS1(MQRC_EXPIRY_ERROR              ),
-	DEF_VALS1(MQRC_FEEDBACK_ERROR            ),
-	DEF_VALS1(MQRC_GET_INHIBITED             ),
-	DEF_VALS1(MQRC_HANDLE_NOT_AVAILABLE      ),
-	DEF_VALS1(MQRC_HCONN_ERROR               ),
-	DEF_VALS1(MQRC_HOBJ_ERROR                ),
-	DEF_VALS1(MQRC_INHIBIT_VALUE_ERROR       ),
-	DEF_VALS1(MQRC_INT_ATTR_COUNT_ERROR      ),
-	DEF_VALS1(MQRC_INT_ATTR_COUNT_TOO_SMALL  ),
-	DEF_VALS1(MQRC_INT_ATTRS_ARRAY_ERROR     ),
-	DEF_VALS1(MQRC_SYNCPOINT_LIMIT_REACHED   ),
-	DEF_VALS1(MQRC_MAX_CONNS_LIMIT_REACHED   ),
-	DEF_VALS1(MQRC_MD_ERROR                  ),
-	DEF_VALS1(MQRC_MISSING_REPLY_TO_Q        ),
-	DEF_VALS1(MQRC_MSG_TYPE_ERROR            ),
-	DEF_VALS1(MQRC_MSG_TOO_BIG_FOR_Q         ),
-	DEF_VALS1(MQRC_MSG_TOO_BIG_FOR_Q_MGR     ),
-	DEF_VALS1(MQRC_NO_MSG_AVAILABLE          ),
-	DEF_VALS1(MQRC_NO_MSG_UNDER_CURSOR       ),
-	DEF_VALS1(MQRC_NOT_AUTHORIZED            ),
-	DEF_VALS1(MQRC_NOT_OPEN_FOR_BROWSE       ),
-	DEF_VALS1(MQRC_NOT_OPEN_FOR_INPUT        ),
-	DEF_VALS1(MQRC_NOT_OPEN_FOR_INQUIRE      ),
-	DEF_VALS1(MQRC_NOT_OPEN_FOR_OUTPUT       ),
-	DEF_VALS1(MQRC_NOT_OPEN_FOR_SET          ),
-	DEF_VALS1(MQRC_OBJECT_CHANGED            ),
-	DEF_VALS1(MQRC_OBJECT_IN_USE             ),
-	DEF_VALS1(MQRC_OBJECT_TYPE_ERROR         ),
-	DEF_VALS1(MQRC_OD_ERROR                  ),
-	DEF_VALS1(MQRC_OPTION_NOT_VALID_FOR_TYPE ),
-	DEF_VALS1(MQRC_OPTIONS_ERROR             ),
-	DEF_VALS1(MQRC_PERSISTENCE_ERROR         ),
-	DEF_VALS1(MQRC_PERSISTENT_NOT_ALLOWED    ),
-	DEF_VALS1(MQRC_PRIORITY_EXCEEDS_MAXIMUM  ),
-	DEF_VALS1(MQRC_PRIORITY_ERROR            ),
-	DEF_VALS1(MQRC_PUT_INHIBITED             ),
-	DEF_VALS1(MQRC_Q_DELETED                 ),
-	DEF_VALS1(MQRC_Q_FULL                    ),
-	DEF_VALS1(MQRC_Q_NOT_EMPTY               ),
-	DEF_VALS1(MQRC_Q_SPACE_NOT_AVAILABLE     ),
-	DEF_VALS1(MQRC_Q_TYPE_ERROR              ),
-	DEF_VALS1(MQRC_Q_MGR_NAME_ERROR          ),
-	DEF_VALS1(MQRC_Q_MGR_NOT_AVAILABLE       ),
-	DEF_VALS1(MQRC_REPORT_OPTIONS_ERROR      ),
-	DEF_VALS1(MQRC_SECOND_MARK_NOT_ALLOWED   ),
-	DEF_VALS1(MQRC_SECURITY_ERROR            ),
-	DEF_VALS1(MQRC_SELECTOR_COUNT_ERROR      ),
-	DEF_VALS1(MQRC_SELECTOR_LIMIT_EXCEEDED   ),
-	DEF_VALS1(MQRC_SELECTOR_ERROR            ),
-	DEF_VALS1(MQRC_SELECTOR_NOT_FOR_TYPE     ),
-	DEF_VALS1(MQRC_SIGNAL_OUTSTANDING        ),
-	DEF_VALS1(MQRC_SIGNAL_REQUEST_ACCEPTED   ),
-	DEF_VALS1(MQRC_STORAGE_NOT_AVAILABLE     ),
-	DEF_VALS1(MQRC_SYNCPOINT_NOT_AVAILABLE   ),
-	DEF_VALS1(MQRC_TRIGGER_CONTROL_ERROR     ),
-	DEF_VALS1(MQRC_TRIGGER_DEPTH_ERROR       ),
-	DEF_VALS1(MQRC_TRIGGER_MSG_PRIORITY_ERR  ),
-	DEF_VALS1(MQRC_TRIGGER_TYPE_ERROR        ),
-	DEF_VALS1(MQRC_TRUNCATED_MSG_ACCEPTED    ),
-	DEF_VALS1(MQRC_TRUNCATED_MSG_FAILED      ),
-	DEF_VALS1(MQRC_UNKNOWN_ALIAS_BASE_Q      ),
-	DEF_VALS1(MQRC_UNKNOWN_OBJECT_NAME       ),
-	DEF_VALS1(MQRC_UNKNOWN_OBJECT_Q_MGR      ),
-	DEF_VALS1(MQRC_UNKNOWN_REMOTE_Q_MGR      ),
-	DEF_VALS1(MQRC_WAIT_INTERVAL_ERROR       ),
-	DEF_VALS1(MQRC_XMIT_Q_TYPE_ERROR         ),
-	DEF_VALS1(MQRC_XMIT_Q_USAGE_ERROR        ),
-	DEF_VALS1(MQRC_NOT_OPEN_FOR_PASS_ALL     ),
-	DEF_VALS1(MQRC_NOT_OPEN_FOR_PASS_IDENT   ),
-	DEF_VALS1(MQRC_NOT_OPEN_FOR_SET_ALL      ),
-	DEF_VALS1(MQRC_NOT_OPEN_FOR_SET_IDENT    ),
-	DEF_VALS1(MQRC_CONTEXT_HANDLE_ERROR      ),
-	DEF_VALS1(MQRC_CONTEXT_NOT_AVAILABLE     ),
-	DEF_VALS1(MQRC_SIGNAL1_ERROR             ),
-	DEF_VALS1(MQRC_OBJECT_ALREADY_EXISTS     ),
-	DEF_VALS1(MQRC_OBJECT_DAMAGED            ),
-	DEF_VALS1(MQRC_RESOURCE_PROBLEM          ),
-	DEF_VALS1(MQRC_ANOTHER_Q_MGR_CONNECTED   ),
-	DEF_VALS1(MQRC_UNKNOWN_REPORT_OPTION     ),
-	DEF_VALS1(MQRC_STORAGE_CLASS_ERROR       ),
-	DEF_VALS1(MQRC_COD_NOT_VALID_FOR_XCF_Q   ),
-	DEF_VALS1(MQRC_XWAIT_CANCELED            ),
-	DEF_VALS1(MQRC_XWAIT_ERROR               ),
-	DEF_VALS1(MQRC_SUPPRESSED_BY_EXIT        ),
-	DEF_VALS1(MQRC_FORMAT_ERROR              ),
-	DEF_VALS1(MQRC_SOURCE_CCSID_ERROR        ),
-	DEF_VALS1(MQRC_SOURCE_INTEGER_ENC_ERROR  ),
-	DEF_VALS1(MQRC_SOURCE_DECIMAL_ENC_ERROR  ),
-	DEF_VALS1(MQRC_SOURCE_FLOAT_ENC_ERROR    ),
-	DEF_VALS1(MQRC_TARGET_CCSID_ERROR        ),
-	DEF_VALS1(MQRC_TARGET_INTEGER_ENC_ERROR  ),
-	DEF_VALS1(MQRC_TARGET_DECIMAL_ENC_ERROR  ),
-	DEF_VALS1(MQRC_TARGET_FLOAT_ENC_ERROR    ),
-	DEF_VALS1(MQRC_NOT_CONVERTED             ),
-	DEF_VALS1(MQRC_CONVERTED_MSG_TOO_BIG     ),
-	DEF_VALS1(MQRC_TRUNCATED                 ),
-	DEF_VALS1(MQRC_NO_EXTERNAL_PARTICIPANTS  ),
-	DEF_VALS1(MQRC_PARTICIPANT_NOT_AVAILABLE ),
-	DEF_VALS1(MQRC_OUTCOME_MIXED             ),
-	DEF_VALS1(MQRC_OUTCOME_PENDING           ),
-	DEF_VALS1(MQRC_BRIDGE_STARTED            ),
-	DEF_VALS1(MQRC_BRIDGE_STOPPED            ),
-	DEF_VALS1(MQRC_ADAPTER_STORAGE_SHORTAGE  ),
-	DEF_VALS1(MQRC_UOW_IN_PROGRESS           ),
-	DEF_VALS1(MQRC_ADAPTER_CONN_LOAD_ERROR   ),
-	DEF_VALS1(MQRC_ADAPTER_SERV_LOAD_ERROR   ),
-	DEF_VALS1(MQRC_ADAPTER_DEFS_ERROR        ),
-	DEF_VALS1(MQRC_ADAPTER_DEFS_LOAD_ERROR   ),
-	DEF_VALS1(MQRC_ADAPTER_CONV_LOAD_ERROR   ),
-	DEF_VALS1(MQRC_BO_ERROR                  ),
-	DEF_VALS1(MQRC_DH_ERROR                  ),
-	DEF_VALS1(MQRC_MULTIPLE_REASONS          ),
-	DEF_VALS1(MQRC_OPEN_FAILED               ),
-	DEF_VALS1(MQRC_ADAPTER_DISC_LOAD_ERROR   ),
-	DEF_VALS1(MQRC_CNO_ERROR                 ),
-	DEF_VALS1(MQRC_CICS_WAIT_FAILED          ),
-	DEF_VALS1(MQRC_DLH_ERROR                 ),
-	DEF_VALS1(MQRC_HEADER_ERROR              ),
-	DEF_VALS1(MQRC_SOURCE_LENGTH_ERROR       ),
-	DEF_VALS1(MQRC_TARGET_LENGTH_ERROR       ),
-	DEF_VALS1(MQRC_SOURCE_BUFFER_ERROR       ),
-	DEF_VALS1(MQRC_TARGET_BUFFER_ERROR       ),
-	DEF_VALS1(MQRC_IIH_ERROR                 ),
-	DEF_VALS1(MQRC_PCF_ERROR                 ),
-	DEF_VALS1(MQRC_DBCS_ERROR                ),
-	DEF_VALS1(MQRC_OBJECT_NAME_ERROR         ),
-	DEF_VALS1(MQRC_OBJECT_Q_MGR_NAME_ERROR   ),
-	DEF_VALS1(MQRC_RECS_PRESENT_ERROR        ),
-	DEF_VALS1(MQRC_OBJECT_RECORDS_ERROR      ),
-	DEF_VALS1(MQRC_RESPONSE_RECORDS_ERROR    ),
-	DEF_VALS1(MQRC_ASID_MISMATCH             ),
-	DEF_VALS1(MQRC_PMO_RECORD_FLAGS_ERROR    ),
-	DEF_VALS1(MQRC_PUT_MSG_RECORDS_ERROR     ),
-	DEF_VALS1(MQRC_CONN_ID_IN_USE            ),
-	DEF_VALS1(MQRC_Q_MGR_QUIESCING           ),
-	DEF_VALS1(MQRC_Q_MGR_STOPPING            ),
-	DEF_VALS1(MQRC_DUPLICATE_RECOV_COORD     ),
-	DEF_VALS1(MQRC_PMO_ERROR                 ),
-	DEF_VALS1(MQRC_API_EXIT_NOT_FOUND        ),
-	DEF_VALS1(MQRC_API_EXIT_LOAD_ERROR       ),
-	DEF_VALS1(MQRC_REMOTE_Q_NAME_ERROR       ),
-	DEF_VALS1(MQRC_INCONSISTENT_PERSISTENCE  ),
-	DEF_VALS1(MQRC_GMO_ERROR                 ),
-	DEF_VALS1(MQRC_CICS_BRIDGE_RESTRICTION   ),
-	DEF_VALS1(MQRC_STOPPED_BY_CLUSTER_EXIT   ),
-	DEF_VALS1(MQRC_CLUSTER_RESOLUTION_ERROR  ),
-	DEF_VALS1(MQRC_CONVERTED_STRING_TOO_BIG  ),
-	DEF_VALS1(MQRC_TMC_ERROR                 ),
-	DEF_VALS1(MQRC_PAGESET_FULL              ),
-	DEF_VALS1(MQRC_STORAGE_MEDIUM_FULL       ),
-	DEF_VALS1(MQRC_PAGESET_ERROR             ),
-	DEF_VALS1(MQRC_NAME_NOT_VALID_FOR_TYPE   ),
-	DEF_VALS1(MQRC_UNEXPECTED_ERROR          ),
-	DEF_VALS1(MQRC_UNKNOWN_XMIT_Q            ),
-	DEF_VALS1(MQRC_UNKNOWN_DEF_XMIT_Q        ),
-	DEF_VALS1(MQRC_DEF_XMIT_Q_TYPE_ERROR     ),
-	DEF_VALS1(MQRC_DEF_XMIT_Q_USAGE_ERROR    ),
-	DEF_VALS1(MQRC_MSG_MARKED_BROWSE_CO_OP   ),
-	DEF_VALS1(MQRC_NAME_IN_USE               ),
-	DEF_VALS1(MQRC_CONNECTION_QUIESCING      ),
-	DEF_VALS1(MQRC_CONNECTION_STOPPING       ),
-	DEF_VALS1(MQRC_ADAPTER_NOT_AVAILABLE     ),
-	DEF_VALS1(MQRC_MSG_ID_ERROR              ),
-	DEF_VALS1(MQRC_CORREL_ID_ERROR           ),
-	DEF_VALS1(MQRC_FILE_SYSTEM_ERROR         ),
-	DEF_VALS1(MQRC_NO_MSG_LOCKED             ),
-	DEF_VALS1(MQRC_SOAP_DOTNET_ERROR         ),
-	DEF_VALS1(MQRC_SOAP_AXIS_ERROR           ),
-	DEF_VALS1(MQRC_SOAP_URL_ERROR            ),
-	DEF_VALS1(MQRC_FILE_NOT_AUDITED          ),
-	DEF_VALS1(MQRC_CONNECTION_NOT_AUTHORIZED ),
-	DEF_VALS1(MQRC_MSG_TOO_BIG_FOR_CHANNEL   ),
-	DEF_VALS1(MQRC_CALL_IN_PROGRESS          ),
-	DEF_VALS1(MQRC_RMH_ERROR                 ),
-	DEF_VALS1(MQRC_Q_MGR_ACTIVE              ),
-	DEF_VALS1(MQRC_Q_MGR_NOT_ACTIVE          ),
-	DEF_VALS1(MQRC_Q_DEPTH_HIGH              ),
-	DEF_VALS1(MQRC_Q_DEPTH_LOW               ),
-	DEF_VALS1(MQRC_Q_SERVICE_INTERVAL_HIGH   ),
-	DEF_VALS1(MQRC_Q_SERVICE_INTERVAL_OK     ),
-	DEF_VALS1(MQRC_RFH_HEADER_FIELD_ERROR    ),
-	DEF_VALS1(MQRC_RAS_PROPERTY_ERROR        ),
-	DEF_VALS1(MQRC_UNIT_OF_WORK_NOT_STARTED  ),
-	DEF_VALS1(MQRC_CHANNEL_AUTO_DEF_OK       ),
-	DEF_VALS1(MQRC_CHANNEL_AUTO_DEF_ERROR    ),
-	DEF_VALS1(MQRC_CFH_ERROR                 ),
-	DEF_VALS1(MQRC_CFIL_ERROR                ),
-	DEF_VALS1(MQRC_CFIN_ERROR                ),
-	DEF_VALS1(MQRC_CFSL_ERROR                ),
-	DEF_VALS1(MQRC_CFST_ERROR                ),
-	DEF_VALS1(MQRC_INCOMPLETE_GROUP          ),
-	DEF_VALS1(MQRC_INCOMPLETE_MSG            ),
-	DEF_VALS1(MQRC_INCONSISTENT_CCSIDS       ),
-	DEF_VALS1(MQRC_INCONSISTENT_ENCODINGS    ),
-	DEF_VALS1(MQRC_INCONSISTENT_UOW          ),
-	DEF_VALS1(MQRC_INVALID_MSG_UNDER_CURSOR  ),
-	DEF_VALS1(MQRC_MATCH_OPTIONS_ERROR       ),
-	DEF_VALS1(MQRC_MDE_ERROR                 ),
-	DEF_VALS1(MQRC_MSG_FLAGS_ERROR           ),
-	DEF_VALS1(MQRC_MSG_SEQ_NUMBER_ERROR      ),
-	DEF_VALS1(MQRC_OFFSET_ERROR              ),
-	DEF_VALS1(MQRC_ORIGINAL_LENGTH_ERROR     ),
-	DEF_VALS1(MQRC_SEGMENT_LENGTH_ZERO       ),
-	DEF_VALS1(MQRC_UOW_NOT_AVAILABLE         ),
-	DEF_VALS1(MQRC_WRONG_GMO_VERSION         ),
-	DEF_VALS1(MQRC_WRONG_MD_VERSION          ),
-	DEF_VALS1(MQRC_GROUP_ID_ERROR            ),
-	DEF_VALS1(MQRC_INCONSISTENT_BROWSE       ),
-	DEF_VALS1(MQRC_XQH_ERROR                 ),
-	DEF_VALS1(MQRC_SRC_ENV_ERROR             ),
-	DEF_VALS1(MQRC_SRC_NAME_ERROR            ),
-	DEF_VALS1(MQRC_DEST_ENV_ERROR            ),
-	DEF_VALS1(MQRC_DEST_NAME_ERROR           ),
-	DEF_VALS1(MQRC_TM_ERROR                  ),
-	DEF_VALS1(MQRC_CLUSTER_EXIT_ERROR        ),
-	DEF_VALS1(MQRC_CLUSTER_EXIT_LOAD_ERROR   ),
-	DEF_VALS1(MQRC_CLUSTER_PUT_INHIBITED     ),
-	DEF_VALS1(MQRC_CLUSTER_RESOURCE_ERROR    ),
-	DEF_VALS1(MQRC_NO_DESTINATIONS_AVAILABLE ),
-	DEF_VALS1(MQRC_CONN_TAG_IN_USE           ),
-	DEF_VALS1(MQRC_PARTIALLY_CONVERTED       ),
-	DEF_VALS1(MQRC_CONNECTION_ERROR          ),
-	DEF_VALS1(MQRC_OPTION_ENVIRONMENT_ERROR  ),
-	DEF_VALS1(MQRC_CD_ERROR                  ),
-	DEF_VALS1(MQRC_CLIENT_CONN_ERROR         ),
-	DEF_VALS1(MQRC_CHANNEL_STOPPED_BY_USER   ),
-	DEF_VALS1(MQRC_HCONFIG_ERROR             ),
-	DEF_VALS1(MQRC_FUNCTION_ERROR            ),
-	DEF_VALS1(MQRC_CHANNEL_STARTED           ),
-	DEF_VALS1(MQRC_CHANNEL_STOPPED           ),
-	DEF_VALS1(MQRC_CHANNEL_CONV_ERROR        ),
-	DEF_VALS1(MQRC_SERVICE_NOT_AVAILABLE     ),
-	DEF_VALS1(MQRC_INITIALIZATION_FAILED     ),
-	DEF_VALS1(MQRC_TERMINATION_FAILED        ),
-	DEF_VALS1(MQRC_UNKNOWN_Q_NAME            ),
-	DEF_VALS1(MQRC_SERVICE_ERROR             ),
-	DEF_VALS1(MQRC_Q_ALREADY_EXISTS          ),
-	DEF_VALS1(MQRC_USER_ID_NOT_AVAILABLE     ),
-	DEF_VALS1(MQRC_UNKNOWN_ENTITY            ),
-	DEF_VALS1(MQRC_UNKNOWN_AUTH_ENTITY       ),
-	DEF_VALS1(MQRC_UNKNOWN_REF_OBJECT        ),
-	DEF_VALS1(MQRC_CHANNEL_ACTIVATED         ),
-	DEF_VALS1(MQRC_CHANNEL_NOT_ACTIVATED     ),
-	DEF_VALS1(MQRC_UOW_CANCELED              ),
-	DEF_VALS1(MQRC_FUNCTION_NOT_SUPPORTED    ),
-	DEF_VALS1(MQRC_SELECTOR_TYPE_ERROR       ),
-	DEF_VALS1(MQRC_COMMAND_TYPE_ERROR        ),
-	DEF_VALS1(MQRC_MULTIPLE_INSTANCE_ERROR   ),
-	DEF_VALS1(MQRC_SYSTEM_ITEM_NOT_ALTERABLE ),
-	DEF_VALS1(MQRC_BAG_CONVERSION_ERROR      ),
-	DEF_VALS1(MQRC_SELECTOR_OUT_OF_RANGE     ),
-	DEF_VALS1(MQRC_SELECTOR_NOT_UNIQUE       ),
-	DEF_VALS1(MQRC_INDEX_NOT_PRESENT         ),
-	DEF_VALS1(MQRC_STRING_ERROR              ),
-	DEF_VALS1(MQRC_ENCODING_NOT_SUPPORTED    ),
-	DEF_VALS1(MQRC_SELECTOR_NOT_PRESENT      ),
-	DEF_VALS1(MQRC_OUT_SELECTOR_ERROR        ),
-	DEF_VALS1(MQRC_STRING_TRUNCATED          ),
-	DEF_VALS1(MQRC_SELECTOR_WRONG_TYPE       ),
-	DEF_VALS1(MQRC_INCONSISTENT_ITEM_TYPE    ),
-	DEF_VALS1(MQRC_INDEX_ERROR               ),
-	DEF_VALS1(MQRC_SYSTEM_BAG_NOT_ALTERABLE  ),
-	DEF_VALS1(MQRC_ITEM_COUNT_ERROR          ),
-	DEF_VALS1(MQRC_FORMAT_NOT_SUPPORTED      ),
-	DEF_VALS1(MQRC_SELECTOR_NOT_SUPPORTED    ),
-	DEF_VALS1(MQRC_ITEM_VALUE_ERROR          ),
-	DEF_VALS1(MQRC_HBAG_ERROR                ),
-	DEF_VALS1(MQRC_PARAMETER_MISSING         ),
-	DEF_VALS1(MQRC_CMD_SERVER_NOT_AVAILABLE  ),
-	DEF_VALS1(MQRC_STRING_LENGTH_ERROR       ),
-	DEF_VALS1(MQRC_INQUIRY_COMMAND_ERROR     ),
-	DEF_VALS1(MQRC_NESTED_BAG_NOT_SUPPORTED  ),
-	DEF_VALS1(MQRC_BAG_WRONG_TYPE            ),
-	DEF_VALS1(MQRC_ITEM_TYPE_ERROR           ),
-	DEF_VALS1(MQRC_SYSTEM_BAG_NOT_DELETABLE  ),
-	DEF_VALS1(MQRC_SYSTEM_ITEM_NOT_DELETABLE ),
-	DEF_VALS1(MQRC_CODED_CHAR_SET_ID_ERROR   ),
-	DEF_VALS1(MQRC_MSG_TOKEN_ERROR           ),
-	DEF_VALS1(MQRC_MISSING_WIH               ),
-	DEF_VALS1(MQRC_WIH_ERROR                 ),
-	DEF_VALS1(MQRC_RFH_ERROR                 ),
-	DEF_VALS1(MQRC_RFH_STRING_ERROR          ),
-	DEF_VALS1(MQRC_RFH_COMMAND_ERROR         ),
-	DEF_VALS1(MQRC_RFH_PARM_ERROR            ),
-	DEF_VALS1(MQRC_RFH_DUPLICATE_PARM        ),
-	DEF_VALS1(MQRC_RFH_PARM_MISSING          ),
-	DEF_VALS1(MQRC_CHAR_CONVERSION_ERROR     ),
-	DEF_VALS1(MQRC_UCS2_CONVERSION_ERROR     ),
-	DEF_VALS1(MQRC_DB2_NOT_AVAILABLE         ),
-	DEF_VALS1(MQRC_OBJECT_NOT_UNIQUE         ),
-	DEF_VALS1(MQRC_CONN_TAG_NOT_RELEASED     ),
-	DEF_VALS1(MQRC_CF_NOT_AVAILABLE          ),
-	DEF_VALS1(MQRC_CF_STRUC_IN_USE           ),
-	DEF_VALS1(MQRC_CF_STRUC_LIST_HDR_IN_USE  ),
-	DEF_VALS1(MQRC_CF_STRUC_AUTH_FAILED      ),
-	DEF_VALS1(MQRC_CF_STRUC_ERROR            ),
-	DEF_VALS1(MQRC_CONN_TAG_NOT_USABLE       ),
-	DEF_VALS1(MQRC_GLOBAL_UOW_CONFLICT       ),
-	DEF_VALS1(MQRC_LOCAL_UOW_CONFLICT        ),
-	DEF_VALS1(MQRC_HANDLE_IN_USE_FOR_UOW     ),
-	DEF_VALS1(MQRC_UOW_ENLISTMENT_ERROR      ),
-	DEF_VALS1(MQRC_UOW_MIX_NOT_SUPPORTED     ),
-	DEF_VALS1(MQRC_WXP_ERROR                 ),
-	DEF_VALS1(MQRC_CURRENT_RECORD_ERROR      ),
-	DEF_VALS1(MQRC_NEXT_OFFSET_ERROR         ),
-	DEF_VALS1(MQRC_NO_RECORD_AVAILABLE       ),
-	DEF_VALS1(MQRC_OBJECT_LEVEL_INCOMPATIBLE ),
-	DEF_VALS1(MQRC_NEXT_RECORD_ERROR         ),
-	DEF_VALS1(MQRC_BACKOUT_THRESHOLD_REACHED ),
-	DEF_VALS1(MQRC_MSG_NOT_MATCHED           ),
-	DEF_VALS1(MQRC_JMS_FORMAT_ERROR          ),
-	DEF_VALS1(MQRC_SEGMENTS_NOT_SUPPORTED    ),
-	DEF_VALS1(MQRC_WRONG_CF_LEVEL            ),
-	DEF_VALS1(MQRC_CONFIG_CREATE_OBJECT      ),
-	DEF_VALS1(MQRC_CONFIG_CHANGE_OBJECT      ),
-	DEF_VALS1(MQRC_CONFIG_DELETE_OBJECT      ),
-	DEF_VALS1(MQRC_CONFIG_REFRESH_OBJECT     ),
-	DEF_VALS1(MQRC_CHANNEL_SSL_ERROR         ),
-	DEF_VALS1(MQRC_PARTICIPANT_NOT_DEFINED   ),
-	DEF_VALS1(MQRC_CF_STRUC_FAILED           ),
-	DEF_VALS1(MQRC_API_EXIT_ERROR            ),
-	DEF_VALS1(MQRC_API_EXIT_INIT_ERROR       ),
-	DEF_VALS1(MQRC_API_EXIT_TERM_ERROR       ),
-	DEF_VALS1(MQRC_EXIT_REASON_ERROR         ),
-	DEF_VALS1(MQRC_RESERVED_VALUE_ERROR      ),
-	DEF_VALS1(MQRC_NO_DATA_AVAILABLE         ),
-	DEF_VALS1(MQRC_SCO_ERROR                 ),
-	DEF_VALS1(MQRC_KEY_REPOSITORY_ERROR      ),
-	DEF_VALS1(MQRC_CRYPTO_HARDWARE_ERROR     ),
-	DEF_VALS1(MQRC_AUTH_INFO_REC_COUNT_ERROR ),
-	DEF_VALS1(MQRC_AUTH_INFO_REC_ERROR       ),
-	DEF_VALS1(MQRC_AIR_ERROR                 ),
-	DEF_VALS1(MQRC_AUTH_INFO_TYPE_ERROR      ),
-	DEF_VALS1(MQRC_AUTH_INFO_CONN_NAME_ERROR ),
-	DEF_VALS1(MQRC_LDAP_USER_NAME_ERROR      ),
-	DEF_VALS1(MQRC_LDAP_USER_NAME_LENGTH_ERR ),
-	DEF_VALS1(MQRC_LDAP_PASSWORD_ERROR       ),
-	DEF_VALS1(MQRC_SSL_ALREADY_INITIALIZED   ),
-	DEF_VALS1(MQRC_SSL_CONFIG_ERROR          ),
-	DEF_VALS1(MQRC_SSL_INITIALIZATION_ERROR  ),
-	DEF_VALS1(MQRC_Q_INDEX_TYPE_ERROR        ),
-	DEF_VALS1(MQRC_CFBS_ERROR                ),
-	DEF_VALS1(MQRC_SSL_NOT_ALLOWED           ),
-	DEF_VALS1(MQRC_JSSE_ERROR                ),
-	DEF_VALS1(MQRC_SSL_PEER_NAME_MISMATCH    ),
-	DEF_VALS1(MQRC_SSL_PEER_NAME_ERROR       ),
-	DEF_VALS1(MQRC_UNSUPPORTED_CIPHER_SUITE  ),
-	DEF_VALS1(MQRC_SSL_CERTIFICATE_REVOKED   ),
-	DEF_VALS1(MQRC_SSL_CERT_STORE_ERROR      ),
-	DEF_VALS1(MQRC_CLIENT_EXIT_LOAD_ERROR    ),
-	DEF_VALS1(MQRC_CLIENT_EXIT_ERROR         ),
-	DEF_VALS1(MQRC_UOW_COMMITTED             ),
-	DEF_VALS1(MQRC_SSL_KEY_RESET_ERROR       ),
-	DEF_VALS1(MQRC_UNKNOWN_COMPONENT_NAME    ),
-	DEF_VALS1(MQRC_LOGGER_STATUS             ),
-	DEF_VALS1(MQRC_COMMAND_MQSC              ),
-	DEF_VALS1(MQRC_COMMAND_PCF               ),
-	DEF_VALS1(MQRC_CFIF_ERROR                ),
-	DEF_VALS1(MQRC_CFSF_ERROR                ),
-	DEF_VALS1(MQRC_CFGR_ERROR                ),
-	DEF_VALS1(MQRC_MSG_NOT_ALLOWED_IN_GROUP  ),
-	DEF_VALS1(MQRC_FILTER_OPERATOR_ERROR     ),
-	DEF_VALS1(MQRC_NESTED_SELECTOR_ERROR     ),
-	DEF_VALS1(MQRC_EPH_ERROR                 ),
-	DEF_VALS1(MQRC_RFH_FORMAT_ERROR          ),
-	DEF_VALS1(MQRC_CFBF_ERROR                ),
-	DEF_VALS1(MQRC_CLIENT_CHANNEL_CONFLICT   ),
-	DEF_VALS1(MQRC_SD_ERROR                  ),
-	DEF_VALS1(MQRC_TOPIC_STRING_ERROR        ),
-	DEF_VALS1(MQRC_STS_ERROR                 ),
-	DEF_VALS1(MQRC_NO_SUBSCRIPTION           ),
-	DEF_VALS1(MQRC_SUBSCRIPTION_IN_USE       ),
-	DEF_VALS1(MQRC_STAT_TYPE_ERROR           ),
-	DEF_VALS1(MQRC_SUB_USER_DATA_ERROR       ),
-	DEF_VALS1(MQRC_SUB_ALREADY_EXISTS        ),
-	DEF_VALS1(MQRC_IDENTITY_MISMATCH         ),
-	DEF_VALS1(MQRC_ALTER_SUB_ERROR           ),
-	DEF_VALS1(MQRC_DURABILITY_NOT_ALLOWED    ),
-	DEF_VALS1(MQRC_NO_RETAINED_MSG           ),
-	DEF_VALS1(MQRC_SRO_ERROR                 ),
-	DEF_VALS1(MQRC_SUB_NAME_ERROR            ),
-	DEF_VALS1(MQRC_OBJECT_STRING_ERROR       ),
-	DEF_VALS1(MQRC_PROPERTY_NAME_ERROR       ),
-	DEF_VALS1(MQRC_SEGMENTATION_NOT_ALLOWED  ),
-	DEF_VALS1(MQRC_CBD_ERROR                 ),
-	DEF_VALS1(MQRC_CTLO_ERROR                ),
-	DEF_VALS1(MQRC_NO_CALLBACKS_ACTIVE       ),
-	DEF_VALS1(MQRC_CALLBACK_NOT_REGISTERED   ),
-	DEF_VALS1(MQRC_OPTIONS_CHANGED           ),
-	DEF_VALS1(MQRC_READ_AHEAD_MSGS           ),
-	DEF_VALS1(MQRC_SELECTOR_SYNTAX_ERROR     ),
-	DEF_VALS1(MQRC_HMSG_ERROR                ),
-	DEF_VALS1(MQRC_CMHO_ERROR                ),
-	DEF_VALS1(MQRC_DMHO_ERROR                ),
-	DEF_VALS1(MQRC_SMPO_ERROR                ),
-	DEF_VALS1(MQRC_IMPO_ERROR                ),
-	DEF_VALS1(MQRC_PROPERTY_NAME_TOO_BIG     ),
-	DEF_VALS1(MQRC_PROP_VALUE_NOT_CONVERTED  ),
-	DEF_VALS1(MQRC_PROP_TYPE_NOT_SUPPORTED   ),
-	DEF_VALS1(MQRC_PROPERTY_VALUE_TOO_BIG    ),
-	DEF_VALS1(MQRC_PROP_CONV_NOT_SUPPORTED   ),
-	DEF_VALS1(MQRC_PROPERTY_NOT_AVAILABLE    ),
-	DEF_VALS1(MQRC_PROP_NUMBER_FORMAT_ERROR  ),
-	DEF_VALS1(MQRC_PROPERTY_TYPE_ERROR       ),
-	DEF_VALS1(MQRC_PROPERTIES_TOO_BIG        ),
-	DEF_VALS1(MQRC_PUT_NOT_RETAINED          ),
-	DEF_VALS1(MQRC_ALIAS_TARGTYPE_CHANGED    ),
-	DEF_VALS1(MQRC_DMPO_ERROR                ),
-	DEF_VALS1(MQRC_PD_ERROR                  ),
-	DEF_VALS1(MQRC_CALLBACK_TYPE_ERROR       ),
-	DEF_VALS1(MQRC_CBD_OPTIONS_ERROR         ),
-	DEF_VALS1(MQRC_MAX_MSG_LENGTH_ERROR      ),
-	DEF_VALS1(MQRC_CALLBACK_ROUTINE_ERROR    ),
-	DEF_VALS1(MQRC_CALLBACK_LINK_ERROR       ),
-	DEF_VALS1(MQRC_OPERATION_ERROR           ),
-	DEF_VALS1(MQRC_BMHO_ERROR                ),
-	DEF_VALS1(MQRC_UNSUPPORTED_PROPERTY      ),
-	DEF_VALS1(MQRC_PROP_NAME_NOT_CONVERTED   ),
-	DEF_VALS1(MQRC_GET_ENABLED               ),
-	DEF_VALS1(MQRC_MODULE_NOT_FOUND          ),
-	DEF_VALS1(MQRC_MODULE_INVALID            ),
-	DEF_VALS1(MQRC_MODULE_ENTRY_NOT_FOUND    ),
-	DEF_VALS1(MQRC_MIXED_CONTENT_NOT_ALLOWED ),
-	DEF_VALS1(MQRC_MSG_HANDLE_IN_USE         ),
-	DEF_VALS1(MQRC_HCONN_ASYNC_ACTIVE        ),
-	DEF_VALS1(MQRC_MHBO_ERROR                ),
-	DEF_VALS1(MQRC_PUBLICATION_FAILURE       ),
-	DEF_VALS1(MQRC_SUB_INHIBITED             ),
-	DEF_VALS1(MQRC_SELECTOR_ALWAYS_FALSE     ),
-	DEF_VALS1(MQRC_XEPO_ERROR                ),
-	DEF_VALS1(MQRC_DURABILITY_NOT_ALTERABLE  ),
-	DEF_VALS1(MQRC_TOPIC_NOT_ALTERABLE       ),
-	DEF_VALS1(MQRC_SUBLEVEL_NOT_ALTERABLE    ),
-	DEF_VALS1(MQRC_PROPERTY_NAME_LENGTH_ERR  ),
-	DEF_VALS1(MQRC_DUPLICATE_GROUP_SUB       ),
-	DEF_VALS1(MQRC_GROUPING_NOT_ALTERABLE    ),
-	DEF_VALS1(MQRC_SELECTOR_INVALID_FOR_TYPE ),
-	DEF_VALS1(MQRC_HOBJ_QUIESCED             ),
-	DEF_VALS1(MQRC_HOBJ_QUIESCED_NO_MSGS     ),
-	DEF_VALS1(MQRC_SELECTION_STRING_ERROR    ),
-	DEF_VALS1(MQRC_RES_OBJECT_STRING_ERROR   ),
-	DEF_VALS1(MQRC_CONNECTION_SUSPENDED      ),
-	DEF_VALS1(MQRC_INVALID_DESTINATION       ),
-	DEF_VALS1(MQRC_INVALID_SUBSCRIPTION      ),
-	DEF_VALS1(MQRC_SELECTOR_NOT_ALTERABLE    ),
-	DEF_VALS1(MQRC_RETAINED_MSG_Q_ERROR      ),
-	DEF_VALS1(MQRC_RETAINED_NOT_DELIVERED    ),
-	DEF_VALS1(MQRC_RFH_RESTRICTED_FORMAT_ERR ),
-	DEF_VALS1(MQRC_CONNECTION_STOPPED        ),
-	DEF_VALS1(MQRC_ASYNC_UOW_CONFLICT        ),
-	DEF_VALS1(MQRC_ASYNC_XA_CONFLICT         ),
-	DEF_VALS1(MQRC_PUBSUB_INHIBITED          ),
-	DEF_VALS1(MQRC_MSG_HANDLE_COPY_FAILURE   ),
-	DEF_VALS1(MQRC_DEST_CLASS_NOT_ALTERABLE  ),
-	DEF_VALS1(MQRC_OPERATION_NOT_ALLOWED     ),
-	DEF_VALS1(MQRC_ACTION_ERROR              ),
-	DEF_VALS1(MQRC_CHANNEL_NOT_AVAILABLE     ),
-	DEF_VALS1(MQRC_HOST_NOT_AVAILABLE        ),
-	DEF_VALS1(MQRC_CHANNEL_CONFIG_ERROR      ),
-	DEF_VALS1(MQRC_UNKNOWN_CHANNEL_NAME      ),
-	DEF_VALS1(MQRC_LOOPING_PUBLICATION       ),
-	DEF_VALS1(MQRC_ALREADY_JOINED            ),
-	DEF_VALS1(MQRC_STANDBY_Q_MGR             ),
-	DEF_VALS1(MQRC_RECONNECTING              ),
-	DEF_VALS1(MQRC_RECONNECTED               ),
-	DEF_VALS1(MQRC_RECONNECT_QMID_MISMATCH   ),
-	DEF_VALS1(MQRC_RECONNECT_INCOMPATIBLE    ),
-	DEF_VALS1(MQRC_RECONNECT_FAILED          ),
-	DEF_VALS1(MQRC_CALL_INTERRUPTED          ),
-	DEF_VALS1(MQRC_NO_SUBS_MATCHED           ),
-	DEF_VALS1(MQRC_SELECTION_NOT_AVAILABLE   ),
-	DEF_VALS1(MQRC_CHANNEL_SSL_WARNING       ),
-	DEF_VALS1(MQRC_OCSP_URL_ERROR            ),
-	DEF_VALS1(MQRC_CONTENT_ERROR             ),
-	DEF_VALS1(MQRC_RECONNECT_Q_MGR_REQD      ),
-	DEF_VALS1(MQRC_RECONNECT_TIMED_OUT       ),
-	DEF_VALS1(MQRC_PUBLISH_EXIT_ERROR        ),
-	DEF_VALS1(MQRC_SSL_ALT_PROVIDER_REQUIRED ),
-	DEF_VALS1(MQRC_PRECONN_EXIT_LOAD_ERROR   ),
-	DEF_VALS1(MQRC_PRECONN_EXIT_NOT_FOUND    ),
-	DEF_VALS1(MQRC_PRECONN_EXIT_ERROR        ),
-	DEF_VALS1(MQRC_CD_ARRAY_ERROR            ),
-	DEF_VALS1(MQRC_CHANNEL_BLOCKED           ),
-	DEF_VALS1(MQRC_CHANNEL_BLOCKED_WARNING   ),
-	DEF_VALS1(MQRC_SUBSCRIPTION_CREATE       ),
-	DEF_VALS1(MQRC_SUBSCRIPTION_DELETE       ),
-	DEF_VALS1(MQRC_SUBSCRIPTION_CHANGE       ),
-	DEF_VALS1(MQRC_SUBSCRIPTION_REFRESH      ),
-	DEF_VALS1(MQRC_INSTALLATION_MISMATCH     ),
-	DEF_VALS1(MQRC_NOT_PRIVILEGED            ),
-	DEF_VALS1(MQRC_PROPERTIES_DISABLED       ),
-	DEF_VALS1(MQRC_HMSG_NOT_AVAILABLE        ),
-	DEF_VALS1(MQRC_EXIT_PROPS_NOT_SUPPORTED  ),
-	DEF_VALS1(MQRC_INSTALLATION_MISSING      ),
-	DEF_VALS1(MQRC_FASTPATH_NOT_AVAILABLE    ),
-	DEF_VALS1(MQRC_CIPHER_SPEC_NOT_SUITE_B   ),
-	DEF_VALS1(MQRC_SUITE_B_ERROR             ),
-	DEF_VALS1(MQRC_CERT_VAL_POLICY_ERROR     ),
-
-	DEF_VALS1(MQRCCF_CFH_TYPE_ERROR             ),
-	DEF_VALS1(MQRCCF_CFH_LENGTH_ERROR           ),
-	DEF_VALS1(MQRCCF_CFH_VERSION_ERROR          ),
-	DEF_VALS1(MQRCCF_CFH_MSG_SEQ_NUMBER_ERR     ),
-	DEF_VALS1(MQRCCF_CFH_CONTROL_ERROR          ),
-	DEF_VALS1(MQRCCF_CFH_PARM_COUNT_ERROR       ),
-	DEF_VALS1(MQRCCF_CFH_COMMAND_ERROR          ),
-	DEF_VALS1(MQRCCF_COMMAND_FAILED             ),
-	DEF_VALS1(MQRCCF_CFIN_LENGTH_ERROR          ),
-	DEF_VALS1(MQRCCF_CFST_LENGTH_ERROR          ),
-	DEF_VALS1(MQRCCF_CFST_STRING_LENGTH_ERR     ),
-	DEF_VALS1(MQRCCF_FORCE_VALUE_ERROR          ),
-	DEF_VALS1(MQRCCF_STRUCTURE_TYPE_ERROR       ),
-	DEF_VALS1(MQRCCF_CFIN_PARM_ID_ERROR         ),
-	DEF_VALS1(MQRCCF_CFST_PARM_ID_ERROR         ),
-	DEF_VALS1(MQRCCF_MSG_LENGTH_ERROR           ),
-	DEF_VALS1(MQRCCF_CFIN_DUPLICATE_PARM        ),
-	DEF_VALS1(MQRCCF_CFST_DUPLICATE_PARM        ),
-	DEF_VALS1(MQRCCF_PARM_COUNT_TOO_SMALL       ),
-	DEF_VALS1(MQRCCF_PARM_COUNT_TOO_BIG         ),
-	DEF_VALS1(MQRCCF_Q_ALREADY_IN_CELL          ),
-	DEF_VALS1(MQRCCF_Q_TYPE_ERROR               ),
-	DEF_VALS1(MQRCCF_MD_FORMAT_ERROR            ),
-	DEF_VALS1(MQRCCF_CFSL_LENGTH_ERROR          ),
-	DEF_VALS1(MQRCCF_REPLACE_VALUE_ERROR        ),
-	DEF_VALS1(MQRCCF_CFIL_DUPLICATE_VALUE       ),
-	DEF_VALS1(MQRCCF_CFIL_COUNT_ERROR           ),
-	DEF_VALS1(MQRCCF_CFIL_LENGTH_ERROR          ),
-	DEF_VALS1(MQRCCF_QUIESCE_VALUE_ERROR        ),
-	DEF_VALS1(MQRCCF_MODE_VALUE_ERROR           ),
-	DEF_VALS1(MQRCCF_MSG_SEQ_NUMBER_ERROR       ),
-	DEF_VALS1(MQRCCF_PING_DATA_COUNT_ERROR      ),
-	DEF_VALS1(MQRCCF_PING_DATA_COMPARE_ERROR    ),
-	DEF_VALS1(MQRCCF_CFSL_PARM_ID_ERROR         ),
-	DEF_VALS1(MQRCCF_CHANNEL_TYPE_ERROR         ),
-	DEF_VALS1(MQRCCF_PARM_SEQUENCE_ERROR        ),
-	DEF_VALS1(MQRCCF_XMIT_PROTOCOL_TYPE_ERR     ),
-	DEF_VALS1(MQRCCF_BATCH_SIZE_ERROR           ),
-	DEF_VALS1(MQRCCF_DISC_INT_ERROR             ),
-	DEF_VALS1(MQRCCF_SHORT_RETRY_ERROR          ),
-	DEF_VALS1(MQRCCF_SHORT_TIMER_ERROR          ),
-	DEF_VALS1(MQRCCF_LONG_RETRY_ERROR           ),
-	DEF_VALS1(MQRCCF_LONG_TIMER_ERROR           ),
-	DEF_VALS1(MQRCCF_SEQ_NUMBER_WRAP_ERROR      ),
-	DEF_VALS1(MQRCCF_MAX_MSG_LENGTH_ERROR       ),
-	DEF_VALS1(MQRCCF_PUT_AUTH_ERROR             ),
-	DEF_VALS1(MQRCCF_PURGE_VALUE_ERROR          ),
-	DEF_VALS1(MQRCCF_CFIL_PARM_ID_ERROR         ),
-	DEF_VALS1(MQRCCF_MSG_TRUNCATED              ),
-	DEF_VALS1(MQRCCF_CCSID_ERROR                ),
-	DEF_VALS1(MQRCCF_ENCODING_ERROR             ),
-	DEF_VALS1(MQRCCF_QUEUES_VALUE_ERROR         ),
-	DEF_VALS1(MQRCCF_DATA_CONV_VALUE_ERROR      ),
-	DEF_VALS1(MQRCCF_INDOUBT_VALUE_ERROR        ),
-	DEF_VALS1(MQRCCF_ESCAPE_TYPE_ERROR          ),
-	DEF_VALS1(MQRCCF_REPOS_VALUE_ERROR          ),
-	DEF_VALS1(MQRCCF_CHANNEL_TABLE_ERROR        ),
-	DEF_VALS1(MQRCCF_MCA_TYPE_ERROR             ),
-	DEF_VALS1(MQRCCF_CHL_INST_TYPE_ERROR        ),
-	DEF_VALS1(MQRCCF_CHL_STATUS_NOT_FOUND       ),
-	DEF_VALS1(MQRCCF_CFSL_DUPLICATE_PARM        ),
-	DEF_VALS1(MQRCCF_CFSL_TOTAL_LENGTH_ERROR    ),
-	DEF_VALS1(MQRCCF_CFSL_COUNT_ERROR           ),
-	DEF_VALS1(MQRCCF_CFSL_STRING_LENGTH_ERR     ),
-	DEF_VALS1(MQRCCF_BROKER_DELETED             ),
-	DEF_VALS1(MQRCCF_STREAM_ERROR               ),
-	DEF_VALS1(MQRCCF_TOPIC_ERROR                ),
-	DEF_VALS1(MQRCCF_NOT_REGISTERED             ),
-	DEF_VALS1(MQRCCF_Q_MGR_NAME_ERROR           ),
-	DEF_VALS1(MQRCCF_INCORRECT_STREAM           ),
-	DEF_VALS1(MQRCCF_Q_NAME_ERROR               ),
-	DEF_VALS1(MQRCCF_NO_RETAINED_MSG            ),
-	DEF_VALS1(MQRCCF_DUPLICATE_IDENTITY         ),
-	DEF_VALS1(MQRCCF_INCORRECT_Q                ),
-	DEF_VALS1(MQRCCF_CORREL_ID_ERROR            ),
-	DEF_VALS1(MQRCCF_NOT_AUTHORIZED             ),
-	DEF_VALS1(MQRCCF_UNKNOWN_STREAM             ),
-	DEF_VALS1(MQRCCF_REG_OPTIONS_ERROR          ),
-	DEF_VALS1(MQRCCF_PUB_OPTIONS_ERROR          ),
-	DEF_VALS1(MQRCCF_UNKNOWN_BROKER             ),
-	DEF_VALS1(MQRCCF_Q_MGR_CCSID_ERROR          ),
-	DEF_VALS1(MQRCCF_DEL_OPTIONS_ERROR          ),
-	DEF_VALS1(MQRCCF_CLUSTER_NAME_CONFLICT      ),
-	DEF_VALS1(MQRCCF_REPOS_NAME_CONFLICT        ),
-	DEF_VALS1(MQRCCF_CLUSTER_Q_USAGE_ERROR      ),
-	DEF_VALS1(MQRCCF_ACTION_VALUE_ERROR         ),
-	DEF_VALS1(MQRCCF_COMMS_LIBRARY_ERROR        ),
-	DEF_VALS1(MQRCCF_NETBIOS_NAME_ERROR         ),
-	DEF_VALS1(MQRCCF_BROKER_COMMAND_FAILED      ),
-	DEF_VALS1(MQRCCF_CFST_CONFLICTING_PARM      ),
-	DEF_VALS1(MQRCCF_PATH_NOT_VALID             ),
-	DEF_VALS1(MQRCCF_PARM_SYNTAX_ERROR          ),
-	DEF_VALS1(MQRCCF_PWD_LENGTH_ERROR           ),
-	DEF_VALS1(MQRCCF_FILTER_ERROR               ),
-	DEF_VALS1(MQRCCF_WRONG_USER                 ),
-	DEF_VALS1(MQRCCF_DUPLICATE_SUBSCRIPTION     ),
-	DEF_VALS1(MQRCCF_SUB_NAME_ERROR             ),
-	DEF_VALS1(MQRCCF_SUB_IDENTITY_ERROR         ),
-	DEF_VALS1(MQRCCF_SUBSCRIPTION_IN_USE        ),
-	DEF_VALS1(MQRCCF_SUBSCRIPTION_LOCKED        ),
-	DEF_VALS1(MQRCCF_ALREADY_JOINED             ),
-	DEF_VALS1(MQRCCF_OBJECT_IN_USE              ),
-	DEF_VALS1(MQRCCF_UNKNOWN_FILE_NAME          ),
-	DEF_VALS1(MQRCCF_FILE_NOT_AVAILABLE         ),
-	DEF_VALS1(MQRCCF_DISC_RETRY_ERROR           ),
-	DEF_VALS1(MQRCCF_ALLOC_RETRY_ERROR          ),
-	DEF_VALS1(MQRCCF_ALLOC_SLOW_TIMER_ERROR     ),
-	DEF_VALS1(MQRCCF_ALLOC_FAST_TIMER_ERROR     ),
-	DEF_VALS1(MQRCCF_PORT_NUMBER_ERROR          ),
-	DEF_VALS1(MQRCCF_CHL_SYSTEM_NOT_ACTIVE      ),
-	DEF_VALS1(MQRCCF_ENTITY_NAME_MISSING        ),
-	DEF_VALS1(MQRCCF_PROFILE_NAME_ERROR         ),
-	DEF_VALS1(MQRCCF_AUTH_VALUE_ERROR           ),
-	DEF_VALS1(MQRCCF_AUTH_VALUE_MISSING         ),
-	DEF_VALS1(MQRCCF_OBJECT_TYPE_MISSING        ),
-	DEF_VALS1(MQRCCF_CONNECTION_ID_ERROR        ),
-	DEF_VALS1(MQRCCF_LOG_TYPE_ERROR             ),
-	DEF_VALS1(MQRCCF_PROGRAM_NOT_AVAILABLE      ),
-	DEF_VALS1(MQRCCF_PROGRAM_AUTH_FAILED        ),
-	DEF_VALS1(MQRCCF_NONE_FOUND                 ),
-	DEF_VALS1(MQRCCF_SECURITY_SWITCH_OFF        ),
-	DEF_VALS1(MQRCCF_SECURITY_REFRESH_FAILED    ),
-	DEF_VALS1(MQRCCF_PARM_CONFLICT              ),
-	DEF_VALS1(MQRCCF_COMMAND_INHIBITED          ),
-	DEF_VALS1(MQRCCF_OBJECT_BEING_DELETED       ),
-	DEF_VALS1(MQRCCF_STORAGE_CLASS_IN_USE       ),
-	DEF_VALS1(MQRCCF_OBJECT_NAME_RESTRICTED     ),
-	DEF_VALS1(MQRCCF_OBJECT_LIMIT_EXCEEDED      ),
-	DEF_VALS1(MQRCCF_OBJECT_OPEN_FORCE          ),
-	DEF_VALS1(MQRCCF_DISPOSITION_CONFLICT       ),
-	DEF_VALS1(MQRCCF_Q_MGR_NOT_IN_QSG           ),
-	DEF_VALS1(MQRCCF_ATTR_VALUE_FIXED           ),
-	DEF_VALS1(MQRCCF_NAMELIST_ERROR             ),
-	DEF_VALS1(MQRCCF_NO_CHANNEL_INITIATOR       ),
-	DEF_VALS1(MQRCCF_CHANNEL_INITIATOR_ERROR    ),
-	DEF_VALS1(MQRCCF_COMMAND_LEVEL_CONFLICT     ),
-	DEF_VALS1(MQRCCF_Q_ATTR_CONFLICT            ),
-	DEF_VALS1(MQRCCF_EVENTS_DISABLED            ),
-	DEF_VALS1(MQRCCF_COMMAND_SCOPE_ERROR        ),
-	DEF_VALS1(MQRCCF_COMMAND_REPLY_ERROR        ),
-	DEF_VALS1(MQRCCF_FUNCTION_RESTRICTED        ),
-	DEF_VALS1(MQRCCF_PARM_MISSING               ),
-	DEF_VALS1(MQRCCF_PARM_VALUE_ERROR           ),
-	DEF_VALS1(MQRCCF_COMMAND_LENGTH_ERROR       ),
-	DEF_VALS1(MQRCCF_COMMAND_ORIGIN_ERROR       ),
-	DEF_VALS1(MQRCCF_LISTENER_CONFLICT          ),
-	DEF_VALS1(MQRCCF_LISTENER_STARTED           ),
-	DEF_VALS1(MQRCCF_LISTENER_STOPPED           ),
-	DEF_VALS1(MQRCCF_CHANNEL_ERROR              ),
-	DEF_VALS1(MQRCCF_CF_STRUC_ERROR             ),
-	DEF_VALS1(MQRCCF_UNKNOWN_USER_ID            ),
-	DEF_VALS1(MQRCCF_UNEXPECTED_ERROR           ),
-	DEF_VALS1(MQRCCF_NO_XCF_PARTNER             ),
-	DEF_VALS1(MQRCCF_CFGR_PARM_ID_ERROR         ),
-	DEF_VALS1(MQRCCF_CFIF_LENGTH_ERROR          ),
-	DEF_VALS1(MQRCCF_CFIF_OPERATOR_ERROR        ),
-	DEF_VALS1(MQRCCF_CFIF_PARM_ID_ERROR         ),
-	DEF_VALS1(MQRCCF_CFSF_FILTER_VAL_LEN_ERR    ),
-	DEF_VALS1(MQRCCF_CFSF_LENGTH_ERROR          ),
-	DEF_VALS1(MQRCCF_CFSF_OPERATOR_ERROR        ),
-	DEF_VALS1(MQRCCF_CFSF_PARM_ID_ERROR         ),
-	DEF_VALS1(MQRCCF_TOO_MANY_FILTERS           ),
-	DEF_VALS1(MQRCCF_LISTENER_RUNNING           ),
-	DEF_VALS1(MQRCCF_LSTR_STATUS_NOT_FOUND      ),
-	DEF_VALS1(MQRCCF_SERVICE_RUNNING            ),
-	DEF_VALS1(MQRCCF_SERV_STATUS_NOT_FOUND      ),
-	DEF_VALS1(MQRCCF_SERVICE_STOPPED            ),
-	DEF_VALS1(MQRCCF_CFBS_DUPLICATE_PARM        ),
-	DEF_VALS1(MQRCCF_CFBS_LENGTH_ERROR          ),
-	DEF_VALS1(MQRCCF_CFBS_PARM_ID_ERROR         ),
-	DEF_VALS1(MQRCCF_CFBS_STRING_LENGTH_ERR     ),
-	DEF_VALS1(MQRCCF_CFGR_LENGTH_ERROR          ),
-	DEF_VALS1(MQRCCF_CFGR_PARM_COUNT_ERROR      ),
-	DEF_VALS1(MQRCCF_CONN_NOT_STOPPED           ),
-	DEF_VALS1(MQRCCF_SERVICE_REQUEST_PENDING    ),
-	DEF_VALS1(MQRCCF_NO_START_CMD               ),
-	DEF_VALS1(MQRCCF_NO_STOP_CMD                ),
-	DEF_VALS1(MQRCCF_CFBF_LENGTH_ERROR          ),
-	DEF_VALS1(MQRCCF_CFBF_PARM_ID_ERROR         ),
-	DEF_VALS1(MQRCCF_CFBF_OPERATOR_ERROR        ),
-	DEF_VALS1(MQRCCF_CFBF_FILTER_VAL_LEN_ERR    ),
-	DEF_VALS1(MQRCCF_LISTENER_STILL_ACTIVE      ),
-	DEF_VALS1(MQRCCF_TOPICSTR_ALREADY_EXISTS    ),
-	DEF_VALS1(MQRCCF_SHARING_CONVS_ERROR        ),
-	DEF_VALS1(MQRCCF_SHARING_CONVS_TYPE         ),
-	DEF_VALS1(MQRCCF_SECURITY_CASE_CONFLICT     ),
-	DEF_VALS1(MQRCCF_TOPIC_TYPE_ERROR           ),
-	DEF_VALS1(MQRCCF_MAX_INSTANCES_ERROR        ),
-	DEF_VALS1(MQRCCF_MAX_INSTS_PER_CLNT_ERR     ),
-	DEF_VALS1(MQRCCF_TOPIC_STRING_NOT_FOUND     ),
-	DEF_VALS1(MQRCCF_SUBSCRIPTION_POINT_ERR     ),
-	DEF_VALS1(MQRCCF_SUB_ALREADY_EXISTS         ),
-	DEF_VALS1(MQRCCF_UNKNOWN_OBJECT_NAME        ),
-	DEF_VALS1(MQRCCF_REMOTE_Q_NAME_ERROR        ),
-	DEF_VALS1(MQRCCF_DURABILITY_NOT_ALLOWED     ),
-	DEF_VALS1(MQRCCF_HOBJ_ERROR                 ),
-	DEF_VALS1(MQRCCF_DEST_NAME_ERROR            ),
-	DEF_VALS1(MQRCCF_INVALID_DESTINATION        ),
-	DEF_VALS1(MQRCCF_PUBSUB_INHIBITED           ),
-	DEF_VALS1(MQRCCF_GROUPUR_CHECKS_FAILED      ),
-	DEF_VALS1(MQRCCF_SSL_ALT_PROVIDER_REQD      ),
-	DEF_VALS1(MQRCCF_OBJECT_ALREADY_EXISTS      ),
-	DEF_VALS1(MQRCCF_OBJECT_WRONG_TYPE          ),
-	DEF_VALS1(MQRCCF_LIKE_OBJECT_WRONG_TYPE     ),
-	DEF_VALS1(MQRCCF_OBJECT_OPEN                ),
-	DEF_VALS1(MQRCCF_ATTR_VALUE_ERROR           ),
-	DEF_VALS1(MQRCCF_UNKNOWN_Q_MGR              ),
-	DEF_VALS1(MQRCCF_Q_WRONG_TYPE               ),
-	DEF_VALS1(MQRCCF_OBJECT_NAME_ERROR          ),
-	DEF_VALS1(MQRCCF_ALLOCATE_FAILED            ),
-	DEF_VALS1(MQRCCF_HOST_NOT_AVAILABLE         ),
-	DEF_VALS1(MQRCCF_CONFIGURATION_ERROR        ),
-	DEF_VALS1(MQRCCF_CONNECTION_REFUSED         ),
-	DEF_VALS1(MQRCCF_ENTRY_ERROR                ),
-	DEF_VALS1(MQRCCF_SEND_FAILED                ),
-	DEF_VALS1(MQRCCF_RECEIVED_DATA_ERROR        ),
-	DEF_VALS1(MQRCCF_RECEIVE_FAILED             ),
-	DEF_VALS1(MQRCCF_CONNECTION_CLOSED          ),
-	DEF_VALS1(MQRCCF_NO_STORAGE                 ),
-	DEF_VALS1(MQRCCF_NO_COMMS_MANAGER           ),
-	DEF_VALS1(MQRCCF_LISTENER_NOT_STARTED       ),
-	DEF_VALS1(MQRCCF_BIND_FAILED                ),
-	DEF_VALS1(MQRCCF_CHANNEL_INDOUBT            ),
-	DEF_VALS1(MQRCCF_MQCONN_FAILED              ),
-	DEF_VALS1(MQRCCF_MQOPEN_FAILED              ),
-	DEF_VALS1(MQRCCF_MQGET_FAILED               ),
-	DEF_VALS1(MQRCCF_MQPUT_FAILED               ),
-	DEF_VALS1(MQRCCF_PING_ERROR                 ),
-	DEF_VALS1(MQRCCF_CHANNEL_IN_USE             ),
-	DEF_VALS1(MQRCCF_CHANNEL_NOT_FOUND          ),
-	DEF_VALS1(MQRCCF_UNKNOWN_REMOTE_CHANNEL     ),
-	DEF_VALS1(MQRCCF_REMOTE_QM_UNAVAILABLE      ),
-	DEF_VALS1(MQRCCF_REMOTE_QM_TERMINATING      ),
-	DEF_VALS1(MQRCCF_MQINQ_FAILED               ),
-	DEF_VALS1(MQRCCF_NOT_XMIT_Q                 ),
-	DEF_VALS1(MQRCCF_CHANNEL_DISABLED           ),
-	DEF_VALS1(MQRCCF_USER_EXIT_NOT_AVAILABLE    ),
-	DEF_VALS1(MQRCCF_COMMIT_FAILED              ),
-	DEF_VALS1(MQRCCF_WRONG_CHANNEL_TYPE         ),
-	DEF_VALS1(MQRCCF_CHANNEL_ALREADY_EXISTS     ),
-	DEF_VALS1(MQRCCF_DATA_TOO_LARGE             ),
-	DEF_VALS1(MQRCCF_CHANNEL_NAME_ERROR         ),
-	DEF_VALS1(MQRCCF_XMIT_Q_NAME_ERROR          ),
-	DEF_VALS1(MQRCCF_MCA_NAME_ERROR             ),
-	DEF_VALS1(MQRCCF_SEND_EXIT_NAME_ERROR       ),
-	DEF_VALS1(MQRCCF_SEC_EXIT_NAME_ERROR        ),
-	DEF_VALS1(MQRCCF_MSG_EXIT_NAME_ERROR        ),
-	DEF_VALS1(MQRCCF_RCV_EXIT_NAME_ERROR        ),
-	DEF_VALS1(MQRCCF_XMIT_Q_NAME_WRONG_TYPE     ),
-	DEF_VALS1(MQRCCF_MCA_NAME_WRONG_TYPE        ),
-	DEF_VALS1(MQRCCF_DISC_INT_WRONG_TYPE        ),
-	DEF_VALS1(MQRCCF_SHORT_RETRY_WRONG_TYPE     ),
-	DEF_VALS1(MQRCCF_SHORT_TIMER_WRONG_TYPE     ),
-	DEF_VALS1(MQRCCF_LONG_RETRY_WRONG_TYPE      ),
-	DEF_VALS1(MQRCCF_LONG_TIMER_WRONG_TYPE      ),
-	DEF_VALS1(MQRCCF_PUT_AUTH_WRONG_TYPE        ),
-	DEF_VALS1(MQRCCF_KEEP_ALIVE_INT_ERROR       ),
-	DEF_VALS1(MQRCCF_MISSING_CONN_NAME          ),
-	DEF_VALS1(MQRCCF_CONN_NAME_ERROR            ),
-	DEF_VALS1(MQRCCF_MQSET_FAILED               ),
-	DEF_VALS1(MQRCCF_CHANNEL_NOT_ACTIVE         ),
-	DEF_VALS1(MQRCCF_TERMINATED_BY_SEC_EXIT     ),
-	DEF_VALS1(MQRCCF_DYNAMIC_Q_SCOPE_ERROR      ),
-	DEF_VALS1(MQRCCF_CELL_DIR_NOT_AVAILABLE     ),
-	DEF_VALS1(MQRCCF_MR_COUNT_ERROR             ),
-	DEF_VALS1(MQRCCF_MR_COUNT_WRONG_TYPE        ),
-	DEF_VALS1(MQRCCF_MR_EXIT_NAME_ERROR         ),
-	DEF_VALS1(MQRCCF_MR_EXIT_NAME_WRONG_TYPE    ),
-	DEF_VALS1(MQRCCF_MR_INTERVAL_ERROR          ),
-	DEF_VALS1(MQRCCF_MR_INTERVAL_WRONG_TYPE     ),
-	DEF_VALS1(MQRCCF_NPM_SPEED_ERROR            ),
-	DEF_VALS1(MQRCCF_NPM_SPEED_WRONG_TYPE       ),
-	DEF_VALS1(MQRCCF_HB_INTERVAL_ERROR          ),
-	DEF_VALS1(MQRCCF_HB_INTERVAL_WRONG_TYPE     ),
-	DEF_VALS1(MQRCCF_CHAD_ERROR                 ),
-	DEF_VALS1(MQRCCF_CHAD_WRONG_TYPE            ),
-	DEF_VALS1(MQRCCF_CHAD_EVENT_ERROR           ),
-	DEF_VALS1(MQRCCF_CHAD_EVENT_WRONG_TYPE      ),
-	DEF_VALS1(MQRCCF_CHAD_EXIT_ERROR            ),
-	DEF_VALS1(MQRCCF_CHAD_EXIT_WRONG_TYPE       ),
-	DEF_VALS1(MQRCCF_SUPPRESSED_BY_EXIT         ),
-	DEF_VALS1(MQRCCF_BATCH_INT_ERROR            ),
-	DEF_VALS1(MQRCCF_BATCH_INT_WRONG_TYPE       ),
-	DEF_VALS1(MQRCCF_NET_PRIORITY_ERROR         ),
-	DEF_VALS1(MQRCCF_NET_PRIORITY_WRONG_TYPE    ),
-	DEF_VALS1(MQRCCF_CHANNEL_CLOSED             ),
-	DEF_VALS1(MQRCCF_Q_STATUS_NOT_FOUND         ),
-	DEF_VALS1(MQRCCF_SSL_CIPHER_SPEC_ERROR      ),
-	DEF_VALS1(MQRCCF_SSL_PEER_NAME_ERROR        ),
-	DEF_VALS1(MQRCCF_SSL_CLIENT_AUTH_ERROR      ),
-	DEF_VALS1(MQRCCF_RETAINED_NOT_SUPPORTED     ),
-
-	DEF_VALS1(MQRC_REOPEN_EXCL_INPUT_ERROR   ),
-	DEF_VALS1(MQRC_REOPEN_INQUIRE_ERROR      ),
-	DEF_VALS1(MQRC_REOPEN_SAVED_CONTEXT_ERR  ),
-	DEF_VALS1(MQRC_REOPEN_TEMPORARY_Q_ERROR  ),
-	DEF_VALS1(MQRC_ATTRIBUTE_LOCKED          ),
-	DEF_VALS1(MQRC_CURSOR_NOT_VALID          ),
-	DEF_VALS1(MQRC_ENCODING_ERROR            ),
-	DEF_VALS1(MQRC_STRUC_ID_ERROR            ),
-	DEF_VALS1(MQRC_NULL_POINTER              ),
-	DEF_VALS1(MQRC_NO_CONNECTION_REFERENCE   ),
-	DEF_VALS1(MQRC_NO_BUFFER                 ),
-	DEF_VALS1(MQRC_BINARY_DATA_LENGTH_ERROR  ),
-	DEF_VALS1(MQRC_BUFFER_NOT_AUTOMATIC      ),
-	DEF_VALS1(MQRC_INSUFFICIENT_BUFFER       ),
-	DEF_VALS1(MQRC_INSUFFICIENT_DATA         ),
-	DEF_VALS1(MQRC_DATA_TRUNCATED            ),
-	DEF_VALS1(MQRC_ZERO_LENGTH               ),
-	DEF_VALS1(MQRC_NEGATIVE_LENGTH           ),
-	DEF_VALS1(MQRC_NEGATIVE_OFFSET           ),
-	DEF_VALS1(MQRC_INCONSISTENT_FORMAT       ),
-	DEF_VALS1(MQRC_INCONSISTENT_OBJECT_STATE ),
-	DEF_VALS1(MQRC_CONTEXT_OBJECT_NOT_VALID  ),
-	DEF_VALS1(MQRC_CONTEXT_OPEN_ERROR        ),
-	DEF_VALS1(MQRC_STRUC_LENGTH_ERROR        ),
-	DEF_VALS1(MQRC_NOT_CONNECTED             ),
-	DEF_VALS1(MQRC_NOT_OPEN                  ),
-	DEF_VALS1(MQRC_DISTRIBUTION_LIST_EMPTY   ),
-	DEF_VALS1(MQRC_INCONSISTENT_OPEN_OPTIONS ),
-	DEF_VALS1(MQRC_WRONG_VERSION             ),
-	DEF_VALS1(MQRC_REFERENCE_ERROR           ),
-	DEF_VALS1(MQRC_XR_NOT_AVAILABLE          ),
+    DEF_VALS1(MQRC_NONE                      ),
+    DEF_VALS1(MQRC_ALIAS_BASE_Q_TYPE_ERROR   ),
+    DEF_VALS1(MQRC_ALREADY_CONNECTED         ),
+    DEF_VALS1(MQRC_BACKED_OUT                ),
+    DEF_VALS1(MQRC_BUFFER_ERROR              ),
+    DEF_VALS1(MQRC_BUFFER_LENGTH_ERROR       ),
+    DEF_VALS1(MQRC_CHAR_ATTR_LENGTH_ERROR    ),
+    DEF_VALS1(MQRC_CHAR_ATTRS_ERROR          ),
+    DEF_VALS1(MQRC_CHAR_ATTRS_TOO_SHORT      ),
+    DEF_VALS1(MQRC_CONNECTION_BROKEN         ),
+    DEF_VALS1(MQRC_DATA_LENGTH_ERROR         ),
+    DEF_VALS1(MQRC_DYNAMIC_Q_NAME_ERROR      ),
+    DEF_VALS1(MQRC_ENVIRONMENT_ERROR         ),
+    DEF_VALS1(MQRC_EXPIRY_ERROR              ),
+    DEF_VALS1(MQRC_FEEDBACK_ERROR            ),
+    DEF_VALS1(MQRC_GET_INHIBITED             ),
+    DEF_VALS1(MQRC_HANDLE_NOT_AVAILABLE      ),
+    DEF_VALS1(MQRC_HCONN_ERROR               ),
+    DEF_VALS1(MQRC_HOBJ_ERROR                ),
+    DEF_VALS1(MQRC_INHIBIT_VALUE_ERROR       ),
+    DEF_VALS1(MQRC_INT_ATTR_COUNT_ERROR      ),
+    DEF_VALS1(MQRC_INT_ATTR_COUNT_TOO_SMALL  ),
+    DEF_VALS1(MQRC_INT_ATTRS_ARRAY_ERROR     ),
+    DEF_VALS1(MQRC_SYNCPOINT_LIMIT_REACHED   ),
+    DEF_VALS1(MQRC_MAX_CONNS_LIMIT_REACHED   ),
+    DEF_VALS1(MQRC_MD_ERROR                  ),
+    DEF_VALS1(MQRC_MISSING_REPLY_TO_Q        ),
+    DEF_VALS1(MQRC_MSG_TYPE_ERROR            ),
+    DEF_VALS1(MQRC_MSG_TOO_BIG_FOR_Q         ),
+    DEF_VALS1(MQRC_MSG_TOO_BIG_FOR_Q_MGR     ),
+    DEF_VALS1(MQRC_NO_MSG_AVAILABLE          ),
+    DEF_VALS1(MQRC_NO_MSG_UNDER_CURSOR       ),
+    DEF_VALS1(MQRC_NOT_AUTHORIZED            ),
+    DEF_VALS1(MQRC_NOT_OPEN_FOR_BROWSE       ),
+    DEF_VALS1(MQRC_NOT_OPEN_FOR_INPUT        ),
+    DEF_VALS1(MQRC_NOT_OPEN_FOR_INQUIRE      ),
+    DEF_VALS1(MQRC_NOT_OPEN_FOR_OUTPUT       ),
+    DEF_VALS1(MQRC_NOT_OPEN_FOR_SET          ),
+    DEF_VALS1(MQRC_OBJECT_CHANGED            ),
+    DEF_VALS1(MQRC_OBJECT_IN_USE             ),
+    DEF_VALS1(MQRC_OBJECT_TYPE_ERROR         ),
+    DEF_VALS1(MQRC_OD_ERROR                  ),
+    DEF_VALS1(MQRC_OPTION_NOT_VALID_FOR_TYPE ),
+    DEF_VALS1(MQRC_OPTIONS_ERROR             ),
+    DEF_VALS1(MQRC_PERSISTENCE_ERROR         ),
+    DEF_VALS1(MQRC_PERSISTENT_NOT_ALLOWED    ),
+    DEF_VALS1(MQRC_PRIORITY_EXCEEDS_MAXIMUM  ),
+    DEF_VALS1(MQRC_PRIORITY_ERROR            ),
+    DEF_VALS1(MQRC_PUT_INHIBITED             ),
+    DEF_VALS1(MQRC_Q_DELETED                 ),
+    DEF_VALS1(MQRC_Q_FULL                    ),
+    DEF_VALS1(MQRC_Q_NOT_EMPTY               ),
+    DEF_VALS1(MQRC_Q_SPACE_NOT_AVAILABLE     ),
+    DEF_VALS1(MQRC_Q_TYPE_ERROR              ),
+    DEF_VALS1(MQRC_Q_MGR_NAME_ERROR          ),
+    DEF_VALS1(MQRC_Q_MGR_NOT_AVAILABLE       ),
+    DEF_VALS1(MQRC_REPORT_OPTIONS_ERROR      ),
+    DEF_VALS1(MQRC_SECOND_MARK_NOT_ALLOWED   ),
+    DEF_VALS1(MQRC_SECURITY_ERROR            ),
+    DEF_VALS1(MQRC_SELECTOR_COUNT_ERROR      ),
+    DEF_VALS1(MQRC_SELECTOR_LIMIT_EXCEEDED   ),
+    DEF_VALS1(MQRC_SELECTOR_ERROR            ),
+    DEF_VALS1(MQRC_SELECTOR_NOT_FOR_TYPE     ),
+    DEF_VALS1(MQRC_SIGNAL_OUTSTANDING        ),
+    DEF_VALS1(MQRC_SIGNAL_REQUEST_ACCEPTED   ),
+    DEF_VALS1(MQRC_STORAGE_NOT_AVAILABLE     ),
+    DEF_VALS1(MQRC_SYNCPOINT_NOT_AVAILABLE   ),
+    DEF_VALS1(MQRC_TRIGGER_CONTROL_ERROR     ),
+    DEF_VALS1(MQRC_TRIGGER_DEPTH_ERROR       ),
+    DEF_VALS1(MQRC_TRIGGER_MSG_PRIORITY_ERR  ),
+    DEF_VALS1(MQRC_TRIGGER_TYPE_ERROR        ),
+    DEF_VALS1(MQRC_TRUNCATED_MSG_ACCEPTED    ),
+    DEF_VALS1(MQRC_TRUNCATED_MSG_FAILED      ),
+    DEF_VALS1(MQRC_UNKNOWN_ALIAS_BASE_Q      ),
+    DEF_VALS1(MQRC_UNKNOWN_OBJECT_NAME       ),
+    DEF_VALS1(MQRC_UNKNOWN_OBJECT_Q_MGR      ),
+    DEF_VALS1(MQRC_UNKNOWN_REMOTE_Q_MGR      ),
+    DEF_VALS1(MQRC_WAIT_INTERVAL_ERROR       ),
+    DEF_VALS1(MQRC_XMIT_Q_TYPE_ERROR         ),
+    DEF_VALS1(MQRC_XMIT_Q_USAGE_ERROR        ),
+    DEF_VALS1(MQRC_NOT_OPEN_FOR_PASS_ALL     ),
+    DEF_VALS1(MQRC_NOT_OPEN_FOR_PASS_IDENT   ),
+    DEF_VALS1(MQRC_NOT_OPEN_FOR_SET_ALL      ),
+    DEF_VALS1(MQRC_NOT_OPEN_FOR_SET_IDENT    ),
+    DEF_VALS1(MQRC_CONTEXT_HANDLE_ERROR      ),
+    DEF_VALS1(MQRC_CONTEXT_NOT_AVAILABLE     ),
+    DEF_VALS1(MQRC_SIGNAL1_ERROR             ),
+    DEF_VALS1(MQRC_OBJECT_ALREADY_EXISTS     ),
+    DEF_VALS1(MQRC_OBJECT_DAMAGED            ),
+    DEF_VALS1(MQRC_RESOURCE_PROBLEM          ),
+    DEF_VALS1(MQRC_ANOTHER_Q_MGR_CONNECTED   ),
+    DEF_VALS1(MQRC_UNKNOWN_REPORT_OPTION     ),
+    DEF_VALS1(MQRC_STORAGE_CLASS_ERROR       ),
+    DEF_VALS1(MQRC_COD_NOT_VALID_FOR_XCF_Q   ),
+    DEF_VALS1(MQRC_XWAIT_CANCELED            ),
+    DEF_VALS1(MQRC_XWAIT_ERROR               ),
+    DEF_VALS1(MQRC_SUPPRESSED_BY_EXIT        ),
+    DEF_VALS1(MQRC_FORMAT_ERROR              ),
+    DEF_VALS1(MQRC_SOURCE_CCSID_ERROR        ),
+    DEF_VALS1(MQRC_SOURCE_INTEGER_ENC_ERROR  ),
+    DEF_VALS1(MQRC_SOURCE_DECIMAL_ENC_ERROR  ),
+    DEF_VALS1(MQRC_SOURCE_FLOAT_ENC_ERROR    ),
+    DEF_VALS1(MQRC_TARGET_CCSID_ERROR        ),
+    DEF_VALS1(MQRC_TARGET_INTEGER_ENC_ERROR  ),
+    DEF_VALS1(MQRC_TARGET_DECIMAL_ENC_ERROR  ),
+    DEF_VALS1(MQRC_TARGET_FLOAT_ENC_ERROR    ),
+    DEF_VALS1(MQRC_NOT_CONVERTED             ),
+    DEF_VALS1(MQRC_CONVERTED_MSG_TOO_BIG     ),
+    DEF_VALS1(MQRC_TRUNCATED                 ),
+    DEF_VALS1(MQRC_NO_EXTERNAL_PARTICIPANTS  ),
+    DEF_VALS1(MQRC_PARTICIPANT_NOT_AVAILABLE ),
+    DEF_VALS1(MQRC_OUTCOME_MIXED             ),
+    DEF_VALS1(MQRC_OUTCOME_PENDING           ),
+    DEF_VALS1(MQRC_BRIDGE_STARTED            ),
+    DEF_VALS1(MQRC_BRIDGE_STOPPED            ),
+    DEF_VALS1(MQRC_ADAPTER_STORAGE_SHORTAGE  ),
+    DEF_VALS1(MQRC_UOW_IN_PROGRESS           ),
+    DEF_VALS1(MQRC_ADAPTER_CONN_LOAD_ERROR   ),
+    DEF_VALS1(MQRC_ADAPTER_SERV_LOAD_ERROR   ),
+    DEF_VALS1(MQRC_ADAPTER_DEFS_ERROR        ),
+    DEF_VALS1(MQRC_ADAPTER_DEFS_LOAD_ERROR   ),
+    DEF_VALS1(MQRC_ADAPTER_CONV_LOAD_ERROR   ),
+    DEF_VALS1(MQRC_BO_ERROR                  ),
+    DEF_VALS1(MQRC_DH_ERROR                  ),
+    DEF_VALS1(MQRC_MULTIPLE_REASONS          ),
+    DEF_VALS1(MQRC_OPEN_FAILED               ),
+    DEF_VALS1(MQRC_ADAPTER_DISC_LOAD_ERROR   ),
+    DEF_VALS1(MQRC_CNO_ERROR                 ),
+    DEF_VALS1(MQRC_CICS_WAIT_FAILED          ),
+    DEF_VALS1(MQRC_DLH_ERROR                 ),
+    DEF_VALS1(MQRC_HEADER_ERROR              ),
+    DEF_VALS1(MQRC_SOURCE_LENGTH_ERROR       ),
+    DEF_VALS1(MQRC_TARGET_LENGTH_ERROR       ),
+    DEF_VALS1(MQRC_SOURCE_BUFFER_ERROR       ),
+    DEF_VALS1(MQRC_TARGET_BUFFER_ERROR       ),
+    DEF_VALS1(MQRC_IIH_ERROR                 ),
+    DEF_VALS1(MQRC_PCF_ERROR                 ),
+    DEF_VALS1(MQRC_DBCS_ERROR                ),
+    DEF_VALS1(MQRC_OBJECT_NAME_ERROR         ),
+    DEF_VALS1(MQRC_OBJECT_Q_MGR_NAME_ERROR   ),
+    DEF_VALS1(MQRC_RECS_PRESENT_ERROR        ),
+    DEF_VALS1(MQRC_OBJECT_RECORDS_ERROR      ),
+    DEF_VALS1(MQRC_RESPONSE_RECORDS_ERROR    ),
+    DEF_VALS1(MQRC_ASID_MISMATCH             ),
+    DEF_VALS1(MQRC_PMO_RECORD_FLAGS_ERROR    ),
+    DEF_VALS1(MQRC_PUT_MSG_RECORDS_ERROR     ),
+    DEF_VALS1(MQRC_CONN_ID_IN_USE            ),
+    DEF_VALS1(MQRC_Q_MGR_QUIESCING           ),
+    DEF_VALS1(MQRC_Q_MGR_STOPPING            ),
+    DEF_VALS1(MQRC_DUPLICATE_RECOV_COORD     ),
+    DEF_VALS1(MQRC_PMO_ERROR                 ),
+    DEF_VALS1(MQRC_API_EXIT_NOT_FOUND        ),
+    DEF_VALS1(MQRC_API_EXIT_LOAD_ERROR       ),
+    DEF_VALS1(MQRC_REMOTE_Q_NAME_ERROR       ),
+    DEF_VALS1(MQRC_INCONSISTENT_PERSISTENCE  ),
+    DEF_VALS1(MQRC_GMO_ERROR                 ),
+    DEF_VALS1(MQRC_CICS_BRIDGE_RESTRICTION   ),
+    DEF_VALS1(MQRC_STOPPED_BY_CLUSTER_EXIT   ),
+    DEF_VALS1(MQRC_CLUSTER_RESOLUTION_ERROR  ),
+    DEF_VALS1(MQRC_CONVERTED_STRING_TOO_BIG  ),
+    DEF_VALS1(MQRC_TMC_ERROR                 ),
+    DEF_VALS1(MQRC_PAGESET_FULL              ),
+    DEF_VALS1(MQRC_STORAGE_MEDIUM_FULL       ),
+    DEF_VALS1(MQRC_PAGESET_ERROR             ),
+    DEF_VALS1(MQRC_NAME_NOT_VALID_FOR_TYPE   ),
+    DEF_VALS1(MQRC_UNEXPECTED_ERROR          ),
+    DEF_VALS1(MQRC_UNKNOWN_XMIT_Q            ),
+    DEF_VALS1(MQRC_UNKNOWN_DEF_XMIT_Q        ),
+    DEF_VALS1(MQRC_DEF_XMIT_Q_TYPE_ERROR     ),
+    DEF_VALS1(MQRC_DEF_XMIT_Q_USAGE_ERROR    ),
+    DEF_VALS1(MQRC_MSG_MARKED_BROWSE_CO_OP   ),
+    DEF_VALS1(MQRC_NAME_IN_USE               ),
+    DEF_VALS1(MQRC_CONNECTION_QUIESCING      ),
+    DEF_VALS1(MQRC_CONNECTION_STOPPING       ),
+    DEF_VALS1(MQRC_ADAPTER_NOT_AVAILABLE     ),
+    DEF_VALS1(MQRC_MSG_ID_ERROR              ),
+    DEF_VALS1(MQRC_CORREL_ID_ERROR           ),
+    DEF_VALS1(MQRC_FILE_SYSTEM_ERROR         ),
+    DEF_VALS1(MQRC_NO_MSG_LOCKED             ),
+    DEF_VALS1(MQRC_SOAP_DOTNET_ERROR         ),
+    DEF_VALS1(MQRC_SOAP_AXIS_ERROR           ),
+    DEF_VALS1(MQRC_SOAP_URL_ERROR            ),
+    DEF_VALS1(MQRC_FILE_NOT_AUDITED          ),
+    DEF_VALS1(MQRC_CONNECTION_NOT_AUTHORIZED ),
+    DEF_VALS1(MQRC_MSG_TOO_BIG_FOR_CHANNEL   ),
+    DEF_VALS1(MQRC_CALL_IN_PROGRESS          ),
+    DEF_VALS1(MQRC_RMH_ERROR                 ),
+    DEF_VALS1(MQRC_Q_MGR_ACTIVE              ),
+    DEF_VALS1(MQRC_Q_MGR_NOT_ACTIVE          ),
+    DEF_VALS1(MQRC_Q_DEPTH_HIGH              ),
+    DEF_VALS1(MQRC_Q_DEPTH_LOW               ),
+    DEF_VALS1(MQRC_Q_SERVICE_INTERVAL_HIGH   ),
+    DEF_VALS1(MQRC_Q_SERVICE_INTERVAL_OK     ),
+    DEF_VALS1(MQRC_RFH_HEADER_FIELD_ERROR    ),
+    DEF_VALS1(MQRC_RAS_PROPERTY_ERROR        ),
+    DEF_VALS1(MQRC_UNIT_OF_WORK_NOT_STARTED  ),
+    DEF_VALS1(MQRC_CHANNEL_AUTO_DEF_OK       ),
+    DEF_VALS1(MQRC_CHANNEL_AUTO_DEF_ERROR    ),
+    DEF_VALS1(MQRC_CFH_ERROR                 ),
+    DEF_VALS1(MQRC_CFIL_ERROR                ),
+    DEF_VALS1(MQRC_CFIN_ERROR                ),
+    DEF_VALS1(MQRC_CFSL_ERROR                ),
+    DEF_VALS1(MQRC_CFST_ERROR                ),
+    DEF_VALS1(MQRC_INCOMPLETE_GROUP          ),
+    DEF_VALS1(MQRC_INCOMPLETE_MSG            ),
+    DEF_VALS1(MQRC_INCONSISTENT_CCSIDS       ),
+    DEF_VALS1(MQRC_INCONSISTENT_ENCODINGS    ),
+    DEF_VALS1(MQRC_INCONSISTENT_UOW          ),
+    DEF_VALS1(MQRC_INVALID_MSG_UNDER_CURSOR  ),
+    DEF_VALS1(MQRC_MATCH_OPTIONS_ERROR       ),
+    DEF_VALS1(MQRC_MDE_ERROR                 ),
+    DEF_VALS1(MQRC_MSG_FLAGS_ERROR           ),
+    DEF_VALS1(MQRC_MSG_SEQ_NUMBER_ERROR      ),
+    DEF_VALS1(MQRC_OFFSET_ERROR              ),
+    DEF_VALS1(MQRC_ORIGINAL_LENGTH_ERROR     ),
+    DEF_VALS1(MQRC_SEGMENT_LENGTH_ZERO       ),
+    DEF_VALS1(MQRC_UOW_NOT_AVAILABLE         ),
+    DEF_VALS1(MQRC_WRONG_GMO_VERSION         ),
+    DEF_VALS1(MQRC_WRONG_MD_VERSION          ),
+    DEF_VALS1(MQRC_GROUP_ID_ERROR            ),
+    DEF_VALS1(MQRC_INCONSISTENT_BROWSE       ),
+    DEF_VALS1(MQRC_XQH_ERROR                 ),
+    DEF_VALS1(MQRC_SRC_ENV_ERROR             ),
+    DEF_VALS1(MQRC_SRC_NAME_ERROR            ),
+    DEF_VALS1(MQRC_DEST_ENV_ERROR            ),
+    DEF_VALS1(MQRC_DEST_NAME_ERROR           ),
+    DEF_VALS1(MQRC_TM_ERROR                  ),
+    DEF_VALS1(MQRC_CLUSTER_EXIT_ERROR        ),
+    DEF_VALS1(MQRC_CLUSTER_EXIT_LOAD_ERROR   ),
+    DEF_VALS1(MQRC_CLUSTER_PUT_INHIBITED     ),
+    DEF_VALS1(MQRC_CLUSTER_RESOURCE_ERROR    ),
+    DEF_VALS1(MQRC_NO_DESTINATIONS_AVAILABLE ),
+    DEF_VALS1(MQRC_CONN_TAG_IN_USE           ),
+    DEF_VALS1(MQRC_PARTIALLY_CONVERTED       ),
+    DEF_VALS1(MQRC_CONNECTION_ERROR          ),
+    DEF_VALS1(MQRC_OPTION_ENVIRONMENT_ERROR  ),
+    DEF_VALS1(MQRC_CD_ERROR                  ),
+    DEF_VALS1(MQRC_CLIENT_CONN_ERROR         ),
+    DEF_VALS1(MQRC_CHANNEL_STOPPED_BY_USER   ),
+    DEF_VALS1(MQRC_HCONFIG_ERROR             ),
+    DEF_VALS1(MQRC_FUNCTION_ERROR            ),
+    DEF_VALS1(MQRC_CHANNEL_STARTED           ),
+    DEF_VALS1(MQRC_CHANNEL_STOPPED           ),
+    DEF_VALS1(MQRC_CHANNEL_CONV_ERROR        ),
+    DEF_VALS1(MQRC_SERVICE_NOT_AVAILABLE     ),
+    DEF_VALS1(MQRC_INITIALIZATION_FAILED     ),
+    DEF_VALS1(MQRC_TERMINATION_FAILED        ),
+    DEF_VALS1(MQRC_UNKNOWN_Q_NAME            ),
+    DEF_VALS1(MQRC_SERVICE_ERROR             ),
+    DEF_VALS1(MQRC_Q_ALREADY_EXISTS          ),
+    DEF_VALS1(MQRC_USER_ID_NOT_AVAILABLE     ),
+    DEF_VALS1(MQRC_UNKNOWN_ENTITY            ),
+    DEF_VALS1(MQRC_UNKNOWN_AUTH_ENTITY       ),
+    DEF_VALS1(MQRC_UNKNOWN_REF_OBJECT        ),
+    DEF_VALS1(MQRC_CHANNEL_ACTIVATED         ),
+    DEF_VALS1(MQRC_CHANNEL_NOT_ACTIVATED     ),
+    DEF_VALS1(MQRC_UOW_CANCELED              ),
+    DEF_VALS1(MQRC_FUNCTION_NOT_SUPPORTED    ),
+    DEF_VALS1(MQRC_SELECTOR_TYPE_ERROR       ),
+    DEF_VALS1(MQRC_COMMAND_TYPE_ERROR        ),
+    DEF_VALS1(MQRC_MULTIPLE_INSTANCE_ERROR   ),
+    DEF_VALS1(MQRC_SYSTEM_ITEM_NOT_ALTERABLE ),
+    DEF_VALS1(MQRC_BAG_CONVERSION_ERROR      ),
+    DEF_VALS1(MQRC_SELECTOR_OUT_OF_RANGE     ),
+    DEF_VALS1(MQRC_SELECTOR_NOT_UNIQUE       ),
+    DEF_VALS1(MQRC_INDEX_NOT_PRESENT         ),
+    DEF_VALS1(MQRC_STRING_ERROR              ),
+    DEF_VALS1(MQRC_ENCODING_NOT_SUPPORTED    ),
+    DEF_VALS1(MQRC_SELECTOR_NOT_PRESENT      ),
+    DEF_VALS1(MQRC_OUT_SELECTOR_ERROR        ),
+    DEF_VALS1(MQRC_STRING_TRUNCATED          ),
+    DEF_VALS1(MQRC_SELECTOR_WRONG_TYPE       ),
+    DEF_VALS1(MQRC_INCONSISTENT_ITEM_TYPE    ),
+    DEF_VALS1(MQRC_INDEX_ERROR               ),
+    DEF_VALS1(MQRC_SYSTEM_BAG_NOT_ALTERABLE  ),
+    DEF_VALS1(MQRC_ITEM_COUNT_ERROR          ),
+    DEF_VALS1(MQRC_FORMAT_NOT_SUPPORTED      ),
+    DEF_VALS1(MQRC_SELECTOR_NOT_SUPPORTED    ),
+    DEF_VALS1(MQRC_ITEM_VALUE_ERROR          ),
+    DEF_VALS1(MQRC_HBAG_ERROR                ),
+    DEF_VALS1(MQRC_PARAMETER_MISSING         ),
+    DEF_VALS1(MQRC_CMD_SERVER_NOT_AVAILABLE  ),
+    DEF_VALS1(MQRC_STRING_LENGTH_ERROR       ),
+    DEF_VALS1(MQRC_INQUIRY_COMMAND_ERROR     ),
+    DEF_VALS1(MQRC_NESTED_BAG_NOT_SUPPORTED  ),
+    DEF_VALS1(MQRC_BAG_WRONG_TYPE            ),
+    DEF_VALS1(MQRC_ITEM_TYPE_ERROR           ),
+    DEF_VALS1(MQRC_SYSTEM_BAG_NOT_DELETABLE  ),
+    DEF_VALS1(MQRC_SYSTEM_ITEM_NOT_DELETABLE ),
+    DEF_VALS1(MQRC_CODED_CHAR_SET_ID_ERROR   ),
+    DEF_VALS1(MQRC_MSG_TOKEN_ERROR           ),
+    DEF_VALS1(MQRC_MISSING_WIH               ),
+    DEF_VALS1(MQRC_WIH_ERROR                 ),
+    DEF_VALS1(MQRC_RFH_ERROR                 ),
+    DEF_VALS1(MQRC_RFH_STRING_ERROR          ),
+    DEF_VALS1(MQRC_RFH_COMMAND_ERROR         ),
+    DEF_VALS1(MQRC_RFH_PARM_ERROR            ),
+    DEF_VALS1(MQRC_RFH_DUPLICATE_PARM        ),
+    DEF_VALS1(MQRC_RFH_PARM_MISSING          ),
+    DEF_VALS1(MQRC_CHAR_CONVERSION_ERROR     ),
+    DEF_VALS1(MQRC_UCS2_CONVERSION_ERROR     ),
+    DEF_VALS1(MQRC_DB2_NOT_AVAILABLE         ),
+    DEF_VALS1(MQRC_OBJECT_NOT_UNIQUE         ),
+    DEF_VALS1(MQRC_CONN_TAG_NOT_RELEASED     ),
+    DEF_VALS1(MQRC_CF_NOT_AVAILABLE          ),
+    DEF_VALS1(MQRC_CF_STRUC_IN_USE           ),
+    DEF_VALS1(MQRC_CF_STRUC_LIST_HDR_IN_USE  ),
+    DEF_VALS1(MQRC_CF_STRUC_AUTH_FAILED      ),
+    DEF_VALS1(MQRC_CF_STRUC_ERROR            ),
+    DEF_VALS1(MQRC_CONN_TAG_NOT_USABLE       ),
+    DEF_VALS1(MQRC_GLOBAL_UOW_CONFLICT       ),
+    DEF_VALS1(MQRC_LOCAL_UOW_CONFLICT        ),
+    DEF_VALS1(MQRC_HANDLE_IN_USE_FOR_UOW     ),
+    DEF_VALS1(MQRC_UOW_ENLISTMENT_ERROR      ),
+    DEF_VALS1(MQRC_UOW_MIX_NOT_SUPPORTED     ),
+    DEF_VALS1(MQRC_WXP_ERROR                 ),
+    DEF_VALS1(MQRC_CURRENT_RECORD_ERROR      ),
+    DEF_VALS1(MQRC_NEXT_OFFSET_ERROR         ),
+    DEF_VALS1(MQRC_NO_RECORD_AVAILABLE       ),
+    DEF_VALS1(MQRC_OBJECT_LEVEL_INCOMPATIBLE ),
+    DEF_VALS1(MQRC_NEXT_RECORD_ERROR         ),
+    DEF_VALS1(MQRC_BACKOUT_THRESHOLD_REACHED ),
+    DEF_VALS1(MQRC_MSG_NOT_MATCHED           ),
+    DEF_VALS1(MQRC_JMS_FORMAT_ERROR          ),
+    DEF_VALS1(MQRC_SEGMENTS_NOT_SUPPORTED    ),
+    DEF_VALS1(MQRC_WRONG_CF_LEVEL            ),
+    DEF_VALS1(MQRC_CONFIG_CREATE_OBJECT      ),
+    DEF_VALS1(MQRC_CONFIG_CHANGE_OBJECT      ),
+    DEF_VALS1(MQRC_CONFIG_DELETE_OBJECT      ),
+    DEF_VALS1(MQRC_CONFIG_REFRESH_OBJECT     ),
+    DEF_VALS1(MQRC_CHANNEL_SSL_ERROR         ),
+    DEF_VALS1(MQRC_PARTICIPANT_NOT_DEFINED   ),
+    DEF_VALS1(MQRC_CF_STRUC_FAILED           ),
+    DEF_VALS1(MQRC_API_EXIT_ERROR            ),
+    DEF_VALS1(MQRC_API_EXIT_INIT_ERROR       ),
+    DEF_VALS1(MQRC_API_EXIT_TERM_ERROR       ),
+    DEF_VALS1(MQRC_EXIT_REASON_ERROR         ),
+    DEF_VALS1(MQRC_RESERVED_VALUE_ERROR      ),
+    DEF_VALS1(MQRC_NO_DATA_AVAILABLE         ),
+    DEF_VALS1(MQRC_SCO_ERROR                 ),
+    DEF_VALS1(MQRC_KEY_REPOSITORY_ERROR      ),
+    DEF_VALS1(MQRC_CRYPTO_HARDWARE_ERROR     ),
+    DEF_VALS1(MQRC_AUTH_INFO_REC_COUNT_ERROR ),
+    DEF_VALS1(MQRC_AUTH_INFO_REC_ERROR       ),
+    DEF_VALS1(MQRC_AIR_ERROR                 ),
+    DEF_VALS1(MQRC_AUTH_INFO_TYPE_ERROR      ),
+    DEF_VALS1(MQRC_AUTH_INFO_CONN_NAME_ERROR ),
+    DEF_VALS1(MQRC_LDAP_USER_NAME_ERROR      ),
+    DEF_VALS1(MQRC_LDAP_USER_NAME_LENGTH_ERR ),
+    DEF_VALS1(MQRC_LDAP_PASSWORD_ERROR       ),
+    DEF_VALS1(MQRC_SSL_ALREADY_INITIALIZED   ),
+    DEF_VALS1(MQRC_SSL_CONFIG_ERROR          ),
+    DEF_VALS1(MQRC_SSL_INITIALIZATION_ERROR  ),
+    DEF_VALS1(MQRC_Q_INDEX_TYPE_ERROR        ),
+    DEF_VALS1(MQRC_CFBS_ERROR                ),
+    DEF_VALS1(MQRC_SSL_NOT_ALLOWED           ),
+    DEF_VALS1(MQRC_JSSE_ERROR                ),
+    DEF_VALS1(MQRC_SSL_PEER_NAME_MISMATCH    ),
+    DEF_VALS1(MQRC_SSL_PEER_NAME_ERROR       ),
+    DEF_VALS1(MQRC_UNSUPPORTED_CIPHER_SUITE  ),
+    DEF_VALS1(MQRC_SSL_CERTIFICATE_REVOKED   ),
+    DEF_VALS1(MQRC_SSL_CERT_STORE_ERROR      ),
+    DEF_VALS1(MQRC_CLIENT_EXIT_LOAD_ERROR    ),
+    DEF_VALS1(MQRC_CLIENT_EXIT_ERROR         ),
+    DEF_VALS1(MQRC_UOW_COMMITTED             ),
+    DEF_VALS1(MQRC_SSL_KEY_RESET_ERROR       ),
+    DEF_VALS1(MQRC_UNKNOWN_COMPONENT_NAME    ),
+    DEF_VALS1(MQRC_LOGGER_STATUS             ),
+    DEF_VALS1(MQRC_COMMAND_MQSC              ),
+    DEF_VALS1(MQRC_COMMAND_PCF               ),
+    DEF_VALS1(MQRC_CFIF_ERROR                ),
+    DEF_VALS1(MQRC_CFSF_ERROR                ),
+    DEF_VALS1(MQRC_CFGR_ERROR                ),
+    DEF_VALS1(MQRC_MSG_NOT_ALLOWED_IN_GROUP  ),
+    DEF_VALS1(MQRC_FILTER_OPERATOR_ERROR     ),
+    DEF_VALS1(MQRC_NESTED_SELECTOR_ERROR     ),
+    DEF_VALS1(MQRC_EPH_ERROR                 ),
+    DEF_VALS1(MQRC_RFH_FORMAT_ERROR          ),
+    DEF_VALS1(MQRC_CFBF_ERROR                ),
+    DEF_VALS1(MQRC_CLIENT_CHANNEL_CONFLICT   ),
+    DEF_VALS1(MQRC_SD_ERROR                  ),
+    DEF_VALS1(MQRC_TOPIC_STRING_ERROR        ),
+    DEF_VALS1(MQRC_STS_ERROR                 ),
+    DEF_VALS1(MQRC_NO_SUBSCRIPTION           ),
+    DEF_VALS1(MQRC_SUBSCRIPTION_IN_USE       ),
+    DEF_VALS1(MQRC_STAT_TYPE_ERROR           ),
+    DEF_VALS1(MQRC_SUB_USER_DATA_ERROR       ),
+    DEF_VALS1(MQRC_SUB_ALREADY_EXISTS        ),
+    DEF_VALS1(MQRC_IDENTITY_MISMATCH         ),
+    DEF_VALS1(MQRC_ALTER_SUB_ERROR           ),
+    DEF_VALS1(MQRC_DURABILITY_NOT_ALLOWED    ),
+    DEF_VALS1(MQRC_NO_RETAINED_MSG           ),
+    DEF_VALS1(MQRC_SRO_ERROR                 ),
+    DEF_VALS1(MQRC_SUB_NAME_ERROR            ),
+    DEF_VALS1(MQRC_OBJECT_STRING_ERROR       ),
+    DEF_VALS1(MQRC_PROPERTY_NAME_ERROR       ),
+    DEF_VALS1(MQRC_SEGMENTATION_NOT_ALLOWED  ),
+    DEF_VALS1(MQRC_CBD_ERROR                 ),
+    DEF_VALS1(MQRC_CTLO_ERROR                ),
+    DEF_VALS1(MQRC_NO_CALLBACKS_ACTIVE       ),
+    DEF_VALS1(MQRC_CALLBACK_NOT_REGISTERED   ),
+    DEF_VALS1(MQRC_OPTIONS_CHANGED           ),
+    DEF_VALS1(MQRC_READ_AHEAD_MSGS           ),
+    DEF_VALS1(MQRC_SELECTOR_SYNTAX_ERROR     ),
+    DEF_VALS1(MQRC_HMSG_ERROR                ),
+    DEF_VALS1(MQRC_CMHO_ERROR                ),
+    DEF_VALS1(MQRC_DMHO_ERROR                ),
+    DEF_VALS1(MQRC_SMPO_ERROR                ),
+    DEF_VALS1(MQRC_IMPO_ERROR                ),
+    DEF_VALS1(MQRC_PROPERTY_NAME_TOO_BIG     ),
+    DEF_VALS1(MQRC_PROP_VALUE_NOT_CONVERTED  ),
+    DEF_VALS1(MQRC_PROP_TYPE_NOT_SUPPORTED   ),
+    DEF_VALS1(MQRC_PROPERTY_VALUE_TOO_BIG    ),
+    DEF_VALS1(MQRC_PROP_CONV_NOT_SUPPORTED   ),
+    DEF_VALS1(MQRC_PROPERTY_NOT_AVAILABLE    ),
+    DEF_VALS1(MQRC_PROP_NUMBER_FORMAT_ERROR  ),
+    DEF_VALS1(MQRC_PROPERTY_TYPE_ERROR       ),
+    DEF_VALS1(MQRC_PROPERTIES_TOO_BIG        ),
+    DEF_VALS1(MQRC_PUT_NOT_RETAINED          ),
+    DEF_VALS1(MQRC_ALIAS_TARGTYPE_CHANGED    ),
+    DEF_VALS1(MQRC_DMPO_ERROR                ),
+    DEF_VALS1(MQRC_PD_ERROR                  ),
+    DEF_VALS1(MQRC_CALLBACK_TYPE_ERROR       ),
+    DEF_VALS1(MQRC_CBD_OPTIONS_ERROR         ),
+    DEF_VALS1(MQRC_MAX_MSG_LENGTH_ERROR      ),
+    DEF_VALS1(MQRC_CALLBACK_ROUTINE_ERROR    ),
+    DEF_VALS1(MQRC_CALLBACK_LINK_ERROR       ),
+    DEF_VALS1(MQRC_OPERATION_ERROR           ),
+    DEF_VALS1(MQRC_BMHO_ERROR                ),
+    DEF_VALS1(MQRC_UNSUPPORTED_PROPERTY      ),
+    DEF_VALS1(MQRC_PROP_NAME_NOT_CONVERTED   ),
+    DEF_VALS1(MQRC_GET_ENABLED               ),
+    DEF_VALS1(MQRC_MODULE_NOT_FOUND          ),
+    DEF_VALS1(MQRC_MODULE_INVALID            ),
+    DEF_VALS1(MQRC_MODULE_ENTRY_NOT_FOUND    ),
+    DEF_VALS1(MQRC_MIXED_CONTENT_NOT_ALLOWED ),
+    DEF_VALS1(MQRC_MSG_HANDLE_IN_USE         ),
+    DEF_VALS1(MQRC_HCONN_ASYNC_ACTIVE        ),
+    DEF_VALS1(MQRC_MHBO_ERROR                ),
+    DEF_VALS1(MQRC_PUBLICATION_FAILURE       ),
+    DEF_VALS1(MQRC_SUB_INHIBITED             ),
+    DEF_VALS1(MQRC_SELECTOR_ALWAYS_FALSE     ),
+    DEF_VALS1(MQRC_XEPO_ERROR                ),
+    DEF_VALS1(MQRC_DURABILITY_NOT_ALTERABLE  ),
+    DEF_VALS1(MQRC_TOPIC_NOT_ALTERABLE       ),
+    DEF_VALS1(MQRC_SUBLEVEL_NOT_ALTERABLE    ),
+    DEF_VALS1(MQRC_PROPERTY_NAME_LENGTH_ERR  ),
+    DEF_VALS1(MQRC_DUPLICATE_GROUP_SUB       ),
+    DEF_VALS1(MQRC_GROUPING_NOT_ALTERABLE    ),
+    DEF_VALS1(MQRC_SELECTOR_INVALID_FOR_TYPE ),
+    DEF_VALS1(MQRC_HOBJ_QUIESCED             ),
+    DEF_VALS1(MQRC_HOBJ_QUIESCED_NO_MSGS     ),
+    DEF_VALS1(MQRC_SELECTION_STRING_ERROR    ),
+    DEF_VALS1(MQRC_RES_OBJECT_STRING_ERROR   ),
+    DEF_VALS1(MQRC_CONNECTION_SUSPENDED      ),
+    DEF_VALS1(MQRC_INVALID_DESTINATION       ),
+    DEF_VALS1(MQRC_INVALID_SUBSCRIPTION      ),
+    DEF_VALS1(MQRC_SELECTOR_NOT_ALTERABLE    ),
+    DEF_VALS1(MQRC_RETAINED_MSG_Q_ERROR      ),
+    DEF_VALS1(MQRC_RETAINED_NOT_DELIVERED    ),
+    DEF_VALS1(MQRC_RFH_RESTRICTED_FORMAT_ERR ),
+    DEF_VALS1(MQRC_CONNECTION_STOPPED        ),
+    DEF_VALS1(MQRC_ASYNC_UOW_CONFLICT        ),
+    DEF_VALS1(MQRC_ASYNC_XA_CONFLICT         ),
+    DEF_VALS1(MQRC_PUBSUB_INHIBITED          ),
+    DEF_VALS1(MQRC_MSG_HANDLE_COPY_FAILURE   ),
+    DEF_VALS1(MQRC_DEST_CLASS_NOT_ALTERABLE  ),
+    DEF_VALS1(MQRC_OPERATION_NOT_ALLOWED     ),
+    DEF_VALS1(MQRC_ACTION_ERROR              ),
+    DEF_VALS1(MQRC_CHANNEL_NOT_AVAILABLE     ),
+    DEF_VALS1(MQRC_HOST_NOT_AVAILABLE        ),
+    DEF_VALS1(MQRC_CHANNEL_CONFIG_ERROR      ),
+    DEF_VALS1(MQRC_UNKNOWN_CHANNEL_NAME      ),
+    DEF_VALS1(MQRC_LOOPING_PUBLICATION       ),
+    DEF_VALS1(MQRC_ALREADY_JOINED            ),
+    DEF_VALS1(MQRC_STANDBY_Q_MGR             ),
+    DEF_VALS1(MQRC_RECONNECTING              ),
+    DEF_VALS1(MQRC_RECONNECTED               ),
+    DEF_VALS1(MQRC_RECONNECT_QMID_MISMATCH   ),
+    DEF_VALS1(MQRC_RECONNECT_INCOMPATIBLE    ),
+    DEF_VALS1(MQRC_RECONNECT_FAILED          ),
+    DEF_VALS1(MQRC_CALL_INTERRUPTED          ),
+    DEF_VALS1(MQRC_NO_SUBS_MATCHED           ),
+    DEF_VALS1(MQRC_SELECTION_NOT_AVAILABLE   ),
+    DEF_VALS1(MQRC_CHANNEL_SSL_WARNING       ),
+    DEF_VALS1(MQRC_OCSP_URL_ERROR            ),
+    DEF_VALS1(MQRC_CONTENT_ERROR             ),
+    DEF_VALS1(MQRC_RECONNECT_Q_MGR_REQD      ),
+    DEF_VALS1(MQRC_RECONNECT_TIMED_OUT       ),
+    DEF_VALS1(MQRC_PUBLISH_EXIT_ERROR        ),
+    DEF_VALS1(MQRC_SSL_ALT_PROVIDER_REQUIRED ),
+    DEF_VALS1(MQRC_PRECONN_EXIT_LOAD_ERROR   ),
+    DEF_VALS1(MQRC_PRECONN_EXIT_NOT_FOUND    ),
+    DEF_VALS1(MQRC_PRECONN_EXIT_ERROR        ),
+    DEF_VALS1(MQRC_CD_ARRAY_ERROR            ),
+    DEF_VALS1(MQRC_CHANNEL_BLOCKED           ),
+    DEF_VALS1(MQRC_CHANNEL_BLOCKED_WARNING   ),
+    DEF_VALS1(MQRC_SUBSCRIPTION_CREATE       ),
+    DEF_VALS1(MQRC_SUBSCRIPTION_DELETE       ),
+    DEF_VALS1(MQRC_SUBSCRIPTION_CHANGE       ),
+    DEF_VALS1(MQRC_SUBSCRIPTION_REFRESH      ),
+    DEF_VALS1(MQRC_INSTALLATION_MISMATCH     ),
+    DEF_VALS1(MQRC_NOT_PRIVILEGED            ),
+    DEF_VALS1(MQRC_PROPERTIES_DISABLED       ),
+    DEF_VALS1(MQRC_HMSG_NOT_AVAILABLE        ),
+    DEF_VALS1(MQRC_EXIT_PROPS_NOT_SUPPORTED  ),
+    DEF_VALS1(MQRC_INSTALLATION_MISSING      ),
+    DEF_VALS1(MQRC_FASTPATH_NOT_AVAILABLE    ),
+    DEF_VALS1(MQRC_CIPHER_SPEC_NOT_SUITE_B   ),
+    DEF_VALS1(MQRC_SUITE_B_ERROR             ),
+    DEF_VALS1(MQRC_CERT_VAL_POLICY_ERROR     ),
+
+    DEF_VALS1(MQRCCF_CFH_TYPE_ERROR             ),
+    DEF_VALS1(MQRCCF_CFH_LENGTH_ERROR           ),
+    DEF_VALS1(MQRCCF_CFH_VERSION_ERROR          ),
+    DEF_VALS1(MQRCCF_CFH_MSG_SEQ_NUMBER_ERR     ),
+    DEF_VALS1(MQRCCF_CFH_CONTROL_ERROR          ),
+    DEF_VALS1(MQRCCF_CFH_PARM_COUNT_ERROR       ),
+    DEF_VALS1(MQRCCF_CFH_COMMAND_ERROR          ),
+    DEF_VALS1(MQRCCF_COMMAND_FAILED             ),
+    DEF_VALS1(MQRCCF_CFIN_LENGTH_ERROR          ),
+    DEF_VALS1(MQRCCF_CFST_LENGTH_ERROR          ),
+    DEF_VALS1(MQRCCF_CFST_STRING_LENGTH_ERR     ),
+    DEF_VALS1(MQRCCF_FORCE_VALUE_ERROR          ),
+    DEF_VALS1(MQRCCF_STRUCTURE_TYPE_ERROR       ),
+    DEF_VALS1(MQRCCF_CFIN_PARM_ID_ERROR         ),
+    DEF_VALS1(MQRCCF_CFST_PARM_ID_ERROR         ),
+    DEF_VALS1(MQRCCF_MSG_LENGTH_ERROR           ),
+    DEF_VALS1(MQRCCF_CFIN_DUPLICATE_PARM        ),
+    DEF_VALS1(MQRCCF_CFST_DUPLICATE_PARM        ),
+    DEF_VALS1(MQRCCF_PARM_COUNT_TOO_SMALL       ),
+    DEF_VALS1(MQRCCF_PARM_COUNT_TOO_BIG         ),
+    DEF_VALS1(MQRCCF_Q_ALREADY_IN_CELL          ),
+    DEF_VALS1(MQRCCF_Q_TYPE_ERROR               ),
+    DEF_VALS1(MQRCCF_MD_FORMAT_ERROR            ),
+    DEF_VALS1(MQRCCF_CFSL_LENGTH_ERROR          ),
+    DEF_VALS1(MQRCCF_REPLACE_VALUE_ERROR        ),
+    DEF_VALS1(MQRCCF_CFIL_DUPLICATE_VALUE       ),
+    DEF_VALS1(MQRCCF_CFIL_COUNT_ERROR           ),
+    DEF_VALS1(MQRCCF_CFIL_LENGTH_ERROR          ),
+    DEF_VALS1(MQRCCF_QUIESCE_VALUE_ERROR        ),
+    DEF_VALS1(MQRCCF_MODE_VALUE_ERROR           ),
+    DEF_VALS1(MQRCCF_MSG_SEQ_NUMBER_ERROR       ),
+    DEF_VALS1(MQRCCF_PING_DATA_COUNT_ERROR      ),
+    DEF_VALS1(MQRCCF_PING_DATA_COMPARE_ERROR    ),
+    DEF_VALS1(MQRCCF_CFSL_PARM_ID_ERROR         ),
+    DEF_VALS1(MQRCCF_CHANNEL_TYPE_ERROR         ),
+    DEF_VALS1(MQRCCF_PARM_SEQUENCE_ERROR        ),
+    DEF_VALS1(MQRCCF_XMIT_PROTOCOL_TYPE_ERR     ),
+    DEF_VALS1(MQRCCF_BATCH_SIZE_ERROR           ),
+    DEF_VALS1(MQRCCF_DISC_INT_ERROR             ),
+    DEF_VALS1(MQRCCF_SHORT_RETRY_ERROR          ),
+    DEF_VALS1(MQRCCF_SHORT_TIMER_ERROR          ),
+    DEF_VALS1(MQRCCF_LONG_RETRY_ERROR           ),
+    DEF_VALS1(MQRCCF_LONG_TIMER_ERROR           ),
+    DEF_VALS1(MQRCCF_SEQ_NUMBER_WRAP_ERROR      ),
+    DEF_VALS1(MQRCCF_MAX_MSG_LENGTH_ERROR       ),
+    DEF_VALS1(MQRCCF_PUT_AUTH_ERROR             ),
+    DEF_VALS1(MQRCCF_PURGE_VALUE_ERROR          ),
+    DEF_VALS1(MQRCCF_CFIL_PARM_ID_ERROR         ),
+    DEF_VALS1(MQRCCF_MSG_TRUNCATED              ),
+    DEF_VALS1(MQRCCF_CCSID_ERROR                ),
+    DEF_VALS1(MQRCCF_ENCODING_ERROR             ),
+    DEF_VALS1(MQRCCF_QUEUES_VALUE_ERROR         ),
+    DEF_VALS1(MQRCCF_DATA_CONV_VALUE_ERROR      ),
+    DEF_VALS1(MQRCCF_INDOUBT_VALUE_ERROR        ),
+    DEF_VALS1(MQRCCF_ESCAPE_TYPE_ERROR          ),
+    DEF_VALS1(MQRCCF_REPOS_VALUE_ERROR          ),
+    DEF_VALS1(MQRCCF_CHANNEL_TABLE_ERROR        ),
+    DEF_VALS1(MQRCCF_MCA_TYPE_ERROR             ),
+    DEF_VALS1(MQRCCF_CHL_INST_TYPE_ERROR        ),
+    DEF_VALS1(MQRCCF_CHL_STATUS_NOT_FOUND       ),
+    DEF_VALS1(MQRCCF_CFSL_DUPLICATE_PARM        ),
+    DEF_VALS1(MQRCCF_CFSL_TOTAL_LENGTH_ERROR    ),
+    DEF_VALS1(MQRCCF_CFSL_COUNT_ERROR           ),
+    DEF_VALS1(MQRCCF_CFSL_STRING_LENGTH_ERR     ),
+    DEF_VALS1(MQRCCF_BROKER_DELETED             ),
+    DEF_VALS1(MQRCCF_STREAM_ERROR               ),
+    DEF_VALS1(MQRCCF_TOPIC_ERROR                ),
+    DEF_VALS1(MQRCCF_NOT_REGISTERED             ),
+    DEF_VALS1(MQRCCF_Q_MGR_NAME_ERROR           ),
+    DEF_VALS1(MQRCCF_INCORRECT_STREAM           ),
+    DEF_VALS1(MQRCCF_Q_NAME_ERROR               ),
+    DEF_VALS1(MQRCCF_NO_RETAINED_MSG            ),
+    DEF_VALS1(MQRCCF_DUPLICATE_IDENTITY         ),
+    DEF_VALS1(MQRCCF_INCORRECT_Q                ),
+    DEF_VALS1(MQRCCF_CORREL_ID_ERROR            ),
+    DEF_VALS1(MQRCCF_NOT_AUTHORIZED             ),
+    DEF_VALS1(MQRCCF_UNKNOWN_STREAM             ),
+    DEF_VALS1(MQRCCF_REG_OPTIONS_ERROR          ),
+    DEF_VALS1(MQRCCF_PUB_OPTIONS_ERROR          ),
+    DEF_VALS1(MQRCCF_UNKNOWN_BROKER             ),
+    DEF_VALS1(MQRCCF_Q_MGR_CCSID_ERROR          ),
+    DEF_VALS1(MQRCCF_DEL_OPTIONS_ERROR          ),
+    DEF_VALS1(MQRCCF_CLUSTER_NAME_CONFLICT      ),
+    DEF_VALS1(MQRCCF_REPOS_NAME_CONFLICT        ),
+    DEF_VALS1(MQRCCF_CLUSTER_Q_USAGE_ERROR      ),
+    DEF_VALS1(MQRCCF_ACTION_VALUE_ERROR         ),
+    DEF_VALS1(MQRCCF_COMMS_LIBRARY_ERROR        ),
+    DEF_VALS1(MQRCCF_NETBIOS_NAME_ERROR         ),
+    DEF_VALS1(MQRCCF_BROKER_COMMAND_FAILED      ),
+    DEF_VALS1(MQRCCF_CFST_CONFLICTING_PARM      ),
+    DEF_VALS1(MQRCCF_PATH_NOT_VALID             ),
+    DEF_VALS1(MQRCCF_PARM_SYNTAX_ERROR          ),
+    DEF_VALS1(MQRCCF_PWD_LENGTH_ERROR           ),
+    DEF_VALS1(MQRCCF_FILTER_ERROR               ),
+    DEF_VALS1(MQRCCF_WRONG_USER                 ),
+    DEF_VALS1(MQRCCF_DUPLICATE_SUBSCRIPTION     ),
+    DEF_VALS1(MQRCCF_SUB_NAME_ERROR             ),
+    DEF_VALS1(MQRCCF_SUB_IDENTITY_ERROR         ),
+    DEF_VALS1(MQRCCF_SUBSCRIPTION_IN_USE        ),
+    DEF_VALS1(MQRCCF_SUBSCRIPTION_LOCKED        ),
+    DEF_VALS1(MQRCCF_ALREADY_JOINED             ),
+    DEF_VALS1(MQRCCF_OBJECT_IN_USE              ),
+    DEF_VALS1(MQRCCF_UNKNOWN_FILE_NAME          ),
+    DEF_VALS1(MQRCCF_FILE_NOT_AVAILABLE         ),
+    DEF_VALS1(MQRCCF_DISC_RETRY_ERROR           ),
+    DEF_VALS1(MQRCCF_ALLOC_RETRY_ERROR          ),
+    DEF_VALS1(MQRCCF_ALLOC_SLOW_TIMER_ERROR     ),
+    DEF_VALS1(MQRCCF_ALLOC_FAST_TIMER_ERROR     ),
+    DEF_VALS1(MQRCCF_PORT_NUMBER_ERROR          ),
+    DEF_VALS1(MQRCCF_CHL_SYSTEM_NOT_ACTIVE      ),
+    DEF_VALS1(MQRCCF_ENTITY_NAME_MISSING        ),
+    DEF_VALS1(MQRCCF_PROFILE_NAME_ERROR         ),
+    DEF_VALS1(MQRCCF_AUTH_VALUE_ERROR           ),
+    DEF_VALS1(MQRCCF_AUTH_VALUE_MISSING         ),
+    DEF_VALS1(MQRCCF_OBJECT_TYPE_MISSING        ),
+    DEF_VALS1(MQRCCF_CONNECTION_ID_ERROR        ),
+    DEF_VALS1(MQRCCF_LOG_TYPE_ERROR             ),
+    DEF_VALS1(MQRCCF_PROGRAM_NOT_AVAILABLE      ),
+    DEF_VALS1(MQRCCF_PROGRAM_AUTH_FAILED        ),
+    DEF_VALS1(MQRCCF_NONE_FOUND                 ),
+    DEF_VALS1(MQRCCF_SECURITY_SWITCH_OFF        ),
+    DEF_VALS1(MQRCCF_SECURITY_REFRESH_FAILED    ),
+    DEF_VALS1(MQRCCF_PARM_CONFLICT              ),
+    DEF_VALS1(MQRCCF_COMMAND_INHIBITED          ),
+    DEF_VALS1(MQRCCF_OBJECT_BEING_DELETED       ),
+    DEF_VALS1(MQRCCF_STORAGE_CLASS_IN_USE       ),
+    DEF_VALS1(MQRCCF_OBJECT_NAME_RESTRICTED     ),
+    DEF_VALS1(MQRCCF_OBJECT_LIMIT_EXCEEDED      ),
+    DEF_VALS1(MQRCCF_OBJECT_OPEN_FORCE          ),
+    DEF_VALS1(MQRCCF_DISPOSITION_CONFLICT       ),
+    DEF_VALS1(MQRCCF_Q_MGR_NOT_IN_QSG           ),
+    DEF_VALS1(MQRCCF_ATTR_VALUE_FIXED           ),
+    DEF_VALS1(MQRCCF_NAMELIST_ERROR             ),
+    DEF_VALS1(MQRCCF_NO_CHANNEL_INITIATOR       ),
+    DEF_VALS1(MQRCCF_CHANNEL_INITIATOR_ERROR    ),
+    DEF_VALS1(MQRCCF_COMMAND_LEVEL_CONFLICT     ),
+    DEF_VALS1(MQRCCF_Q_ATTR_CONFLICT            ),
+    DEF_VALS1(MQRCCF_EVENTS_DISABLED            ),
+    DEF_VALS1(MQRCCF_COMMAND_SCOPE_ERROR        ),
+    DEF_VALS1(MQRCCF_COMMAND_REPLY_ERROR        ),
+    DEF_VALS1(MQRCCF_FUNCTION_RESTRICTED        ),
+    DEF_VALS1(MQRCCF_PARM_MISSING               ),
+    DEF_VALS1(MQRCCF_PARM_VALUE_ERROR           ),
+    DEF_VALS1(MQRCCF_COMMAND_LENGTH_ERROR       ),
+    DEF_VALS1(MQRCCF_COMMAND_ORIGIN_ERROR       ),
+    DEF_VALS1(MQRCCF_LISTENER_CONFLICT          ),
+    DEF_VALS1(MQRCCF_LISTENER_STARTED           ),
+    DEF_VALS1(MQRCCF_LISTENER_STOPPED           ),
+    DEF_VALS1(MQRCCF_CHANNEL_ERROR              ),
+    DEF_VALS1(MQRCCF_CF_STRUC_ERROR             ),
+    DEF_VALS1(MQRCCF_UNKNOWN_USER_ID            ),
+    DEF_VALS1(MQRCCF_UNEXPECTED_ERROR           ),
+    DEF_VALS1(MQRCCF_NO_XCF_PARTNER             ),
+    DEF_VALS1(MQRCCF_CFGR_PARM_ID_ERROR         ),
+    DEF_VALS1(MQRCCF_CFIF_LENGTH_ERROR          ),
+    DEF_VALS1(MQRCCF_CFIF_OPERATOR_ERROR        ),
+    DEF_VALS1(MQRCCF_CFIF_PARM_ID_ERROR         ),
+    DEF_VALS1(MQRCCF_CFSF_FILTER_VAL_LEN_ERR    ),
+    DEF_VALS1(MQRCCF_CFSF_LENGTH_ERROR          ),
+    DEF_VALS1(MQRCCF_CFSF_OPERATOR_ERROR        ),
+    DEF_VALS1(MQRCCF_CFSF_PARM_ID_ERROR         ),
+    DEF_VALS1(MQRCCF_TOO_MANY_FILTERS           ),
+    DEF_VALS1(MQRCCF_LISTENER_RUNNING           ),
+    DEF_VALS1(MQRCCF_LSTR_STATUS_NOT_FOUND      ),
+    DEF_VALS1(MQRCCF_SERVICE_RUNNING            ),
+    DEF_VALS1(MQRCCF_SERV_STATUS_NOT_FOUND      ),
+    DEF_VALS1(MQRCCF_SERVICE_STOPPED            ),
+    DEF_VALS1(MQRCCF_CFBS_DUPLICATE_PARM        ),
+    DEF_VALS1(MQRCCF_CFBS_LENGTH_ERROR          ),
+    DEF_VALS1(MQRCCF_CFBS_PARM_ID_ERROR         ),
+    DEF_VALS1(MQRCCF_CFBS_STRING_LENGTH_ERR     ),
+    DEF_VALS1(MQRCCF_CFGR_LENGTH_ERROR          ),
+    DEF_VALS1(MQRCCF_CFGR_PARM_COUNT_ERROR      ),
+    DEF_VALS1(MQRCCF_CONN_NOT_STOPPED           ),
+    DEF_VALS1(MQRCCF_SERVICE_REQUEST_PENDING    ),
+    DEF_VALS1(MQRCCF_NO_START_CMD               ),
+    DEF_VALS1(MQRCCF_NO_STOP_CMD                ),
+    DEF_VALS1(MQRCCF_CFBF_LENGTH_ERROR          ),
+    DEF_VALS1(MQRCCF_CFBF_PARM_ID_ERROR         ),
+    DEF_VALS1(MQRCCF_CFBF_OPERATOR_ERROR        ),
+    DEF_VALS1(MQRCCF_CFBF_FILTER_VAL_LEN_ERR    ),
+    DEF_VALS1(MQRCCF_LISTENER_STILL_ACTIVE      ),
+    DEF_VALS1(MQRCCF_TOPICSTR_ALREADY_EXISTS    ),
+    DEF_VALS1(MQRCCF_SHARING_CONVS_ERROR        ),
+    DEF_VALS1(MQRCCF_SHARING_CONVS_TYPE         ),
+    DEF_VALS1(MQRCCF_SECURITY_CASE_CONFLICT     ),
+    DEF_VALS1(MQRCCF_TOPIC_TYPE_ERROR           ),
+    DEF_VALS1(MQRCCF_MAX_INSTANCES_ERROR        ),
+    DEF_VALS1(MQRCCF_MAX_INSTS_PER_CLNT_ERR     ),
+    DEF_VALS1(MQRCCF_TOPIC_STRING_NOT_FOUND     ),
+    DEF_VALS1(MQRCCF_SUBSCRIPTION_POINT_ERR     ),
+    DEF_VALS1(MQRCCF_SUB_ALREADY_EXISTS         ),
+    DEF_VALS1(MQRCCF_UNKNOWN_OBJECT_NAME        ),
+    DEF_VALS1(MQRCCF_REMOTE_Q_NAME_ERROR        ),
+    DEF_VALS1(MQRCCF_DURABILITY_NOT_ALLOWED     ),
+    DEF_VALS1(MQRCCF_HOBJ_ERROR                 ),
+    DEF_VALS1(MQRCCF_DEST_NAME_ERROR            ),
+    DEF_VALS1(MQRCCF_INVALID_DESTINATION        ),
+    DEF_VALS1(MQRCCF_PUBSUB_INHIBITED           ),
+    DEF_VALS1(MQRCCF_GROUPUR_CHECKS_FAILED      ),
+    DEF_VALS1(MQRCCF_SSL_ALT_PROVIDER_REQD      ),
+    DEF_VALS1(MQRCCF_OBJECT_ALREADY_EXISTS      ),
+    DEF_VALS1(MQRCCF_OBJECT_WRONG_TYPE          ),
+    DEF_VALS1(MQRCCF_LIKE_OBJECT_WRONG_TYPE     ),
+    DEF_VALS1(MQRCCF_OBJECT_OPEN                ),
+    DEF_VALS1(MQRCCF_ATTR_VALUE_ERROR           ),
+    DEF_VALS1(MQRCCF_UNKNOWN_Q_MGR              ),
+    DEF_VALS1(MQRCCF_Q_WRONG_TYPE               ),
+    DEF_VALS1(MQRCCF_OBJECT_NAME_ERROR          ),
+    DEF_VALS1(MQRCCF_ALLOCATE_FAILED            ),
+    DEF_VALS1(MQRCCF_HOST_NOT_AVAILABLE         ),
+    DEF_VALS1(MQRCCF_CONFIGURATION_ERROR        ),
+    DEF_VALS1(MQRCCF_CONNECTION_REFUSED         ),
+    DEF_VALS1(MQRCCF_ENTRY_ERROR                ),
+    DEF_VALS1(MQRCCF_SEND_FAILED                ),
+    DEF_VALS1(MQRCCF_RECEIVED_DATA_ERROR        ),
+    DEF_VALS1(MQRCCF_RECEIVE_FAILED             ),
+    DEF_VALS1(MQRCCF_CONNECTION_CLOSED          ),
+    DEF_VALS1(MQRCCF_NO_STORAGE                 ),
+    DEF_VALS1(MQRCCF_NO_COMMS_MANAGER           ),
+    DEF_VALS1(MQRCCF_LISTENER_NOT_STARTED       ),
+    DEF_VALS1(MQRCCF_BIND_FAILED                ),
+    DEF_VALS1(MQRCCF_CHANNEL_INDOUBT            ),
+    DEF_VALS1(MQRCCF_MQCONN_FAILED              ),
+    DEF_VALS1(MQRCCF_MQOPEN_FAILED              ),
+    DEF_VALS1(MQRCCF_MQGET_FAILED               ),
+    DEF_VALS1(MQRCCF_MQPUT_FAILED               ),
+    DEF_VALS1(MQRCCF_PING_ERROR                 ),
+    DEF_VALS1(MQRCCF_CHANNEL_IN_USE             ),
+    DEF_VALS1(MQRCCF_CHANNEL_NOT_FOUND          ),
+    DEF_VALS1(MQRCCF_UNKNOWN_REMOTE_CHANNEL     ),
+    DEF_VALS1(MQRCCF_REMOTE_QM_UNAVAILABLE      ),
+    DEF_VALS1(MQRCCF_REMOTE_QM_TERMINATING      ),
+    DEF_VALS1(MQRCCF_MQINQ_FAILED               ),
+    DEF_VALS1(MQRCCF_NOT_XMIT_Q                 ),
+    DEF_VALS1(MQRCCF_CHANNEL_DISABLED           ),
+    DEF_VALS1(MQRCCF_USER_EXIT_NOT_AVAILABLE    ),
+    DEF_VALS1(MQRCCF_COMMIT_FAILED              ),
+    DEF_VALS1(MQRCCF_WRONG_CHANNEL_TYPE         ),
+    DEF_VALS1(MQRCCF_CHANNEL_ALREADY_EXISTS     ),
+    DEF_VALS1(MQRCCF_DATA_TOO_LARGE             ),
+    DEF_VALS1(MQRCCF_CHANNEL_NAME_ERROR         ),
+    DEF_VALS1(MQRCCF_XMIT_Q_NAME_ERROR          ),
+    DEF_VALS1(MQRCCF_MCA_NAME_ERROR             ),
+    DEF_VALS1(MQRCCF_SEND_EXIT_NAME_ERROR       ),
+    DEF_VALS1(MQRCCF_SEC_EXIT_NAME_ERROR        ),
+    DEF_VALS1(MQRCCF_MSG_EXIT_NAME_ERROR        ),
+    DEF_VALS1(MQRCCF_RCV_EXIT_NAME_ERROR        ),
+    DEF_VALS1(MQRCCF_XMIT_Q_NAME_WRONG_TYPE     ),
+    DEF_VALS1(MQRCCF_MCA_NAME_WRONG_TYPE        ),
+    DEF_VALS1(MQRCCF_DISC_INT_WRONG_TYPE        ),
+    DEF_VALS1(MQRCCF_SHORT_RETRY_WRONG_TYPE     ),
+    DEF_VALS1(MQRCCF_SHORT_TIMER_WRONG_TYPE     ),
+    DEF_VALS1(MQRCCF_LONG_RETRY_WRONG_TYPE      ),
+    DEF_VALS1(MQRCCF_LONG_TIMER_WRONG_TYPE      ),
+    DEF_VALS1(MQRCCF_PUT_AUTH_WRONG_TYPE        ),
+    DEF_VALS1(MQRCCF_KEEP_ALIVE_INT_ERROR       ),
+    DEF_VALS1(MQRCCF_MISSING_CONN_NAME          ),
+    DEF_VALS1(MQRCCF_CONN_NAME_ERROR            ),
+    DEF_VALS1(MQRCCF_MQSET_FAILED               ),
+    DEF_VALS1(MQRCCF_CHANNEL_NOT_ACTIVE         ),
+    DEF_VALS1(MQRCCF_TERMINATED_BY_SEC_EXIT     ),
+    DEF_VALS1(MQRCCF_DYNAMIC_Q_SCOPE_ERROR      ),
+    DEF_VALS1(MQRCCF_CELL_DIR_NOT_AVAILABLE     ),
+    DEF_VALS1(MQRCCF_MR_COUNT_ERROR             ),
+    DEF_VALS1(MQRCCF_MR_COUNT_WRONG_TYPE        ),
+    DEF_VALS1(MQRCCF_MR_EXIT_NAME_ERROR         ),
+    DEF_VALS1(MQRCCF_MR_EXIT_NAME_WRONG_TYPE    ),
+    DEF_VALS1(MQRCCF_MR_INTERVAL_ERROR          ),
+    DEF_VALS1(MQRCCF_MR_INTERVAL_WRONG_TYPE     ),
+    DEF_VALS1(MQRCCF_NPM_SPEED_ERROR            ),
+    DEF_VALS1(MQRCCF_NPM_SPEED_WRONG_TYPE       ),
+    DEF_VALS1(MQRCCF_HB_INTERVAL_ERROR          ),
+    DEF_VALS1(MQRCCF_HB_INTERVAL_WRONG_TYPE     ),
+    DEF_VALS1(MQRCCF_CHAD_ERROR                 ),
+    DEF_VALS1(MQRCCF_CHAD_WRONG_TYPE            ),
+    DEF_VALS1(MQRCCF_CHAD_EVENT_ERROR           ),
+    DEF_VALS1(MQRCCF_CHAD_EVENT_WRONG_TYPE      ),
+    DEF_VALS1(MQRCCF_CHAD_EXIT_ERROR            ),
+    DEF_VALS1(MQRCCF_CHAD_EXIT_WRONG_TYPE       ),
+    DEF_VALS1(MQRCCF_SUPPRESSED_BY_EXIT         ),
+    DEF_VALS1(MQRCCF_BATCH_INT_ERROR            ),
+    DEF_VALS1(MQRCCF_BATCH_INT_WRONG_TYPE       ),
+    DEF_VALS1(MQRCCF_NET_PRIORITY_ERROR         ),
+    DEF_VALS1(MQRCCF_NET_PRIORITY_WRONG_TYPE    ),
+    DEF_VALS1(MQRCCF_CHANNEL_CLOSED             ),
+    DEF_VALS1(MQRCCF_Q_STATUS_NOT_FOUND         ),
+    DEF_VALS1(MQRCCF_SSL_CIPHER_SPEC_ERROR      ),
+    DEF_VALS1(MQRCCF_SSL_PEER_NAME_ERROR        ),
+    DEF_VALS1(MQRCCF_SSL_CLIENT_AUTH_ERROR      ),
+    DEF_VALS1(MQRCCF_RETAINED_NOT_SUPPORTED     ),
+
+    DEF_VALS1(MQRC_REOPEN_EXCL_INPUT_ERROR   ),
+    DEF_VALS1(MQRC_REOPEN_INQUIRE_ERROR      ),
+    DEF_VALS1(MQRC_REOPEN_SAVED_CONTEXT_ERR  ),
+    DEF_VALS1(MQRC_REOPEN_TEMPORARY_Q_ERROR  ),
+    DEF_VALS1(MQRC_ATTRIBUTE_LOCKED          ),
+    DEF_VALS1(MQRC_CURSOR_NOT_VALID          ),
+    DEF_VALS1(MQRC_ENCODING_ERROR            ),
+    DEF_VALS1(MQRC_STRUC_ID_ERROR            ),
+    DEF_VALS1(MQRC_NULL_POINTER              ),
+    DEF_VALS1(MQRC_NO_CONNECTION_REFERENCE   ),
+    DEF_VALS1(MQRC_NO_BUFFER                 ),
+    DEF_VALS1(MQRC_BINARY_DATA_LENGTH_ERROR  ),
+    DEF_VALS1(MQRC_BUFFER_NOT_AUTOMATIC      ),
+    DEF_VALS1(MQRC_INSUFFICIENT_BUFFER       ),
+    DEF_VALS1(MQRC_INSUFFICIENT_DATA         ),
+    DEF_VALS1(MQRC_DATA_TRUNCATED            ),
+    DEF_VALS1(MQRC_ZERO_LENGTH               ),
+    DEF_VALS1(MQRC_NEGATIVE_LENGTH           ),
+    DEF_VALS1(MQRC_NEGATIVE_OFFSET           ),
+    DEF_VALS1(MQRC_INCONSISTENT_FORMAT       ),
+    DEF_VALS1(MQRC_INCONSISTENT_OBJECT_STATE ),
+    DEF_VALS1(MQRC_CONTEXT_OBJECT_NOT_VALID  ),
+    DEF_VALS1(MQRC_CONTEXT_OPEN_ERROR        ),
+    DEF_VALS1(MQRC_STRUC_LENGTH_ERROR        ),
+    DEF_VALS1(MQRC_NOT_CONNECTED             ),
+    DEF_VALS1(MQRC_NOT_OPEN                  ),
+    DEF_VALS1(MQRC_DISTRIBUTION_LIST_EMPTY   ),
+    DEF_VALS1(MQRC_INCONSISTENT_OPEN_OPTIONS ),
+    DEF_VALS1(MQRC_WRONG_VERSION             ),
+    DEF_VALS1(MQRC_REFERENCE_ERROR           ),
+    DEF_VALS1(MQRC_XR_NOT_AVAILABLE          ),
 DEF_VALSE;
 
 DEF_VALSBX(selector)
-	DEF_VALS1(MQIA_APPL_TYPE                 ),
-	DEF_VALS1(MQIA_CODED_CHAR_SET_ID         ),
-	DEF_VALS1(MQIA_CURRENT_Q_DEPTH           ),
-	DEF_VALS1(MQIA_DEF_INPUT_OPEN_OPTION     ),
-	DEF_VALS1(MQIA_DEF_PERSISTENCE           ),
-	DEF_VALS1(MQIA_DEF_PRIORITY              ),
-	DEF_VALS1(MQIA_DEFINITION_TYPE           ),
-	DEF_VALS1(MQIA_HARDEN_GET_BACKOUT        ),
-	DEF_VALS1(MQIA_INHIBIT_GET               ),
-	DEF_VALS1(MQIA_INHIBIT_PUT               ),
-	DEF_VALS1(MQIA_MAX_HANDLES               ),
-	DEF_VALS1(MQIA_USAGE                     ),
-	DEF_VALS1(MQIA_MAX_MSG_LENGTH            ),
-	DEF_VALS1(MQIA_MAX_PRIORITY              ),
-	DEF_VALS1(MQIA_MAX_Q_DEPTH               ),
-	DEF_VALS1(MQIA_MSG_DELIVERY_SEQUENCE     ),
-	DEF_VALS1(MQIA_OPEN_INPUT_COUNT          ),
-	DEF_VALS1(MQIA_OPEN_OUTPUT_COUNT         ),
-	DEF_VALS1(MQIA_NAME_COUNT                ),
-	DEF_VALS1(MQIA_Q_TYPE                    ),
-	DEF_VALS1(MQIA_RETENTION_INTERVAL        ),
-	DEF_VALS1(MQIA_BACKOUT_THRESHOLD         ),
-	DEF_VALS1(MQIA_SHAREABILITY              ),
-	DEF_VALS1(MQIA_TRIGGER_CONTROL           ),
-	DEF_VALS1(MQIA_TRIGGER_INTERVAL          ),
-	DEF_VALS1(MQIA_TRIGGER_MSG_PRIORITY      ),
-	DEF_VALS1(MQIA_CPI_LEVEL                 ),
-	DEF_VALS1(MQIA_TRIGGER_TYPE              ),
-	DEF_VALS1(MQIA_TRIGGER_DEPTH             ),
-	DEF_VALS1(MQIA_SYNCPOINT                 ),
-	DEF_VALS1(MQIA_COMMAND_LEVEL             ),
-	DEF_VALS1(MQIA_PLATFORM                  ),
-	DEF_VALS1(MQIA_MAX_UNCOMMITTED_MSGS      ),
-	DEF_VALS1(MQIA_DIST_LISTS                ),
-	DEF_VALS1(MQIA_TIME_SINCE_RESET          ),
-	DEF_VALS1(MQIA_HIGH_Q_DEPTH              ),
-	DEF_VALS1(MQIA_MSG_ENQ_COUNT             ),
-	DEF_VALS1(MQIA_MSG_DEQ_COUNT             ),
-	DEF_VALS1(MQIA_EXPIRY_INTERVAL           ),
-	DEF_VALS1(MQIA_Q_DEPTH_HIGH_LIMIT        ),
-	DEF_VALS1(MQIA_Q_DEPTH_LOW_LIMIT         ),
-	DEF_VALS1(MQIA_Q_DEPTH_MAX_EVENT         ),
-	DEF_VALS1(MQIA_Q_DEPTH_HIGH_EVENT        ),
-	DEF_VALS1(MQIA_Q_DEPTH_LOW_EVENT         ),
-	DEF_VALS1(MQIA_SCOPE                     ),
-	DEF_VALS1(MQIA_Q_SERVICE_INTERVAL_EVENT  ),
-	DEF_VALS1(MQIA_AUTHORITY_EVENT           ),
-	DEF_VALS1(MQIA_INHIBIT_EVENT             ),
-	DEF_VALS1(MQIA_LOCAL_EVENT               ),
-	DEF_VALS1(MQIA_REMOTE_EVENT              ),
-	DEF_VALS1(MQIA_CONFIGURATION_EVENT       ),
-	DEF_VALS1(MQIA_START_STOP_EVENT          ),
-	DEF_VALS1(MQIA_PERFORMANCE_EVENT         ),
-	DEF_VALS1(MQIA_Q_SERVICE_INTERVAL        ),
-	DEF_VALS1(MQIA_CHANNEL_AUTO_DEF          ),
-	DEF_VALS1(MQIA_CHANNEL_AUTO_DEF_EVENT    ),
-	DEF_VALS1(MQIA_INDEX_TYPE                ),
-	DEF_VALS1(MQIA_CLUSTER_WORKLOAD_LENGTH   ),
-	DEF_VALS1(MQIA_CLUSTER_Q_TYPE            ),
-	DEF_VALS1(MQIA_ARCHIVE                   ),
-	DEF_VALS1(MQIA_DEF_BIND                  ),
-	DEF_VALS1(MQIA_PAGESET_ID                ),
-	DEF_VALS1(MQIA_QSG_DISP                  ),
-	DEF_VALS1(MQIA_INTRA_GROUP_QUEUING       ),
-	DEF_VALS1(MQIA_IGQ_PUT_AUTHORITY         ),
-	DEF_VALS1(MQIA_AUTH_INFO_TYPE            ),
-	DEF_VALS1(MQIA_MSG_MARK_BROWSE_INTERVAL  ),
-	DEF_VALS1(MQIA_SSL_TASKS                 ),
-	DEF_VALS1(MQIA_CF_LEVEL                  ),
-	DEF_VALS1(MQIA_CF_RECOVER                ),
-	DEF_VALS1(MQIA_NAMELIST_TYPE             ),
-	DEF_VALS1(MQIA_CHANNEL_EVENT             ),
-	DEF_VALS1(MQIA_BRIDGE_EVENT              ),
-	DEF_VALS1(MQIA_SSL_EVENT                 ),
-	DEF_VALS1(MQIA_SSL_RESET_COUNT           ),
-	DEF_VALS1(MQIA_SHARED_Q_Q_MGR_NAME       ),
-	DEF_VALS1(MQIA_NPM_CLASS                 ),
-	DEF_VALS1(MQIA_MAX_OPEN_Q                ),
-	DEF_VALS1(MQIA_MONITOR_INTERVAL          ),
-	DEF_VALS1(MQIA_Q_USERS                   ),
-	DEF_VALS1(MQIA_MAX_GLOBAL_LOCKS          ),
-	DEF_VALS1(MQIA_MAX_LOCAL_LOCKS           ),
-	DEF_VALS1(MQIA_LISTENER_PORT_NUMBER      ),
-	DEF_VALS1(MQIA_BATCH_INTERFACE_AUTO      ),
-	DEF_VALS1(MQIA_CMD_SERVER_AUTO           ),
-	DEF_VALS1(MQIA_CMD_SERVER_CONVERT_MSG    ),
-	DEF_VALS1(MQIA_CMD_SERVER_DLQ_MSG        ),
-	DEF_VALS1(MQIA_MAX_Q_TRIGGERS            ),
-	DEF_VALS1(MQIA_TRIGGER_RESTART           ),
-	DEF_VALS1(MQIA_SSL_FIPS_REQUIRED         ),
-	DEF_VALS1(MQIA_IP_ADDRESS_VERSION        ),
-	DEF_VALS1(MQIA_LOGGER_EVENT              ),
-	DEF_VALS1(MQIA_CLWL_Q_RANK               ),
-	DEF_VALS1(MQIA_CLWL_Q_PRIORITY           ),
-	DEF_VALS1(MQIA_CLWL_MRU_CHANNELS         ),
-	DEF_VALS1(MQIA_CLWL_USEQ                 ),
-	DEF_VALS1(MQIA_COMMAND_EVENT             ),
-	DEF_VALS1(MQIA_ACTIVE_CHANNELS           ),
-	DEF_VALS1(MQIA_CHINIT_ADAPTERS           ),
-	DEF_VALS1(MQIA_ADOPTNEWMCA_CHECK         ),
-	DEF_VALS1(MQIA_ADOPTNEWMCA_TYPE          ),
-	DEF_VALS1(MQIA_ADOPTNEWMCA_INTERVAL      ),
-	DEF_VALS1(MQIA_CHINIT_DISPATCHERS        ),
-	DEF_VALS1(MQIA_DNS_WLM                   ),
-	DEF_VALS1(MQIA_LISTENER_TIMER            ),
-	DEF_VALS1(MQIA_LU62_CHANNELS             ),
-	DEF_VALS1(MQIA_MAX_CHANNELS              ),
-	DEF_VALS1(MQIA_OUTBOUND_PORT_MIN         ),
-	DEF_VALS1(MQIA_RECEIVE_TIMEOUT           ),
-	DEF_VALS1(MQIA_RECEIVE_TIMEOUT_TYPE      ),
-	DEF_VALS1(MQIA_RECEIVE_TIMEOUT_MIN       ),
-	DEF_VALS1(MQIA_TCP_CHANNELS              ),
-	DEF_VALS1(MQIA_TCP_KEEP_ALIVE            ),
-	DEF_VALS1(MQIA_TCP_STACK_TYPE            ),
-	DEF_VALS1(MQIA_CHINIT_TRACE_AUTO_START   ),
-	DEF_VALS1(MQIA_CHINIT_TRACE_TABLE_SIZE   ),
-	DEF_VALS1(MQIA_CHINIT_CONTROL            ),
-	DEF_VALS1(MQIA_CMD_SERVER_CONTROL        ),
-	DEF_VALS1(MQIA_SERVICE_TYPE              ),
-	DEF_VALS1(MQIA_MONITORING_CHANNEL        ),
-	DEF_VALS1(MQIA_MONITORING_Q              ),
-	DEF_VALS1(MQIA_MONITORING_AUTO_CLUSSDR   ),
-	DEF_VALS1(MQIA_STATISTICS_MQI            ),
-	DEF_VALS1(MQIA_STATISTICS_Q              ),
-	DEF_VALS1(MQIA_STATISTICS_CHANNEL        ),
-	DEF_VALS1(MQIA_STATISTICS_AUTO_CLUSSDR   ),
-	DEF_VALS1(MQIA_STATISTICS_INTERVAL       ),
-	DEF_VALS1(MQIA_ACCOUNTING_MQI            ),
-	DEF_VALS1(MQIA_ACCOUNTING_Q              ),
-	DEF_VALS1(MQIA_ACCOUNTING_INTERVAL       ),
-	DEF_VALS1(MQIA_ACCOUNTING_CONN_OVERRIDE  ),
-	DEF_VALS1(MQIA_TRACE_ROUTE_RECORDING     ),
-	DEF_VALS1(MQIA_ACTIVITY_RECORDING        ),
-	DEF_VALS1(MQIA_SERVICE_CONTROL           ),
-	DEF_VALS1(MQIA_OUTBOUND_PORT_MAX         ),
-	DEF_VALS1(MQIA_SECURITY_CASE             ),
-	DEF_VALS1(MQIA_QMOPT_CSMT_ON_ERROR       ),
-	DEF_VALS1(MQIA_QMOPT_CONS_INFO_MSGS      ),
-	DEF_VALS1(MQIA_QMOPT_CONS_WARNING_MSGS   ),
-	DEF_VALS1(MQIA_QMOPT_CONS_ERROR_MSGS     ),
-	DEF_VALS1(MQIA_QMOPT_CONS_CRITICAL_MSGS  ),
-	DEF_VALS1(MQIA_QMOPT_CONS_COMMS_MSGS     ),
-	DEF_VALS1(MQIA_QMOPT_CONS_REORG_MSGS     ),
-	DEF_VALS1(MQIA_QMOPT_CONS_SYSTEM_MSGS    ),
-	DEF_VALS1(MQIA_QMOPT_LOG_INFO_MSGS       ),
-	DEF_VALS1(MQIA_QMOPT_LOG_WARNING_MSGS    ),
-	DEF_VALS1(MQIA_QMOPT_LOG_ERROR_MSGS      ),
-	DEF_VALS1(MQIA_QMOPT_LOG_CRITICAL_MSGS   ),
-	DEF_VALS1(MQIA_QMOPT_LOG_COMMS_MSGS      ),
-	DEF_VALS1(MQIA_QMOPT_LOG_REORG_MSGS      ),
-	DEF_VALS1(MQIA_QMOPT_LOG_SYSTEM_MSGS     ),
-	DEF_VALS1(MQIA_QMOPT_TRACE_MQI_CALLS     ),
-	DEF_VALS1(MQIA_QMOPT_TRACE_COMMS         ),
-	DEF_VALS1(MQIA_QMOPT_TRACE_REORG         ),
-	DEF_VALS1(MQIA_QMOPT_TRACE_CONVERSION    ),
-	DEF_VALS1(MQIA_QMOPT_TRACE_SYSTEM        ),
-	DEF_VALS1(MQIA_QMOPT_INTERNAL_DUMP       ),
-	DEF_VALS1(MQIA_MAX_RECOVERY_TASKS        ),
-	DEF_VALS1(MQIA_MAX_CLIENTS               ),
-	DEF_VALS1(MQIA_AUTO_REORGANIZATION       ),
-	DEF_VALS1(MQIA_AUTO_REORG_INTERVAL       ),
-	DEF_VALS1(MQIA_DURABLE_SUB               ),
-	DEF_VALS1(MQIA_MULTICAST                 ),
-	DEF_VALS1(MQIA_INHIBIT_PUB               ),
-	DEF_VALS1(MQIA_INHIBIT_SUB               ),
-	DEF_VALS1(MQIA_TREE_LIFE_TIME            ),
-	DEF_VALS1(MQIA_DEF_PUT_RESPONSE_TYPE     ),
-	DEF_VALS1(MQIA_TOPIC_DEF_PERSISTENCE     ),
-	DEF_VALS1(MQIA_MASTER_ADMIN              ),
-	DEF_VALS1(MQIA_PUBSUB_MODE               ),
-	DEF_VALS1(MQIA_DEF_READ_AHEAD            ),
-	DEF_VALS1(MQIA_READ_AHEAD                ),
-	DEF_VALS1(MQIA_PROPERTY_CONTROL          ),
-	DEF_VALS1(MQIA_MAX_PROPERTIES_LENGTH     ),
-	DEF_VALS1(MQIA_BASE_TYPE                 ),
-	DEF_VALS1(MQIA_PM_DELIVERY               ),
-	DEF_VALS1(MQIA_NPM_DELIVERY              ),
-	DEF_VALS1(MQIA_PROXY_SUB                 ),
-	DEF_VALS1(MQIA_PUBSUB_NP_MSG             ),
-	DEF_VALS1(MQIA_SUB_COUNT                 ),
-	DEF_VALS1(MQIA_PUBSUB_NP_RESP            ),
-	DEF_VALS1(MQIA_PUBSUB_MAXMSG_RETRY_COUNT ),
-	DEF_VALS1(MQIA_PUBSUB_SYNC_PT            ),
-	DEF_VALS1(MQIA_TOPIC_TYPE                ),
-	DEF_VALS1(MQIA_PUB_COUNT                 ),
-	DEF_VALS1(MQIA_WILDCARD_OPERATION        ),
-	DEF_VALS1(MQIA_SUB_SCOPE                 ),
-	DEF_VALS1(MQIA_PUB_SCOPE                 ),
-	DEF_VALS1(MQIA_GROUP_UR                  ),
-	DEF_VALS1(MQIA_UR_DISP                   ),
-	DEF_VALS1(MQIA_COMM_INFO_TYPE            ),
-	DEF_VALS1(MQIA_CF_OFFLOAD                ),
-	DEF_VALS1(MQIA_CF_OFFLOAD_THRESHOLD1     ),
-	DEF_VALS1(MQIA_CF_OFFLOAD_THRESHOLD2     ),
-	DEF_VALS1(MQIA_CF_OFFLOAD_THRESHOLD3     ),
-	DEF_VALS1(MQIA_CF_SMDS_BUFFERS           ),
-	DEF_VALS1(MQIA_CF_OFFLDUSE               ),
-	DEF_VALS1(MQIA_MAX_RESPONSES             ),
-	DEF_VALS1(MQIA_RESPONSE_RESTART_POINT    ),
-	DEF_VALS1(MQIA_COMM_EVENT                ),
-	DEF_VALS1(MQIA_MCAST_BRIDGE              ),
-	DEF_VALS1(MQIA_USE_DEAD_LETTER_Q         ),
-	DEF_VALS1(MQIA_TOLERATE_UNPROTECTED      ),
-	DEF_VALS1(MQIA_SIGNATURE_ALGORITHM       ),
-	DEF_VALS1(MQIA_ENCRYPTION_ALGORITHM      ),
-	DEF_VALS1(MQIA_POLICY_VERSION            ),
-	DEF_VALS1(MQIA_ACTIVITY_CONN_OVERRIDE    ),
-	DEF_VALS1(MQIA_ACTIVITY_TRACE            ),
-	DEF_VALS1(MQIA_SUB_CONFIGURATION_EVENT   ),
-	DEF_VALS1(MQIA_XR_CAPABILITY             ),
-	DEF_VALS1(MQIA_CF_RECAUTO                ),
-	DEF_VALS1(MQIA_QMGR_CFCONLOS             ),
-	DEF_VALS1(MQIA_CF_CFCONLOS               ),
-	DEF_VALS1(MQIA_SUITE_B_STRENGTH          ),
-	DEF_VALS1(MQIA_CHLAUTH_RECORDS           ),
-	DEF_VALS1(MQIA_PUBSUB_CLUSTER            ),
-	DEF_VALS1(MQIA_DEF_CLUSTER_XMIT_Q_TYPE   ),
-	DEF_VALS1(MQIA_PROT_POLICY_CAPABILITY    ),
-	DEF_VALS1(MQIA_CERT_VAL_POLICY           ),
-	DEF_VALS1(MQIA_USER_LIST                 ),
-	DEF_VALS1(MQCA_APPL_ID                   ),
-	DEF_VALS1(MQCA_BASE_Q_NAME               ),
-	DEF_VALS1(MQCA_BASE_OBJECT_NAME          ),
-	DEF_VALS1(MQCA_COMMAND_INPUT_Q_NAME      ),
-	DEF_VALS1(MQCA_CREATION_DATE             ),
-	DEF_VALS1(MQCA_CREATION_TIME             ),
-	DEF_VALS1(MQCA_DEAD_LETTER_Q_NAME        ),
-	DEF_VALS1(MQCA_ENV_DATA                  ),
-	DEF_VALS1(MQCA_INITIATION_Q_NAME         ),
-	DEF_VALS1(MQCA_NAMELIST_DESC             ),
-	DEF_VALS1(MQCA_NAMELIST_NAME             ),
-	DEF_VALS1(MQCA_PROCESS_DESC              ),
-	DEF_VALS1(MQCA_PROCESS_NAME              ),
-	DEF_VALS1(MQCA_Q_DESC                    ),
-	DEF_VALS1(MQCA_Q_MGR_DESC                ),
-	DEF_VALS1(MQCA_Q_MGR_NAME                ),
-	DEF_VALS1(MQCA_Q_NAME                    ),
-	DEF_VALS1(MQCA_REMOTE_Q_MGR_NAME         ),
-	DEF_VALS1(MQCA_REMOTE_Q_NAME             ),
-	DEF_VALS1(MQCA_BACKOUT_REQ_Q_NAME        ),
-	DEF_VALS1(MQCA_NAMES                     ),
-	DEF_VALS1(MQCA_USER_DATA                 ),
-	DEF_VALS1(MQCA_STORAGE_CLASS             ),
-	DEF_VALS1(MQCA_TRIGGER_DATA              ),
-	DEF_VALS1(MQCA_XMIT_Q_NAME               ),
-	DEF_VALS1(MQCA_DEF_XMIT_Q_NAME           ),
-	DEF_VALS1(MQCA_CHANNEL_AUTO_DEF_EXIT     ),
-	DEF_VALS1(MQCA_ALTERATION_DATE           ),
-	DEF_VALS1(MQCA_ALTERATION_TIME           ),
-	DEF_VALS1(MQCA_CLUSTER_NAME              ),
-	DEF_VALS1(MQCA_CLUSTER_NAMELIST          ),
-	DEF_VALS1(MQCA_CLUSTER_Q_MGR_NAME        ),
-	DEF_VALS1(MQCA_Q_MGR_IDENTIFIER          ),
-	DEF_VALS1(MQCA_CLUSTER_WORKLOAD_EXIT     ),
-	DEF_VALS1(MQCA_CLUSTER_WORKLOAD_DATA     ),
-	DEF_VALS1(MQCA_REPOSITORY_NAME           ),
-	DEF_VALS1(MQCA_REPOSITORY_NAMELIST       ),
-	DEF_VALS1(MQCA_CLUSTER_DATE              ),
-	DEF_VALS1(MQCA_CLUSTER_TIME              ),
-	DEF_VALS1(MQCA_CF_STRUC_NAME             ),
-	DEF_VALS1(MQCA_QSG_NAME                  ),
-	DEF_VALS1(MQCA_IGQ_USER_ID               ),
-	DEF_VALS1(MQCA_STORAGE_CLASS_DESC        ),
-	DEF_VALS1(MQCA_XCF_GROUP_NAME            ),
-	DEF_VALS1(MQCA_XCF_MEMBER_NAME           ),
-	DEF_VALS1(MQCA_AUTH_INFO_NAME            ),
-	DEF_VALS1(MQCA_AUTH_INFO_DESC            ),
-	DEF_VALS1(MQCA_LDAP_USER_NAME            ),
-	DEF_VALS1(MQCA_LDAP_PASSWORD             ),
-	DEF_VALS1(MQCA_SSL_KEY_REPOSITORY        ),
-	DEF_VALS1(MQCA_SSL_CRL_NAMELIST          ),
-	DEF_VALS1(MQCA_SSL_CRYPTO_HARDWARE       ),
-	DEF_VALS1(MQCA_CF_STRUC_DESC             ),
-	DEF_VALS1(MQCA_AUTH_INFO_CONN_NAME       ),
-	DEF_VALS1(MQCA_CICS_FILE_NAME            ),
-	DEF_VALS1(MQCA_TRIGGER_TRANS_ID          ),
-	DEF_VALS1(MQCA_TRIGGER_PROGRAM_NAME      ),
-	DEF_VALS1(MQCA_TRIGGER_TERM_ID           ),
-	DEF_VALS1(MQCA_TRIGGER_CHANNEL_NAME      ),
-	DEF_VALS1(MQCA_SYSTEM_LOG_Q_NAME         ),
-	DEF_VALS1(MQCA_MONITOR_Q_NAME            ),
-	DEF_VALS1(MQCA_COMMAND_REPLY_Q_NAME      ),
-	DEF_VALS1(MQCA_BATCH_INTERFACE_ID        ),
-	DEF_VALS1(MQCA_SSL_KEY_LIBRARY           ),
-	DEF_VALS1(MQCA_SSL_KEY_MEMBER            ),
-	DEF_VALS1(MQCA_DNS_GROUP                 ),
-	DEF_VALS1(MQCA_LU_GROUP_NAME             ),
-	DEF_VALS1(MQCA_LU_NAME                   ),
-	DEF_VALS1(MQCA_LU62_ARM_SUFFIX           ),
-	DEF_VALS1(MQCA_TCP_NAME                  ),
-	DEF_VALS1(MQCA_CHINIT_SERVICE_PARM       ),
-	DEF_VALS1(MQCA_SERVICE_NAME              ),
-	DEF_VALS1(MQCA_SERVICE_DESC              ),
-	DEF_VALS1(MQCA_SERVICE_START_COMMAND     ),
-	DEF_VALS1(MQCA_SERVICE_START_ARGS        ),
-	DEF_VALS1(MQCA_SERVICE_STOP_COMMAND      ),
-	DEF_VALS1(MQCA_SERVICE_STOP_ARGS         ),
-	DEF_VALS1(MQCA_STDOUT_DESTINATION        ),
-	DEF_VALS1(MQCA_STDERR_DESTINATION        ),
-	DEF_VALS1(MQCA_TPIPE_NAME                ),
-	DEF_VALS1(MQCA_PASS_TICKET_APPL          ),
-	DEF_VALS1(MQCA_AUTO_REORG_START_TIME     ),
-	DEF_VALS1(MQCA_AUTO_REORG_CATALOG        ),
-	DEF_VALS1(MQCA_TOPIC_NAME                ),
-	DEF_VALS1(MQCA_TOPIC_DESC                ),
-	DEF_VALS1(MQCA_TOPIC_STRING              ),
-	DEF_VALS1(MQCA_MODEL_DURABLE_Q           ),
-	DEF_VALS1(MQCA_MODEL_NON_DURABLE_Q       ),
-	DEF_VALS1(MQCA_RESUME_DATE               ),
-	DEF_VALS1(MQCA_RESUME_TIME               ),
-	DEF_VALS1(MQCA_CHILD                     ),
-	DEF_VALS1(MQCA_PARENT                    ),
-	DEF_VALS1(MQCA_ADMIN_TOPIC_NAME          ),
-	DEF_VALS1(MQCA_TOPIC_STRING_FILTER       ),
-	DEF_VALS1(MQCA_AUTH_INFO_OCSP_URL        ),
-	DEF_VALS1(MQCA_COMM_INFO_NAME            ),
-	DEF_VALS1(MQCA_COMM_INFO_DESC            ),
-	DEF_VALS1(MQCA_POLICY_NAME               ),
-	DEF_VALS1(MQCA_SIGNER_DN                 ),
-	DEF_VALS1(MQCA_RECIPIENT_DN              ),
-	DEF_VALS1(MQCA_INSTALLATION_DESC         ),
-	DEF_VALS1(MQCA_INSTALLATION_NAME         ),
-	DEF_VALS1(MQCA_INSTALLATION_PATH         ),
-	DEF_VALS1(MQCA_CHLAUTH_DESC              ),
-	DEF_VALS1(MQCA_CUSTOM                    ),
-	DEF_VALS1(MQCA_VERSION                   ),
-	DEF_VALS1(MQCA_XR_VERSION                ),
-	DEF_VALS1(MQCA_XR_SSL_CIPHER_SUITES      ),
-	DEF_VALS1(MQCA_CLUS_CHL_NAME             ),
+    DEF_VALS1(MQIA_APPL_TYPE                 ),
+    DEF_VALS1(MQIA_CODED_CHAR_SET_ID         ),
+    DEF_VALS1(MQIA_CURRENT_Q_DEPTH           ),
+    DEF_VALS1(MQIA_DEF_INPUT_OPEN_OPTION     ),
+    DEF_VALS1(MQIA_DEF_PERSISTENCE           ),
+    DEF_VALS1(MQIA_DEF_PRIORITY              ),
+    DEF_VALS1(MQIA_DEFINITION_TYPE           ),
+    DEF_VALS1(MQIA_HARDEN_GET_BACKOUT        ),
+    DEF_VALS1(MQIA_INHIBIT_GET               ),
+    DEF_VALS1(MQIA_INHIBIT_PUT               ),
+    DEF_VALS1(MQIA_MAX_HANDLES               ),
+    DEF_VALS1(MQIA_USAGE                     ),
+    DEF_VALS1(MQIA_MAX_MSG_LENGTH            ),
+    DEF_VALS1(MQIA_MAX_PRIORITY              ),
+    DEF_VALS1(MQIA_MAX_Q_DEPTH               ),
+    DEF_VALS1(MQIA_MSG_DELIVERY_SEQUENCE     ),
+    DEF_VALS1(MQIA_OPEN_INPUT_COUNT          ),
+    DEF_VALS1(MQIA_OPEN_OUTPUT_COUNT         ),
+    DEF_VALS1(MQIA_NAME_COUNT                ),
+    DEF_VALS1(MQIA_Q_TYPE                    ),
+    DEF_VALS1(MQIA_RETENTION_INTERVAL        ),
+    DEF_VALS1(MQIA_BACKOUT_THRESHOLD         ),
+    DEF_VALS1(MQIA_SHAREABILITY              ),
+    DEF_VALS1(MQIA_TRIGGER_CONTROL           ),
+    DEF_VALS1(MQIA_TRIGGER_INTERVAL          ),
+    DEF_VALS1(MQIA_TRIGGER_MSG_PRIORITY      ),
+    DEF_VALS1(MQIA_CPI_LEVEL                 ),
+    DEF_VALS1(MQIA_TRIGGER_TYPE              ),
+    DEF_VALS1(MQIA_TRIGGER_DEPTH             ),
+    DEF_VALS1(MQIA_SYNCPOINT                 ),
+    DEF_VALS1(MQIA_COMMAND_LEVEL             ),
+    DEF_VALS1(MQIA_PLATFORM                  ),
+    DEF_VALS1(MQIA_MAX_UNCOMMITTED_MSGS      ),
+    DEF_VALS1(MQIA_DIST_LISTS                ),
+    DEF_VALS1(MQIA_TIME_SINCE_RESET          ),
+    DEF_VALS1(MQIA_HIGH_Q_DEPTH              ),
+    DEF_VALS1(MQIA_MSG_ENQ_COUNT             ),
+    DEF_VALS1(MQIA_MSG_DEQ_COUNT             ),
+    DEF_VALS1(MQIA_EXPIRY_INTERVAL           ),
+    DEF_VALS1(MQIA_Q_DEPTH_HIGH_LIMIT        ),
+    DEF_VALS1(MQIA_Q_DEPTH_LOW_LIMIT         ),
+    DEF_VALS1(MQIA_Q_DEPTH_MAX_EVENT         ),
+    DEF_VALS1(MQIA_Q_DEPTH_HIGH_EVENT        ),
+    DEF_VALS1(MQIA_Q_DEPTH_LOW_EVENT         ),
+    DEF_VALS1(MQIA_SCOPE                     ),
+    DEF_VALS1(MQIA_Q_SERVICE_INTERVAL_EVENT  ),
+    DEF_VALS1(MQIA_AUTHORITY_EVENT           ),
+    DEF_VALS1(MQIA_INHIBIT_EVENT             ),
+    DEF_VALS1(MQIA_LOCAL_EVENT               ),
+    DEF_VALS1(MQIA_REMOTE_EVENT              ),
+    DEF_VALS1(MQIA_CONFIGURATION_EVENT       ),
+    DEF_VALS1(MQIA_START_STOP_EVENT          ),
+    DEF_VALS1(MQIA_PERFORMANCE_EVENT         ),
+    DEF_VALS1(MQIA_Q_SERVICE_INTERVAL        ),
+    DEF_VALS1(MQIA_CHANNEL_AUTO_DEF          ),
+    DEF_VALS1(MQIA_CHANNEL_AUTO_DEF_EVENT    ),
+    DEF_VALS1(MQIA_INDEX_TYPE                ),
+    DEF_VALS1(MQIA_CLUSTER_WORKLOAD_LENGTH   ),
+    DEF_VALS1(MQIA_CLUSTER_Q_TYPE            ),
+    DEF_VALS1(MQIA_ARCHIVE                   ),
+    DEF_VALS1(MQIA_DEF_BIND                  ),
+    DEF_VALS1(MQIA_PAGESET_ID                ),
+    DEF_VALS1(MQIA_QSG_DISP                  ),
+    DEF_VALS1(MQIA_INTRA_GROUP_QUEUING       ),
+    DEF_VALS1(MQIA_IGQ_PUT_AUTHORITY         ),
+    DEF_VALS1(MQIA_AUTH_INFO_TYPE            ),
+    DEF_VALS1(MQIA_MSG_MARK_BROWSE_INTERVAL  ),
+    DEF_VALS1(MQIA_SSL_TASKS                 ),
+    DEF_VALS1(MQIA_CF_LEVEL                  ),
+    DEF_VALS1(MQIA_CF_RECOVER                ),
+    DEF_VALS1(MQIA_NAMELIST_TYPE             ),
+    DEF_VALS1(MQIA_CHANNEL_EVENT             ),
+    DEF_VALS1(MQIA_BRIDGE_EVENT              ),
+    DEF_VALS1(MQIA_SSL_EVENT                 ),
+    DEF_VALS1(MQIA_SSL_RESET_COUNT           ),
+    DEF_VALS1(MQIA_SHARED_Q_Q_MGR_NAME       ),
+    DEF_VALS1(MQIA_NPM_CLASS                 ),
+    DEF_VALS1(MQIA_MAX_OPEN_Q                ),
+    DEF_VALS1(MQIA_MONITOR_INTERVAL          ),
+    DEF_VALS1(MQIA_Q_USERS                   ),
+    DEF_VALS1(MQIA_MAX_GLOBAL_LOCKS          ),
+    DEF_VALS1(MQIA_MAX_LOCAL_LOCKS           ),
+    DEF_VALS1(MQIA_LISTENER_PORT_NUMBER      ),
+    DEF_VALS1(MQIA_BATCH_INTERFACE_AUTO      ),
+    DEF_VALS1(MQIA_CMD_SERVER_AUTO           ),
+    DEF_VALS1(MQIA_CMD_SERVER_CONVERT_MSG    ),
+    DEF_VALS1(MQIA_CMD_SERVER_DLQ_MSG        ),
+    DEF_VALS1(MQIA_MAX_Q_TRIGGERS            ),
+    DEF_VALS1(MQIA_TRIGGER_RESTART           ),
+    DEF_VALS1(MQIA_SSL_FIPS_REQUIRED         ),
+    DEF_VALS1(MQIA_IP_ADDRESS_VERSION        ),
+    DEF_VALS1(MQIA_LOGGER_EVENT              ),
+    DEF_VALS1(MQIA_CLWL_Q_RANK               ),
+    DEF_VALS1(MQIA_CLWL_Q_PRIORITY           ),
+    DEF_VALS1(MQIA_CLWL_MRU_CHANNELS         ),
+    DEF_VALS1(MQIA_CLWL_USEQ                 ),
+    DEF_VALS1(MQIA_COMMAND_EVENT             ),
+    DEF_VALS1(MQIA_ACTIVE_CHANNELS           ),
+    DEF_VALS1(MQIA_CHINIT_ADAPTERS           ),
+    DEF_VALS1(MQIA_ADOPTNEWMCA_CHECK         ),
+    DEF_VALS1(MQIA_ADOPTNEWMCA_TYPE          ),
+    DEF_VALS1(MQIA_ADOPTNEWMCA_INTERVAL      ),
+    DEF_VALS1(MQIA_CHINIT_DISPATCHERS        ),
+    DEF_VALS1(MQIA_DNS_WLM                   ),
+    DEF_VALS1(MQIA_LISTENER_TIMER            ),
+    DEF_VALS1(MQIA_LU62_CHANNELS             ),
+    DEF_VALS1(MQIA_MAX_CHANNELS              ),
+    DEF_VALS1(MQIA_OUTBOUND_PORT_MIN         ),
+    DEF_VALS1(MQIA_RECEIVE_TIMEOUT           ),
+    DEF_VALS1(MQIA_RECEIVE_TIMEOUT_TYPE      ),
+    DEF_VALS1(MQIA_RECEIVE_TIMEOUT_MIN       ),
+    DEF_VALS1(MQIA_TCP_CHANNELS              ),
+    DEF_VALS1(MQIA_TCP_KEEP_ALIVE            ),
+    DEF_VALS1(MQIA_TCP_STACK_TYPE            ),
+    DEF_VALS1(MQIA_CHINIT_TRACE_AUTO_START   ),
+    DEF_VALS1(MQIA_CHINIT_TRACE_TABLE_SIZE   ),
+    DEF_VALS1(MQIA_CHINIT_CONTROL            ),
+    DEF_VALS1(MQIA_CMD_SERVER_CONTROL        ),
+    DEF_VALS1(MQIA_SERVICE_TYPE              ),
+    DEF_VALS1(MQIA_MONITORING_CHANNEL        ),
+    DEF_VALS1(MQIA_MONITORING_Q              ),
+    DEF_VALS1(MQIA_MONITORING_AUTO_CLUSSDR   ),
+    DEF_VALS1(MQIA_STATISTICS_MQI            ),
+    DEF_VALS1(MQIA_STATISTICS_Q              ),
+    DEF_VALS1(MQIA_STATISTICS_CHANNEL        ),
+    DEF_VALS1(MQIA_STATISTICS_AUTO_CLUSSDR   ),
+    DEF_VALS1(MQIA_STATISTICS_INTERVAL       ),
+    DEF_VALS1(MQIA_ACCOUNTING_MQI            ),
+    DEF_VALS1(MQIA_ACCOUNTING_Q              ),
+    DEF_VALS1(MQIA_ACCOUNTING_INTERVAL       ),
+    DEF_VALS1(MQIA_ACCOUNTING_CONN_OVERRIDE  ),
+    DEF_VALS1(MQIA_TRACE_ROUTE_RECORDING     ),
+    DEF_VALS1(MQIA_ACTIVITY_RECORDING        ),
+    DEF_VALS1(MQIA_SERVICE_CONTROL           ),
+    DEF_VALS1(MQIA_OUTBOUND_PORT_MAX         ),
+    DEF_VALS1(MQIA_SECURITY_CASE             ),
+    DEF_VALS1(MQIA_QMOPT_CSMT_ON_ERROR       ),
+    DEF_VALS1(MQIA_QMOPT_CONS_INFO_MSGS      ),
+    DEF_VALS1(MQIA_QMOPT_CONS_WARNING_MSGS   ),
+    DEF_VALS1(MQIA_QMOPT_CONS_ERROR_MSGS     ),
+    DEF_VALS1(MQIA_QMOPT_CONS_CRITICAL_MSGS  ),
+    DEF_VALS1(MQIA_QMOPT_CONS_COMMS_MSGS     ),
+    DEF_VALS1(MQIA_QMOPT_CONS_REORG_MSGS     ),
+    DEF_VALS1(MQIA_QMOPT_CONS_SYSTEM_MSGS    ),
+    DEF_VALS1(MQIA_QMOPT_LOG_INFO_MSGS       ),
+    DEF_VALS1(MQIA_QMOPT_LOG_WARNING_MSGS    ),
+    DEF_VALS1(MQIA_QMOPT_LOG_ERROR_MSGS      ),
+    DEF_VALS1(MQIA_QMOPT_LOG_CRITICAL_MSGS   ),
+    DEF_VALS1(MQIA_QMOPT_LOG_COMMS_MSGS      ),
+    DEF_VALS1(MQIA_QMOPT_LOG_REORG_MSGS      ),
+    DEF_VALS1(MQIA_QMOPT_LOG_SYSTEM_MSGS     ),
+    DEF_VALS1(MQIA_QMOPT_TRACE_MQI_CALLS     ),
+    DEF_VALS1(MQIA_QMOPT_TRACE_COMMS         ),
+    DEF_VALS1(MQIA_QMOPT_TRACE_REORG         ),
+    DEF_VALS1(MQIA_QMOPT_TRACE_CONVERSION    ),
+    DEF_VALS1(MQIA_QMOPT_TRACE_SYSTEM        ),
+    DEF_VALS1(MQIA_QMOPT_INTERNAL_DUMP       ),
+    DEF_VALS1(MQIA_MAX_RECOVERY_TASKS        ),
+    DEF_VALS1(MQIA_MAX_CLIENTS               ),
+    DEF_VALS1(MQIA_AUTO_REORGANIZATION       ),
+    DEF_VALS1(MQIA_AUTO_REORG_INTERVAL       ),
+    DEF_VALS1(MQIA_DURABLE_SUB               ),
+    DEF_VALS1(MQIA_MULTICAST                 ),
+    DEF_VALS1(MQIA_INHIBIT_PUB               ),
+    DEF_VALS1(MQIA_INHIBIT_SUB               ),
+    DEF_VALS1(MQIA_TREE_LIFE_TIME            ),
+    DEF_VALS1(MQIA_DEF_PUT_RESPONSE_TYPE     ),
+    DEF_VALS1(MQIA_TOPIC_DEF_PERSISTENCE     ),
+    DEF_VALS1(MQIA_MASTER_ADMIN              ),
+    DEF_VALS1(MQIA_PUBSUB_MODE               ),
+    DEF_VALS1(MQIA_DEF_READ_AHEAD            ),
+    DEF_VALS1(MQIA_READ_AHEAD                ),
+    DEF_VALS1(MQIA_PROPERTY_CONTROL          ),
+    DEF_VALS1(MQIA_MAX_PROPERTIES_LENGTH     ),
+    DEF_VALS1(MQIA_BASE_TYPE                 ),
+    DEF_VALS1(MQIA_PM_DELIVERY               ),
+    DEF_VALS1(MQIA_NPM_DELIVERY              ),
+    DEF_VALS1(MQIA_PROXY_SUB                 ),
+    DEF_VALS1(MQIA_PUBSUB_NP_MSG             ),
+    DEF_VALS1(MQIA_SUB_COUNT                 ),
+    DEF_VALS1(MQIA_PUBSUB_NP_RESP            ),
+    DEF_VALS1(MQIA_PUBSUB_MAXMSG_RETRY_COUNT ),
+    DEF_VALS1(MQIA_PUBSUB_SYNC_PT            ),
+    DEF_VALS1(MQIA_TOPIC_TYPE                ),
+    DEF_VALS1(MQIA_PUB_COUNT                 ),
+    DEF_VALS1(MQIA_WILDCARD_OPERATION        ),
+    DEF_VALS1(MQIA_SUB_SCOPE                 ),
+    DEF_VALS1(MQIA_PUB_SCOPE                 ),
+    DEF_VALS1(MQIA_GROUP_UR                  ),
+    DEF_VALS1(MQIA_UR_DISP                   ),
+    DEF_VALS1(MQIA_COMM_INFO_TYPE            ),
+    DEF_VALS1(MQIA_CF_OFFLOAD                ),
+    DEF_VALS1(MQIA_CF_OFFLOAD_THRESHOLD1     ),
+    DEF_VALS1(MQIA_CF_OFFLOAD_THRESHOLD2     ),
+    DEF_VALS1(MQIA_CF_OFFLOAD_THRESHOLD3     ),
+    DEF_VALS1(MQIA_CF_SMDS_BUFFERS           ),
+    DEF_VALS1(MQIA_CF_OFFLDUSE               ),
+    DEF_VALS1(MQIA_MAX_RESPONSES             ),
+    DEF_VALS1(MQIA_RESPONSE_RESTART_POINT    ),
+    DEF_VALS1(MQIA_COMM_EVENT                ),
+    DEF_VALS1(MQIA_MCAST_BRIDGE              ),
+    DEF_VALS1(MQIA_USE_DEAD_LETTER_Q         ),
+    DEF_VALS1(MQIA_TOLERATE_UNPROTECTED      ),
+    DEF_VALS1(MQIA_SIGNATURE_ALGORITHM       ),
+    DEF_VALS1(MQIA_ENCRYPTION_ALGORITHM      ),
+    DEF_VALS1(MQIA_POLICY_VERSION            ),
+    DEF_VALS1(MQIA_ACTIVITY_CONN_OVERRIDE    ),
+    DEF_VALS1(MQIA_ACTIVITY_TRACE            ),
+    DEF_VALS1(MQIA_SUB_CONFIGURATION_EVENT   ),
+    DEF_VALS1(MQIA_XR_CAPABILITY             ),
+    DEF_VALS1(MQIA_CF_RECAUTO                ),
+    DEF_VALS1(MQIA_QMGR_CFCONLOS             ),
+    DEF_VALS1(MQIA_CF_CFCONLOS               ),
+    DEF_VALS1(MQIA_SUITE_B_STRENGTH          ),
+    DEF_VALS1(MQIA_CHLAUTH_RECORDS           ),
+    DEF_VALS1(MQIA_PUBSUB_CLUSTER            ),
+    DEF_VALS1(MQIA_DEF_CLUSTER_XMIT_Q_TYPE   ),
+    DEF_VALS1(MQIA_PROT_POLICY_CAPABILITY    ),
+    DEF_VALS1(MQIA_CERT_VAL_POLICY           ),
+    DEF_VALS1(MQIA_USER_LIST                 ),
+    DEF_VALS1(MQCA_APPL_ID                   ),
+    DEF_VALS1(MQCA_BASE_Q_NAME               ),
+    DEF_VALS1(MQCA_BASE_OBJECT_NAME          ),
+    DEF_VALS1(MQCA_COMMAND_INPUT_Q_NAME      ),
+    DEF_VALS1(MQCA_CREATION_DATE             ),
+    DEF_VALS1(MQCA_CREATION_TIME             ),
+    DEF_VALS1(MQCA_DEAD_LETTER_Q_NAME        ),
+    DEF_VALS1(MQCA_ENV_DATA                  ),
+    DEF_VALS1(MQCA_INITIATION_Q_NAME         ),
+    DEF_VALS1(MQCA_NAMELIST_DESC             ),
+    DEF_VALS1(MQCA_NAMELIST_NAME             ),
+    DEF_VALS1(MQCA_PROCESS_DESC              ),
+    DEF_VALS1(MQCA_PROCESS_NAME              ),
+    DEF_VALS1(MQCA_Q_DESC                    ),
+    DEF_VALS1(MQCA_Q_MGR_DESC                ),
+    DEF_VALS1(MQCA_Q_MGR_NAME                ),
+    DEF_VALS1(MQCA_Q_NAME                    ),
+    DEF_VALS1(MQCA_REMOTE_Q_MGR_NAME         ),
+    DEF_VALS1(MQCA_REMOTE_Q_NAME             ),
+    DEF_VALS1(MQCA_BACKOUT_REQ_Q_NAME        ),
+    DEF_VALS1(MQCA_NAMES                     ),
+    DEF_VALS1(MQCA_USER_DATA                 ),
+    DEF_VALS1(MQCA_STORAGE_CLASS             ),
+    DEF_VALS1(MQCA_TRIGGER_DATA              ),
+    DEF_VALS1(MQCA_XMIT_Q_NAME               ),
+    DEF_VALS1(MQCA_DEF_XMIT_Q_NAME           ),
+    DEF_VALS1(MQCA_CHANNEL_AUTO_DEF_EXIT     ),
+    DEF_VALS1(MQCA_ALTERATION_DATE           ),
+    DEF_VALS1(MQCA_ALTERATION_TIME           ),
+    DEF_VALS1(MQCA_CLUSTER_NAME              ),
+    DEF_VALS1(MQCA_CLUSTER_NAMELIST          ),
+    DEF_VALS1(MQCA_CLUSTER_Q_MGR_NAME        ),
+    DEF_VALS1(MQCA_Q_MGR_IDENTIFIER          ),
+    DEF_VALS1(MQCA_CLUSTER_WORKLOAD_EXIT     ),
+    DEF_VALS1(MQCA_CLUSTER_WORKLOAD_DATA     ),
+    DEF_VALS1(MQCA_REPOSITORY_NAME           ),
+    DEF_VALS1(MQCA_REPOSITORY_NAMELIST       ),
+    DEF_VALS1(MQCA_CLUSTER_DATE              ),
+    DEF_VALS1(MQCA_CLUSTER_TIME              ),
+    DEF_VALS1(MQCA_CF_STRUC_NAME             ),
+    DEF_VALS1(MQCA_QSG_NAME                  ),
+    DEF_VALS1(MQCA_IGQ_USER_ID               ),
+    DEF_VALS1(MQCA_STORAGE_CLASS_DESC        ),
+    DEF_VALS1(MQCA_XCF_GROUP_NAME            ),
+    DEF_VALS1(MQCA_XCF_MEMBER_NAME           ),
+    DEF_VALS1(MQCA_AUTH_INFO_NAME            ),
+    DEF_VALS1(MQCA_AUTH_INFO_DESC            ),
+    DEF_VALS1(MQCA_LDAP_USER_NAME            ),
+    DEF_VALS1(MQCA_LDAP_PASSWORD             ),
+    DEF_VALS1(MQCA_SSL_KEY_REPOSITORY        ),
+    DEF_VALS1(MQCA_SSL_CRL_NAMELIST          ),
+    DEF_VALS1(MQCA_SSL_CRYPTO_HARDWARE       ),
+    DEF_VALS1(MQCA_CF_STRUC_DESC             ),
+    DEF_VALS1(MQCA_AUTH_INFO_CONN_NAME       ),
+    DEF_VALS1(MQCA_CICS_FILE_NAME            ),
+    DEF_VALS1(MQCA_TRIGGER_TRANS_ID          ),
+    DEF_VALS1(MQCA_TRIGGER_PROGRAM_NAME      ),
+    DEF_VALS1(MQCA_TRIGGER_TERM_ID           ),
+    DEF_VALS1(MQCA_TRIGGER_CHANNEL_NAME      ),
+    DEF_VALS1(MQCA_SYSTEM_LOG_Q_NAME         ),
+    DEF_VALS1(MQCA_MONITOR_Q_NAME            ),
+    DEF_VALS1(MQCA_COMMAND_REPLY_Q_NAME      ),
+    DEF_VALS1(MQCA_BATCH_INTERFACE_ID        ),
+    DEF_VALS1(MQCA_SSL_KEY_LIBRARY           ),
+    DEF_VALS1(MQCA_SSL_KEY_MEMBER            ),
+    DEF_VALS1(MQCA_DNS_GROUP                 ),
+    DEF_VALS1(MQCA_LU_GROUP_NAME             ),
+    DEF_VALS1(MQCA_LU_NAME                   ),
+    DEF_VALS1(MQCA_LU62_ARM_SUFFIX           ),
+    DEF_VALS1(MQCA_TCP_NAME                  ),
+    DEF_VALS1(MQCA_CHINIT_SERVICE_PARM       ),
+    DEF_VALS1(MQCA_SERVICE_NAME              ),
+    DEF_VALS1(MQCA_SERVICE_DESC              ),
+    DEF_VALS1(MQCA_SERVICE_START_COMMAND     ),
+    DEF_VALS1(MQCA_SERVICE_START_ARGS        ),
+    DEF_VALS1(MQCA_SERVICE_STOP_COMMAND      ),
+    DEF_VALS1(MQCA_SERVICE_STOP_ARGS         ),
+    DEF_VALS1(MQCA_STDOUT_DESTINATION        ),
+    DEF_VALS1(MQCA_STDERR_DESTINATION        ),
+    DEF_VALS1(MQCA_TPIPE_NAME                ),
+    DEF_VALS1(MQCA_PASS_TICKET_APPL          ),
+    DEF_VALS1(MQCA_AUTO_REORG_START_TIME     ),
+    DEF_VALS1(MQCA_AUTO_REORG_CATALOG        ),
+    DEF_VALS1(MQCA_TOPIC_NAME                ),
+    DEF_VALS1(MQCA_TOPIC_DESC                ),
+    DEF_VALS1(MQCA_TOPIC_STRING              ),
+    DEF_VALS1(MQCA_MODEL_DURABLE_Q           ),
+    DEF_VALS1(MQCA_MODEL_NON_DURABLE_Q       ),
+    DEF_VALS1(MQCA_RESUME_DATE               ),
+    DEF_VALS1(MQCA_RESUME_TIME               ),
+    DEF_VALS1(MQCA_CHILD                     ),
+    DEF_VALS1(MQCA_PARENT                    ),
+    DEF_VALS1(MQCA_ADMIN_TOPIC_NAME          ),
+    DEF_VALS1(MQCA_TOPIC_STRING_FILTER       ),
+    DEF_VALS1(MQCA_AUTH_INFO_OCSP_URL        ),
+    DEF_VALS1(MQCA_COMM_INFO_NAME            ),
+    DEF_VALS1(MQCA_COMM_INFO_DESC            ),
+    DEF_VALS1(MQCA_POLICY_NAME               ),
+    DEF_VALS1(MQCA_SIGNER_DN                 ),
+    DEF_VALS1(MQCA_RECIPIENT_DN              ),
+    DEF_VALS1(MQCA_INSTALLATION_DESC         ),
+    DEF_VALS1(MQCA_INSTALLATION_NAME         ),
+    DEF_VALS1(MQCA_INSTALLATION_PATH         ),
+    DEF_VALS1(MQCA_CHLAUTH_DESC              ),
+    DEF_VALS1(MQCA_CUSTOM                    ),
+    DEF_VALS1(MQCA_VERSION                   ),
+    DEF_VALS1(MQCA_XR_VERSION                ),
+    DEF_VALS1(MQCA_XR_SSL_CIPHER_SUITES      ),
+    DEF_VALS1(MQCA_CLUS_CHL_NAME             ),
 DEF_VALSE;
 
 DEF_VALSBX(mqcmd)
-	DEF_VALS1(MQCMD_NONE                     ),
-	DEF_VALS1(MQCMD_CHANGE_Q_MGR             ),
-	DEF_VALS1(MQCMD_INQUIRE_Q_MGR            ),
-	DEF_VALS1(MQCMD_CHANGE_PROCESS           ),
-	DEF_VALS1(MQCMD_COPY_PROCESS             ),
-	DEF_VALS1(MQCMD_CREATE_PROCESS           ),
-	DEF_VALS1(MQCMD_DELETE_PROCESS           ),
-	DEF_VALS1(MQCMD_INQUIRE_PROCESS          ),
-	DEF_VALS1(MQCMD_CHANGE_Q                 ),
-	DEF_VALS1(MQCMD_CLEAR_Q                  ),
-	DEF_VALS1(MQCMD_COPY_Q                   ),
-	DEF_VALS1(MQCMD_CREATE_Q                 ),
-	DEF_VALS1(MQCMD_DELETE_Q                 ),
-	DEF_VALS1(MQCMD_INQUIRE_Q                ),
-	DEF_VALS1(MQCMD_REFRESH_Q_MGR            ),
-	DEF_VALS1(MQCMD_RESET_Q_STATS            ),
-	DEF_VALS1(MQCMD_INQUIRE_Q_NAMES          ),
-	DEF_VALS1(MQCMD_INQUIRE_PROCESS_NAMES    ),
-	DEF_VALS1(MQCMD_INQUIRE_CHANNEL_NAMES    ),
-	DEF_VALS1(MQCMD_CHANGE_CHANNEL           ),
-	DEF_VALS1(MQCMD_COPY_CHANNEL             ),
-	DEF_VALS1(MQCMD_CREATE_CHANNEL           ),
-	DEF_VALS1(MQCMD_DELETE_CHANNEL           ),
-	DEF_VALS1(MQCMD_INQUIRE_CHANNEL          ),
-	DEF_VALS1(MQCMD_PING_CHANNEL             ),
-	DEF_VALS1(MQCMD_RESET_CHANNEL            ),
-	DEF_VALS1(MQCMD_START_CHANNEL            ),
-	DEF_VALS1(MQCMD_STOP_CHANNEL             ),
-	DEF_VALS1(MQCMD_START_CHANNEL_INIT       ),
-	DEF_VALS1(MQCMD_START_CHANNEL_LISTENER   ),
-	DEF_VALS1(MQCMD_CHANGE_NAMELIST          ),
-	DEF_VALS1(MQCMD_COPY_NAMELIST            ),
-	DEF_VALS1(MQCMD_CREATE_NAMELIST          ),
-	DEF_VALS1(MQCMD_DELETE_NAMELIST          ),
-	DEF_VALS1(MQCMD_INQUIRE_NAMELIST         ),
-	DEF_VALS1(MQCMD_INQUIRE_NAMELIST_NAMES   ),
-	DEF_VALS1(MQCMD_ESCAPE                   ),
-	DEF_VALS1(MQCMD_RESOLVE_CHANNEL          ),
-	DEF_VALS1(MQCMD_PING_Q_MGR               ),
-	DEF_VALS1(MQCMD_INQUIRE_Q_STATUS         ),
-	DEF_VALS1(MQCMD_INQUIRE_CHANNEL_STATUS   ),
-	DEF_VALS1(MQCMD_CONFIG_EVENT             ),
-	DEF_VALS1(MQCMD_Q_MGR_EVENT              ),
-	DEF_VALS1(MQCMD_PERFM_EVENT              ),
-	DEF_VALS1(MQCMD_CHANNEL_EVENT            ),
-	DEF_VALS1(MQCMD_DELETE_PUBLICATION       ),
-	DEF_VALS1(MQCMD_DEREGISTER_PUBLISHER     ),
-	DEF_VALS1(MQCMD_DEREGISTER_SUBSCRIBER    ),
-	DEF_VALS1(MQCMD_PUBLISH                  ),
-	DEF_VALS1(MQCMD_REGISTER_PUBLISHER       ),
-	DEF_VALS1(MQCMD_REGISTER_SUBSCRIBER      ),
-	DEF_VALS1(MQCMD_REQUEST_UPDATE           ),
-	DEF_VALS1(MQCMD_BROKER_INTERNAL          ),
-	DEF_VALS1(MQCMD_ACTIVITY_MSG             ),
-	DEF_VALS1(MQCMD_INQUIRE_CLUSTER_Q_MGR    ),
-	DEF_VALS1(MQCMD_RESUME_Q_MGR_CLUSTER     ),
-	DEF_VALS1(MQCMD_SUSPEND_Q_MGR_CLUSTER    ),
-	DEF_VALS1(MQCMD_REFRESH_CLUSTER          ),
-	DEF_VALS1(MQCMD_RESET_CLUSTER            ),
-	DEF_VALS1(MQCMD_TRACE_ROUTE              ),
-	DEF_VALS1(MQCMD_REFRESH_SECURITY         ),
-	DEF_VALS1(MQCMD_CHANGE_AUTH_INFO         ),
-	DEF_VALS1(MQCMD_COPY_AUTH_INFO           ),
-	DEF_VALS1(MQCMD_CREATE_AUTH_INFO         ),
-	DEF_VALS1(MQCMD_DELETE_AUTH_INFO         ),
-	DEF_VALS1(MQCMD_INQUIRE_AUTH_INFO        ),
-	DEF_VALS1(MQCMD_INQUIRE_AUTH_INFO_NAMES  ),
-	DEF_VALS1(MQCMD_INQUIRE_CONNECTION       ),
-	DEF_VALS1(MQCMD_STOP_CONNECTION          ),
-	DEF_VALS1(MQCMD_INQUIRE_AUTH_RECS        ),
-	DEF_VALS1(MQCMD_INQUIRE_ENTITY_AUTH      ),
-	DEF_VALS1(MQCMD_DELETE_AUTH_REC          ),
-	DEF_VALS1(MQCMD_SET_AUTH_REC             ),
-	DEF_VALS1(MQCMD_LOGGER_EVENT             ),
-	DEF_VALS1(MQCMD_RESET_Q_MGR              ),
-	DEF_VALS1(MQCMD_CHANGE_LISTENER          ),
-	DEF_VALS1(MQCMD_COPY_LISTENER            ),
-	DEF_VALS1(MQCMD_CREATE_LISTENER          ),
-	DEF_VALS1(MQCMD_DELETE_LISTENER          ),
-	DEF_VALS1(MQCMD_INQUIRE_LISTENER         ),
-	DEF_VALS1(MQCMD_INQUIRE_LISTENER_STATUS  ),
-	DEF_VALS1(MQCMD_COMMAND_EVENT            ),
-	DEF_VALS1(MQCMD_CHANGE_SECURITY          ),
-	DEF_VALS1(MQCMD_CHANGE_CF_STRUC          ),
-	DEF_VALS1(MQCMD_CHANGE_STG_CLASS         ),
-	DEF_VALS1(MQCMD_CHANGE_TRACE             ),
-	DEF_VALS1(MQCMD_ARCHIVE_LOG              ),
-	DEF_VALS1(MQCMD_BACKUP_CF_STRUC          ),
-	DEF_VALS1(MQCMD_CREATE_BUFFER_POOL       ),
-	DEF_VALS1(MQCMD_CREATE_PAGE_SET          ),
-	DEF_VALS1(MQCMD_CREATE_CF_STRUC          ),
-	DEF_VALS1(MQCMD_CREATE_STG_CLASS         ),
-	DEF_VALS1(MQCMD_COPY_CF_STRUC            ),
-	DEF_VALS1(MQCMD_COPY_STG_CLASS           ),
-	DEF_VALS1(MQCMD_DELETE_CF_STRUC          ),
-	DEF_VALS1(MQCMD_DELETE_STG_CLASS         ),
-	DEF_VALS1(MQCMD_INQUIRE_ARCHIVE          ),
-	DEF_VALS1(MQCMD_INQUIRE_CF_STRUC         ),
-	DEF_VALS1(MQCMD_INQUIRE_CF_STRUC_STATUS  ),
-	DEF_VALS1(MQCMD_INQUIRE_CMD_SERVER       ),
-	DEF_VALS1(MQCMD_INQUIRE_CHANNEL_INIT     ),
-	DEF_VALS1(MQCMD_INQUIRE_QSG              ),
-	DEF_VALS1(MQCMD_INQUIRE_LOG              ),
-	DEF_VALS1(MQCMD_INQUIRE_SECURITY         ),
-	DEF_VALS1(MQCMD_INQUIRE_STG_CLASS        ),
-	DEF_VALS1(MQCMD_INQUIRE_SYSTEM           ),
-	DEF_VALS1(MQCMD_INQUIRE_THREAD           ),
-	DEF_VALS1(MQCMD_INQUIRE_TRACE            ),
-	DEF_VALS1(MQCMD_INQUIRE_USAGE            ),
-	DEF_VALS1(MQCMD_MOVE_Q                   ),
-	DEF_VALS1(MQCMD_RECOVER_BSDS             ),
-	DEF_VALS1(MQCMD_RECOVER_CF_STRUC         ),
-	DEF_VALS1(MQCMD_RESET_TPIPE              ),
-	DEF_VALS1(MQCMD_RESOLVE_INDOUBT          ),
-	DEF_VALS1(MQCMD_RESUME_Q_MGR             ),
-	DEF_VALS1(MQCMD_REVERIFY_SECURITY        ),
-	DEF_VALS1(MQCMD_SET_ARCHIVE              ),
-	DEF_VALS1(MQCMD_SET_LOG                  ),
-	DEF_VALS1(MQCMD_SET_SYSTEM               ),
-	DEF_VALS1(MQCMD_START_CMD_SERVER         ),
-	DEF_VALS1(MQCMD_START_Q_MGR              ),
-	DEF_VALS1(MQCMD_START_TRACE              ),
-	DEF_VALS1(MQCMD_STOP_CHANNEL_INIT        ),
-	DEF_VALS1(MQCMD_STOP_CHANNEL_LISTENER    ),
-	DEF_VALS1(MQCMD_STOP_CMD_SERVER          ),
-	DEF_VALS1(MQCMD_STOP_Q_MGR               ),
-	DEF_VALS1(MQCMD_STOP_TRACE               ),
-	DEF_VALS1(MQCMD_SUSPEND_Q_MGR            ),
-	DEF_VALS1(MQCMD_INQUIRE_CF_STRUC_NAMES   ),
-	DEF_VALS1(MQCMD_INQUIRE_STG_CLASS_NAMES  ),
-	DEF_VALS1(MQCMD_CHANGE_SERVICE           ),
-	DEF_VALS1(MQCMD_COPY_SERVICE             ),
-	DEF_VALS1(MQCMD_CREATE_SERVICE           ),
-	DEF_VALS1(MQCMD_DELETE_SERVICE           ),
-	DEF_VALS1(MQCMD_INQUIRE_SERVICE          ),
-	DEF_VALS1(MQCMD_INQUIRE_SERVICE_STATUS   ),
-	DEF_VALS1(MQCMD_START_SERVICE            ),
-	DEF_VALS1(MQCMD_STOP_SERVICE             ),
-	DEF_VALS1(MQCMD_DELETE_BUFFER_POOL       ),
-	DEF_VALS1(MQCMD_DELETE_PAGE_SET          ),
-	DEF_VALS1(MQCMD_CHANGE_BUFFER_POOL       ),
-	DEF_VALS1(MQCMD_CHANGE_PAGE_SET          ),
-	DEF_VALS1(MQCMD_INQUIRE_Q_MGR_STATUS     ),
-	DEF_VALS1(MQCMD_CREATE_LOG               ),
-	DEF_VALS1(MQCMD_STATISTICS_MQI           ),
-	DEF_VALS1(MQCMD_STATISTICS_Q             ),
-	DEF_VALS1(MQCMD_STATISTICS_CHANNEL       ),
-	DEF_VALS1(MQCMD_ACCOUNTING_MQI           ),
-	DEF_VALS1(MQCMD_ACCOUNTING_Q             ),
-	DEF_VALS1(MQCMD_INQUIRE_AUTH_SERVICE     ),
-	DEF_VALS1(MQCMD_CHANGE_TOPIC             ),
-	DEF_VALS1(MQCMD_COPY_TOPIC               ),
-	DEF_VALS1(MQCMD_CREATE_TOPIC             ),
-	DEF_VALS1(MQCMD_DELETE_TOPIC             ),
-	DEF_VALS1(MQCMD_INQUIRE_TOPIC            ),
-	DEF_VALS1(MQCMD_INQUIRE_TOPIC_NAMES      ),
-	DEF_VALS1(MQCMD_INQUIRE_SUBSCRIPTION     ),
-	DEF_VALS1(MQCMD_CREATE_SUBSCRIPTION      ),
-	DEF_VALS1(MQCMD_CHANGE_SUBSCRIPTION      ),
-	DEF_VALS1(MQCMD_DELETE_SUBSCRIPTION      ),
-	DEF_VALS1(MQCMD_COPY_SUBSCRIPTION        ),
-	DEF_VALS1(MQCMD_INQUIRE_SUB_STATUS       ),
-	DEF_VALS1(MQCMD_INQUIRE_TOPIC_STATUS     ),
-	DEF_VALS1(MQCMD_CLEAR_TOPIC_STRING       ),
-	DEF_VALS1(MQCMD_INQUIRE_PUBSUB_STATUS    ),
-	DEF_VALS1(MQCMD_INQUIRE_SMDS             ),
-	DEF_VALS1(MQCMD_CHANGE_SMDS              ),
-	DEF_VALS1(MQCMD_RESET_SMDS               ),
-	DEF_VALS1(MQCMD_CREATE_COMM_INFO         ),
-	DEF_VALS1(MQCMD_INQUIRE_COMM_INFO        ),
-	DEF_VALS1(MQCMD_CHANGE_COMM_INFO         ),
-	DEF_VALS1(MQCMD_COPY_COMM_INFO           ),
-	DEF_VALS1(MQCMD_DELETE_COMM_INFO         ),
-	DEF_VALS1(MQCMD_PURGE_CHANNEL            ),
-	DEF_VALS1(MQCMD_MQXR_DIAGNOSTICS         ),
-	DEF_VALS1(MQCMD_START_SMDSCONN           ),
-	DEF_VALS1(MQCMD_STOP_SMDSCONN            ),
-	DEF_VALS1(MQCMD_INQUIRE_SMDSCONN         ),
-	DEF_VALS1(MQCMD_INQUIRE_MQXR_STATUS      ),
-	DEF_VALS1(MQCMD_START_CLIENT_TRACE       ),
-	DEF_VALS1(MQCMD_STOP_CLIENT_TRACE        ),
-	DEF_VALS1(MQCMD_SET_CHLAUTH_REC          ),
-	DEF_VALS1(MQCMD_INQUIRE_CHLAUTH_RECS     ),
-	DEF_VALS1(MQCMD_INQUIRE_PROT_POLICY      ),
-	DEF_VALS1(MQCMD_CREATE_PROT_POLICY       ),
-	DEF_VALS1(MQCMD_DELETE_PROT_POLICY       ),
-	DEF_VALS1(MQCMD_CHANGE_PROT_POLICY       ),
-	DEF_VALS1(MQCMD_ACTIVITY_TRACE           ),
-	DEF_VALS1(MQCMD_RESET_CF_STRUC           ),
-	DEF_VALS1(MQCMD_INQUIRE_XR_CAPABILITY    ),
+    DEF_VALS1(MQCMD_NONE                     ),
+    DEF_VALS1(MQCMD_CHANGE_Q_MGR             ),
+    DEF_VALS1(MQCMD_INQUIRE_Q_MGR            ),
+    DEF_VALS1(MQCMD_CHANGE_PROCESS           ),
+    DEF_VALS1(MQCMD_COPY_PROCESS             ),
+    DEF_VALS1(MQCMD_CREATE_PROCESS           ),
+    DEF_VALS1(MQCMD_DELETE_PROCESS           ),
+    DEF_VALS1(MQCMD_INQUIRE_PROCESS          ),
+    DEF_VALS1(MQCMD_CHANGE_Q                 ),
+    DEF_VALS1(MQCMD_CLEAR_Q                  ),
+    DEF_VALS1(MQCMD_COPY_Q                   ),
+    DEF_VALS1(MQCMD_CREATE_Q                 ),
+    DEF_VALS1(MQCMD_DELETE_Q                 ),
+    DEF_VALS1(MQCMD_INQUIRE_Q                ),
+    DEF_VALS1(MQCMD_REFRESH_Q_MGR            ),
+    DEF_VALS1(MQCMD_RESET_Q_STATS            ),
+    DEF_VALS1(MQCMD_INQUIRE_Q_NAMES          ),
+    DEF_VALS1(MQCMD_INQUIRE_PROCESS_NAMES    ),
+    DEF_VALS1(MQCMD_INQUIRE_CHANNEL_NAMES    ),
+    DEF_VALS1(MQCMD_CHANGE_CHANNEL           ),
+    DEF_VALS1(MQCMD_COPY_CHANNEL             ),
+    DEF_VALS1(MQCMD_CREATE_CHANNEL           ),
+    DEF_VALS1(MQCMD_DELETE_CHANNEL           ),
+    DEF_VALS1(MQCMD_INQUIRE_CHANNEL          ),
+    DEF_VALS1(MQCMD_PING_CHANNEL             ),
+    DEF_VALS1(MQCMD_RESET_CHANNEL            ),
+    DEF_VALS1(MQCMD_START_CHANNEL            ),
+    DEF_VALS1(MQCMD_STOP_CHANNEL             ),
+    DEF_VALS1(MQCMD_START_CHANNEL_INIT       ),
+    DEF_VALS1(MQCMD_START_CHANNEL_LISTENER   ),
+    DEF_VALS1(MQCMD_CHANGE_NAMELIST          ),
+    DEF_VALS1(MQCMD_COPY_NAMELIST            ),
+    DEF_VALS1(MQCMD_CREATE_NAMELIST          ),
+    DEF_VALS1(MQCMD_DELETE_NAMELIST          ),
+    DEF_VALS1(MQCMD_INQUIRE_NAMELIST         ),
+    DEF_VALS1(MQCMD_INQUIRE_NAMELIST_NAMES   ),
+    DEF_VALS1(MQCMD_ESCAPE                   ),
+    DEF_VALS1(MQCMD_RESOLVE_CHANNEL          ),
+    DEF_VALS1(MQCMD_PING_Q_MGR               ),
+    DEF_VALS1(MQCMD_INQUIRE_Q_STATUS         ),
+    DEF_VALS1(MQCMD_INQUIRE_CHANNEL_STATUS   ),
+    DEF_VALS1(MQCMD_CONFIG_EVENT             ),
+    DEF_VALS1(MQCMD_Q_MGR_EVENT              ),
+    DEF_VALS1(MQCMD_PERFM_EVENT              ),
+    DEF_VALS1(MQCMD_CHANNEL_EVENT            ),
+    DEF_VALS1(MQCMD_DELETE_PUBLICATION       ),
+    DEF_VALS1(MQCMD_DEREGISTER_PUBLISHER     ),
+    DEF_VALS1(MQCMD_DEREGISTER_SUBSCRIBER    ),
+    DEF_VALS1(MQCMD_PUBLISH                  ),
+    DEF_VALS1(MQCMD_REGISTER_PUBLISHER       ),
+    DEF_VALS1(MQCMD_REGISTER_SUBSCRIBER      ),
+    DEF_VALS1(MQCMD_REQUEST_UPDATE           ),
+    DEF_VALS1(MQCMD_BROKER_INTERNAL          ),
+    DEF_VALS1(MQCMD_ACTIVITY_MSG             ),
+    DEF_VALS1(MQCMD_INQUIRE_CLUSTER_Q_MGR    ),
+    DEF_VALS1(MQCMD_RESUME_Q_MGR_CLUSTER     ),
+    DEF_VALS1(MQCMD_SUSPEND_Q_MGR_CLUSTER    ),
+    DEF_VALS1(MQCMD_REFRESH_CLUSTER          ),
+    DEF_VALS1(MQCMD_RESET_CLUSTER            ),
+    DEF_VALS1(MQCMD_TRACE_ROUTE              ),
+    DEF_VALS1(MQCMD_REFRESH_SECURITY         ),
+    DEF_VALS1(MQCMD_CHANGE_AUTH_INFO         ),
+    DEF_VALS1(MQCMD_COPY_AUTH_INFO           ),
+    DEF_VALS1(MQCMD_CREATE_AUTH_INFO         ),
+    DEF_VALS1(MQCMD_DELETE_AUTH_INFO         ),
+    DEF_VALS1(MQCMD_INQUIRE_AUTH_INFO        ),
+    DEF_VALS1(MQCMD_INQUIRE_AUTH_INFO_NAMES  ),
+    DEF_VALS1(MQCMD_INQUIRE_CONNECTION       ),
+    DEF_VALS1(MQCMD_STOP_CONNECTION          ),
+    DEF_VALS1(MQCMD_INQUIRE_AUTH_RECS        ),
+    DEF_VALS1(MQCMD_INQUIRE_ENTITY_AUTH      ),
+    DEF_VALS1(MQCMD_DELETE_AUTH_REC          ),
+    DEF_VALS1(MQCMD_SET_AUTH_REC             ),
+    DEF_VALS1(MQCMD_LOGGER_EVENT             ),
+    DEF_VALS1(MQCMD_RESET_Q_MGR              ),
+    DEF_VALS1(MQCMD_CHANGE_LISTENER          ),
+    DEF_VALS1(MQCMD_COPY_LISTENER            ),
+    DEF_VALS1(MQCMD_CREATE_LISTENER          ),
+    DEF_VALS1(MQCMD_DELETE_LISTENER          ),
+    DEF_VALS1(MQCMD_INQUIRE_LISTENER         ),
+    DEF_VALS1(MQCMD_INQUIRE_LISTENER_STATUS  ),
+    DEF_VALS1(MQCMD_COMMAND_EVENT            ),
+    DEF_VALS1(MQCMD_CHANGE_SECURITY          ),
+    DEF_VALS1(MQCMD_CHANGE_CF_STRUC          ),
+    DEF_VALS1(MQCMD_CHANGE_STG_CLASS         ),
+    DEF_VALS1(MQCMD_CHANGE_TRACE             ),
+    DEF_VALS1(MQCMD_ARCHIVE_LOG              ),
+    DEF_VALS1(MQCMD_BACKUP_CF_STRUC          ),
+    DEF_VALS1(MQCMD_CREATE_BUFFER_POOL       ),
+    DEF_VALS1(MQCMD_CREATE_PAGE_SET          ),
+    DEF_VALS1(MQCMD_CREATE_CF_STRUC          ),
+    DEF_VALS1(MQCMD_CREATE_STG_CLASS         ),
+    DEF_VALS1(MQCMD_COPY_CF_STRUC            ),
+    DEF_VALS1(MQCMD_COPY_STG_CLASS           ),
+    DEF_VALS1(MQCMD_DELETE_CF_STRUC          ),
+    DEF_VALS1(MQCMD_DELETE_STG_CLASS         ),
+    DEF_VALS1(MQCMD_INQUIRE_ARCHIVE          ),
+    DEF_VALS1(MQCMD_INQUIRE_CF_STRUC         ),
+    DEF_VALS1(MQCMD_INQUIRE_CF_STRUC_STATUS  ),
+    DEF_VALS1(MQCMD_INQUIRE_CMD_SERVER       ),
+    DEF_VALS1(MQCMD_INQUIRE_CHANNEL_INIT     ),
+    DEF_VALS1(MQCMD_INQUIRE_QSG              ),
+    DEF_VALS1(MQCMD_INQUIRE_LOG              ),
+    DEF_VALS1(MQCMD_INQUIRE_SECURITY         ),
+    DEF_VALS1(MQCMD_INQUIRE_STG_CLASS        ),
+    DEF_VALS1(MQCMD_INQUIRE_SYSTEM           ),
+    DEF_VALS1(MQCMD_INQUIRE_THREAD           ),
+    DEF_VALS1(MQCMD_INQUIRE_TRACE            ),
+    DEF_VALS1(MQCMD_INQUIRE_USAGE            ),
+    DEF_VALS1(MQCMD_MOVE_Q                   ),
+    DEF_VALS1(MQCMD_RECOVER_BSDS             ),
+    DEF_VALS1(MQCMD_RECOVER_CF_STRUC         ),
+    DEF_VALS1(MQCMD_RESET_TPIPE              ),
+    DEF_VALS1(MQCMD_RESOLVE_INDOUBT          ),
+    DEF_VALS1(MQCMD_RESUME_Q_MGR             ),
+    DEF_VALS1(MQCMD_REVERIFY_SECURITY        ),
+    DEF_VALS1(MQCMD_SET_ARCHIVE              ),
+    DEF_VALS1(MQCMD_SET_LOG                  ),
+    DEF_VALS1(MQCMD_SET_SYSTEM               ),
+    DEF_VALS1(MQCMD_START_CMD_SERVER         ),
+    DEF_VALS1(MQCMD_START_Q_MGR              ),
+    DEF_VALS1(MQCMD_START_TRACE              ),
+    DEF_VALS1(MQCMD_STOP_CHANNEL_INIT        ),
+    DEF_VALS1(MQCMD_STOP_CHANNEL_LISTENER    ),
+    DEF_VALS1(MQCMD_STOP_CMD_SERVER          ),
+    DEF_VALS1(MQCMD_STOP_Q_MGR               ),
+    DEF_VALS1(MQCMD_STOP_TRACE               ),
+    DEF_VALS1(MQCMD_SUSPEND_Q_MGR            ),
+    DEF_VALS1(MQCMD_INQUIRE_CF_STRUC_NAMES   ),
+    DEF_VALS1(MQCMD_INQUIRE_STG_CLASS_NAMES  ),
+    DEF_VALS1(MQCMD_CHANGE_SERVICE           ),
+    DEF_VALS1(MQCMD_COPY_SERVICE             ),
+    DEF_VALS1(MQCMD_CREATE_SERVICE           ),
+    DEF_VALS1(MQCMD_DELETE_SERVICE           ),
+    DEF_VALS1(MQCMD_INQUIRE_SERVICE          ),
+    DEF_VALS1(MQCMD_INQUIRE_SERVICE_STATUS   ),
+    DEF_VALS1(MQCMD_START_SERVICE            ),
+    DEF_VALS1(MQCMD_STOP_SERVICE             ),
+    DEF_VALS1(MQCMD_DELETE_BUFFER_POOL       ),
+    DEF_VALS1(MQCMD_DELETE_PAGE_SET          ),
+    DEF_VALS1(MQCMD_CHANGE_BUFFER_POOL       ),
+    DEF_VALS1(MQCMD_CHANGE_PAGE_SET          ),
+    DEF_VALS1(MQCMD_INQUIRE_Q_MGR_STATUS     ),
+    DEF_VALS1(MQCMD_CREATE_LOG               ),
+    DEF_VALS1(MQCMD_STATISTICS_MQI           ),
+    DEF_VALS1(MQCMD_STATISTICS_Q             ),
+    DEF_VALS1(MQCMD_STATISTICS_CHANNEL       ),
+    DEF_VALS1(MQCMD_ACCOUNTING_MQI           ),
+    DEF_VALS1(MQCMD_ACCOUNTING_Q             ),
+    DEF_VALS1(MQCMD_INQUIRE_AUTH_SERVICE     ),
+    DEF_VALS1(MQCMD_CHANGE_TOPIC             ),
+    DEF_VALS1(MQCMD_COPY_TOPIC               ),
+    DEF_VALS1(MQCMD_CREATE_TOPIC             ),
+    DEF_VALS1(MQCMD_DELETE_TOPIC             ),
+    DEF_VALS1(MQCMD_INQUIRE_TOPIC            ),
+    DEF_VALS1(MQCMD_INQUIRE_TOPIC_NAMES      ),
+    DEF_VALS1(MQCMD_INQUIRE_SUBSCRIPTION     ),
+    DEF_VALS1(MQCMD_CREATE_SUBSCRIPTION      ),
+    DEF_VALS1(MQCMD_CHANGE_SUBSCRIPTION      ),
+    DEF_VALS1(MQCMD_DELETE_SUBSCRIPTION      ),
+    DEF_VALS1(MQCMD_COPY_SUBSCRIPTION        ),
+    DEF_VALS1(MQCMD_INQUIRE_SUB_STATUS       ),
+    DEF_VALS1(MQCMD_INQUIRE_TOPIC_STATUS     ),
+    DEF_VALS1(MQCMD_CLEAR_TOPIC_STRING       ),
+    DEF_VALS1(MQCMD_INQUIRE_PUBSUB_STATUS    ),
+    DEF_VALS1(MQCMD_INQUIRE_SMDS             ),
+    DEF_VALS1(MQCMD_CHANGE_SMDS              ),
+    DEF_VALS1(MQCMD_RESET_SMDS               ),
+    DEF_VALS1(MQCMD_CREATE_COMM_INFO         ),
+    DEF_VALS1(MQCMD_INQUIRE_COMM_INFO        ),
+    DEF_VALS1(MQCMD_CHANGE_COMM_INFO         ),
+    DEF_VALS1(MQCMD_COPY_COMM_INFO           ),
+    DEF_VALS1(MQCMD_DELETE_COMM_INFO         ),
+    DEF_VALS1(MQCMD_PURGE_CHANNEL            ),
+    DEF_VALS1(MQCMD_MQXR_DIAGNOSTICS         ),
+    DEF_VALS1(MQCMD_START_SMDSCONN           ),
+    DEF_VALS1(MQCMD_STOP_SMDSCONN            ),
+    DEF_VALS1(MQCMD_INQUIRE_SMDSCONN         ),
+    DEF_VALS1(MQCMD_INQUIRE_MQXR_STATUS      ),
+    DEF_VALS1(MQCMD_START_CLIENT_TRACE       ),
+    DEF_VALS1(MQCMD_STOP_CLIENT_TRACE        ),
+    DEF_VALS1(MQCMD_SET_CHLAUTH_REC          ),
+    DEF_VALS1(MQCMD_INQUIRE_CHLAUTH_RECS     ),
+    DEF_VALS1(MQCMD_INQUIRE_PROT_POLICY      ),
+    DEF_VALS1(MQCMD_CREATE_PROT_POLICY       ),
+    DEF_VALS1(MQCMD_DELETE_PROT_POLICY       ),
+    DEF_VALS1(MQCMD_CHANGE_PROT_POLICY       ),
+    DEF_VALS1(MQCMD_ACTIVITY_TRACE           ),
+    DEF_VALS1(MQCMD_RESET_CF_STRUC           ),
+    DEF_VALS1(MQCMD_INQUIRE_XR_CAPABILITY    ),
 DEF_VALSE;
 
 /* Types of Structure */
 DEF_VALSBX(mqcft)
-	DEF_VALS1(MQCFT_NONE                     ),
-	DEF_VALS1(MQCFT_COMMAND                  ),
-	DEF_VALS1(MQCFT_RESPONSE                 ),
-	DEF_VALS1(MQCFT_INTEGER                  ),
-	DEF_VALS1(MQCFT_STRING                   ),
-	DEF_VALS1(MQCFT_INTEGER_LIST             ),
-	DEF_VALS1(MQCFT_STRING_LIST              ),
-	DEF_VALS1(MQCFT_EVENT                    ),
-	DEF_VALS1(MQCFT_USER                     ),
-	DEF_VALS1(MQCFT_BYTE_STRING              ),
-	DEF_VALS1(MQCFT_TRACE_ROUTE              ),
-	DEF_VALS1(MQCFT_REPORT                   ),
-	DEF_VALS1(MQCFT_INTEGER_FILTER           ),
-	DEF_VALS1(MQCFT_STRING_FILTER            ),
-	DEF_VALS1(MQCFT_BYTE_STRING_FILTER       ),
-	DEF_VALS1(MQCFT_COMMAND_XR               ),
-	DEF_VALS1(MQCFT_XR_MSG                   ),
-	DEF_VALS1(MQCFT_XR_ITEM                  ),
-	DEF_VALS1(MQCFT_XR_SUMMARY               ),
-	DEF_VALS1(MQCFT_GROUP                    ),
-	DEF_VALS1(MQCFT_STATISTICS               ),
-	DEF_VALS1(MQCFT_ACCOUNTING               ),
-	DEF_VALS1(MQCFT_INTEGER64                ),
-	DEF_VALS1(MQCFT_INTEGER64_LIST           ),
-	DEF_VALS1(MQCFT_APP_ACTIVITY             ),
+    DEF_VALS1(MQCFT_NONE                     ),
+    DEF_VALS1(MQCFT_COMMAND                  ),
+    DEF_VALS1(MQCFT_RESPONSE                 ),
+    DEF_VALS1(MQCFT_INTEGER                  ),
+    DEF_VALS1(MQCFT_STRING                   ),
+    DEF_VALS1(MQCFT_INTEGER_LIST             ),
+    DEF_VALS1(MQCFT_STRING_LIST              ),
+    DEF_VALS1(MQCFT_EVENT                    ),
+    DEF_VALS1(MQCFT_USER                     ),
+    DEF_VALS1(MQCFT_BYTE_STRING              ),
+    DEF_VALS1(MQCFT_TRACE_ROUTE              ),
+    DEF_VALS1(MQCFT_REPORT                   ),
+    DEF_VALS1(MQCFT_INTEGER_FILTER           ),
+    DEF_VALS1(MQCFT_STRING_FILTER            ),
+    DEF_VALS1(MQCFT_BYTE_STRING_FILTER       ),
+    DEF_VALS1(MQCFT_COMMAND_XR               ),
+    DEF_VALS1(MQCFT_XR_MSG                   ),
+    DEF_VALS1(MQCFT_XR_ITEM                  ),
+    DEF_VALS1(MQCFT_XR_SUMMARY               ),
+    DEF_VALS1(MQCFT_GROUP                    ),
+    DEF_VALS1(MQCFT_STATISTICS               ),
+    DEF_VALS1(MQCFT_ACCOUNTING               ),
+    DEF_VALS1(MQCFT_INTEGER64                ),
+    DEF_VALS1(MQCFT_INTEGER64_LIST           ),
+    DEF_VALS1(MQCFT_APP_ACTIVITY             ),
 DEF_VALSE;
 
 DEF_VALSBX(objtype)
-	DEF_VALS1(MQOT_NONE             ),
-	DEF_VALS1(MQOT_Q                ),
-	DEF_VALS1(MQOT_NAMELIST         ),
-	DEF_VALS1(MQOT_PROCESS          ),
-	DEF_VALS1(MQOT_STORAGE_CLASS    ),
-	DEF_VALS1(MQOT_Q_MGR            ),
-	DEF_VALS1(MQOT_CHANNEL          ),
-	DEF_VALS1(MQOT_AUTH_INFO        ),
-	DEF_VALS1(MQOT_TOPIC            ),
-	DEF_VALS1(MQOT_COMM_INFO        ),
-	DEF_VALS1(MQOT_CF_STRUC         ),
-	DEF_VALS1(MQOT_LISTENER         ),
-	DEF_VALS1(MQOT_SERVICE          ),
-	DEF_VALS1(MQOT_RESERVED_1       ),
-	DEF_VALS1(MQOT_ALL              ),
-	DEF_VALS1(MQOT_ALIAS_Q          ),
-	DEF_VALS1(MQOT_MODEL_Q          ),
-	DEF_VALS1(MQOT_LOCAL_Q          ),
-	DEF_VALS1(MQOT_REMOTE_Q         ),
-	DEF_VALS1(MQOT_SENDER_CHANNEL   ),
-	DEF_VALS1(MQOT_SERVER_CHANNEL   ),
-	DEF_VALS1(MQOT_REQUESTER_CHANNEL),
-	DEF_VALS1(MQOT_RECEIVER_CHANNEL ),
-	DEF_VALS1(MQOT_CURRENT_CHANNEL  ),
-	DEF_VALS1(MQOT_SAVED_CHANNEL    ),
-	DEF_VALS1(MQOT_SVRCONN_CHANNEL  ),
-	DEF_VALS1(MQOT_CLNTCONN_CHANNEL ),
-	DEF_VALS1(MQOT_SHORT_CHANNEL    ),
-	DEF_VALS1(MQOT_CHLAUTH          ),
-	DEF_VALS1(MQOT_REMOTE_Q_MGR_NAME),
-	DEF_VALS1(MQOT_PROT_POLICY      ),
+    DEF_VALS1(MQOT_NONE             ),
+    DEF_VALS1(MQOT_Q                ),
+    DEF_VALS1(MQOT_NAMELIST         ),
+    DEF_VALS1(MQOT_PROCESS          ),
+    DEF_VALS1(MQOT_STORAGE_CLASS    ),
+    DEF_VALS1(MQOT_Q_MGR            ),
+    DEF_VALS1(MQOT_CHANNEL          ),
+    DEF_VALS1(MQOT_AUTH_INFO        ),
+    DEF_VALS1(MQOT_TOPIC            ),
+    DEF_VALS1(MQOT_COMM_INFO        ),
+    DEF_VALS1(MQOT_CF_STRUC         ),
+    DEF_VALS1(MQOT_LISTENER         ),
+    DEF_VALS1(MQOT_SERVICE          ),
+    DEF_VALS1(MQOT_RESERVED_1       ),
+    DEF_VALS1(MQOT_ALL              ),
+    DEF_VALS1(MQOT_ALIAS_Q          ),
+    DEF_VALS1(MQOT_MODEL_Q          ),
+    DEF_VALS1(MQOT_LOCAL_Q          ),
+    DEF_VALS1(MQOT_REMOTE_Q         ),
+    DEF_VALS1(MQOT_SENDER_CHANNEL   ),
+    DEF_VALS1(MQOT_SERVER_CHANNEL   ),
+    DEF_VALS1(MQOT_REQUESTER_CHANNEL),
+    DEF_VALS1(MQOT_RECEIVER_CHANNEL ),
+    DEF_VALS1(MQOT_CURRENT_CHANNEL  ),
+    DEF_VALS1(MQOT_SAVED_CHANNEL    ),
+    DEF_VALS1(MQOT_SVRCONN_CHANNEL  ),
+    DEF_VALS1(MQOT_CLNTCONN_CHANNEL ),
+    DEF_VALS1(MQOT_SHORT_CHANNEL    ),
+    DEF_VALS1(MQOT_CHLAUTH          ),
+    DEF_VALS1(MQOT_REMOTE_Q_MGR_NAME),
+    DEF_VALS1(MQOT_PROT_POLICY      ),
 DEF_VALSE;
 
 DEF_VALSB(AuthInfoType)
-	DEF_VALS1(MQAIT_CRL_LDAP),
-	DEF_VALS1(MQAIT_OCSP),
+    DEF_VALS1(MQAIT_CRL_LDAP),
+    DEF_VALS1(MQAIT_OCSP),
 DEF_VALSE;
 
 DEF_VALSBX(FilterOP)
-	DEF_VALS1(MQCFOP_LESS        ),
-	DEF_VALS1(MQCFOP_EQUAL       ),
-	DEF_VALS1(MQCFOP_GREATER     ),
-	DEF_VALS1(MQCFOP_NOT_LESS    ),
-	DEF_VALS1(MQCFOP_NOT_EQUAL   ),
-	DEF_VALS1(MQCFOP_NOT_GREATER ),
-	DEF_VALS1(MQCFOP_LIKE        ),
-	DEF_VALS1(MQCFOP_NOT_LIKE    ),
-	DEF_VALS1(MQCFOP_CONTAINS    ),
-	DEF_VALS1(MQCFOP_EXCLUDES    ),
-	DEF_VALS1(MQCFOP_CONTAINS_GEN),
-	DEF_VALS1(MQCFOP_EXCLUDES_GEN),
+    DEF_VALS1(MQCFOP_LESS        ),
+    DEF_VALS1(MQCFOP_EQUAL       ),
+    DEF_VALS1(MQCFOP_GREATER     ),
+    DEF_VALS1(MQCFOP_NOT_LESS    ),
+    DEF_VALS1(MQCFOP_NOT_EQUAL   ),
+    DEF_VALS1(MQCFOP_NOT_GREATER ),
+    DEF_VALS1(MQCFOP_LIKE        ),
+    DEF_VALS1(MQCFOP_NOT_LIKE    ),
+    DEF_VALS1(MQCFOP_CONTAINS    ),
+    DEF_VALS1(MQCFOP_EXCLUDES    ),
+    DEF_VALS1(MQCFOP_CONTAINS_GEN),
+    DEF_VALS1(MQCFOP_EXCLUDES_GEN),
 DEF_VALSE;
 
 DEF_VALSB(PutResponse)
-	DEF_VALS1(MQPRT_ASYNC_RESPONSE    ),
-	DEF_VALS1(MQPRT_RESPONSE_AS_PARENT),
-	DEF_VALS1(MQPRT_SYNC_RESPONSE     ),
+    DEF_VALS1(MQPRT_ASYNC_RESPONSE    ),
+    DEF_VALS1(MQPRT_RESPONSE_AS_PARENT),
+    DEF_VALS1(MQPRT_SYNC_RESPONSE     ),
 DEF_VALSE;
 
 DEF_VALSB(TraceRouteRecording)
-	DEF_VALS1(MQRECORDING_MSG     ),
-	DEF_VALS1(MQRECORDING_Q       ),
-	DEF_VALS1(MQRECORDING_DISABLED),
+    DEF_VALS1(MQRECORDING_MSG     ),
+    DEF_VALS1(MQRECORDING_Q       ),
+    DEF_VALS1(MQRECORDING_DISABLED),
 DEF_VALSE;
 
 DEF_VALSB(TCPStackType)
-	DEF_VALS1(MQTCPSTACK_SINGLE  ),
-	DEF_VALS1(MQTCPSTACK_MULTIPLE),
+    DEF_VALS1(MQTCPSTACK_SINGLE  ),
+    DEF_VALS1(MQTCPSTACK_MULTIPLE),
 DEF_VALSE;
 
 DEF_VALSB(TCPKeepAlive)
-	DEF_VALS1(MQTCPKEEP_YES),
-	DEF_VALS1(MQTCPKEEP_NO ),
+    DEF_VALS1(MQTCPKEEP_YES),
+    DEF_VALS1(MQTCPKEEP_NO ),
 DEF_VALSE;
 
 DEF_VALSB(SharedQueueQueueManagerName)
-	DEF_VALS1(MQSQQM_USE   ),
-	DEF_VALS1(MQSQQM_IGNORE),
+    DEF_VALS1(MQSQQM_USE   ),
+    DEF_VALS1(MQSQQM_IGNORE),
 DEF_VALSE;
 
 DEF_VALSB(ReceiveTimeoutType)
-	DEF_VALS1(MQRCVTIME_MULTIPLY),
-	DEF_VALS1(MQRCVTIME_ADD     ),
-	DEF_VALS1(MQRCVTIME_EQUAL   ),
+    DEF_VALS1(MQRCVTIME_MULTIPLY),
+    DEF_VALS1(MQRCVTIME_ADD     ),
+    DEF_VALS1(MQRCVTIME_EQUAL   ),
 DEF_VALSE;
 
 DEF_VALSB(IPAddressVersion)
-	DEF_VALS1(MQIPADDR_IPV4),
-	DEF_VALS1(MQIPADDR_IPV6),
+    DEF_VALS1(MQIPADDR_IPV4),
+    DEF_VALS1(MQIPADDR_IPV6),
 DEF_VALSE;
 
 DEF_VALSB(GroupUR)
-	DEF_VALS1(MQGUR_DISABLED),
-	DEF_VALS1(MQGUR_ENABLED ),
+    DEF_VALS1(MQGUR_DISABLED),
+    DEF_VALS1(MQGUR_ENABLED ),
 DEF_VALSE;
 
 DEF_VALSB(DNSWLM)
-	DEF_VALS1(MQDNSWLM_YES),
-	DEF_VALS1(MQDNSWLM_NO ),
+    DEF_VALS1(MQDNSWLM_YES),
+    DEF_VALS1(MQDNSWLM_NO ),
 DEF_VALSE;
 
 DEF_VALSB(AdoptNewMCAType)
-	DEF_VALS1(MQADOPT_TYPE_NO ),
-	DEF_VALS1(MQADOPT_TYPE_ALL),
+    DEF_VALS1(MQADOPT_TYPE_NO ),
+    DEF_VALS1(MQADOPT_TYPE_ALL),
 DEF_VALSE;
 
 DEF_VALSB(AdoptNewMCACheck)
-	DEF_VALS1(MQADOPT_CHECK_Q_MGR_NAME),
-	DEF_VALS1(MQADOPT_CHECK_NET_ADDR  ),
-	DEF_VALS1(MQADOPT_CHECK_ALL       ),
-	DEF_VALS1(MQADOPT_CHECK_NONE      ),
+    DEF_VALS1(MQADOPT_CHECK_Q_MGR_NAME),
+    DEF_VALS1(MQADOPT_CHECK_NET_ADDR  ),
+    DEF_VALS1(MQADOPT_CHECK_ALL       ),
+    DEF_VALS1(MQADOPT_CHECK_NONE      ),
 DEF_VALSE;
 
 DEF_VALSB(ActivityRecording)
-	DEF_VALS1(MQRECORDING_MSG     ),
-	DEF_VALS1(MQRECORDING_Q       ),
-	DEF_VALS1(MQRECORDING_DISABLED),
+    DEF_VALS1(MQRECORDING_MSG     ),
+    DEF_VALS1(MQRECORDING_Q       ),
+    DEF_VALS1(MQRECORDING_DISABLED),
 DEF_VALSE;
 
 DEF_VALSB(TransportType)
-	DEF_VALS1(MQXPT_LU62   ),
-	DEF_VALS1(MQXPT_TCP    ),
-	DEF_VALS1(MQXPT_NETBIOS),
-	DEF_VALS1(MQXPT_SPX    ),
+    DEF_VALS1(MQXPT_LU62   ),
+    DEF_VALS1(MQXPT_TCP    ),
+    DEF_VALS1(MQXPT_NETBIOS),
+    DEF_VALS1(MQXPT_SPX    ),
 DEF_VALSE;
 
 DEF_VALSB(SSLClientAuthentication)
-	DEF_VALS1(MQSCA_REQUIRED),
-	DEF_VALS1(MQSCA_OPTIONAL),
+    DEF_VALS1(MQSCA_REQUIRED),
+    DEF_VALS1(MQSCA_OPTIONAL),
 DEF_VALSE;
 
 
 DEF_VALSB(PutAuthority)
-	DEF_VALS1(MQPA_DEFAULT         ),
-	DEF_VALS1(MQPA_CONTEXT         ),
-	DEF_VALS1(MQPA_ALTERNATE_OR_MCA),
-	DEF_VALS1(MQPA_ONLY_MCA        ),
+    DEF_VALS1(MQPA_DEFAULT         ),
+    DEF_VALS1(MQPA_CONTEXT         ),
+    DEF_VALS1(MQPA_ALTERNATE_OR_MCA),
+    DEF_VALS1(MQPA_ONLY_MCA        ),
 DEF_VALSE;
 
 DEF_VALSB(NonPersistentMsgSpeed)
-	DEF_VALS1(MQNPMS_NORMAL),
-	DEF_VALS1(MQNPMS_FAST  ),
+    DEF_VALS1(MQNPMS_NORMAL),
+    DEF_VALS1(MQNPMS_FAST  ),
 DEF_VALSE;
 
 DEF_VALSB(MessageCompression)
-	DEF_VALS1(MQCOMPRESS_NONE          ),
-	DEF_VALS1(MQCOMPRESS_RLE           ),
-	DEF_VALS1(MQCOMPRESS_ZLIBFAST      ),
-	DEF_VALS1(MQCOMPRESS_ZLIBHIGH      ),
-	DEF_VALS1(MQCOMPRESS_ANY           ),
-	DEF_VALS1(MQCOMPRESS_NOT_AVAILABLE ),
+    DEF_VALS1(MQCOMPRESS_NONE          ),
+    DEF_VALS1(MQCOMPRESS_RLE           ),
+    DEF_VALS1(MQCOMPRESS_ZLIBFAST      ),
+    DEF_VALS1(MQCOMPRESS_ZLIBHIGH      ),
+    DEF_VALS1(MQCOMPRESS_ANY           ),
+    DEF_VALS1(MQCOMPRESS_NOT_AVAILABLE ),
 DEF_VALSE;
 
 DEF_VALSB(HeaderCompression)
-	DEF_VALS1(MQCOMPRESS_NONE          ),
-	DEF_VALS1(MQCOMPRESS_SYSTEM        ),
-	DEF_VALS1(MQCOMPRESS_NOT_AVAILABLE ),
+    DEF_VALS1(MQCOMPRESS_NONE          ),
+    DEF_VALS1(MQCOMPRESS_SYSTEM        ),
+    DEF_VALS1(MQCOMPRESS_NOT_AVAILABLE ),
 DEF_VALSE;
 
 #if 0
 DEF_VALSB(MCAStatus)
-	DEF_VALS1(MQMCAS_STOPPED),
-	DEF_VALS1(MQMCAS_RUNNING),
+    DEF_VALS1(MQMCAS_STOPPED),
+    DEF_VALS1(MQMCAS_RUNNING),
 DEF_VALSE;
 #endif
 
 DEF_VALSB(MCAType)
-	DEF_VALS1(MQMCAT_PROCESS),
-	DEF_VALS1(MQMCAT_THREAD ),
+    DEF_VALS1(MQMCAT_PROCESS),
+    DEF_VALS1(MQMCAT_THREAD ),
 DEF_VALSE;
 
 DEF_VALSB(DataConversion)
-	DEF_VALS1(MQCDC_NO_SENDER_CONVERSION),
-	DEF_VALS1(MQCDC_SENDER_CONVERSION   ),
+    DEF_VALS1(MQCDC_NO_SENDER_CONVERSION),
+    DEF_VALS1(MQCDC_SENDER_CONVERSION   ),
 DEF_VALSE;
 
 DEF_VALSB(Usage)
-	DEF_VALS1(MQUS_NORMAL      ),
-	DEF_VALS1(MQUS_TRANSMISSION),
+    DEF_VALS1(MQUS_NORMAL      ),
+    DEF_VALS1(MQUS_TRANSMISSION),
 DEF_VALSE;
 
 DEF_VALSB(ChannelType)
-	DEF_VALS1(MQCHT_SENDER   ),
-	DEF_VALS1(MQCHT_SERVER   ),
-	DEF_VALS1(MQCHT_RECEIVER ),
-	DEF_VALS1(MQCHT_REQUESTER),
-	DEF_VALS1(MQCHT_SVRCONN  ),
-	DEF_VALS1(MQCHT_CLNTCONN ),
-	DEF_VALS1(MQCHT_CLUSRCVR ),
-	DEF_VALS1(MQCHT_CLUSSDR  ),
+    DEF_VALS1(MQCHT_SENDER   ),
+    DEF_VALS1(MQCHT_SERVER   ),
+    DEF_VALS1(MQCHT_RECEIVER ),
+    DEF_VALS1(MQCHT_REQUESTER),
+    DEF_VALS1(MQCHT_SVRCONN  ),
+    DEF_VALS1(MQCHT_CLNTCONN ),
+    DEF_VALS1(MQCHT_CLUSRCVR ),
+    DEF_VALS1(MQCHT_CLUSSDR  ),
 DEF_VALSE;
 
 DEF_VALSB(ServiceIntervalEvent)
-	DEF_VALS1(MQQSIE_NONE),
-	DEF_VALS1(MQQSIE_OK  ),
-	DEF_VALS1(MQQSIE_HIGH),
+    DEF_VALS1(MQQSIE_NONE),
+    DEF_VALS1(MQQSIE_OK  ),
+    DEF_VALS1(MQQSIE_HIGH),
 DEF_VALSE;
 
 DEF_VALSB(Monitoring)
-	DEF_VALS1(MQMON_NONE  ),
-	DEF_VALS2(MQMON_ON    ,"ON/ENABLED"),
-	DEF_VALS2(MQMON_OFF   ,"OFF/DISABLED"),
-	DEF_VALS1(MQMON_LOW   ),
-	DEF_VALS1(MQMON_MEDIUM),
-	DEF_VALS1(MQMON_HIGH  ),
-	DEF_VALS1(MQMON_Q_MGR ),
+    DEF_VALS1(MQMON_NONE  ),
+    DEF_VALS2(MQMON_ON    ,"ON/ENABLED"),
+    DEF_VALS2(MQMON_OFF   ,"OFF/DISABLED"),
+    DEF_VALS1(MQMON_LOW   ),
+    DEF_VALS1(MQMON_MEDIUM),
+    DEF_VALS1(MQMON_HIGH  ),
+    DEF_VALS1(MQMON_Q_MGR ),
 DEF_VALSE;
 
 DEF_VALSB(QueueType)
-	DEF_VALS1(MQQT_LOCAL ),
-	DEF_VALS1(MQQT_MODEL ),
-	DEF_VALS1(MQQT_ALIAS ),
-	DEF_VALS1(MQQT_REMOTE),
-	DEF_VALS1(MQQT_CLUSTER),
-	DEF_VALS1(MQQT_ALL),
+    DEF_VALS1(MQQT_LOCAL ),
+    DEF_VALS1(MQQT_MODEL ),
+    DEF_VALS1(MQQT_ALIAS ),
+    DEF_VALS1(MQQT_REMOTE),
+    DEF_VALS1(MQQT_CLUSTER),
+    DEF_VALS1(MQQT_ALL),
 DEF_VALSE;
 
 DEF_VALSB(EventRule)
-	DEF_VALS1(MQEVR_ENABLED   ),
-	DEF_VALS1(MQEVR_DISABLED  ),
-	DEF_VALS1(MQEVR_EXCEPTION ),
-	DEF_VALS1(MQEVR_NO_DISPLAY),
+    DEF_VALS1(MQEVR_ENABLED   ),
+    DEF_VALS1(MQEVR_DISABLED  ),
+    DEF_VALS1(MQEVR_EXCEPTION ),
+    DEF_VALS1(MQEVR_NO_DISPLAY),
 DEF_VALSE;
 
 DEF_VALSB(InputOpenOption)
-	DEF_VALS1(MQOO_INPUT_EXCLUSIVE),
-	DEF_VALS1(MQOO_INPUT_SHARED   ),
+    DEF_VALS1(MQOO_INPUT_EXCLUSIVE),
+    DEF_VALS1(MQOO_INPUT_SHARED   ),
 DEF_VALSE;
 
 DEF_VALSB(CFConLoss)
-	DEF_VALS1(MQCFCONLOS_TERMINATE),
-	DEF_VALS1(MQCFCONLOS_TOLERATE ),
+    DEF_VALS1(MQCFCONLOS_TERMINATE),
+    DEF_VALS1(MQCFCONLOS_TOLERATE ),
 DEF_VALSE;
 
 DEF_VALSB(CLWLUseQ)
-	DEF_VALS1(MQCLWL_USEQ_ANY     ),
-	DEF_VALS1(MQCLWL_USEQ_LOCAL   ),
-	DEF_VALS1(MQCLWL_USEQ_AS_Q_MGR),
+    DEF_VALS1(MQCLWL_USEQ_ANY     ),
+    DEF_VALS1(MQCLWL_USEQ_LOCAL   ),
+    DEF_VALS1(MQCLWL_USEQ_AS_Q_MGR),
 DEF_VALSE;
 
 DEF_VALSB(DefinitionType)
-	DEF_VALS1(MQQDT_PREDEFINED       ),
-	DEF_VALS1(MQQDT_PERMANENT_DYNAMIC),
-	DEF_VALS1(MQQDT_TEMPORARY_DYNAMIC),
-	DEF_VALS1(MQQDT_SHARED_DYNAMIC   ),
+    DEF_VALS1(MQQDT_PREDEFINED       ),
+    DEF_VALS1(MQQDT_PERMANENT_DYNAMIC),
+    DEF_VALS1(MQQDT_TEMPORARY_DYNAMIC),
+    DEF_VALS1(MQQDT_SHARED_DYNAMIC   ),
 DEF_VALSE;
 
 DEF_VALSB(InhibitGetVal)
-	DEF_VALS1(MQQA_GET_INHIBITED),
-	DEF_VALS1(MQQA_GET_ALLOWED  ),
+    DEF_VALS1(MQQA_GET_INHIBITED),
+    DEF_VALS1(MQQA_GET_ALLOWED  ),
 DEF_VALSE;
 
 DEF_VALSB(IntraGroupQueuing)
-	DEF_VALS1(MQIGQ_DISABLED),
-	DEF_VALS1(MQIGQ_ENABLED),
+    DEF_VALS1(MQIGQ_DISABLED),
+    DEF_VALS1(MQIGQ_ENABLED),
 DEF_VALSE;
 
 DEF_VALSB(InhibitPutVal)
-	DEF_VALS1(MQQA_PUT_INHIBITED),
-	DEF_VALS1(MQQA_PUT_ALLOWED  ),
+    DEF_VALS1(MQQA_PUT_INHIBITED),
+    DEF_VALS1(MQQA_PUT_ALLOWED  ),
 DEF_VALSE;
 
 DEF_VALSB(Shareability)
-	DEF_VALS1(MQQA_SHAREABLE    ),
-	DEF_VALS1(MQQA_NOT_SHAREABLE),
+    DEF_VALS1(MQQA_SHAREABLE    ),
+    DEF_VALS1(MQQA_NOT_SHAREABLE),
 DEF_VALSE;
 
 DEF_VALSB(BackOutHardening)
-	DEF_VALS1(MQQA_BACKOUT_HARDENED    ),
-	DEF_VALS1(MQQA_BACKOUT_NOT_HARDENED),
+    DEF_VALS1(MQQA_BACKOUT_HARDENED    ),
+    DEF_VALS1(MQQA_BACKOUT_NOT_HARDENED),
 DEF_VALSE;
 
 DEF_VALSB(MsgDelivSeq)
-	DEF_VALS1(MQMDS_PRIORITY),
-	DEF_VALS1(MQMDS_FIFO    ),
+    DEF_VALS1(MQMDS_PRIORITY),
+    DEF_VALS1(MQMDS_FIFO    ),
 DEF_VALSE;
 
 DEF_VALSB(NonpersistentMsgCls)
-	DEF_VALS1(MQNPM_CLASS_NORMAL),
-	DEF_VALS1(MQNPM_CLASS_HIGH  ),
+    DEF_VALS1(MQNPM_CLASS_NORMAL),
+    DEF_VALS1(MQNPM_CLASS_HIGH  ),
 DEF_VALSE;
 
 DEF_VALSB(TriggerControl)
-	DEF_VALS1(MQTC_OFF),
-	DEF_VALS1(MQTC_ON ),
+    DEF_VALS1(MQTC_OFF),
+    DEF_VALS1(MQTC_ON ),
 DEF_VALSE;
 
 DEF_VALSB(TriggerType)
-	DEF_VALS1(MQTT_NONE ),
-	DEF_VALS1(MQTT_FIRST),
-	DEF_VALS1(MQTT_EVERY),
-	DEF_VALS1(MQTT_DEPTH),
+    DEF_VALS1(MQTT_NONE ),
+    DEF_VALS1(MQTT_FIRST),
+    DEF_VALS1(MQTT_EVERY),
+    DEF_VALS1(MQTT_DEPTH),
 DEF_VALSE;
 
 #if 0
 DEF_VALSB(TriggerRestart)
-	DEF_VALS1(MQTRIGGER_RESTART_NO ),
-	DEF_VALS1(MQTRIGGER_RESTART_YES),
+    DEF_VALS1(MQTRIGGER_RESTART_NO ),
+    DEF_VALS1(MQTRIGGER_RESTART_YES),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(QueueUsages)
-	DEF_VALS1(MQUS_NORMAL      ),
-	DEF_VALS1(MQUS_TRANSMISSION),
+    DEF_VALS1(MQUS_NORMAL      ),
+    DEF_VALS1(MQUS_TRANSMISSION),
 DEF_VALSE;
 #endif
 
 DEF_VALSB(DistributionLists)
-	DEF_VALS1(MQDL_SUPPORTED    ),
-	DEF_VALS1(MQDL_NOT_SUPPORTED),
+    DEF_VALS1(MQDL_SUPPORTED    ),
+    DEF_VALS1(MQDL_NOT_SUPPORTED),
 DEF_VALSE;
 
 DEF_VALSB(IndexTypes)
-	DEF_VALS1(MQIT_NONE     ),
-	DEF_VALS1(MQIT_MSG_ID   ),
-	DEF_VALS1(MQIT_CORREL_ID),
-	DEF_VALS1(MQIT_MSG_TOKEN),
-	DEF_VALS1(MQIT_GROUP_ID ),
+    DEF_VALS1(MQIT_NONE     ),
+    DEF_VALS1(MQIT_MSG_ID   ),
+    DEF_VALS1(MQIT_CORREL_ID),
+    DEF_VALS1(MQIT_MSG_TOKEN),
+    DEF_VALS1(MQIT_GROUP_ID ),
 DEF_VALSE;
 
 DEF_VALSB(Bindings)
-	DEF_VALS1(MQBND_BIND_ON_OPEN  ),
-	DEF_VALS1(MQBND_BIND_NOT_FIXED),
+    DEF_VALS1(MQBND_BIND_ON_OPEN  ),
+    DEF_VALS1(MQBND_BIND_NOT_FIXED),
 DEF_VALSE;
 
 DEF_VALSB(QShrGrpDisp)
-	DEF_VALS1(MQQSGD_ALL    ),
-	DEF_VALS1(MQQSGD_Q_MGR  ),
-	DEF_VALS1(MQQSGD_COPY   ),
-	DEF_VALS1(MQQSGD_SHARED ),
-	DEF_VALS1(MQQSGD_GROUP  ),
-	DEF_VALS1(MQQSGD_PRIVATE),
-	DEF_VALS1(MQQSGD_LIVE   ),
+    DEF_VALS1(MQQSGD_ALL    ),
+    DEF_VALS1(MQQSGD_Q_MGR  ),
+    DEF_VALS1(MQQSGD_COPY   ),
+    DEF_VALS1(MQQSGD_SHARED ),
+    DEF_VALS1(MQQSGD_GROUP  ),
+    DEF_VALS1(MQQSGD_PRIVATE),
+    DEF_VALS1(MQQSGD_LIVE   ),
 DEF_VALSE;
 
 #if 0
 DEF_VALSB(ReorgCtls)
-	DEF_VALS1(MQREORG_DISABLED),
-	DEF_VALS1(MQREORG_ENABLED),
+    DEF_VALS1(MQREORG_DISABLED),
+    DEF_VALS1(MQREORG_ENABLED),
 DEF_VALSE;
 #endif
 
 DEF_VALSB(ReadAheadValues)
-	DEF_VALS1(MQREADA_NO       ),
-	DEF_VALS1(MQREADA_YES      ),
-	DEF_VALS1(MQREADA_DISABLED ),
-	DEF_VALS1(MQREADA_INHIBITED),
-	DEF_VALS1(MQREADA_BACKLOG  ),
+    DEF_VALS1(MQREADA_NO       ),
+    DEF_VALS1(MQREADA_YES      ),
+    DEF_VALS1(MQREADA_DISABLED ),
+    DEF_VALS1(MQREADA_INHIBITED),
+    DEF_VALS1(MQREADA_BACKLOG  ),
 DEF_VALSE;
 
 DEF_VALSB(PropertyCtlVal)
-	DEF_VALS1(MQPROP_COMPATIBILITY),
-	DEF_VALS1(MQPROP_NONE),
-	DEF_VALS1(MQPROP_ALL),
-	DEF_VALS1(MQPROP_FORCE_MQRFH2),
+    DEF_VALS1(MQPROP_COMPATIBILITY),
+    DEF_VALS1(MQPROP_NONE),
+    DEF_VALS1(MQPROP_ALL),
+    DEF_VALS1(MQPROP_FORCE_MQRFH2),
 DEF_VALSE;
 
 DEF_VALSB(BaseType)
-	DEF_VALS1(MQOT_Q    ),
-	DEF_VALS1(MQOT_TOPIC),
+    DEF_VALS1(MQOT_Q    ),
+    DEF_VALS1(MQOT_TOPIC),
 DEF_VALSE;
 
 DEF_VALSB(EvtOrig)
-	DEF_VALS1(MQEVO_CONSOLE ),
-	DEF_VALS1(MQEVO_INIT    ),
-	DEF_VALS1(MQEVO_INTERNAL),
-	DEF_VALS1(MQEVO_MQSET   ),
-	DEF_VALS1(MQEVO_MSG     ),
-	DEF_VALS1(MQEVO_OTHER   ),
+    DEF_VALS1(MQEVO_CONSOLE ),
+    DEF_VALS1(MQEVO_INIT    ),
+    DEF_VALS1(MQEVO_INTERNAL),
+    DEF_VALS1(MQEVO_MQSET   ),
+    DEF_VALS1(MQEVO_MSG     ),
+    DEF_VALS1(MQEVO_OTHER   ),
 DEF_VALSE;
 
 DEF_VALSB(ObjType)
-	DEF_VALS1(MQOT_NONE             ),
-	DEF_VALS1(MQOT_Q                ),
-	DEF_VALS1(MQOT_NAMELIST         ),
-	DEF_VALS1(MQOT_PROCESS          ),
-	DEF_VALS1(MQOT_STORAGE_CLASS    ),
-	DEF_VALS1(MQOT_Q_MGR            ),
-	DEF_VALS1(MQOT_CHANNEL          ),
-	DEF_VALS1(MQOT_AUTH_INFO        ),
-	DEF_VALS1(MQOT_TOPIC            ),
-	DEF_VALS1(MQOT_COMM_INFO        ),
-	DEF_VALS1(MQOT_CF_STRUC         ),
-	DEF_VALS1(MQOT_LISTENER         ),
-	DEF_VALS1(MQOT_SERVICE          ),
-	DEF_VALS1(MQOT_RESERVED_1       ),
-	DEF_VALS1(MQOT_ALL              ),
-	DEF_VALS1(MQOT_ALIAS_Q          ),
-	DEF_VALS1(MQOT_MODEL_Q          ),
-	DEF_VALS1(MQOT_LOCAL_Q          ),
-	DEF_VALS1(MQOT_REMOTE_Q         ),
-	DEF_VALS1(MQOT_SENDER_CHANNEL   ),
-	DEF_VALS1(MQOT_SERVER_CHANNEL   ),
-	DEF_VALS1(MQOT_REQUESTER_CHANNEL),
-	DEF_VALS1(MQOT_RECEIVER_CHANNEL ),
-	DEF_VALS1(MQOT_CURRENT_CHANNEL  ),
-	DEF_VALS1(MQOT_SAVED_CHANNEL    ),
-	DEF_VALS1(MQOT_SVRCONN_CHANNEL  ),
-	DEF_VALS1(MQOT_CLNTCONN_CHANNEL ),
-	DEF_VALS1(MQOT_SHORT_CHANNEL    ),
-	DEF_VALS1(MQOT_CHLAUTH          ),
-	DEF_VALS1(MQOT_REMOTE_Q_MGR_NAME),
-	DEF_VALS1(MQOT_PROT_POLICY      ),
+    DEF_VALS1(MQOT_NONE             ),
+    DEF_VALS1(MQOT_Q                ),
+    DEF_VALS1(MQOT_NAMELIST         ),
+    DEF_VALS1(MQOT_PROCESS          ),
+    DEF_VALS1(MQOT_STORAGE_CLASS    ),
+    DEF_VALS1(MQOT_Q_MGR            ),
+    DEF_VALS1(MQOT_CHANNEL          ),
+    DEF_VALS1(MQOT_AUTH_INFO        ),
+    DEF_VALS1(MQOT_TOPIC            ),
+    DEF_VALS1(MQOT_COMM_INFO        ),
+    DEF_VALS1(MQOT_CF_STRUC         ),
+    DEF_VALS1(MQOT_LISTENER         ),
+    DEF_VALS1(MQOT_SERVICE          ),
+    DEF_VALS1(MQOT_RESERVED_1       ),
+    DEF_VALS1(MQOT_ALL              ),
+    DEF_VALS1(MQOT_ALIAS_Q          ),
+    DEF_VALS1(MQOT_MODEL_Q          ),
+    DEF_VALS1(MQOT_LOCAL_Q          ),
+    DEF_VALS1(MQOT_REMOTE_Q         ),
+    DEF_VALS1(MQOT_SENDER_CHANNEL   ),
+    DEF_VALS1(MQOT_SERVER_CHANNEL   ),
+    DEF_VALS1(MQOT_REQUESTER_CHANNEL),
+    DEF_VALS1(MQOT_RECEIVER_CHANNEL ),
+    DEF_VALS1(MQOT_CURRENT_CHANNEL  ),
+    DEF_VALS1(MQOT_SAVED_CHANNEL    ),
+    DEF_VALS1(MQOT_SVRCONN_CHANNEL  ),
+    DEF_VALS1(MQOT_CLNTCONN_CHANNEL ),
+    DEF_VALS1(MQOT_SHORT_CHANNEL    ),
+    DEF_VALS1(MQOT_CHLAUTH          ),
+    DEF_VALS1(MQOT_REMOTE_Q_MGR_NAME),
+    DEF_VALS1(MQOT_PROT_POLICY      ),
 DEF_VALSE;
 
 DEF_VALSB(Persistence)
-	DEF_VALS1(MQPER_PERSISTENCE_AS_PARENT),
-	DEF_VALS1(MQPER_NOT_PERSISTENT),
-	DEF_VALS1(MQPER_PERSISTENT),
-	DEF_VALS1(MQPER_PERSISTENCE_AS_Q_DEF),
+    DEF_VALS1(MQPER_PERSISTENCE_AS_PARENT),
+    DEF_VALS1(MQPER_NOT_PERSISTENT),
+    DEF_VALS1(MQPER_PERSISTENT),
+    DEF_VALS1(MQPER_PERSISTENCE_AS_Q_DEF),
 DEF_VALSE;
 
 #if 0
 DEF_VALSB(MsgType)
-	DEF_VALS1(MQMT_REQUEST),
-	DEF_VALS1(MQMT_REPLY),
-	DEF_VALS1(MQMT_DATAGRAM),
-	DEF_VALS1(MQMT_REPORT),
+    DEF_VALS1(MQMT_REQUEST),
+    DEF_VALS1(MQMT_REPLY),
+    DEF_VALS1(MQMT_DATAGRAM),
+    DEF_VALS1(MQMT_REPORT),
 DEF_VALSE;
 #endif
 
 DEF_VALSB(Platform)
-	DEF_VALS2(MQPL_ZOS,"MQPL_MVS/MQPL_OS390"),
-	DEF_VALS1(MQPL_OS2       ),
-	DEF_VALS1(MQPL_UNIX      ),
-	DEF_VALS1(MQPL_OS400     ),
-	DEF_VALS1(MQPL_WINDOWS   ),
-	DEF_VALS1(MQPL_WINDOWS_NT),
-	DEF_VALS1(MQPL_VMS       ),
-	DEF_VALS2(MQPL_NSK,"MQPL_NSS"),
-	DEF_VALS1(MQPL_OPEN_TP1  ),
-	DEF_VALS1(MQPL_VM        ),
-	DEF_VALS1(MQPL_TPF       ),
-	DEF_VALS1(MQPL_VSE       ),
+    DEF_VALS2(MQPL_ZOS,"MQPL_MVS/MQPL_OS390"),
+    DEF_VALS1(MQPL_OS2       ),
+    DEF_VALS1(MQPL_UNIX      ),
+    DEF_VALS1(MQPL_OS400     ),
+    DEF_VALS1(MQPL_WINDOWS   ),
+    DEF_VALS1(MQPL_WINDOWS_NT),
+    DEF_VALS1(MQPL_VMS       ),
+    DEF_VALS2(MQPL_NSK,"MQPL_NSS"),
+    DEF_VALS1(MQPL_OPEN_TP1  ),
+    DEF_VALS1(MQPL_VM        ),
+    DEF_VALS1(MQPL_TPF       ),
+    DEF_VALS1(MQPL_VSE       ),
 DEF_VALSE;
 
 DEF_VALSB(ApplType)
-	DEF_VALS1(MQAT_UNKNOWN              ),
-	DEF_VALS1(MQAT_NO_CONTEXT           ),
-	DEF_VALS1(MQAT_CICS                 ),
-	DEF_VALS2(MQAT_ZOS,"MQAT_MVS/MQAT_OS390"),
-	DEF_VALS1(MQAT_IMS                  ),
-	DEF_VALS1(MQAT_OS2                  ),
-	DEF_VALS1(MQAT_DOS                  ),
-	DEF_VALS2(MQAT_AIX,"MQAT_UNIX"),
-	DEF_VALS1(MQAT_QMGR                 ),
-	DEF_VALS1(MQAT_OS400                ),
-	DEF_VALS1(MQAT_WINDOWS              ),
-	DEF_VALS1(MQAT_CICS_VSE             ),
-	DEF_VALS1(MQAT_WINDOWS_NT           ),
-	DEF_VALS1(MQAT_VMS                  ),
-	DEF_VALS2(MQAT_NSK,"MQAT_GUARDIAN"),
-	DEF_VALS1(MQAT_VOS                  ),
-	DEF_VALS1(MQAT_OPEN_TP1             ),
-	DEF_VALS1(MQAT_VM                   ),
-	DEF_VALS1(MQAT_IMS_BRIDGE           ),
-	DEF_VALS1(MQAT_XCF                  ),
-	DEF_VALS1(MQAT_CICS_BRIDGE          ),
-	DEF_VALS1(MQAT_NOTES_AGENT          ),
-	DEF_VALS1(MQAT_TPF                  ),
-	DEF_VALS1(MQAT_USER                 ),
-	DEF_VALS2(MQAT_QMGR_PUBLISH,"MQAT_BROKER"),
-	DEF_VALS1(MQAT_JAVA                 ),
-	DEF_VALS1(MQAT_DQM                  ),
-	DEF_VALS1(MQAT_CHANNEL_INITIATOR    ),
-	DEF_VALS1(MQAT_WLM                  ),
-	DEF_VALS1(MQAT_BATCH                ),
-	DEF_VALS1(MQAT_RRS_BATCH            ),
-	DEF_VALS1(MQAT_SIB                  ),
-	DEF_VALS1(MQAT_SYSTEM_EXTENSION     ),
+    DEF_VALS1(MQAT_UNKNOWN              ),
+    DEF_VALS1(MQAT_NO_CONTEXT           ),
+    DEF_VALS1(MQAT_CICS                 ),
+    DEF_VALS2(MQAT_ZOS,"MQAT_MVS/MQAT_OS390"),
+    DEF_VALS1(MQAT_IMS                  ),
+    DEF_VALS1(MQAT_OS2                  ),
+    DEF_VALS1(MQAT_DOS                  ),
+    DEF_VALS2(MQAT_AIX,"MQAT_UNIX"),
+    DEF_VALS1(MQAT_QMGR                 ),
+    DEF_VALS1(MQAT_OS400                ),
+    DEF_VALS1(MQAT_WINDOWS              ),
+    DEF_VALS1(MQAT_CICS_VSE             ),
+    DEF_VALS1(MQAT_WINDOWS_NT           ),
+    DEF_VALS1(MQAT_VMS                  ),
+    DEF_VALS2(MQAT_NSK,"MQAT_GUARDIAN"),
+    DEF_VALS1(MQAT_VOS                  ),
+    DEF_VALS1(MQAT_OPEN_TP1             ),
+    DEF_VALS1(MQAT_VM                   ),
+    DEF_VALS1(MQAT_IMS_BRIDGE           ),
+    DEF_VALS1(MQAT_XCF                  ),
+    DEF_VALS1(MQAT_CICS_BRIDGE          ),
+    DEF_VALS1(MQAT_NOTES_AGENT          ),
+    DEF_VALS1(MQAT_TPF                  ),
+    DEF_VALS1(MQAT_USER                 ),
+    DEF_VALS2(MQAT_QMGR_PUBLISH,"MQAT_BROKER"),
+    DEF_VALS1(MQAT_JAVA                 ),
+    DEF_VALS1(MQAT_DQM                  ),
+    DEF_VALS1(MQAT_CHANNEL_INITIATOR    ),
+    DEF_VALS1(MQAT_WLM                  ),
+    DEF_VALS1(MQAT_BATCH                ),
+    DEF_VALS1(MQAT_RRS_BATCH            ),
+    DEF_VALS1(MQAT_SIB                  ),
+    DEF_VALS1(MQAT_SYSTEM_EXTENSION     ),
 DEF_VALSE;
 
 DEF_VALSBX(PrmTyp)
-	DEF_VALS1(MQCFT_NONE              ),
-	DEF_VALS1(MQCFT_COMMAND           ),
-	DEF_VALS1(MQCFT_RESPONSE          ),
-	DEF_VALS1(MQCFT_INTEGER           ),
-	DEF_VALS1(MQCFT_STRING            ),
-	DEF_VALS1(MQCFT_INTEGER_LIST      ),
-	DEF_VALS1(MQCFT_STRING_LIST       ),
-	DEF_VALS1(MQCFT_EVENT             ),
-	DEF_VALS1(MQCFT_USER              ),
-	DEF_VALS1(MQCFT_BYTE_STRING       ),
-	DEF_VALS1(MQCFT_TRACE_ROUTE       ),
-	DEF_VALS1(MQCFT_REPORT            ),
-	DEF_VALS1(MQCFT_INTEGER_FILTER    ),
-	DEF_VALS1(MQCFT_STRING_FILTER     ),
-	DEF_VALS1(MQCFT_BYTE_STRING_FILTER),
-	DEF_VALS1(MQCFT_COMMAND_XR        ),
-	DEF_VALS1(MQCFT_XR_MSG            ),
-	DEF_VALS1(MQCFT_XR_ITEM           ),
-	DEF_VALS1(MQCFT_XR_SUMMARY        ),
-	DEF_VALS1(MQCFT_GROUP             ),
-	DEF_VALS1(MQCFT_STATISTICS        ),
-	DEF_VALS1(MQCFT_ACCOUNTING        ),
-	DEF_VALS1(MQCFT_INTEGER64         ),
-	DEF_VALS1(MQCFT_INTEGER64_LIST    ),
+    DEF_VALS1(MQCFT_NONE              ),
+    DEF_VALS1(MQCFT_COMMAND           ),
+    DEF_VALS1(MQCFT_RESPONSE          ),
+    DEF_VALS1(MQCFT_INTEGER           ),
+    DEF_VALS1(MQCFT_STRING            ),
+    DEF_VALS1(MQCFT_INTEGER_LIST      ),
+    DEF_VALS1(MQCFT_STRING_LIST       ),
+    DEF_VALS1(MQCFT_EVENT             ),
+    DEF_VALS1(MQCFT_USER              ),
+    DEF_VALS1(MQCFT_BYTE_STRING       ),
+    DEF_VALS1(MQCFT_TRACE_ROUTE       ),
+    DEF_VALS1(MQCFT_REPORT            ),
+    DEF_VALS1(MQCFT_INTEGER_FILTER    ),
+    DEF_VALS1(MQCFT_STRING_FILTER     ),
+    DEF_VALS1(MQCFT_BYTE_STRING_FILTER),
+    DEF_VALS1(MQCFT_COMMAND_XR        ),
+    DEF_VALS1(MQCFT_XR_MSG            ),
+    DEF_VALS1(MQCFT_XR_ITEM           ),
+    DEF_VALS1(MQCFT_XR_SUMMARY        ),
+    DEF_VALS1(MQCFT_GROUP             ),
+    DEF_VALS1(MQCFT_STATISTICS        ),
+    DEF_VALS1(MQCFT_ACCOUNTING        ),
+    DEF_VALS1(MQCFT_INTEGER64         ),
+    DEF_VALS1(MQCFT_INTEGER64_LIST    ),
 DEF_VALSE;
 
 DEF_VALSB(Command)
-	DEF_VALS1(MQCMD_NONE                   ),
-	DEF_VALS1(MQCMD_CHANGE_Q_MGR           ),
-	DEF_VALS1(MQCMD_INQUIRE_Q_MGR          ),
-	DEF_VALS1(MQCMD_CHANGE_PROCESS         ),
-	DEF_VALS1(MQCMD_COPY_PROCESS           ),
-	DEF_VALS1(MQCMD_CREATE_PROCESS         ),
-	DEF_VALS1(MQCMD_DELETE_PROCESS         ),
-	DEF_VALS1(MQCMD_INQUIRE_PROCESS        ),
-	DEF_VALS1(MQCMD_CHANGE_Q               ),
-	DEF_VALS1(MQCMD_CLEAR_Q                ),
-	DEF_VALS1(MQCMD_COPY_Q                 ),
-	DEF_VALS1(MQCMD_CREATE_Q               ),
-	DEF_VALS1(MQCMD_DELETE_Q               ),
-	DEF_VALS1(MQCMD_INQUIRE_Q              ),
-	DEF_VALS1(MQCMD_REFRESH_Q_MGR          ),
-	DEF_VALS1(MQCMD_RESET_Q_STATS          ),
-	DEF_VALS1(MQCMD_INQUIRE_Q_NAMES        ),
-	DEF_VALS1(MQCMD_INQUIRE_PROCESS_NAMES  ),
-	DEF_VALS1(MQCMD_INQUIRE_CHANNEL_NAMES  ),
-	DEF_VALS1(MQCMD_CHANGE_CHANNEL         ),
-	DEF_VALS1(MQCMD_COPY_CHANNEL           ),
-	DEF_VALS1(MQCMD_CREATE_CHANNEL         ),
-	DEF_VALS1(MQCMD_DELETE_CHANNEL         ),
-	DEF_VALS1(MQCMD_INQUIRE_CHANNEL        ),
-	DEF_VALS1(MQCMD_PING_CHANNEL           ),
-	DEF_VALS1(MQCMD_RESET_CHANNEL          ),
-	DEF_VALS1(MQCMD_START_CHANNEL          ),
-	DEF_VALS1(MQCMD_STOP_CHANNEL           ),
-	DEF_VALS1(MQCMD_START_CHANNEL_INIT     ),
-	DEF_VALS1(MQCMD_START_CHANNEL_LISTENER ),
-	DEF_VALS1(MQCMD_CHANGE_NAMELIST        ),
-	DEF_VALS1(MQCMD_COPY_NAMELIST          ),
-	DEF_VALS1(MQCMD_CREATE_NAMELIST        ),
-	DEF_VALS1(MQCMD_DELETE_NAMELIST        ),
-	DEF_VALS1(MQCMD_INQUIRE_NAMELIST       ),
-	DEF_VALS1(MQCMD_INQUIRE_NAMELIST_NAMES ),
-	DEF_VALS1(MQCMD_ESCAPE                 ),
-	DEF_VALS1(MQCMD_RESOLVE_CHANNEL        ),
-	DEF_VALS1(MQCMD_PING_Q_MGR             ),
-	DEF_VALS1(MQCMD_INQUIRE_Q_STATUS       ),
-	DEF_VALS1(MQCMD_INQUIRE_CHANNEL_STATUS ),
-	DEF_VALS1(MQCMD_CONFIG_EVENT           ),
-	DEF_VALS1(MQCMD_Q_MGR_EVENT            ),
-	DEF_VALS1(MQCMD_PERFM_EVENT            ),
-	DEF_VALS1(MQCMD_CHANNEL_EVENT          ),
-	DEF_VALS1(MQCMD_DELETE_PUBLICATION     ),
-	DEF_VALS1(MQCMD_DEREGISTER_PUBLISHER   ),
-	DEF_VALS1(MQCMD_DEREGISTER_SUBSCRIBER  ),
-	DEF_VALS1(MQCMD_PUBLISH                ),
-	DEF_VALS1(MQCMD_REGISTER_PUBLISHER     ),
-	DEF_VALS1(MQCMD_REGISTER_SUBSCRIBER    ),
-	DEF_VALS1(MQCMD_REQUEST_UPDATE         ),
-	DEF_VALS1(MQCMD_BROKER_INTERNAL        ),
-	DEF_VALS1(MQCMD_ACTIVITY_MSG           ),
-	DEF_VALS1(MQCMD_INQUIRE_CLUSTER_Q_MGR  ),
-	DEF_VALS1(MQCMD_RESUME_Q_MGR_CLUSTER   ),
-	DEF_VALS1(MQCMD_SUSPEND_Q_MGR_CLUSTER  ),
-	DEF_VALS1(MQCMD_REFRESH_CLUSTER        ),
-	DEF_VALS1(MQCMD_RESET_CLUSTER          ),
-	DEF_VALS1(MQCMD_TRACE_ROUTE            ),
-	DEF_VALS1(MQCMD_REFRESH_SECURITY       ),
-	DEF_VALS1(MQCMD_CHANGE_AUTH_INFO       ),
-	DEF_VALS1(MQCMD_COPY_AUTH_INFO         ),
-	DEF_VALS1(MQCMD_CREATE_AUTH_INFO       ),
-	DEF_VALS1(MQCMD_DELETE_AUTH_INFO       ),
-	DEF_VALS1(MQCMD_INQUIRE_AUTH_INFO      ),
-	DEF_VALS1(MQCMD_INQUIRE_AUTH_INFO_NAMES),
-	DEF_VALS1(MQCMD_INQUIRE_CONNECTION     ),
-	DEF_VALS1(MQCMD_STOP_CONNECTION        ),
-	DEF_VALS1(MQCMD_INQUIRE_AUTH_RECS      ),
-	DEF_VALS1(MQCMD_INQUIRE_ENTITY_AUTH    ),
-	DEF_VALS1(MQCMD_DELETE_AUTH_REC        ),
-	DEF_VALS1(MQCMD_SET_AUTH_REC           ),
-	DEF_VALS1(MQCMD_LOGGER_EVENT           ),
-	DEF_VALS1(MQCMD_RESET_Q_MGR            ),
-	DEF_VALS1(MQCMD_CHANGE_LISTENER        ),
-	DEF_VALS1(MQCMD_COPY_LISTENER          ),
-	DEF_VALS1(MQCMD_CREATE_LISTENER        ),
-	DEF_VALS1(MQCMD_DELETE_LISTENER        ),
-	DEF_VALS1(MQCMD_INQUIRE_LISTENER       ),
-	DEF_VALS1(MQCMD_INQUIRE_LISTENER_STATUS),
-	DEF_VALS1(MQCMD_COMMAND_EVENT          ),
-	DEF_VALS1(MQCMD_CHANGE_SECURITY        ),
-	DEF_VALS1(MQCMD_CHANGE_CF_STRUC        ),
-	DEF_VALS1(MQCMD_CHANGE_STG_CLASS       ),
-	DEF_VALS1(MQCMD_CHANGE_TRACE           ),
-	DEF_VALS1(MQCMD_ARCHIVE_LOG            ),
-	DEF_VALS1(MQCMD_BACKUP_CF_STRUC        ),
-	DEF_VALS1(MQCMD_CREATE_BUFFER_POOL     ),
-	DEF_VALS1(MQCMD_CREATE_PAGE_SET        ),
-	DEF_VALS1(MQCMD_CREATE_CF_STRUC        ),
-	DEF_VALS1(MQCMD_CREATE_STG_CLASS       ),
-	DEF_VALS1(MQCMD_COPY_CF_STRUC          ),
-	DEF_VALS1(MQCMD_COPY_STG_CLASS         ),
-	DEF_VALS1(MQCMD_DELETE_CF_STRUC        ),
-	DEF_VALS1(MQCMD_DELETE_STG_CLASS       ),
-	DEF_VALS1(MQCMD_INQUIRE_ARCHIVE        ),
-	DEF_VALS1(MQCMD_INQUIRE_CF_STRUC       ),
-	DEF_VALS1(MQCMD_INQUIRE_CF_STRUC_STATUS),
-	DEF_VALS1(MQCMD_INQUIRE_CMD_SERVER     ),
-	DEF_VALS1(MQCMD_INQUIRE_CHANNEL_INIT   ),
-	DEF_VALS1(MQCMD_INQUIRE_QSG            ),
-	DEF_VALS1(MQCMD_INQUIRE_LOG            ),
-	DEF_VALS1(MQCMD_INQUIRE_SECURITY       ),
-	DEF_VALS1(MQCMD_INQUIRE_STG_CLASS      ),
-	DEF_VALS1(MQCMD_INQUIRE_SYSTEM         ),
-	DEF_VALS1(MQCMD_INQUIRE_THREAD         ),
-	DEF_VALS1(MQCMD_INQUIRE_TRACE          ),
-	DEF_VALS1(MQCMD_INQUIRE_USAGE          ),
-	DEF_VALS1(MQCMD_MOVE_Q                 ),
-	DEF_VALS1(MQCMD_RECOVER_BSDS           ),
-	DEF_VALS1(MQCMD_RECOVER_CF_STRUC       ),
-	DEF_VALS1(MQCMD_RESET_TPIPE            ),
-	DEF_VALS1(MQCMD_RESOLVE_INDOUBT        ),
-	DEF_VALS1(MQCMD_RESUME_Q_MGR           ),
-	DEF_VALS1(MQCMD_REVERIFY_SECURITY      ),
-	DEF_VALS1(MQCMD_SET_ARCHIVE            ),
-	DEF_VALS1(MQCMD_SET_LOG                ),
-	DEF_VALS1(MQCMD_SET_SYSTEM             ),
-	DEF_VALS1(MQCMD_START_CMD_SERVER       ),
-	DEF_VALS1(MQCMD_START_Q_MGR            ),
-	DEF_VALS1(MQCMD_START_TRACE            ),
-	DEF_VALS1(MQCMD_STOP_CHANNEL_INIT      ),
-	DEF_VALS1(MQCMD_STOP_CHANNEL_LISTENER  ),
-	DEF_VALS1(MQCMD_STOP_CMD_SERVER        ),
-	DEF_VALS1(MQCMD_STOP_Q_MGR             ),
-	DEF_VALS1(MQCMD_STOP_TRACE             ),
-	DEF_VALS1(MQCMD_SUSPEND_Q_MGR          ),
-	DEF_VALS1(MQCMD_INQUIRE_CF_STRUC_NAMES ),
-	DEF_VALS1(MQCMD_INQUIRE_STG_CLASS_NAMES),
-	DEF_VALS1(MQCMD_CHANGE_SERVICE         ),
-	DEF_VALS1(MQCMD_COPY_SERVICE           ),
-	DEF_VALS1(MQCMD_CREATE_SERVICE         ),
-	DEF_VALS1(MQCMD_DELETE_SERVICE         ),
-	DEF_VALS1(MQCMD_INQUIRE_SERVICE        ),
-	DEF_VALS1(MQCMD_INQUIRE_SERVICE_STATUS ),
-	DEF_VALS1(MQCMD_START_SERVICE          ),
-	DEF_VALS1(MQCMD_STOP_SERVICE           ),
-	DEF_VALS1(MQCMD_DELETE_BUFFER_POOL     ),
-	DEF_VALS1(MQCMD_DELETE_PAGE_SET        ),
-	DEF_VALS1(MQCMD_CHANGE_BUFFER_POOL     ),
-	DEF_VALS1(MQCMD_CHANGE_PAGE_SET        ),
-	DEF_VALS1(MQCMD_INQUIRE_Q_MGR_STATUS   ),
-	DEF_VALS1(MQCMD_CREATE_LOG             ),
-	DEF_VALS1(MQCMD_STATISTICS_MQI         ),
-	DEF_VALS1(MQCMD_STATISTICS_Q           ),
-	DEF_VALS1(MQCMD_STATISTICS_CHANNEL     ),
-	DEF_VALS1(MQCMD_ACCOUNTING_MQI         ),
-	DEF_VALS1(MQCMD_ACCOUNTING_Q           ),
-	DEF_VALS1(MQCMD_INQUIRE_AUTH_SERVICE   ),
-	DEF_VALS1(MQCMD_CHANGE_TOPIC           ),
-	DEF_VALS1(MQCMD_COPY_TOPIC             ),
-	DEF_VALS1(MQCMD_CREATE_TOPIC           ),
-	DEF_VALS1(MQCMD_DELETE_TOPIC           ),
-	DEF_VALS1(MQCMD_INQUIRE_TOPIC          ),
-	DEF_VALS1(MQCMD_INQUIRE_TOPIC_NAMES    ),
-	DEF_VALS1(MQCMD_INQUIRE_SUBSCRIPTION   ),
-	DEF_VALS1(MQCMD_CREATE_SUBSCRIPTION    ),
-	DEF_VALS1(MQCMD_CHANGE_SUBSCRIPTION    ),
-	DEF_VALS1(MQCMD_DELETE_SUBSCRIPTION    ),
-	DEF_VALS1(MQCMD_COPY_SUBSCRIPTION      ),
-	DEF_VALS1(MQCMD_INQUIRE_SUB_STATUS     ),
-	DEF_VALS1(MQCMD_INQUIRE_TOPIC_STATUS   ),
-	DEF_VALS1(MQCMD_CLEAR_TOPIC_STRING     ),
-	DEF_VALS1(MQCMD_INQUIRE_PUBSUB_STATUS  ),
+    DEF_VALS1(MQCMD_NONE                   ),
+    DEF_VALS1(MQCMD_CHANGE_Q_MGR           ),
+    DEF_VALS1(MQCMD_INQUIRE_Q_MGR          ),
+    DEF_VALS1(MQCMD_CHANGE_PROCESS         ),
+    DEF_VALS1(MQCMD_COPY_PROCESS           ),
+    DEF_VALS1(MQCMD_CREATE_PROCESS         ),
+    DEF_VALS1(MQCMD_DELETE_PROCESS         ),
+    DEF_VALS1(MQCMD_INQUIRE_PROCESS        ),
+    DEF_VALS1(MQCMD_CHANGE_Q               ),
+    DEF_VALS1(MQCMD_CLEAR_Q                ),
+    DEF_VALS1(MQCMD_COPY_Q                 ),
+    DEF_VALS1(MQCMD_CREATE_Q               ),
+    DEF_VALS1(MQCMD_DELETE_Q               ),
+    DEF_VALS1(MQCMD_INQUIRE_Q              ),
+    DEF_VALS1(MQCMD_REFRESH_Q_MGR          ),
+    DEF_VALS1(MQCMD_RESET_Q_STATS          ),
+    DEF_VALS1(MQCMD_INQUIRE_Q_NAMES        ),
+    DEF_VALS1(MQCMD_INQUIRE_PROCESS_NAMES  ),
+    DEF_VALS1(MQCMD_INQUIRE_CHANNEL_NAMES  ),
+    DEF_VALS1(MQCMD_CHANGE_CHANNEL         ),
+    DEF_VALS1(MQCMD_COPY_CHANNEL           ),
+    DEF_VALS1(MQCMD_CREATE_CHANNEL         ),
+    DEF_VALS1(MQCMD_DELETE_CHANNEL         ),
+    DEF_VALS1(MQCMD_INQUIRE_CHANNEL        ),
+    DEF_VALS1(MQCMD_PING_CHANNEL           ),
+    DEF_VALS1(MQCMD_RESET_CHANNEL          ),
+    DEF_VALS1(MQCMD_START_CHANNEL          ),
+    DEF_VALS1(MQCMD_STOP_CHANNEL           ),
+    DEF_VALS1(MQCMD_START_CHANNEL_INIT     ),
+    DEF_VALS1(MQCMD_START_CHANNEL_LISTENER ),
+    DEF_VALS1(MQCMD_CHANGE_NAMELIST        ),
+    DEF_VALS1(MQCMD_COPY_NAMELIST          ),
+    DEF_VALS1(MQCMD_CREATE_NAMELIST        ),
+    DEF_VALS1(MQCMD_DELETE_NAMELIST        ),
+    DEF_VALS1(MQCMD_INQUIRE_NAMELIST       ),
+    DEF_VALS1(MQCMD_INQUIRE_NAMELIST_NAMES ),
+    DEF_VALS1(MQCMD_ESCAPE                 ),
+    DEF_VALS1(MQCMD_RESOLVE_CHANNEL        ),
+    DEF_VALS1(MQCMD_PING_Q_MGR             ),
+    DEF_VALS1(MQCMD_INQUIRE_Q_STATUS       ),
+    DEF_VALS1(MQCMD_INQUIRE_CHANNEL_STATUS ),
+    DEF_VALS1(MQCMD_CONFIG_EVENT           ),
+    DEF_VALS1(MQCMD_Q_MGR_EVENT            ),
+    DEF_VALS1(MQCMD_PERFM_EVENT            ),
+    DEF_VALS1(MQCMD_CHANNEL_EVENT          ),
+    DEF_VALS1(MQCMD_DELETE_PUBLICATION     ),
+    DEF_VALS1(MQCMD_DEREGISTER_PUBLISHER   ),
+    DEF_VALS1(MQCMD_DEREGISTER_SUBSCRIBER  ),
+    DEF_VALS1(MQCMD_PUBLISH                ),
+    DEF_VALS1(MQCMD_REGISTER_PUBLISHER     ),
+    DEF_VALS1(MQCMD_REGISTER_SUBSCRIBER    ),
+    DEF_VALS1(MQCMD_REQUEST_UPDATE         ),
+    DEF_VALS1(MQCMD_BROKER_INTERNAL        ),
+    DEF_VALS1(MQCMD_ACTIVITY_MSG           ),
+    DEF_VALS1(MQCMD_INQUIRE_CLUSTER_Q_MGR  ),
+    DEF_VALS1(MQCMD_RESUME_Q_MGR_CLUSTER   ),
+    DEF_VALS1(MQCMD_SUSPEND_Q_MGR_CLUSTER  ),
+    DEF_VALS1(MQCMD_REFRESH_CLUSTER        ),
+    DEF_VALS1(MQCMD_RESET_CLUSTER          ),
+    DEF_VALS1(MQCMD_TRACE_ROUTE            ),
+    DEF_VALS1(MQCMD_REFRESH_SECURITY       ),
+    DEF_VALS1(MQCMD_CHANGE_AUTH_INFO       ),
+    DEF_VALS1(MQCMD_COPY_AUTH_INFO         ),
+    DEF_VALS1(MQCMD_CREATE_AUTH_INFO       ),
+    DEF_VALS1(MQCMD_DELETE_AUTH_INFO       ),
+    DEF_VALS1(MQCMD_INQUIRE_AUTH_INFO      ),
+    DEF_VALS1(MQCMD_INQUIRE_AUTH_INFO_NAMES),
+    DEF_VALS1(MQCMD_INQUIRE_CONNECTION     ),
+    DEF_VALS1(MQCMD_STOP_CONNECTION        ),
+    DEF_VALS1(MQCMD_INQUIRE_AUTH_RECS      ),
+    DEF_VALS1(MQCMD_INQUIRE_ENTITY_AUTH    ),
+    DEF_VALS1(MQCMD_DELETE_AUTH_REC        ),
+    DEF_VALS1(MQCMD_SET_AUTH_REC           ),
+    DEF_VALS1(MQCMD_LOGGER_EVENT           ),
+    DEF_VALS1(MQCMD_RESET_Q_MGR            ),
+    DEF_VALS1(MQCMD_CHANGE_LISTENER        ),
+    DEF_VALS1(MQCMD_COPY_LISTENER          ),
+    DEF_VALS1(MQCMD_CREATE_LISTENER        ),
+    DEF_VALS1(MQCMD_DELETE_LISTENER        ),
+    DEF_VALS1(MQCMD_INQUIRE_LISTENER       ),
+    DEF_VALS1(MQCMD_INQUIRE_LISTENER_STATUS),
+    DEF_VALS1(MQCMD_COMMAND_EVENT          ),
+    DEF_VALS1(MQCMD_CHANGE_SECURITY        ),
+    DEF_VALS1(MQCMD_CHANGE_CF_STRUC        ),
+    DEF_VALS1(MQCMD_CHANGE_STG_CLASS       ),
+    DEF_VALS1(MQCMD_CHANGE_TRACE           ),
+    DEF_VALS1(MQCMD_ARCHIVE_LOG            ),
+    DEF_VALS1(MQCMD_BACKUP_CF_STRUC        ),
+    DEF_VALS1(MQCMD_CREATE_BUFFER_POOL     ),
+    DEF_VALS1(MQCMD_CREATE_PAGE_SET        ),
+    DEF_VALS1(MQCMD_CREATE_CF_STRUC        ),
+    DEF_VALS1(MQCMD_CREATE_STG_CLASS       ),
+    DEF_VALS1(MQCMD_COPY_CF_STRUC          ),
+    DEF_VALS1(MQCMD_COPY_STG_CLASS         ),
+    DEF_VALS1(MQCMD_DELETE_CF_STRUC        ),
+    DEF_VALS1(MQCMD_DELETE_STG_CLASS       ),
+    DEF_VALS1(MQCMD_INQUIRE_ARCHIVE        ),
+    DEF_VALS1(MQCMD_INQUIRE_CF_STRUC       ),
+    DEF_VALS1(MQCMD_INQUIRE_CF_STRUC_STATUS),
+    DEF_VALS1(MQCMD_INQUIRE_CMD_SERVER     ),
+    DEF_VALS1(MQCMD_INQUIRE_CHANNEL_INIT   ),
+    DEF_VALS1(MQCMD_INQUIRE_QSG            ),
+    DEF_VALS1(MQCMD_INQUIRE_LOG            ),
+    DEF_VALS1(MQCMD_INQUIRE_SECURITY       ),
+    DEF_VALS1(MQCMD_INQUIRE_STG_CLASS      ),
+    DEF_VALS1(MQCMD_INQUIRE_SYSTEM         ),
+    DEF_VALS1(MQCMD_INQUIRE_THREAD         ),
+    DEF_VALS1(MQCMD_INQUIRE_TRACE          ),
+    DEF_VALS1(MQCMD_INQUIRE_USAGE          ),
+    DEF_VALS1(MQCMD_MOVE_Q                 ),
+    DEF_VALS1(MQCMD_RECOVER_BSDS           ),
+    DEF_VALS1(MQCMD_RECOVER_CF_STRUC       ),
+    DEF_VALS1(MQCMD_RESET_TPIPE            ),
+    DEF_VALS1(MQCMD_RESOLVE_INDOUBT        ),
+    DEF_VALS1(MQCMD_RESUME_Q_MGR           ),
+    DEF_VALS1(MQCMD_REVERIFY_SECURITY      ),
+    DEF_VALS1(MQCMD_SET_ARCHIVE            ),
+    DEF_VALS1(MQCMD_SET_LOG                ),
+    DEF_VALS1(MQCMD_SET_SYSTEM             ),
+    DEF_VALS1(MQCMD_START_CMD_SERVER       ),
+    DEF_VALS1(MQCMD_START_Q_MGR            ),
+    DEF_VALS1(MQCMD_START_TRACE            ),
+    DEF_VALS1(MQCMD_STOP_CHANNEL_INIT      ),
+    DEF_VALS1(MQCMD_STOP_CHANNEL_LISTENER  ),
+    DEF_VALS1(MQCMD_STOP_CMD_SERVER        ),
+    DEF_VALS1(MQCMD_STOP_Q_MGR             ),
+    DEF_VALS1(MQCMD_STOP_TRACE             ),
+    DEF_VALS1(MQCMD_SUSPEND_Q_MGR          ),
+    DEF_VALS1(MQCMD_INQUIRE_CF_STRUC_NAMES ),
+    DEF_VALS1(MQCMD_INQUIRE_STG_CLASS_NAMES),
+    DEF_VALS1(MQCMD_CHANGE_SERVICE         ),
+    DEF_VALS1(MQCMD_COPY_SERVICE           ),
+    DEF_VALS1(MQCMD_CREATE_SERVICE         ),
+    DEF_VALS1(MQCMD_DELETE_SERVICE         ),
+    DEF_VALS1(MQCMD_INQUIRE_SERVICE        ),
+    DEF_VALS1(MQCMD_INQUIRE_SERVICE_STATUS ),
+    DEF_VALS1(MQCMD_START_SERVICE          ),
+    DEF_VALS1(MQCMD_STOP_SERVICE           ),
+    DEF_VALS1(MQCMD_DELETE_BUFFER_POOL     ),
+    DEF_VALS1(MQCMD_DELETE_PAGE_SET        ),
+    DEF_VALS1(MQCMD_CHANGE_BUFFER_POOL     ),
+    DEF_VALS1(MQCMD_CHANGE_PAGE_SET        ),
+    DEF_VALS1(MQCMD_INQUIRE_Q_MGR_STATUS   ),
+    DEF_VALS1(MQCMD_CREATE_LOG             ),
+    DEF_VALS1(MQCMD_STATISTICS_MQI         ),
+    DEF_VALS1(MQCMD_STATISTICS_Q           ),
+    DEF_VALS1(MQCMD_STATISTICS_CHANNEL     ),
+    DEF_VALS1(MQCMD_ACCOUNTING_MQI         ),
+    DEF_VALS1(MQCMD_ACCOUNTING_Q           ),
+    DEF_VALS1(MQCMD_INQUIRE_AUTH_SERVICE   ),
+    DEF_VALS1(MQCMD_CHANGE_TOPIC           ),
+    DEF_VALS1(MQCMD_COPY_TOPIC             ),
+    DEF_VALS1(MQCMD_CREATE_TOPIC           ),
+    DEF_VALS1(MQCMD_DELETE_TOPIC           ),
+    DEF_VALS1(MQCMD_INQUIRE_TOPIC          ),
+    DEF_VALS1(MQCMD_INQUIRE_TOPIC_NAMES    ),
+    DEF_VALS1(MQCMD_INQUIRE_SUBSCRIPTION   ),
+    DEF_VALS1(MQCMD_CREATE_SUBSCRIPTION    ),
+    DEF_VALS1(MQCMD_CHANGE_SUBSCRIPTION    ),
+    DEF_VALS1(MQCMD_DELETE_SUBSCRIPTION    ),
+    DEF_VALS1(MQCMD_COPY_SUBSCRIPTION      ),
+    DEF_VALS1(MQCMD_INQUIRE_SUB_STATUS     ),
+    DEF_VALS1(MQCMD_INQUIRE_TOPIC_STATUS   ),
+    DEF_VALS1(MQCMD_CLEAR_TOPIC_STRING     ),
+    DEF_VALS1(MQCMD_INQUIRE_PUBSUB_STATUS  ),
 DEF_VALSE;
 
 #if 0
 DEF_VALSB(CommandInformationValues)
-	DEF_VALS1(MQCMDI_CMDSCOPE_ACCEPTED      ),
-	DEF_VALS1(MQCMDI_CMDSCOPE_GENERATED     ),
-	DEF_VALS1(MQCMDI_CMDSCOPE_COMPLETED     ),
-	DEF_VALS1(MQCMDI_QSG_DISP_COMPLETED     ),
-	DEF_VALS1(MQCMDI_COMMAND_ACCEPTED       ),
-	DEF_VALS1(MQCMDI_CLUSTER_REQUEST_QUEUED ),
-	DEF_VALS1(MQCMDI_CHANNEL_INIT_STARTED   ),
-	DEF_VALS1(MQCMDI_RECOVER_STARTED        ),
-	DEF_VALS1(MQCMDI_BACKUP_STARTED         ),
-	DEF_VALS1(MQCMDI_RECOVER_COMPLETED      ),
-	DEF_VALS1(MQCMDI_SEC_TIMER_ZERO         ),
-	DEF_VALS1(MQCMDI_REFRESH_CONFIGURATION  ),
-	DEF_VALS1(MQCMDI_SEC_SIGNOFF_ERROR      ),
-	DEF_VALS1(MQCMDI_IMS_BRIDGE_SUSPENDED   ),
-	DEF_VALS1(MQCMDI_DB2_SUSPENDED          ),
-	DEF_VALS1(MQCMDI_DB2_OBSOLETE_MSGS      ),
-	DEF_VALS1(MQCMDI_SEC_UPPERCASE          ),
-	DEF_VALS1(MQCMDI_SEC_MIXEDCASE          ),
+    DEF_VALS1(MQCMDI_CMDSCOPE_ACCEPTED      ),
+    DEF_VALS1(MQCMDI_CMDSCOPE_GENERATED     ),
+    DEF_VALS1(MQCMDI_CMDSCOPE_COMPLETED     ),
+    DEF_VALS1(MQCMDI_QSG_DISP_COMPLETED     ),
+    DEF_VALS1(MQCMDI_COMMAND_ACCEPTED       ),
+    DEF_VALS1(MQCMDI_CLUSTER_REQUEST_QUEUED ),
+    DEF_VALS1(MQCMDI_CHANNEL_INIT_STARTED   ),
+    DEF_VALS1(MQCMDI_RECOVER_STARTED        ),
+    DEF_VALS1(MQCMDI_BACKUP_STARTED         ),
+    DEF_VALS1(MQCMDI_RECOVER_COMPLETED      ),
+    DEF_VALS1(MQCMDI_SEC_TIMER_ZERO         ),
+    DEF_VALS1(MQCMDI_REFRESH_CONFIGURATION  ),
+    DEF_VALS1(MQCMDI_SEC_SIGNOFF_ERROR      ),
+    DEF_VALS1(MQCMDI_IMS_BRIDGE_SUSPENDED   ),
+    DEF_VALS1(MQCMDI_DB2_SUSPENDED          ),
+    DEF_VALS1(MQCMDI_DB2_OBSOLETE_MSGS      ),
+    DEF_VALS1(MQCMDI_SEC_UPPERCASE          ),
+    DEF_VALS1(MQCMDI_SEC_MIXEDCASE          ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(CtlOpt)
-	DEF_VALS1(MQCFC_LAST    ),
-	DEF_VALS1(MQCFC_NOT_LAST),
+    DEF_VALS1(MQCFC_LAST    ),
+    DEF_VALS1(MQCFC_NOT_LAST),
 DEF_VALSE;
 #endif
 
 DEF_VALSBX(PrmId)
-	DEF_VALS1(MQBACF_ACCOUNTING_TOKEN       ),
-	DEF_VALS1(MQBACF_CF_LEID                ),
-	DEF_VALS1(MQBACF_CONNECTION_ID          ),
-	DEF_VALS1(MQBACF_CORREL_ID              ),
-	DEF_VALS1(MQBACF_DESTINATION_CORREL_ID  ),
-	DEF_VALS1(MQBACF_EVENT_ACCOUNTING_TOKEN ),
-	DEF_VALS1(MQBACF_EVENT_SECURITY_ID      ),
-	DEF_VALS1(MQBACF_EXTERNAL_UOW_ID        ),
-	DEF_VALS1(MQBACF_GENERIC_CONNECTION_ID  ),
-	DEF_VALS1(MQBACF_GROUP_ID               ),
-	DEF_VALS1(MQBACF_MSG_ID                 ),
-	DEF_VALS1(MQBACF_ORIGIN_UOW_ID          ),
-	DEF_VALS1(MQBACF_Q_MGR_UOW_ID           ),
-	DEF_VALS1(MQBACF_RESPONSE_ID            ),
-	DEF_VALS1(MQBACF_RESPONSE_SET           ),
-	DEF_VALS1(MQBACF_SUB_ID                 ),
-	DEF_VALS1(MQCACF_ACTIVITY_DESC          ),
-	DEF_VALS1(MQCACF_ADMIN_TOPIC_NAMES      ),
-	DEF_VALS1(MQCACF_ADMIN_TOPIC_NAMES      ),
-	DEF_VALS1(MQCACF_ALIAS_Q_NAMES          ),
-	DEF_VALS1(MQCACF_APPL_DESC              ),
-	DEF_VALS1(MQCACF_APPL_IDENTITY_DATA     ),
-	DEF_VALS1(MQCACF_APPL_NAME              ),
-	DEF_VALS1(MQCACF_APPL_ORIGIN_DATA       ),
-	DEF_VALS1(MQCACF_APPL_TAG               ),
-	DEF_VALS1(MQCACF_ASID                   ),
-	DEF_VALS1(MQCACF_AUTH_INFO_NAMES        ),
-	DEF_VALS1(MQCACF_AUTH_PROFILE_NAME      ),
-	DEF_VALS1(MQCACF_AUX_ERROR_DATA_STR_1   ),
-	DEF_VALS1(MQCACF_AUX_ERROR_DATA_STR_2   ),
-	DEF_VALS1(MQCACF_AUX_ERROR_DATA_STR_3   ),
-	DEF_VALS1(MQCACF_BACKUP_DATE            ),
-	DEF_VALS1(MQCACF_BACKUP_TIME            ),
-	DEF_VALS1(MQCACF_BRIDGE_NAME            ),
-	DEF_VALS1(MQCACF_CF_STRUC_BACKUP_END    ),
-	DEF_VALS1(MQCACF_CF_STRUC_BACKUP_START  ),
-	DEF_VALS1(MQCACF_CF_STRUC_LOG_Q_MGRS    ),
-	DEF_VALS1(MQCACF_CF_STRUC_NAMES         ),
-	DEF_VALS1(MQCACF_CHILD_Q_MGR_NAME       ),
-	DEF_VALS1(MQCACF_COMMAND_MQSC           ),
-	DEF_VALS1(MQCACF_COMMAND_SCOPE          ),
-	DEF_VALS1(MQCACF_CONFIGURATION_DATE     ),
-	DEF_VALS1(MQCACF_CONFIGURATION_TIME     ),
-	DEF_VALS1(MQCACF_CORREL_ID              ),
-	DEF_VALS1(MQCACF_CURRENT_LOG_EXTENT_NAME),
-	DEF_VALS1(MQCACF_DATA_SET_NAME          ),
-	DEF_VALS1(MQCACF_DB2_NAME               ),
-	DEF_VALS1(MQCACF_DESTINATION            ),
-	DEF_VALS1(MQCACF_DESTINATION_Q_MGR      ),
-	DEF_VALS1(MQCACF_DSG_NAME               ),
-	DEF_VALS1(MQCACF_ENTITY_NAME            ),
-	DEF_VALS1(MQCACF_ENV_INFO               ),
-	DEF_VALS1(MQCACF_ESCAPE_TEXT            ),
-	DEF_VALS1(MQCACF_EVENT_APPL_IDENTITY    ),
-	DEF_VALS1(MQCACF_EVENT_APPL_NAME        ),
-	DEF_VALS1(MQCACF_EVENT_APPL_ORIGIN      ),
-	DEF_VALS1(MQCACF_EVENT_Q_MGR            ),
-	DEF_VALS1(MQCACF_EVENT_USER_ID          ),
-	DEF_VALS1(MQCACF_FAIL_DATE              ),
-	DEF_VALS1(MQCACF_FAIL_TIME              ),
-	DEF_VALS1(MQCACF_FILTER                 ),
-	DEF_VALS1(MQCACF_FROM_AUTH_INFO_NAME    ),
-	DEF_VALS1(MQCACF_FROM_CF_STRUC_NAME     ),
-	DEF_VALS1(MQCACF_FROM_CHANNEL_NAME      ),
-	DEF_VALS1(MQCACF_FROM_LISTENER_NAME     ),
-	DEF_VALS1(MQCACF_FROM_NAMELIST_NAME     ),
-	DEF_VALS1(MQCACF_FROM_PROCESS_NAME      ),
-	DEF_VALS1(MQCACF_FROM_Q_NAME            ),
-	DEF_VALS1(MQCACF_FROM_SERVICE_NAME      ),
-	DEF_VALS1(MQCACF_FROM_STORAGE_CLASS     ),
-	DEF_VALS1(MQCACF_FROM_SUB_NAME          ),
-	DEF_VALS1(MQCACF_FROM_TOPIC_NAME        ),
-	DEF_VALS1(MQCACF_GROUP_ENTITY_NAMES     ),
-	DEF_VALS1(MQCACF_LAST_GET_DATE          ),
-	DEF_VALS1(MQCACF_LAST_GET_TIME          ),
-	DEF_VALS1(MQCACF_LAST_MSG_DATE          ),
-	DEF_VALS1(MQCACF_LAST_MSG_TIME          ),
-	DEF_VALS1(MQCACF_LAST_PUB_DATE          ),
-	DEF_VALS1(MQCACF_LAST_PUB_TIME          ),
-	DEF_VALS1(MQCACF_LAST_PUT_DATE          ),
-	DEF_VALS1(MQCACF_LAST_PUT_TIME          ),
-	DEF_VALS1(MQCACF_LOCAL_Q_NAMES          ),
-	DEF_VALS1(MQCACF_LOG_PATH               ),
-	DEF_VALS1(MQCACF_MEDIA_LOG_EXTENT_NAME  ),
-	DEF_VALS1(MQCACF_MODEL_Q_NAMES          ),
-	DEF_VALS1(MQCACF_NAMELIST_NAMES         ),
-	DEF_VALS1(MQCACF_NONE                   ),
-	DEF_VALS1(MQCACF_OBJECT_NAME            ),
-	DEF_VALS1(MQCACF_OBJECT_Q_MGR_NAME      ),
-	DEF_VALS1(MQCACF_OPERATION_DATE         ),
-	DEF_VALS1(MQCACF_OPERATION_TIME         ),
-	DEF_VALS1(MQCACF_ORIGIN_NAME            ),
-	DEF_VALS1(MQCACF_PARENT_Q_MGR_NAME      ),
-	DEF_VALS1(MQCACF_PRINCIPAL_ENTITY_NAMES ),
-	DEF_VALS1(MQCACF_PROCESS_NAMES          ),
-	DEF_VALS1(MQCACF_PSB_NAME               ),
-	DEF_VALS1(MQCACF_PST_ID                 ),
-	DEF_VALS1(MQCACF_PUBLISH_TIMESTAMP      ),
-	DEF_VALS1(MQCACF_PUT_DATE               ),
-	DEF_VALS1(MQCACF_PUT_TIME               ),
-	DEF_VALS1(MQCACF_Q_MGR_CPF              ),
-	DEF_VALS1(MQCACF_Q_MGR_UOW_ID           ),
-	DEF_VALS1(MQCACF_Q_NAMES                ),
-	DEF_VALS1(MQCACF_RECEIVER_CHANNEL_NAMES ),
-	DEF_VALS1(MQCACF_REG_CORREL_ID          ),
-	DEF_VALS1(MQCACF_REG_Q_MGR_NAME         ),
-	DEF_VALS1(MQCACF_REG_Q_NAME             ),
-	DEF_VALS1(MQCACF_REG_STREAM_NAME        ),
-	DEF_VALS1(MQCACF_REG_SUB_IDENTITY       ),
-	DEF_VALS1(MQCACF_REG_SUB_NAME           ),
-	DEF_VALS1(MQCACF_REG_SUB_USER_DATA      ),
-	DEF_VALS1(MQCACF_REG_TIME               ),
-	DEF_VALS1(MQCACF_REG_TOPIC              ),
-	DEF_VALS1(MQCACF_REG_USER_ID            ),
-	DEF_VALS1(MQCACF_REMOTE_Q_NAMES         ),
-	DEF_VALS1(MQCACF_REPLY_TO_Q             ),
-	DEF_VALS1(MQCACF_REPLY_TO_Q_MGR         ),
-	DEF_VALS1(MQCACF_REQUESTER_CHANNEL_NAMES),
-	DEF_VALS1(MQCACF_RESOLVED_Q_NAME        ),
-	DEF_VALS1(MQCACF_RESPONSE_Q_MGR_NAME    ),
-	DEF_VALS1(MQCACF_RESTART_LOG_EXTENT_NAME),
-	DEF_VALS1(MQCACF_ROUTING_FINGER_PRINT   ),
-	DEF_VALS1(MQCACF_SECURITY_PROFILE       ),
-	DEF_VALS1(MQCACF_SENDER_CHANNEL_NAMES   ),
-	DEF_VALS1(MQCACF_SERVER_CHANNEL_NAMES   ),
-	DEF_VALS1(MQCACF_SERVICE_COMPONENT      ),
-	DEF_VALS1(MQCACF_SERVICE_START_DATE     ),
-	DEF_VALS1(MQCACF_SERVICE_START_TIME     ),
-	DEF_VALS1(MQCACF_STORAGE_CLASS_NAMES    ),
-	DEF_VALS1(MQCACF_STREAM_NAME            ),
-	DEF_VALS1(MQCACF_STRING_DATA            ),
-	DEF_VALS1(MQCACF_STRUC_ID               ),
-	DEF_VALS1(MQCACF_SUBSCRIPTION_IDENTITY  ),
-	DEF_VALS1(MQCACF_SUBSCRIPTION_NAME      ),
-	DEF_VALS1(MQCACF_SUBSCRIPTION_POINT     ),
-	DEF_VALS1(MQCACF_SUBSCRIPTION_USER_DATA ),
-	DEF_VALS1(MQCACF_SUB_NAME               ),
-	DEF_VALS1(MQCACF_SUB_SELECTOR           ),
-	DEF_VALS1(MQCACF_SUB_USER_DATA          ),
-	DEF_VALS1(MQCACF_SUB_USER_ID            ),
-	DEF_VALS1(MQCACF_SUPPORTED_STREAM_NAME  ),
-	DEF_VALS1(MQCACF_SYSP_ARCHIVE_PFX1      ),
-	DEF_VALS1(MQCACF_SYSP_ARCHIVE_PFX2      ),
-	DEF_VALS1(MQCACF_SYSP_ARCHIVE_UNIT1     ),
-	DEF_VALS1(MQCACF_SYSP_ARCHIVE_UNIT2     ),
-	DEF_VALS1(MQCACF_SYSP_CMD_USER_ID       ),
-	DEF_VALS1(MQCACF_SYSP_LOG_CORREL_ID     ),
-	DEF_VALS1(MQCACF_SYSP_LOG_RBA           ),
-	DEF_VALS1(MQCACF_SYSP_OFFLINE_RBA       ),
-	DEF_VALS1(MQCACF_SYSP_OTMA_DRU_EXIT     ),
-	DEF_VALS1(MQCACF_SYSP_OTMA_GROUP        ),
-	DEF_VALS1(MQCACF_SYSP_OTMA_MEMBER       ),
-	DEF_VALS1(MQCACF_SYSP_OTMA_TPIPE_PFX    ),
-	DEF_VALS1(MQCACF_SYSP_Q_MGR_DATE        ),
-	DEF_VALS1(MQCACF_SYSP_Q_MGR_RBA         ),
-	DEF_VALS1(MQCACF_SYSP_Q_MGR_TIME        ),
-	DEF_VALS1(MQCACF_SYSP_SERVICE           ),
-	DEF_VALS1(MQCACF_SYSP_UNIT_VOLSER       ),
-	DEF_VALS1(MQCACF_SYSTEM_NAME            ),
-	DEF_VALS1(MQCACF_TASK_NUMBER            ),
-	DEF_VALS1(MQCACF_TOPIC                  ),
-	DEF_VALS1(MQCACF_TOPIC_NAMES            ),
-	DEF_VALS1(MQCACF_TO_AUTH_INFO_NAME      ),
-	DEF_VALS1(MQCACF_TO_CF_STRUC_NAME       ),
-	DEF_VALS1(MQCACF_TO_CHANNEL_NAME        ),
-	DEF_VALS1(MQCACF_TO_LISTENER_NAME       ),
-	DEF_VALS1(MQCACF_TO_NAMELIST_NAME       ),
-	DEF_VALS1(MQCACF_TO_PROCESS_NAME        ),
-	DEF_VALS1(MQCACF_TO_Q_NAME              ),
-	DEF_VALS1(MQCACF_TO_SERVICE_NAME        ),
-	DEF_VALS1(MQCACF_TO_STORAGE_CLASS       ),
-	DEF_VALS1(MQCACF_TO_SUB_NAME            ),
-	DEF_VALS1(MQCACF_TO_TOPIC_NAME          ),
-	DEF_VALS1(MQCACF_TRANSACTION_ID         ),
-	DEF_VALS1(MQCACF_UOW_LOG_EXTENT_NAME    ),
-	DEF_VALS1(MQCACF_UOW_LOG_START_DATE     ),
-	DEF_VALS1(MQCACF_UOW_LOG_START_TIME     ),
-	DEF_VALS1(MQCACF_UOW_START_DATE         ),
-	DEF_VALS1(MQCACF_UOW_START_TIME         ),
-	DEF_VALS1(MQCACF_USAGE_LOG_LRSN         ),
-	DEF_VALS1(MQCACF_USAGE_LOG_RBA          ),
-	DEF_VALS1(MQCACF_USER_IDENTIFIER        ),
-	DEF_VALS1(MQCACF_VALUE_NAME             ),
-	DEF_VALS1(MQCACF_ALTERNATE_USERID       ),
-	DEF_VALS1(MQCACF_APPL_DESC              ),
-	DEF_VALS1(MQCACF_APPL_FUNCTION          ),
-	DEF_VALS1(MQCACF_CF_OFFLOAD_SIZE1       ),
-	DEF_VALS1(MQCACF_CF_OFFLOAD_SIZE2       ),
-	DEF_VALS1(MQCACF_CF_OFFLOAD_SIZE3       ),
-	DEF_VALS1(MQCACF_CF_SMDS                ),
-	DEF_VALS1(MQCACF_CF_SMDSCONN            ),
-	DEF_VALS1(MQCACF_CF_SMDS_GENERIC_NAME   ),
-	DEF_VALS1(MQCACF_CF_STRUC_NAME          ),
-	DEF_VALS1(MQCACF_CHAR_ATTRS             ),
-	DEF_VALS1(MQCACF_DYNAMIC_Q_NAME         ),
-	DEF_VALS1(MQCACF_FROM_COMM_INFO_NAME    ),
-	DEF_VALS1(MQCACF_HOST_NAME              ),
-	DEF_VALS1(MQCACF_MQCB_NAME              ),
-	DEF_VALS1(MQCACF_OBJECT_STRING          ),
-	DEF_VALS1(MQCACF_Q_MGR_START_DATE       ),
-	DEF_VALS1(MQCACF_Q_MGR_START_TIME       ),
-	DEF_VALS1(MQCACF_RECOVERY_DATE          ),
-	DEF_VALS1(MQCACF_RECOVERY_TIME          ),
-	DEF_VALS1(MQCACF_RESOLVED_LOCAL_Q_MGR   ),
-	DEF_VALS1(MQCACF_RESOLVED_LOCAL_Q_NAME  ),
-	DEF_VALS1(MQCACF_RESOLVED_OBJECT_STRING ),
-	DEF_VALS1(MQCACF_RESOLVED_Q_MGR         ),
-	DEF_VALS1(MQCACF_ROUTING_FINGER_PRINT   ),
-	DEF_VALS1(MQCACF_SELECTION_STRING       ),
-	DEF_VALS1(MQCACF_TO_COMM_INFO_NAME      ),
-	DEF_VALS1(MQCACF_XA_INFO                ),
-	DEF_VALS1(MQCACF_XQH_PUT_DATE           ),
-	DEF_VALS1(MQCACF_XQH_PUT_TIME           ),
-	DEF_VALS1(MQCACF_XQH_REMOTE_Q_MGR       ),
-	DEF_VALS1(MQCACF_XQH_REMOTE_Q_NAME      ),
-
-	DEF_VALS1(MQCACH_CHANNEL_NAME           ),
-	DEF_VALS1(MQCACH_CHANNEL_NAMES          ),
-	DEF_VALS1(MQCACH_CHANNEL_START_DATE     ),
-	DEF_VALS1(MQCACH_CHANNEL_START_TIME     ),
-	DEF_VALS1(MQCACH_CLIENT_ID              ),
-	DEF_VALS1(MQCACH_CLIENT_USER_ID         ),
-	DEF_VALS1(MQCACH_CONNECTION_NAME        ),
-	DEF_VALS1(MQCACH_CONNECTION_NAME_LIST   ),
-	DEF_VALS1(MQCACH_CURRENT_LUWID          ),
-	DEF_VALS1(MQCACH_DESC                   ),
-	DEF_VALS1(MQCACH_FORMAT_NAME            ),
-	DEF_VALS1(MQCACH_GROUP_ADDRESS          ),
-	DEF_VALS1(MQCACH_IP_ADDRESS             ),
-	DEF_VALS1(MQCACH_JAAS_CONFIG            ),
-	DEF_VALS1(MQCACH_LAST_LUWID             ),
-	DEF_VALS1(MQCACH_LAST_MSG_DATE          ),
-	DEF_VALS1(MQCACH_LAST_MSG_TIME          ),
-	DEF_VALS1(MQCACH_LISTENER_DESC          ),
-	DEF_VALS1(MQCACH_LISTENER_NAME          ),
-	DEF_VALS1(MQCACH_LISTENER_START_DATE    ),
-	DEF_VALS1(MQCACH_LISTENER_START_TIME    ),
-	DEF_VALS1(MQCACH_LOCAL_ADDRESS          ),
-	DEF_VALS1(MQCACH_LOCAL_NAME             ),
-	DEF_VALS1(MQCACH_LU_NAME                ),
-	DEF_VALS1(MQCACH_MCA_JOB_NAME           ),
-	DEF_VALS1(MQCACH_MCA_NAME               ),
-	DEF_VALS1(MQCACH_MCA_USER_ID            ),
-	DEF_VALS1(MQCACH_MCA_USER_ID_LIST       ),
-	DEF_VALS1(MQCACH_MODE_NAME              ),
-	DEF_VALS1(MQCACH_MR_EXIT_NAME           ),
-	DEF_VALS1(MQCACH_MR_EXIT_USER_DATA      ),
-	DEF_VALS1(MQCACH_MSG_EXIT_NAME          ),
-	DEF_VALS1(MQCACH_MSG_EXIT_USER_DATA     ),
-	DEF_VALS1(MQCACH_PASSWORD               ),
-	DEF_VALS1(MQCACH_RCV_EXIT_NAME          ),
-	DEF_VALS1(MQCACH_RCV_EXIT_USER_DATA     ),
-	DEF_VALS1(MQCACH_REMOTE_APPL_TAG        ),
-	DEF_VALS1(MQCACH_REMOTE_VERSION         ),
-	DEF_VALS1(MQCACH_REMOTE_PRODUCT         ),
-	DEF_VALS1(MQCACH_SEC_EXIT_NAME          ),
-	DEF_VALS1(MQCACH_SEC_EXIT_USER_DATA     ),
-	DEF_VALS1(MQCACH_SEND_EXIT_NAME         ),
-	DEF_VALS1(MQCACH_SEND_EXIT_USER_DATA    ),
-	DEF_VALS1(MQCACH_SSL_CERT_ISSUER_NAME   ),
-	DEF_VALS1(MQCACH_SSL_CERT_USER_ID       ),
-	DEF_VALS1(MQCACH_SSL_CIPHER_SPEC        ),
-	DEF_VALS1(MQCACH_SSL_CIPHER_SUITE       ),
-	DEF_VALS1(MQCACH_SSL_HANDSHAKE_STAGE    ),
-	DEF_VALS1(MQCACH_SSL_KEY_RESET_DATE     ),
-	DEF_VALS1(MQCACH_SSL_KEY_RESET_TIME     ),
-	DEF_VALS1(MQCACH_SSL_KEY_PASSPHRASE     ),
-	DEF_VALS1(MQCACH_SSL_PEER_NAME          ),
-	DEF_VALS1(MQCACH_SSL_SHORT_PEER_NAME    ),
-	DEF_VALS1(MQCACH_TCP_NAME               ),
-	DEF_VALS1(MQCACH_TP_NAME                ),
-	DEF_VALS1(MQCACH_USER_ID                ),
-	DEF_VALS1(MQCACH_XMIT_Q_NAME            ),
-
-	DEF_VALS1(MQCAMO_CLOSE_DATE             ),
-	DEF_VALS1(MQCAMO_CLOSE_TIME             ),
-	DEF_VALS1(MQCAMO_CONN_DATE              ),
-	DEF_VALS1(MQCAMO_CONN_TIME              ),
-	DEF_VALS1(MQCAMO_DISC_DATE              ),
-	DEF_VALS1(MQCAMO_DISC_TIME              ),
-	DEF_VALS1(MQCAMO_END_DATE               ),
-	DEF_VALS1(MQCAMO_END_TIME               ),
-	DEF_VALS1(MQCAMO_OPEN_DATE              ),
-	DEF_VALS1(MQCAMO_OPEN_TIME              ),
-	DEF_VALS1(MQCAMO_START_DATE             ),
-	DEF_VALS1(MQCAMO_START_TIME             ),
-
-	DEF_VALS1(MQCA_ADMIN_TOPIC_NAME      ),
-	DEF_VALS1(MQCA_ALTERATION_DATE       ),
-	DEF_VALS1(MQCA_ALTERATION_TIME       ),
-	DEF_VALS1(MQCA_APPL_ID               ),
-	DEF_VALS1(MQCA_AUTH_INFO_CONN_NAME   ),
-	DEF_VALS1(MQCA_AUTH_INFO_DESC        ),
-	DEF_VALS1(MQCA_AUTH_INFO_NAME        ),
-	DEF_VALS1(MQCA_AUTH_INFO_OCSP_URL    ),
-	DEF_VALS1(MQCA_AUTO_REORG_CATALOG    ),
-	DEF_VALS1(MQCA_AUTO_REORG_START_TIME ),
-	DEF_VALS1(MQCA_BACKOUT_REQ_Q_NAME    ),
-	DEF_VALS2(MQCA_BASE_Q_NAME,"MQCA_BASE_OBJECT_NAME"),
-	DEF_VALS1(MQCA_BATCH_INTERFACE_ID    ),
-	DEF_VALS1(MQCA_CF_STRUC_DESC         ),
-	DEF_VALS1(MQCA_CF_STRUC_NAME         ),
-	DEF_VALS1(MQCA_CHANNEL_AUTO_DEF_EXIT ),
-	DEF_VALS1(MQCA_CHILD                 ),
-	DEF_VALS1(MQCA_CHINIT_SERVICE_PARM   ),
-	DEF_VALS1(MQCA_CICS_FILE_NAME        ),
-	DEF_VALS1(MQCA_CLUSTER_DATE          ),
-	DEF_VALS1(MQCA_CLUSTER_NAME          ),
-	DEF_VALS1(MQCA_CLUSTER_NAMELIST      ),
-	DEF_VALS1(MQCA_CLUSTER_Q_MGR_NAME    ),
-	DEF_VALS1(MQCA_CLUSTER_TIME          ),
-	DEF_VALS1(MQCA_CLUSTER_WORKLOAD_DATA ),
-	DEF_VALS1(MQCA_CLUSTER_WORKLOAD_EXIT ),
-	DEF_VALS1(MQCA_COMMAND_INPUT_Q_NAME  ),
-	DEF_VALS1(MQCA_COMMAND_REPLY_Q_NAME  ),
-	DEF_VALS1(MQCA_CREATION_DATE         ),
-	DEF_VALS1(MQCA_CREATION_TIME         ),
-	DEF_VALS1(MQCA_DEAD_LETTER_Q_NAME    ),
-	DEF_VALS1(MQCA_DEF_XMIT_Q_NAME       ),
-	DEF_VALS1(MQCA_DNS_GROUP             ),
-	DEF_VALS1(MQCA_ENV_DATA              ),
-	DEF_VALS1(MQCA_IGQ_USER_ID           ),
-	DEF_VALS1(MQCA_INITIATION_Q_NAME     ),
-	DEF_VALS1(MQCA_LDAP_PASSWORD         ),
-	DEF_VALS1(MQCA_LDAP_USER_NAME        ),
-	DEF_VALS1(MQCA_LU62_ARM_SUFFIX       ),
-	DEF_VALS1(MQCA_LU_GROUP_NAME         ),
-	DEF_VALS1(MQCA_LU_NAME               ),
-	DEF_VALS1(MQCA_MODEL_DURABLE_Q       ),
-	DEF_VALS1(MQCA_MODEL_NON_DURABLE_Q   ),
-	DEF_VALS1(MQCA_MONITOR_Q_NAME        ),
-	DEF_VALS1(MQCA_NAMELIST_DESC         ),
-	DEF_VALS1(MQCA_NAMELIST_NAME         ),
-	DEF_VALS1(MQCA_NAMES                 ),
-	DEF_VALS1(MQCA_PARENT                ),
-	DEF_VALS1(MQCA_PASS_TICKET_APPL      ),
-	DEF_VALS1(MQCA_PROCESS_DESC          ),
-	DEF_VALS1(MQCA_PROCESS_NAME          ),
-	DEF_VALS1(MQCA_QSG_NAME              ),
-	DEF_VALS1(MQCA_Q_DESC                ),
-	DEF_VALS1(MQCA_Q_MGR_DESC            ),
-	DEF_VALS1(MQCA_Q_MGR_IDENTIFIER      ),
-	DEF_VALS1(MQCA_Q_MGR_NAME            ),
-	DEF_VALS1(MQCA_Q_NAME                ),
-	DEF_VALS1(MQCA_REMOTE_Q_MGR_NAME     ),
-	DEF_VALS1(MQCA_REMOTE_Q_NAME         ),
-	DEF_VALS1(MQCA_REPOSITORY_NAME       ),
-	DEF_VALS1(MQCA_REPOSITORY_NAMELIST   ),
-	DEF_VALS1(MQCA_RESUME_DATE           ),
-	DEF_VALS1(MQCA_RESUME_TIME           ),
-	DEF_VALS1(MQCA_SERVICE_DESC          ),
-	DEF_VALS1(MQCA_SERVICE_NAME          ),
-	DEF_VALS1(MQCA_SERVICE_START_ARGS    ),
-	DEF_VALS1(MQCA_SERVICE_START_COMMAND ),
-	DEF_VALS1(MQCA_SERVICE_STOP_ARGS     ),
-	DEF_VALS1(MQCA_SERVICE_STOP_COMMAND  ),
-	DEF_VALS1(MQCA_SSL_CRL_NAMELIST      ),
-	DEF_VALS1(MQCA_SSL_CRYPTO_HARDWARE   ),
-	DEF_VALS1(MQCA_SSL_KEY_LIBRARY       ),
-	DEF_VALS1(MQCA_SSL_KEY_MEMBER        ),
-	DEF_VALS1(MQCA_SSL_KEY_REPOSITORY    ),
-	DEF_VALS1(MQCA_STDERR_DESTINATION    ),
-	DEF_VALS1(MQCA_STDOUT_DESTINATION    ),
-	DEF_VALS1(MQCA_STORAGE_CLASS         ),
-	DEF_VALS1(MQCA_STORAGE_CLASS_DESC    ),
-	DEF_VALS1(MQCA_SYSTEM_LOG_Q_NAME     ),
-	DEF_VALS1(MQCA_TCP_NAME              ),
-	DEF_VALS1(MQCA_TOPIC_DESC            ),
-	DEF_VALS1(MQCA_TOPIC_NAME            ),
-	DEF_VALS1(MQCA_TOPIC_STRING          ),
-	DEF_VALS1(MQCA_TOPIC_STRING_FILTER   ),
-	DEF_VALS1(MQCA_TPIPE_NAME            ),
-	DEF_VALS1(MQCA_TRIGGER_CHANNEL_NAME  ),
-	DEF_VALS1(MQCA_TRIGGER_DATA          ),
-	DEF_VALS1(MQCA_TRIGGER_PROGRAM_NAME  ),
-	DEF_VALS1(MQCA_TRIGGER_TERM_ID       ),
-	DEF_VALS1(MQCA_TRIGGER_TRANS_ID      ),
-	DEF_VALS1(MQCA_USER_DATA             ),
-	DEF_VALS1(MQCA_USER_LIST             ),
-	DEF_VALS1(MQCA_XCF_GROUP_NAME        ),
-	DEF_VALS1(MQCA_XCF_MEMBER_NAME       ),
-	DEF_VALS1(MQCA_XR_VERSION2           ),
-	DEF_VALS1(MQCA_XMIT_Q_NAME           ),
-	DEF_VALS1(MQCA_CHLAUTH_DESC          ),
-	DEF_VALS1(MQCA_CLUS_CHL_NAME         ),
-	DEF_VALS1(MQCA_COMM_INFO_NAME        ),
-	DEF_VALS1(MQCA_COMM_INFO_DESC        ),
-	DEF_VALS1(MQCA_CUSTOM                ),
-	DEF_VALS1(MQCA_INSTALLATION_DESC     ),
-	DEF_VALS1(MQCA_INSTALLATION_NAME     ),
-	DEF_VALS1(MQCA_INSTALLATION_PATH     ),
-	DEF_VALS1(MQCA_POLICY_NAME           ),
-	DEF_VALS1(MQCA_RECIPIENT_DN          ),
-	DEF_VALS1(MQCA_SIGNER_DN             ),
-	DEF_VALS1(MQCA_XR_VERSION            ),
-	DEF_VALS1(MQCA_XR_SSL_CIPHER_SUITES  ),
-
-	DEF_VALS1(MQGACF_ACTIVITY               ),
-	DEF_VALS1(MQGACF_APP_DIST_LIST          ),
-	DEF_VALS1(MQGACF_ACTIVITY_TRACE         ),
-	DEF_VALS1(MQGACF_CHL_STATISTICS_DATA    ),
-	DEF_VALS1(MQGACF_COMMAND_CONTEXT        ),
-	DEF_VALS1(MQGACF_COMMAND_DATA           ),
-	DEF_VALS1(MQGACF_EMBEDDED_MQMD          ),
-	DEF_VALS1(MQGACF_MESSAGE                ),
-	DEF_VALS1(MQGACF_MQMD                   ),
-	DEF_VALS1(MQGACF_OPERATION              ),
-	DEF_VALS1(MQGACF_Q_ACCOUNTING_DATA      ),
-	DEF_VALS1(MQGACF_Q_STATISTICS_DATA      ),
-	DEF_VALS1(MQGACF_TRACE_ROUTE            ),
-	DEF_VALS1(MQGACF_VALUE_NAMING           ),
-
-	DEF_VALS1(MQIACF_ACTION                 ),
-	DEF_VALS1(MQIACF_ALL                    ),
-	DEF_VALS1(MQIACF_ANONYMOUS_COUNT        ),
-	DEF_VALS1(MQIACF_APPL_COUNT             ),
-	DEF_VALS1(MQIACF_ASYNC_STATE            ),
-	DEF_VALS1(MQIACF_AUTHORIZATION_LIST     ),
-	DEF_VALS1(MQIACF_AUTH_ADD_AUTHS         ),
-	DEF_VALS1(MQIACF_AUTH_INFO_ATTRS        ),
-	DEF_VALS1(MQIACF_AUTH_OPTIONS           ),
-	DEF_VALS1(MQIACF_AUTH_PROFILE_ATTRS     ),
-	DEF_VALS1(MQIACF_AUTH_REMOVE_AUTHS      ),
-	DEF_VALS1(MQIACF_AUTH_SERVICE_ATTRS     ),
-	DEF_VALS1(MQIACF_AUX_ERROR_DATA_INT_1   ),
-	DEF_VALS1(MQIACF_AUX_ERROR_DATA_INT_2   ),
-	DEF_VALS1(MQIACF_BACKOUT_COUNT          ),
-	DEF_VALS1(MQIACF_BRIDGE_TYPE            ),
-	DEF_VALS1(MQIACF_BROKER_COUNT           ),
-	DEF_VALS1(MQIACF_BROKER_OPTIONS         ),
-	DEF_VALS1(MQIACF_BUFFER_POOL_ID         ),
-	DEF_VALS1(MQIACF_CF_STATUS_BACKUP       ),
-	DEF_VALS1(MQIACF_CF_STATUS_CONNECT      ),
-	DEF_VALS1(MQIACF_CF_STATUS_SUMMARY      ),
-	DEF_VALS1(MQIACF_CF_STATUS_TYPE         ),
-	DEF_VALS1(MQIACF_CF_STRUC_ATTRS         ),
-	DEF_VALS1(MQIACF_CF_STRUC_BACKUP_SIZE   ),
-	DEF_VALS1(MQIACF_CF_STRUC_ENTRIES_MAX   ),
-	DEF_VALS1(MQIACF_CF_STRUC_ENTRIES_USED  ),
-	DEF_VALS1(MQIACF_CF_STRUC_SIZE_MAX      ),
-	DEF_VALS1(MQIACF_CF_STRUC_SIZE_USED     ),
-	DEF_VALS1(MQIACF_CF_STRUC_STATUS        ),
-	DEF_VALS1(MQIACF_CF_STRUC_TYPE          ),
-	DEF_VALS1(MQIACF_CHANNEL_ATTRS          ),
-	DEF_VALS1(MQIACF_CHINIT_STATUS          ),
-	DEF_VALS1(MQIACF_CHLAUTH_TYPE           ),
-	DEF_VALS1(MQIACF_CLEAR_SCOPE            ),
-	DEF_VALS1(MQIACF_CLEAR_TYPE             ),
-	DEF_VALS1(MQIACF_CLUSTER_INFO           ),
-	DEF_VALS1(MQIACF_CLUSTER_Q_MGR_ATTRS    ),
-	DEF_VALS1(MQIACF_CMDSCOPE_Q_MGR_COUNT   ),
-	DEF_VALS1(MQIACF_CMD_SERVER_STATUS      ),
-	DEF_VALS1(MQIACF_COMMAND                ),
-	DEF_VALS1(MQIACF_COMMAND_INFO           ),
-	DEF_VALS1(MQIACF_COMP_CODE              ),
-	DEF_VALS1(MQIACF_CONFIGURATION_EVENTS   ),
-	DEF_VALS1(MQIACF_CONFIGURATION_OBJECTS  ),
-	DEF_VALS1(MQIACF_CONNECTION_ATTRS       ),
-	DEF_VALS1(MQIACF_CONNECTION_COUNT       ),
-	DEF_VALS1(MQIACF_CONNECT_OPTIONS        ),
-	DEF_VALS1(MQIACF_CONN_INFO_ALL          ),
-	DEF_VALS1(MQIACF_CONN_INFO_CONN         ),
-	DEF_VALS1(MQIACF_CONN_INFO_HANDLE       ),
-	DEF_VALS1(MQIACF_CONN_INFO_TYPE         ),
-	DEF_VALS1(MQIACF_CONV_REASON_CODE       ),
-	DEF_VALS1(MQIACF_DB2_CONN_STATUS        ),
-	DEF_VALS1(MQIACF_DELETE_OPTIONS         ),
-	DEF_VALS1(MQIACF_DESTINATION_CLASS      ),
-	DEF_VALS1(MQIACF_DISCONTINUITY_COUNT    ),
-	DEF_VALS1(MQIACF_DURABLE_SUBSCRIPTION   ),
-	DEF_VALS1(MQIACF_ENCODING               ),
-	DEF_VALS1(MQIACF_ENTITY_TYPE            ),
-	DEF_VALS2(MQIACF_ERROR_IDENTIFIER,"MQIACF_ERROR_ID"),
-	DEF_VALS1(MQIACF_ERROR_OFFSET           ),
-	DEF_VALS1(MQIACF_ESCAPE_TYPE            ),
-	DEF_VALS1(MQIACF_EVENT_APPL_TYPE        ),
-	DEF_VALS1(MQIACF_EVENT_ORIGIN           ),
-	DEF_VALS1(MQIACF_EXCLUDE_INTERVAL       ),
-	DEF_VALS1(MQIACF_EXPIRY                 ),
-	DEF_VALS1(MQIACF_EXPIRY_Q_COUNT         ),
-	DEF_VALS1(MQIACF_FEEDBACK               ),
-	DEF_VALS1(MQIACF_FORCE                  ),
-	DEF_VALS1(MQIACF_GROUPUR_CHECK_ID       ),
-	DEF_VALS1(MQIACF_HANDLE_STATE           ),
-	DEF_VALS1(MQIACF_INQUIRY                ),
-	DEF_VALS1(MQIACF_INTEGER_DATA           ),
-	DEF_VALS1(MQIACF_INTERFACE_VERSION      ),
-	DEF_VALS1(MQIACF_LISTENER_ATTRS         ),
-	DEF_VALS1(MQIACF_LISTENER_STATUS_ATTRS  ),
-	DEF_VALS1(MQIACF_LOG_COMPRESSION        ),
-	DEF_VALS1(MQIACF_MAX_ACTIVITIES         ),
-	DEF_VALS1(MQIACF_MESSAGE_COUNT          ),
-	DEF_VALS2(MQIACF_MODE,"MQIACF_QUIESCE"),
-	DEF_VALS1(MQIACF_MONITORING             ),
-	DEF_VALS1(MQIACF_MOVE_COUNT             ),
-	DEF_VALS1(MQIACF_MOVE_TYPE              ),
-	DEF_VALS1(MQIACF_MOVE_TYPE_ADD          ),
-	DEF_VALS1(MQIACF_MOVE_TYPE_MOVE         ),
-	DEF_VALS1(MQIACF_MSG_FLAGS              ),
-	DEF_VALS1(MQIACF_MSG_LENGTH             ),
-	DEF_VALS1(MQIACF_MSG_TYPE               ),
-	DEF_VALS1(MQIACF_MULC_CAPTURE           ),
-	DEF_VALS1(MQIACF_NAMELIST_ATTRS         ),
-	DEF_VALS1(MQIACF_OBJECT_TYPE            ),
-	DEF_VALS1(MQIACF_OBSOLETE_MSGS          ),
-	DEF_VALS1(MQIACF_OFFSET                 ),
-	DEF_VALS1(MQIACF_OLDEST_MSG_AGE         ),
-	DEF_VALS1(MQIACF_OPEN_BROWSE            ),
-	DEF_VALS1(MQIACF_OPEN_INPUT_TYPE        ),
-	DEF_VALS1(MQIACF_OPEN_INQUIRE           ),
-	DEF_VALS1(MQIACF_OPEN_OPTIONS           ),
-	DEF_VALS1(MQIACF_OPEN_OUTPUT            ),
-	DEF_VALS1(MQIACF_OPEN_SET               ),
-	DEF_VALS1(MQIACF_OPEN_TYPE              ),
-	DEF_VALS1(MQIACF_OPERATION_MODE         ),
-	DEF_VALS1(MQIACF_OPERATION_TYPE         ),
-	DEF_VALS1(MQIACF_OPTIONS                ),
-	DEF_VALS1(MQIACF_ORIGINAL_LENGTH        ),
-	DEF_VALS1(MQIACF_PAGESET_STATUS         ),
-	DEF_VALS1(MQIACF_PARAMETER_ID           ),
-	DEF_VALS1(MQIACF_PERMIT_STANDBY         ),
-	DEF_VALS1(MQIACF_PERSISTENCE            ),
-	DEF_VALS1(MQIACF_PRIORITY               ),
-	DEF_VALS1(MQIACF_PROCESS_ATTRS          ),
-	DEF_VALS1(MQIACF_PROCESS_ID             ),
-	DEF_VALS1(MQIACF_PS_STATUS_TYPE         ),
-	DEF_VALS1(MQIACF_PUBLICATION_OPTIONS    ),
-	DEF_VALS1(MQIACF_PUBLISH_COUNT          ),
-	DEF_VALS1(MQIACF_PUBSUB_PROPERTIES      ),
-	DEF_VALS1(MQIACF_PUBSUB_STATUS          ),
-	DEF_VALS1(MQIACF_PUBSUB_STATUS_ATTRS    ),
-	DEF_VALS1(MQIACF_PUB_PRIORITY           ),
-	DEF_VALS1(MQIACF_PURGE                  ),
-	DEF_VALS1(MQIACF_QSG_DISPS              ),
-	DEF_VALS1(MQIACF_Q_ATTRS                ),
-	DEF_VALS1(MQIACF_Q_HANDLE               ),
-	DEF_VALS1(MQIACF_Q_MGR_ATTRS            ),
-	DEF_VALS1(MQIACF_Q_MGR_CLUSTER          ),
-	DEF_VALS1(MQIACF_Q_MGR_DEFINITION_TYPE  ),
-	DEF_VALS1(MQIACF_Q_MGR_DQM              ),
-	DEF_VALS1(MQIACF_Q_MGR_EVENT            ),
-	DEF_VALS1(MQIACF_Q_MGR_FACILITY         ),
-	DEF_VALS1(MQIACF_Q_MGR_NUMBER           ),
-	DEF_VALS1(MQIACF_Q_MGR_PUBSUB           ),
-	DEF_VALS1(MQIACF_Q_MGR_STATUS           ),
-	DEF_VALS1(MQIACF_Q_MGR_STATUS_ATTRS     ),
-	DEF_VALS1(MQIACF_Q_MGR_SYSTEM           ),
-	DEF_VALS1(MQIACF_Q_MGR_TYPE             ),
-	DEF_VALS1(MQIACF_Q_MGR_VERSION          ),
-	DEF_VALS1(MQIACF_Q_STATUS               ),
-	DEF_VALS1(MQIACF_Q_STATUS_ATTRS         ),
-	DEF_VALS1(MQIACF_Q_STATUS_TYPE          ),
-	DEF_VALS1(MQIACF_Q_TIME_INDICATOR       ),
-	DEF_VALS1(MQIACF_Q_TYPES                ),
-	DEF_VALS1(MQIACF_REASON_CODE            ),
-	DEF_VALS1(MQIACF_REASON_QUALIFIER       ),
-	DEF_VALS1(MQIACF_RECORDED_ACTIVITIES    ),
-	DEF_VALS1(MQIACF_REFRESH_INTERVAL       ),
-	DEF_VALS1(MQIACF_REFRESH_REPOSITORY     ),
-	DEF_VALS1(MQIACF_REFRESH_TYPE           ),
-	DEF_VALS1(MQIACF_REGISTRATION_OPTIONS   ),
-	DEF_VALS1(MQIACF_REG_REG_OPTIONS        ),
-	DEF_VALS1(MQIACF_REMOVE_QUEUES          ),
-	DEF_VALS1(MQIACF_REPLACE                ),
-	DEF_VALS1(MQIACF_REPORT                 ),
-	DEF_VALS1(MQIACF_REQUEST_ONLY           ),
-	DEF_VALS1(MQIACF_RETAINED_PUBLICATION   ),
-	DEF_VALS1(MQIACF_ROUTE_ACCUMULATION     ),
-	DEF_VALS1(MQIACF_ROUTE_DELIVERY         ),
-	DEF_VALS1(MQIACF_ROUTE_DETAIL           ),
-	DEF_VALS1(MQIACF_ROUTE_FORWARDING       ),
-	DEF_VALS1(MQIACF_SECURITY_ATTRS         ),
-	DEF_VALS1(MQIACF_SECURITY_INTERVAL      ),
-	DEF_VALS1(MQIACF_SECURITY_ITEM          ),
-	DEF_VALS1(MQIACF_SECURITY_SETTING       ),
-	DEF_VALS1(MQIACF_SECURITY_SWITCH        ),
-	DEF_VALS1(MQIACF_SECURITY_TIMEOUT       ),
-	DEF_VALS1(MQIACF_SECURITY_TYPE          ),
-	DEF_VALS1(MQIACF_SELECTOR               ),
-	DEF_VALS1(MQIACF_SELECTOR_TYPE          ),
-	DEF_VALS1(MQIACF_SEQUENCE_NUMBER        ),
-	DEF_VALS1(MQIACF_SERVICE_ATTRS          ),
-	DEF_VALS1(MQIACF_SERVICE_STATUS         ),
-	DEF_VALS1(MQIACF_SERVICE_STATUS_ATTRS   ),
-	DEF_VALS1(MQIACF_STORAGE_CLASS_ATTRS    ),
-	DEF_VALS1(MQIACF_SUBSCRIPTION_SCOPE     ),
-	DEF_VALS1(MQIACF_SUB_ATTRS              ),
-	DEF_VALS1(MQIACF_SUB_LEVEL              ),
-	DEF_VALS1(MQIACF_SUB_OPTIONS            ),
-	DEF_VALS1(MQIACF_SUB_STATUS_ATTRS       ),
-	DEF_VALS1(MQIACF_SUB_SUMMARY            ),
-	DEF_VALS1(MQIACF_SUB_TYPE               ),
-	DEF_VALS1(MQIACF_SUSPEND                ),
-	DEF_VALS1(MQIACF_SYSP_ALLOC_PRIMARY     ),
-	DEF_VALS1(MQIACF_SYSP_ALLOC_SECONDARY   ),
-	DEF_VALS1(MQIACF_SYSP_ALLOC_UNIT        ),
-	DEF_VALS1(MQIACF_SYSP_ARCHIVE           ),
-	DEF_VALS1(MQIACF_SYSP_ARCHIVE_RETAIN    ),
-	DEF_VALS1(MQIACF_SYSP_ARCHIVE_WTOR      ),
-	DEF_VALS1(MQIACF_SYSP_BLOCK_SIZE        ),
-	DEF_VALS1(MQIACF_SYSP_CATALOG           ),
-	DEF_VALS1(MQIACF_SYSP_CHKPOINT_COUNT    ),
-	DEF_VALS1(MQIACF_SYSP_CLUSTER_CACHE     ),
-	DEF_VALS1(MQIACF_SYSP_COMPACT           ),
-	DEF_VALS1(MQIACF_SYSP_DB2_BLOB_TASKS    ),
-	DEF_VALS1(MQIACF_SYSP_DB2_TASKS         ),
-	DEF_VALS1(MQIACF_SYSP_DEALLOC_INTERVAL  ),
-	DEF_VALS1(MQIACF_SYSP_DUAL_ACTIVE       ),
-	DEF_VALS1(MQIACF_SYSP_DUAL_ARCHIVE      ),
-	DEF_VALS1(MQIACF_SYSP_DUAL_BSDS         ),
-	DEF_VALS1(MQIACF_SYSP_EXIT_INTERVAL     ),
-	DEF_VALS1(MQIACF_SYSP_EXIT_TASKS        ),
-	DEF_VALS1(MQIACF_SYSP_FULL_LOGS         ),
-	DEF_VALS1(MQIACF_SYSP_IN_BUFFER_SIZE    ),
-	DEF_VALS1(MQIACF_SYSP_LOG_COPY          ),
-	DEF_VALS1(MQIACF_SYSP_LOG_SUSPEND       ),
-	DEF_VALS1(MQIACF_SYSP_LOG_USED          ),
-	DEF_VALS1(MQIACF_SYSP_MAX_ARCHIVE       ),
-	DEF_VALS1(MQIACF_SYSP_MAX_CONNS         ),
-	DEF_VALS1(MQIACF_SYSP_MAX_CONNS_BACK    ),
-	DEF_VALS1(MQIACF_SYSP_MAX_CONNS_FORE    ),
-	DEF_VALS1(MQIACF_SYSP_MAX_READ_TAPES    ),
-	DEF_VALS1(MQIACF_SYSP_OFFLOAD_STATUS    ),
-	DEF_VALS1(MQIACF_SYSP_OTMA_INTERVAL     ),
-	DEF_VALS1(MQIACF_SYSP_OUT_BUFFER_COUNT  ),
-	DEF_VALS1(MQIACF_SYSP_OUT_BUFFER_SIZE   ),
-	DEF_VALS1(MQIACF_SYSP_PROTECT           ),
-	DEF_VALS1(MQIACF_SYSP_QUIESCE_INTERVAL  ),
-	DEF_VALS1(MQIACF_SYSP_Q_INDEX_DEFER     ),
-	DEF_VALS1(MQIACF_SYSP_RESLEVEL_AUDIT    ),
-	DEF_VALS1(MQIACF_SYSP_ROUTING_CODE      ),
-	DEF_VALS1(MQIACF_SYSP_SMF_ACCOUNTING    ),
-	DEF_VALS1(MQIACF_SYSP_SMF_INTERVAL      ),
-	DEF_VALS1(MQIACF_SYSP_SMF_STATS         ),
-	DEF_VALS1(MQIACF_SYSP_TIMESTAMP         ),
-	DEF_VALS1(MQIACF_SYSP_TOTAL_LOGS        ),
-	DEF_VALS1(MQIACF_SYSP_TRACE_CLASS       ),
-	DEF_VALS1(MQIACF_SYSP_TRACE_SIZE        ),
-	DEF_VALS1(MQIACF_SYSP_TYPE              ),
-	DEF_VALS1(MQIACF_SYSP_UNIT_ADDRESS      ),
-	DEF_VALS1(MQIACF_SYSP_UNIT_STATUS       ),
-	DEF_VALS1(MQIACF_SYSP_WLM_INTERVAL      ),
-	DEF_VALS1(MQIACF_SYSP_WLM_INT_UNITS     ),
-	DEF_VALS1(MQIACF_THREAD_ID              ),
-	DEF_VALS1(MQIACF_TOPIC_ATTRS            ),
-	DEF_VALS1(MQIACF_TOPIC_PUB              ),
-	DEF_VALS1(MQIACF_TOPIC_STATUS           ),
-	DEF_VALS1(MQIACF_TOPIC_STATUS_ATTRS     ),
-	DEF_VALS1(MQIACF_TOPIC_STATUS_TYPE      ),
-	DEF_VALS1(MQIACF_TOPIC_SUB              ),
-	DEF_VALS1(MQIACF_UNCOMMITTED_MSGS       ),
-	DEF_VALS1(MQIACF_UNRECORDED_ACTIVITIES  ),
-	DEF_VALS1(MQIACF_UOW_STATE              ),
-	DEF_VALS1(MQIACF_UOW_TYPE               ),
-	DEF_VALS1(MQIACF_USAGE_BUFFER_POOL      ),
-	DEF_VALS1(MQIACF_USAGE_DATA_SET         ),
-	DEF_VALS1(MQIACF_USAGE_DATA_SET_TYPE    ),
-	DEF_VALS1(MQIACF_USAGE_EXPAND_COUNT     ),
-	DEF_VALS1(MQIACF_USAGE_EXPAND_TYPE      ),
-	DEF_VALS1(MQIACF_USAGE_NONPERSIST_PAGES ),
-	DEF_VALS1(MQIACF_USAGE_PAGESET          ),
-	DEF_VALS1(MQIACF_USAGE_PERSIST_PAGES    ),
-	DEF_VALS1(MQIACF_USAGE_RESTART_EXTENTS  ),
-	DEF_VALS1(MQIACF_USAGE_TOTAL_BUFFERS    ),
-	DEF_VALS1(MQIACF_USAGE_TOTAL_PAGES      ),
-	DEF_VALS1(MQIACF_USAGE_TYPE             ),
-	DEF_VALS1(MQIACF_USAGE_UNUSED_PAGES     ),
-	DEF_VALS1(MQIACF_USER_ID_SUPPORT        ),
-	DEF_VALS1(MQIACF_VARIABLE_USER_ID       ),
-	DEF_VALS1(MQIACF_VERSION                ),
-	DEF_VALS1(MQIACF_WAIT_INTERVAL          ),
-	DEF_VALS1(MQIACF_WILDCARD_SCHEMA        ),
-	DEF_VALS1(MQIACF_MCAST_REL_INDICATOR    ),
-
-	DEF_VALS1(MQIACH_ACTIVE_CHL             ),
-	DEF_VALS1(MQIACH_ACTIVE_CHL_MAX         ),
-	DEF_VALS1(MQIACH_ACTIVE_CHL_PAUSED      ),
-	DEF_VALS1(MQIACH_ACTIVE_CHL_RETRY       ),
-	DEF_VALS1(MQIACH_ACTIVE_CHL_STARTED     ),
-	DEF_VALS1(MQIACH_ACTIVE_CHL_STOPPED     ),
-	DEF_VALS1(MQIACH_ADAPS_MAX              ),
-	DEF_VALS1(MQIACH_ADAPS_STARTED          ),
-	DEF_VALS1(MQIACH_ADAPTER                ),
-	DEF_VALS1(MQIACH_ALLOC_FAST_TIMER       ),
-	DEF_VALS1(MQIACH_ALLOC_RETRY            ),
-	DEF_VALS1(MQIACH_ALLOC_SLOW_TIMER       ),
-	DEF_VALS1(MQIACH_BACKLOG                ),
-	DEF_VALS1(MQIACH_BATCHES                ),
-	DEF_VALS1(MQIACH_BATCH_HB               ),
-	DEF_VALS1(MQIACH_BATCH_INTERVAL         ),
-	DEF_VALS1(MQIACH_BATCH_SIZE             ),
-	DEF_VALS1(MQIACH_BATCH_SIZE_INDICATOR   ),
-	DEF_VALS1(MQIACH_BUFFERS_SENT           ),
-	DEF_VALS1(MQIACH_BYTES_SENT             ),
-	DEF_VALS1(MQIACH_CHANNEL_DISP           ),
-	DEF_VALS1(MQIACH_CHANNEL_ERROR_DATA     ),
-	DEF_VALS1(MQIACH_CHANNEL_INSTANCE_ATTRS ),
-	DEF_VALS1(MQIACH_CHANNEL_INSTANCE_TYPE  ),
-	DEF_VALS1(MQIACH_CHANNEL_STATUS         ),
-	DEF_VALS1(MQIACH_CHANNEL_SUBSTATE       ),
-	DEF_VALS1(MQIACH_CHANNEL_TABLE          ),
-	DEF_VALS1(MQIACH_CHANNEL_TYPE           ),
-	DEF_VALS1(MQIACH_CHANNEL_TYPES          ),
-	DEF_VALS1(MQIACH_CLIENT_CHANNEL_WEIGHT  ),
-	DEF_VALS1(MQIACH_CLWL_CHANNEL_PRIORITY  ),
-	DEF_VALS1(MQIACH_CLWL_CHANNEL_RANK      ),
-	DEF_VALS1(MQIACH_CLWL_CHANNEL_WEIGHT    ),
-	DEF_VALS1(MQIACH_COMMAND_COUNT          ),
-	DEF_VALS1(MQIACH_COMPRESSION_RATE       ),
-	DEF_VALS1(MQIACH_COMPRESSION_TIME       ),
-	DEF_VALS1(MQIACH_CONNECTION_AFFINITY    ),
-	DEF_VALS1(MQIACH_CURRENT_CHL            ),
-	DEF_VALS1(MQIACH_CURRENT_CHL_LU62       ),
-	DEF_VALS1(MQIACH_CURRENT_CHL_MAX        ),
-	DEF_VALS1(MQIACH_CURRENT_CHL_TCP        ),
-	DEF_VALS1(MQIACH_CURRENT_MSGS           ),
-	DEF_VALS1(MQIACH_CURRENT_SHARING_CONVS  ),
-	DEF_VALS1(MQIACH_DATA_CONVERSION        ),
-	DEF_VALS1(MQIACH_DATA_COUNT             ),
-	DEF_VALS1(MQIACH_DEF_CHANNEL_DISP       ),
-	DEF_VALS1(MQIACH_DISC_INTERVAL          ),
-	DEF_VALS1(MQIACH_DISC_RETRY             ),
-	DEF_VALS1(MQIACH_DISPS_MAX              ),
-	DEF_VALS1(MQIACH_DISPS_STARTED          ),
-	DEF_VALS1(MQIACH_EXIT_TIME_INDICATOR    ),
-	DEF_VALS1(MQIACH_HB_INTERVAL            ),
-	DEF_VALS1(MQIACH_HDR_COMPRESSION        ),
-	DEF_VALS1(MQIACH_INBOUND_DISP           ),
-	DEF_VALS1(MQIACH_INDOUBT_STATUS         ),
-	DEF_VALS1(MQIACH_IN_DOUBT               ),
-	DEF_VALS1(MQIACH_KEEP_ALIVE_INTERVAL    ),
-	DEF_VALS1(MQIACH_LISTENER_CONTROL       ),
-	DEF_VALS1(MQIACH_LISTENER_STATUS        ),
-	DEF_VALS1(MQIACH_LONG_RETRIES_LEFT      ),
-	DEF_VALS1(MQIACH_LONG_RETRY             ),
-	DEF_VALS1(MQIACH_LONG_TIMER             ),
-	DEF_VALS1(MQIACH_MAX_INSTANCES          ),
-	DEF_VALS1(MQIACH_MAX_INSTS_PER_CLIENT   ),
-	DEF_VALS1(MQIACH_MAX_MSG_LENGTH         ),
-	DEF_VALS1(MQIACH_MAX_SHARING_CONVS      ),
-	DEF_VALS1(MQIACH_MAX_XMIT_SIZE          ),
-	DEF_VALS1(MQIACH_MCA_STATUS             ),
-	DEF_VALS1(MQIACH_MCA_TYPE               ),
-	DEF_VALS1(MQIACH_MR_COUNT               ),
-	DEF_VALS1(MQIACH_MR_INTERVAL            ),
-	DEF_VALS1(MQIACH_MSGS                   ),
-	DEF_VALS1(MQIACH_MSG_COMPRESSION        ),
-	DEF_VALS1(MQIACH_MSG_SEQUENCE_NUMBER    ),
-	DEF_VALS1(MQIACH_NAME_COUNT             ),
-	DEF_VALS1(MQIACH_NETWORK_PRIORITY       ),
-	DEF_VALS1(MQIACH_NETWORK_TIME_INDICATOR ),
-	DEF_VALS1(MQIACH_NPM_SPEED              ),
-	DEF_VALS1(MQIACH_PORT                   ),
-	DEF_VALS1(MQIACH_PORT_NUMBER            ),
-	DEF_VALS1(MQIACH_PUT_AUTHORITY          ),
-	DEF_VALS1(MQIACH_SEQUENCE_NUMBER_WRAP   ),
-	DEF_VALS1(MQIACH_SESSION_COUNT          ),
-	DEF_VALS1(MQIACH_SHARED_CHL_RESTART     ),
-	DEF_VALS1(MQIACH_SHARING_CONVERSATIONS  ),
-	DEF_VALS1(MQIACH_SHORT_RETRIES_LEFT     ),
-	DEF_VALS1(MQIACH_SHORT_RETRY            ),
-	DEF_VALS1(MQIACH_SHORT_TIMER            ),
-	DEF_VALS1(MQIACH_SOCKET                 ),
-	DEF_VALS1(MQIACH_SSLTASKS_MAX           ),
-	DEF_VALS1(MQIACH_SSLTASKS_STARTED       ),
-	DEF_VALS1(MQIACH_SSL_CLIENT_AUTH        ),
-	DEF_VALS1(MQIACH_SSL_KEY_RESETS         ),
-	DEF_VALS1(MQIACH_SSL_RETURN_CODE        ),
-	DEF_VALS1(MQIACH_STOP_REQUESTED         ),
-	DEF_VALS1(MQIACH_XMITQ_MSGS_AVAILABLE   ),
-	DEF_VALS1(MQIACH_XMITQ_TIME_INDICATOR   ),
-	DEF_VALS1(MQIACH_XMIT_PROTOCOL_TYPE     ),
-	DEF_VALS2(MQIACH_BUFFERS_RECEIVED,"MQIACH_BUFFERS_RCVD"),
-	DEF_VALS2(MQIACH_BYTES_RECEIVED,"MQIACH_BYTES_RCVD"),
-	DEF_VALS2(MQIACH_CURRENT_SEQUENCE_NUMBER,"MQIACH_CURRENT_SEQ_NUMBER"),
-	DEF_VALS2(MQIACH_LAST_SEQUENCE_NUMBER, "MQIACH_LAST_SEQ_NUMBER"),
-	DEF_VALS1(MQIACH_AVAILABLE_CIPHERSPECS  ),
-	DEF_VALS1(MQIACH_BATCH_DATA_LIMIT       ),
-	DEF_VALS1(MQIACH_CHANNEL_SUMMARY_ATTRS 	),
-	DEF_VALS1(MQIACH_DEF_RECONNECT          ),
-	DEF_VALS1(MQIACH_IN_DOUBT_IN            ),
-	DEF_VALS1(MQIACH_IN_DOUBT_OUT           ),
-	DEF_VALS1(MQIACH_MATCH                  ),
-	DEF_VALS1(MQIACH_MC_HB_INTERVAL         ),
-	DEF_VALS1(MQIACH_MQTT_KEEP_ALIVE        ),
-	DEF_VALS1(MQIACH_MSGS_RCVD              ),
-	DEF_VALS1(MQIACH_MSGS_RECEIVED          ),
-	DEF_VALS1(MQIACH_MSGS_SENT              ),
-	DEF_VALS1(MQIACH_MSG_HISTORY            ),
-	DEF_VALS1(MQIACH_MULTICAST_PROPERTIES   ),
-	DEF_VALS1(MQIACH_NEW_SUBSCRIBER_HISTORY ),
-	DEF_VALS1(MQIACH_PENDING_OUT            ),
-	DEF_VALS1(MQIACH_RESET_REQUESTED        ),
-	DEF_VALS1(MQIACH_USER_SOURCE            ),
-	DEF_VALS1(MQIACH_USE_CLIENT_ID          ),
-	DEF_VALS1(MQIACH_WARNING                ),
-
-	DEF_VALS1(MQIAMO64_BROWSE_BYTES         ),
-	DEF_VALS1(MQIAMO64_BYTES                ),
-	DEF_VALS1(MQIAMO64_GET_BYTES            ),
-	DEF_VALS1(MQIAMO64_PUBLISH_MSG_BYTES    ),
-	DEF_VALS1(MQIAMO64_PUT_BYTES            ),
-	DEF_VALS1(MQIAMO64_TOPIC_PUT_BYTES      ),
-	DEF_VALS1(MQIAMO64_AVG_Q_TIME           ),
-	DEF_VALS1(MQIAMO64_Q_TIME_AVG           ),
-	DEF_VALS1(MQIAMO64_Q_TIME_MAX           ),
-	DEF_VALS1(MQIAMO64_Q_TIME_MIN           ),
-	DEF_VALS1(MQIAMO64_HIGHRES_TIME         ),
-
-	DEF_VALS1(MQIAMO_AVG_BATCH_SIZE         ),
-	DEF_VALS1(MQIAMO_BACKOUTS               ),
-	DEF_VALS1(MQIAMO_BROWSES                ),
-	DEF_VALS1(MQIAMO_BROWSES_FAILED         ),
-	DEF_VALS1(MQIAMO_BROWSE_MAX_BYTES       ),
-	DEF_VALS1(MQIAMO_BROWSE_MIN_BYTES       ),
-	DEF_VALS1(MQIAMO_CBS                    ),
-	DEF_VALS1(MQIAMO_CBS_FAILED             ),
-	DEF_VALS1(MQIAMO_CLOSES                 ),
-	DEF_VALS1(MQIAMO_CLOSES_FAILED          ),
-	DEF_VALS1(MQIAMO_COMMITS                ),
-	DEF_VALS1(MQIAMO_COMMITS_FAILED         ),
-	DEF_VALS1(MQIAMO_CONNS                  ),
-	DEF_VALS1(MQIAMO_CONNS_FAILED           ),
-	DEF_VALS1(MQIAMO_CONNS_MAX              ),
-	DEF_VALS1(MQIAMO_CTLS                   ),
-	DEF_VALS1(MQIAMO_CTLS_FAILED            ),
-	DEF_VALS1(MQIAMO_DISCS                  ),
-	DEF_VALS1(MQIAMO_DISCS_IMPLICIT         ),
-	DEF_VALS1(MQIAMO_DISC_TYPE              ),
-	DEF_VALS1(MQIAMO_EXIT_TIME_AVG          ),
-	DEF_VALS1(MQIAMO_EXIT_TIME_MAX          ),
-	DEF_VALS1(MQIAMO_EXIT_TIME_MIN          ),
-	DEF_VALS1(MQIAMO_FULL_BATCHES           ),
-	DEF_VALS1(MQIAMO_GENERATED_MSGS         ),
-	DEF_VALS1(MQIAMO_GETS                   ),
-	DEF_VALS1(MQIAMO_GETS_FAILED            ),
-	DEF_VALS1(MQIAMO_GET_MAX_BYTES          ),
-	DEF_VALS1(MQIAMO_GET_MIN_BYTES          ),
-	DEF_VALS1(MQIAMO_INCOMPLETE_BATCHES     ),
-	DEF_VALS1(MQIAMO_INQS                   ),
-	DEF_VALS1(MQIAMO_INQS_FAILED            ),
-	DEF_VALS1(MQIAMO_MSGS                   ),
-	DEF_VALS1(MQIAMO_MSGS_EXPIRED           ),
-	DEF_VALS1(MQIAMO_MSGS_NOT_QUEUED        ),
-	DEF_VALS1(MQIAMO_MSGS_PURGED            ),
-	DEF_VALS1(MQIAMO_NET_TIME_AVG           ),
-	DEF_VALS1(MQIAMO_NET_TIME_MAX           ),
-	DEF_VALS1(MQIAMO_NET_TIME_MIN           ),
-	DEF_VALS1(MQIAMO_OBJECT_COUNT           ),
-	DEF_VALS1(MQIAMO_OPENS                  ),
-	DEF_VALS1(MQIAMO_OPENS_FAILED           ),
-	DEF_VALS1(MQIAMO_PUBLISH_MSG_COUNT      ),
-	DEF_VALS1(MQIAMO_PUT1S                  ),
-	DEF_VALS1(MQIAMO_PUT1S_FAILED           ),
-	DEF_VALS1(MQIAMO_PUTS                   ),
-	DEF_VALS1(MQIAMO_PUTS_FAILED            ),
-	DEF_VALS1(MQIAMO_PUT_MAX_BYTES          ),
-	DEF_VALS1(MQIAMO_PUT_MIN_BYTES          ),
-	DEF_VALS1(MQIAMO_PUT_RETRIES            ),
-	DEF_VALS1(MQIAMO_Q_MAX_DEPTH            ),
-	DEF_VALS1(MQIAMO_Q_MIN_DEPTH            ),
-	DEF_VALS1(MQIAMO_SETS                   ),
-	DEF_VALS1(MQIAMO_SETS_FAILED            ),
-	DEF_VALS1(MQIAMO_STATS                  ),
-	DEF_VALS1(MQIAMO_STATS_FAILED           ),
-	DEF_VALS1(MQIAMO_SUBRQS                 ),
-	DEF_VALS1(MQIAMO_SUBRQS_FAILED          ),
-	DEF_VALS1(MQIAMO_SUBS_DUR               ),
-	DEF_VALS1(MQIAMO_SUBS_FAILED            ),
-	DEF_VALS1(MQIAMO_SUBS_NDUR              ),
-	DEF_VALS1(MQIAMO_SUB_DUR_HIGHWATER      ),
-	DEF_VALS1(MQIAMO_SUB_DUR_LOWWATER       ),
-	DEF_VALS1(MQIAMO_SUB_NDUR_HIGHWATER     ),
-	DEF_VALS1(MQIAMO_SUB_NDUR_LOWWATER      ),
-	DEF_VALS1(MQIAMO_TOPIC_PUT1S            ),
-	DEF_VALS1(MQIAMO_TOPIC_PUT1S_FAILED     ),
-	DEF_VALS1(MQIAMO_TOPIC_PUTS             ),
-	DEF_VALS1(MQIAMO_TOPIC_PUTS_FAILED      ),
-	DEF_VALS1(MQIAMO_UNSUBS_DUR             ),
-	DEF_VALS1(MQIAMO_UNSUBS_FAILED          ),
-	DEF_VALS1(MQIAMO_UNSUBS_NDUR            ),
-	DEF_VALS2(MQIAMO_AVG_Q_TIME,"MQIAMO64_AVG_Q_TIME"),
-	DEF_VALS2(MQIAMO_Q_TIME_AVG,"MQIAMO64_Q_TIME_AVG"),
-	DEF_VALS2(MQIAMO_Q_TIME_MAX,"MQIAMO64_Q_TIME_MAX"),
-	DEF_VALS2(MQIAMO_Q_TIME_MIN,"MQIAMO64_Q_TIME_MIN"),
-	DEF_VALS1(MQIAMO_ACKS_RCVD              ),
-	DEF_VALS1(MQIAMO_ACK_FEEDBACK           ),
-	DEF_VALS1(MQIAMO_ACTIVE_ACKERS          ),
-	DEF_VALS1(MQIAMO_BYTES_SENT             ),
-	DEF_VALS1(MQIAMO_DEST_DATA_PORT         ),
-	DEF_VALS1(MQIAMO_DEST_REPAIR_PORT       ),
-	DEF_VALS1(MQIAMO_FEEDBACK_MODE          ),
-	DEF_VALS1(MQIAMO_HISTORY_PKTS           ),
-	DEF_VALS1(MQIAMO_INTERVAL               ),
-	DEF_VALS1(MQIAMO_LAST_USED              ),
-	DEF_VALS1(MQIAMO_LATE_JOIN_MARK         ),
-	DEF_VALS1(MQIAMO_MCAST_BATCH_TIME       ),
-	DEF_VALS1(MQIAMO_MCAST_HEARTBEAT        ),
-	DEF_VALS1(MQIAMO_MCAST_XMIT_RATE        ),
-	DEF_VALS1(MQIAMO_MSGS_DELIVERED         ),
-	DEF_VALS1(MQIAMO_MSGS_RCVD              ),
-	DEF_VALS1(MQIAMO_MSGS_SENT              ),
-	DEF_VALS1(MQIAMO_MSG_BYTES_RCVD         ),
-	DEF_VALS1(MQIAMO_NACKS_CREATED          ),
-	DEF_VALS1(MQIAMO_NACKS_RCVD             ),
-	DEF_VALS1(MQIAMO_NACK_FEEDBACK          ),
-	DEF_VALS1(MQIAMO_NACK_PKTS_SENT         ),
-	DEF_VALS1(MQIAMO_NUM_STREAMS            ),
-	DEF_VALS1(MQIAMO_PENDING_PKTS           ),
-	DEF_VALS1(MQIAMO_PKTS_DELIVERED         ),
-	DEF_VALS1(MQIAMO_PKTS_DROPPED           ),
-	DEF_VALS1(MQIAMO_PKTS_DUPLICATED        ),
-	DEF_VALS1(MQIAMO_PKTS_LOST              ),
-	DEF_VALS1(MQIAMO_PKTS_PROCESSED         ),
-	DEF_VALS1(MQIAMO_PKTS_REPAIRED          ),
-	DEF_VALS1(MQIAMO_PKTS_SENT              ),
-	DEF_VALS1(MQIAMO_PKT_RATE               ),
-	DEF_VALS1(MQIAMO_RELIABILITY_TYPE       ),
-	DEF_VALS1(MQIAMO_REPAIR_BYTES           ),
-	DEF_VALS1(MQIAMO_REPAIR_PKTS            ),
-	DEF_VALS1(MQIAMO_REPAIR_PKTS_RCVD       ),
-	DEF_VALS1(MQIAMO_REPAIR_PKTS_RQSTD      ),
-	DEF_VALS1(MQIAMO_TOTAL_BYTES_SENT       ),
-	DEF_VALS1(MQIAMO_TOTAL_MSGS_DELIVERED   ),
-	DEF_VALS1(MQIAMO_TOTAL_MSGS_EXPIRED     ),
-	DEF_VALS1(MQIAMO_TOTAL_MSGS_PROCESSED   ),
-	DEF_VALS1(MQIAMO_TOTAL_MSGS_RCVD        ),
-	DEF_VALS1(MQIAMO_TOTAL_MSGS_RETURNED    ),
-	DEF_VALS1(MQIAMO_TOTAL_MSGS_SELECTED    ),
-	DEF_VALS1(MQIAMO_TOTAL_MSGS_SENT        ),
-	DEF_VALS1(MQIAMO_TOTAL_MSG_BYTES_RCVD   ),
-	DEF_VALS1(MQIAMO_TOTAL_PKTS_SENT        ),
-	DEF_VALS1(MQIAMO_TOTAL_REPAIR_PKTS      ),
-	DEF_VALS1(MQIAMO_TOTAL_REPAIR_PKTS_RCVD ),
-	DEF_VALS1(MQIAMO_TOTAL_REPAIR_PKTS_RQSTD),
-
-	DEF_VALS1(MQIACH_AVAILABLE_CIPHERSPECS  ),
-	DEF_VALS1(MQIACH_BATCH_DATA_LIMIT       ),
-	DEF_VALS1(MQIACH_CHANNEL_SUMMARY_ATTRS  ),
-	DEF_VALS1(MQIACH_DEF_RECONNECT          ),
-	DEF_VALS1(MQIACH_MATCH                  ),
-	DEF_VALS2(MQIACH_MSGS_RECEIVED,"MQIACH_MSGS_RCVD"),
-	DEF_VALS1(MQIACH_MSGS_SENT              ),
-	DEF_VALS1(MQIACH_PENDING_OUT            ),
-	DEF_VALS1(MQCACH_REMOTE_VERSION         ),
-	DEF_VALS1(MQCACH_REMOTE_PRODUCT         ),
-	DEF_VALS1(MQIACH_RESET_REQUESTED        ),
-	DEF_VALS1(MQIACH_USER_SOURCE            ),
-	DEF_VALS1(MQIACH_WARNING                ),
-
-	DEF_VALS1(MQIA_ACCOUNTING_CONN_OVERRIDE ),
-	DEF_VALS1(MQIA_ACCOUNTING_INTERVAL      ),
-	DEF_VALS1(MQIA_ACCOUNTING_MQI           ),
-	DEF_VALS1(MQIA_ACCOUNTING_Q             ),
-	DEF_VALS1(MQIA_ACTIVE_CHANNELS          ),
-	DEF_VALS1(MQIA_ACTIVITY_RECORDING       ),
-	DEF_VALS1(MQIA_ADOPTNEWMCA_CHECK        ),
-	DEF_VALS1(MQIA_ADOPTNEWMCA_INTERVAL     ),
-	DEF_VALS1(MQIA_ADOPTNEWMCA_TYPE         ),
-	DEF_VALS1(MQIA_APPL_TYPE                ),
-	DEF_VALS1(MQIA_ARCHIVE                  ),
-	DEF_VALS1(MQIA_AUTHORITY_EVENT          ),
-	DEF_VALS1(MQIA_AUTH_INFO_TYPE           ),
-	DEF_VALS1(MQIA_AUTO_REORGANIZATION      ),
-	DEF_VALS1(MQIA_AUTO_REORG_INTERVAL      ),
-	DEF_VALS1(MQIA_BACKOUT_THRESHOLD        ),
-	DEF_VALS1(MQIA_BASE_TYPE                ),
-	DEF_VALS1(MQIA_BATCH_INTERFACE_AUTO     ),
-	DEF_VALS1(MQIA_BRIDGE_EVENT             ),
-	DEF_VALS1(MQIA_CF_LEVEL                 ),
-	DEF_VALS1(MQIA_CF_RECOVER               ),
-	DEF_VALS1(MQIA_CHANNEL_AUTO_DEF         ),
-	DEF_VALS1(MQIA_CHANNEL_AUTO_DEF_EVENT   ),
-	DEF_VALS1(MQIA_CHANNEL_EVENT            ),
-	DEF_VALS1(MQIA_CHINIT_ADAPTERS          ),
-	DEF_VALS1(MQIA_CHINIT_CONTROL           ),
-	DEF_VALS1(MQIA_CHINIT_DISPATCHERS       ),
-	DEF_VALS1(MQIA_CHINIT_TRACE_AUTO_START  ),
-	DEF_VALS1(MQIA_CHINIT_TRACE_TABLE_SIZE  ),
-	DEF_VALS1(MQIA_CLUSTER_Q_TYPE           ),
-	DEF_VALS1(MQIA_CLUSTER_WORKLOAD_LENGTH  ),
-	DEF_VALS1(MQIA_CLWL_MRU_CHANNELS        ),
-	DEF_VALS1(MQIA_CLWL_Q_PRIORITY          ),
-	DEF_VALS1(MQIA_CLWL_Q_RANK              ),
-	DEF_VALS1(MQIA_CLWL_USEQ                ),
-	DEF_VALS1(MQIA_CMD_SERVER_AUTO          ),
-	DEF_VALS1(MQIA_CMD_SERVER_CONTROL       ),
-	DEF_VALS1(MQIA_CMD_SERVER_CONVERT_MSG   ),
-	DEF_VALS1(MQIA_CMD_SERVER_DLQ_MSG       ),
-	DEF_VALS1(MQIA_CODED_CHAR_SET_ID        ),
-	DEF_VALS1(MQIA_COMMAND_EVENT            ),
-	DEF_VALS1(MQIA_COMMAND_LEVEL            ),
-	DEF_VALS1(MQIA_CONFIGURATION_EVENT      ),
-	DEF_VALS1(MQIA_CPI_LEVEL                ),
-	DEF_VALS1(MQIA_CURRENT_Q_DEPTH          ),
-	DEF_VALS1(MQIA_DEFINITION_TYPE          ),
-	DEF_VALS1(MQIA_DEF_BIND                 ),
-	DEF_VALS1(MQIA_DEF_INPUT_OPEN_OPTION    ),
-	DEF_VALS1(MQIA_DEF_PERSISTENCE          ),
-	DEF_VALS1(MQIA_DEF_PRIORITY             ),
-	DEF_VALS1(MQIA_DEF_PUT_RESPONSE_TYPE    ),
-	DEF_VALS1(MQIA_DEF_READ_AHEAD           ),
-	DEF_VALS1(MQIA_DIST_LISTS               ),
-	DEF_VALS1(MQIA_DNS_WLM                  ),
-	DEF_VALS1(MQIA_DURABLE_SUB              ),
-	DEF_VALS1(MQIA_EXPIRY_INTERVAL          ),
-	DEF_VALS1(MQIA_GROUP_UR                 ),
-	DEF_VALS1(MQIA_HARDEN_GET_BACKOUT       ),
-	DEF_VALS1(MQIA_HIGH_Q_DEPTH             ),
-	DEF_VALS1(MQIA_IGQ_PUT_AUTHORITY        ),
-	DEF_VALS1(MQIA_INDEX_TYPE               ),
-	DEF_VALS1(MQIA_INHIBIT_EVENT            ),
-	DEF_VALS1(MQIA_INHIBIT_GET              ),
-	DEF_VALS1(MQIA_INHIBIT_PUB              ),
-	DEF_VALS1(MQIA_INHIBIT_PUT              ),
-	DEF_VALS1(MQIA_INHIBIT_SUB              ),
-	DEF_VALS1(MQIA_INTRA_GROUP_QUEUING      ),
-	DEF_VALS1(MQIA_IP_ADDRESS_VERSION       ),
-	DEF_VALS1(MQIA_LISTENER_PORT_NUMBER     ),
-	DEF_VALS1(MQIA_LISTENER_TIMER           ),
-	DEF_VALS1(MQIA_LOCAL_EVENT              ),
-	DEF_VALS1(MQIA_LOGGER_EVENT             ),
-	DEF_VALS1(MQIA_LU62_CHANNELS            ),
-	DEF_VALS1(MQIA_MASTER_ADMIN             ),
-	DEF_VALS1(MQIA_MAX_CHANNELS             ),
-	DEF_VALS1(MQIA_MAX_CLIENTS              ),
-	DEF_VALS1(MQIA_MAX_GLOBAL_LOCKS         ),
-	DEF_VALS1(MQIA_MAX_HANDLES              ),
-	DEF_VALS1(MQIA_MAX_LOCAL_LOCKS          ),
-	DEF_VALS1(MQIA_MAX_MSG_LENGTH           ),
-	DEF_VALS1(MQIA_MAX_OPEN_Q               ),
-	DEF_VALS1(MQIA_MAX_PRIORITY             ),
-	DEF_VALS1(MQIA_MAX_PROPERTIES_LENGTH    ),
-	DEF_VALS1(MQIA_MAX_Q_DEPTH              ),
-	DEF_VALS1(MQIA_MAX_Q_TRIGGERS           ),
-	DEF_VALS1(MQIA_MAX_RECOVERY_TASKS       ),
-	DEF_VALS1(MQIA_MAX_UNCOMMITTED_MSGS     ),
-	DEF_VALS1(MQIA_MONITORING_AUTO_CLUSSDR  ),
-	DEF_VALS1(MQIA_MONITORING_CHANNEL       ),
-	DEF_VALS1(MQIA_MONITORING_Q             ),
-	DEF_VALS1(MQIA_MONITOR_INTERVAL         ),
-	DEF_VALS1(MQIA_MSG_DELIVERY_SEQUENCE    ),
-	DEF_VALS1(MQIA_MSG_DEQ_COUNT            ),
-	DEF_VALS1(MQIA_MSG_ENQ_COUNT            ),
-	DEF_VALS1(MQIA_MSG_MARK_BROWSE_INTERVAL ),
-	DEF_VALS1(MQIA_NAMELIST_TYPE            ),
-	DEF_VALS1(MQIA_NAME_COUNT               ),
-	DEF_VALS1(MQIA_NPM_CLASS                ),
-	DEF_VALS1(MQIA_NPM_DELIVERY             ),
-	DEF_VALS1(MQIA_OPEN_INPUT_COUNT         ),
-	DEF_VALS1(MQIA_OPEN_OUTPUT_COUNT        ),
-	DEF_VALS1(MQIA_OUTBOUND_PORT_MAX        ),
-	DEF_VALS1(MQIA_OUTBOUND_PORT_MIN        ),
-	DEF_VALS1(MQIA_PAGESET_ID               ),
-	DEF_VALS1(MQIA_PERFORMANCE_EVENT        ),
-	DEF_VALS1(MQIA_PLATFORM                 ),
-	DEF_VALS1(MQIA_PM_DELIVERY              ),
-	DEF_VALS1(MQIA_PROPERTY_CONTROL         ),
-	DEF_VALS1(MQIA_PROXY_SUB                ),
-	DEF_VALS1(MQIA_PUBSUB_MAXMSG_RETRY_COUNT),
-	DEF_VALS1(MQIA_PUBSUB_MODE              ),
-	DEF_VALS1(MQIA_PUBSUB_NP_MSG            ),
-	DEF_VALS1(MQIA_PUBSUB_NP_RESP           ),
-	DEF_VALS1(MQIA_PUBSUB_SYNC_PT           ),
-	DEF_VALS1(MQIA_PUB_COUNT                ),
-	DEF_VALS1(MQIA_PUB_SCOPE                ),
-	DEF_VALS1(MQIA_QMGR_CFCONLOS            ),
-	DEF_VALS1(MQIA_QMOPT_CONS_COMMS_MSGS    ),
-	DEF_VALS1(MQIA_QMOPT_CONS_CRITICAL_MSGS ),
-	DEF_VALS1(MQIA_QMOPT_CONS_ERROR_MSGS    ),
-	DEF_VALS1(MQIA_QMOPT_CONS_INFO_MSGS     ),
-	DEF_VALS1(MQIA_QMOPT_CONS_REORG_MSGS    ),
-	DEF_VALS1(MQIA_QMOPT_CONS_SYSTEM_MSGS   ),
-	DEF_VALS1(MQIA_QMOPT_CONS_WARNING_MSGS  ),
-	DEF_VALS1(MQIA_QMOPT_CSMT_ON_ERROR      ),
-	DEF_VALS1(MQIA_QMOPT_INTERNAL_DUMP      ),
-	DEF_VALS1(MQIA_QMOPT_LOG_COMMS_MSGS     ),
-	DEF_VALS1(MQIA_QMOPT_LOG_CRITICAL_MSGS  ),
-	DEF_VALS1(MQIA_QMOPT_LOG_ERROR_MSGS     ),
-	DEF_VALS1(MQIA_QMOPT_LOG_INFO_MSGS      ),
-	DEF_VALS1(MQIA_QMOPT_LOG_REORG_MSGS     ),
-	DEF_VALS1(MQIA_QMOPT_LOG_SYSTEM_MSGS    ),
-	DEF_VALS1(MQIA_QMOPT_LOG_WARNING_MSGS   ),
-	DEF_VALS1(MQIA_QMOPT_TRACE_COMMS        ),
-	DEF_VALS1(MQIA_QMOPT_TRACE_CONVERSION   ),
-	DEF_VALS1(MQIA_QMOPT_TRACE_MQI_CALLS    ),
-	DEF_VALS1(MQIA_QMOPT_TRACE_REORG        ),
-	DEF_VALS1(MQIA_QMOPT_TRACE_SYSTEM       ),
-	DEF_VALS1(MQIA_QSG_DISP                 ),
-	DEF_VALS1(MQIA_Q_DEPTH_HIGH_EVENT       ),
-	DEF_VALS1(MQIA_Q_DEPTH_HIGH_LIMIT       ),
-	DEF_VALS1(MQIA_Q_DEPTH_LOW_EVENT        ),
-	DEF_VALS1(MQIA_Q_DEPTH_LOW_LIMIT        ),
-	DEF_VALS1(MQIA_Q_DEPTH_MAX_EVENT        ),
-	DEF_VALS1(MQIA_Q_SERVICE_INTERVAL       ),
-	DEF_VALS1(MQIA_Q_SERVICE_INTERVAL_EVENT ),
-	DEF_VALS1(MQIA_Q_TYPE                   ),
-	DEF_VALS1(MQIA_Q_USERS                  ),
-	DEF_VALS1(MQIA_READ_AHEAD               ),
-	DEF_VALS1(MQIA_RECEIVE_TIMEOUT          ),
-	DEF_VALS1(MQIA_RECEIVE_TIMEOUT_MIN      ),
-	DEF_VALS1(MQIA_RECEIVE_TIMEOUT_TYPE     ),
-	DEF_VALS1(MQIA_REMOTE_EVENT             ),
-	DEF_VALS1(MQIA_RETENTION_INTERVAL       ),
-	DEF_VALS1(MQIA_SCOPE                    ),
-	DEF_VALS1(MQIA_SECURITY_CASE            ),
-	DEF_VALS1(MQIA_SERVICE_CONTROL          ),
-	DEF_VALS1(MQIA_SERVICE_TYPE             ),
-	DEF_VALS1(MQIA_SHAREABILITY             ),
-	DEF_VALS1(MQIA_SHARED_Q_Q_MGR_NAME      ),
-	DEF_VALS1(MQIA_SSL_EVENT                ),
-	DEF_VALS1(MQIA_SSL_FIPS_REQUIRED        ),
-	DEF_VALS1(MQIA_SSL_RESET_COUNT          ),
-	DEF_VALS1(MQIA_SSL_TASKS                ),
-	DEF_VALS1(MQIA_START_STOP_EVENT         ),
-	DEF_VALS1(MQIA_STATISTICS_AUTO_CLUSSDR  ),
-	DEF_VALS1(MQIA_STATISTICS_CHANNEL       ),
-	DEF_VALS1(MQIA_STATISTICS_INTERVAL      ),
-	DEF_VALS1(MQIA_STATISTICS_MQI           ),
-	DEF_VALS1(MQIA_STATISTICS_Q             ),
-	DEF_VALS1(MQIA_SUB_COUNT                ),
-	DEF_VALS1(MQIA_SUB_SCOPE                ),
-	DEF_VALS1(MQIA_SYNCPOINT                ),
-	DEF_VALS1(MQIA_TCP_CHANNELS             ),
-	DEF_VALS1(MQIA_TCP_KEEP_ALIVE           ),
-	DEF_VALS1(MQIA_TCP_STACK_TYPE           ),
-	DEF_VALS1(MQIA_TIME_SINCE_RESET         ),
-	DEF_VALS1(MQIA_TOPIC_DEF_PERSISTENCE    ),
-	DEF_VALS1(MQIA_TOPIC_TYPE               ),
-	DEF_VALS1(MQIA_TRACE_ROUTE_RECORDING    ),
-	DEF_VALS1(MQIA_TREE_LIFE_TIME           ),
-	DEF_VALS1(MQIA_TRIGGER_CONTROL          ),
-	DEF_VALS1(MQIA_TRIGGER_DEPTH            ),
-	DEF_VALS1(MQIA_TRIGGER_INTERVAL         ),
-	DEF_VALS1(MQIA_TRIGGER_MSG_PRIORITY     ),
-	DEF_VALS1(MQIA_TRIGGER_RESTART          ),
-	DEF_VALS1(MQIA_TRIGGER_TYPE             ),
-	DEF_VALS1(MQIA_UR_DISP                  ),
-	DEF_VALS1(MQIA_USAGE                    ),
-	DEF_VALS1(MQIA_USER_LIST                ),
-	DEF_VALS1(MQIA_WILDCARD_OPERATION       ),
-	DEF_VALS1(MQIA_ACTIVITY_CONN_OVERRIDE   ),
-	DEF_VALS1(MQIA_ACTIVITY_TRACE           ),
-	DEF_VALS1(MQIA_CERT_VAL_POLICY          ),
-	DEF_VALS1(MQIA_CHLAUTH_RECORDS          ),
-	DEF_VALS1(MQIA_COMM_EVENT               ),
-	DEF_VALS1(MQIA_COMM_INFO_TYPE           ),
-	DEF_VALS1(MQIA_DEF_CLUSTER_XMIT_Q_TYPE  ),
-	DEF_VALS1(MQIA_ENCRYPTION_ALGORITHM     ),
-	DEF_VALS1(MQIA_MCAST_BRIDGE             ),
-	DEF_VALS1(MQIA_MULTICAST                ),
-	DEF_VALS1(MQIA_POLICY_VERSION           ),
-	DEF_VALS1(MQIA_PROT_POLICY_CAPABILITY   ),
-	DEF_VALS1(MQIA_PUBSUB_CLUSTER           ),
-	DEF_VALS1(MQIA_SIGNATURE_ALGORITHM      ),
-	DEF_VALS1(MQIA_SUB_CONFIGURATION_EVENT  ),
-	DEF_VALS1(MQIA_SUITE_B_STRENGTH         ),
-	DEF_VALS1(MQIA_TOLERATE_UNPROTECTED     ),
-	DEF_VALS1(MQIA_USE_DEAD_LETTER_Q        ),
-	DEF_VALS1(MQIA_XR_CAPABILITY            ),
+    DEF_VALS1(MQBACF_ACCOUNTING_TOKEN       ),
+    DEF_VALS1(MQBACF_CF_LEID                ),
+    DEF_VALS1(MQBACF_CONNECTION_ID          ),
+    DEF_VALS1(MQBACF_CORREL_ID              ),
+    DEF_VALS1(MQBACF_DESTINATION_CORREL_ID  ),
+    DEF_VALS1(MQBACF_EVENT_ACCOUNTING_TOKEN ),
+    DEF_VALS1(MQBACF_EVENT_SECURITY_ID      ),
+    DEF_VALS1(MQBACF_EXTERNAL_UOW_ID        ),
+    DEF_VALS1(MQBACF_GENERIC_CONNECTION_ID  ),
+    DEF_VALS1(MQBACF_GROUP_ID               ),
+    DEF_VALS1(MQBACF_MSG_ID                 ),
+    DEF_VALS1(MQBACF_ORIGIN_UOW_ID          ),
+    DEF_VALS1(MQBACF_Q_MGR_UOW_ID           ),
+    DEF_VALS1(MQBACF_RESPONSE_ID            ),
+    DEF_VALS1(MQBACF_RESPONSE_SET           ),
+    DEF_VALS1(MQBACF_SUB_ID                 ),
+    DEF_VALS1(MQCACF_ACTIVITY_DESC          ),
+    DEF_VALS1(MQCACF_ADMIN_TOPIC_NAMES      ),
+    DEF_VALS1(MQCACF_ADMIN_TOPIC_NAMES      ),
+    DEF_VALS1(MQCACF_ALIAS_Q_NAMES          ),
+    DEF_VALS1(MQCACF_APPL_DESC              ),
+    DEF_VALS1(MQCACF_APPL_IDENTITY_DATA     ),
+    DEF_VALS1(MQCACF_APPL_NAME              ),
+    DEF_VALS1(MQCACF_APPL_ORIGIN_DATA       ),
+    DEF_VALS1(MQCACF_APPL_TAG               ),
+    DEF_VALS1(MQCACF_ASID                   ),
+    DEF_VALS1(MQCACF_AUTH_INFO_NAMES        ),
+    DEF_VALS1(MQCACF_AUTH_PROFILE_NAME      ),
+    DEF_VALS1(MQCACF_AUX_ERROR_DATA_STR_1   ),
+    DEF_VALS1(MQCACF_AUX_ERROR_DATA_STR_2   ),
+    DEF_VALS1(MQCACF_AUX_ERROR_DATA_STR_3   ),
+    DEF_VALS1(MQCACF_BACKUP_DATE            ),
+    DEF_VALS1(MQCACF_BACKUP_TIME            ),
+    DEF_VALS1(MQCACF_BRIDGE_NAME            ),
+    DEF_VALS1(MQCACF_CF_STRUC_BACKUP_END    ),
+    DEF_VALS1(MQCACF_CF_STRUC_BACKUP_START  ),
+    DEF_VALS1(MQCACF_CF_STRUC_LOG_Q_MGRS    ),
+    DEF_VALS1(MQCACF_CF_STRUC_NAMES         ),
+    DEF_VALS1(MQCACF_CHILD_Q_MGR_NAME       ),
+    DEF_VALS1(MQCACF_COMMAND_MQSC           ),
+    DEF_VALS1(MQCACF_COMMAND_SCOPE          ),
+    DEF_VALS1(MQCACF_CONFIGURATION_DATE     ),
+    DEF_VALS1(MQCACF_CONFIGURATION_TIME     ),
+    DEF_VALS1(MQCACF_CORREL_ID              ),
+    DEF_VALS1(MQCACF_CURRENT_LOG_EXTENT_NAME),
+    DEF_VALS1(MQCACF_DATA_SET_NAME          ),
+    DEF_VALS1(MQCACF_DB2_NAME               ),
+    DEF_VALS1(MQCACF_DESTINATION            ),
+    DEF_VALS1(MQCACF_DESTINATION_Q_MGR      ),
+    DEF_VALS1(MQCACF_DSG_NAME               ),
+    DEF_VALS1(MQCACF_ENTITY_NAME            ),
+    DEF_VALS1(MQCACF_ENV_INFO               ),
+    DEF_VALS1(MQCACF_ESCAPE_TEXT            ),
+    DEF_VALS1(MQCACF_EVENT_APPL_IDENTITY    ),
+    DEF_VALS1(MQCACF_EVENT_APPL_NAME        ),
+    DEF_VALS1(MQCACF_EVENT_APPL_ORIGIN      ),
+    DEF_VALS1(MQCACF_EVENT_Q_MGR            ),
+    DEF_VALS1(MQCACF_EVENT_USER_ID          ),
+    DEF_VALS1(MQCACF_FAIL_DATE              ),
+    DEF_VALS1(MQCACF_FAIL_TIME              ),
+    DEF_VALS1(MQCACF_FILTER                 ),
+    DEF_VALS1(MQCACF_FROM_AUTH_INFO_NAME    ),
+    DEF_VALS1(MQCACF_FROM_CF_STRUC_NAME     ),
+    DEF_VALS1(MQCACF_FROM_CHANNEL_NAME      ),
+    DEF_VALS1(MQCACF_FROM_LISTENER_NAME     ),
+    DEF_VALS1(MQCACF_FROM_NAMELIST_NAME     ),
+    DEF_VALS1(MQCACF_FROM_PROCESS_NAME      ),
+    DEF_VALS1(MQCACF_FROM_Q_NAME            ),
+    DEF_VALS1(MQCACF_FROM_SERVICE_NAME      ),
+    DEF_VALS1(MQCACF_FROM_STORAGE_CLASS     ),
+    DEF_VALS1(MQCACF_FROM_SUB_NAME          ),
+    DEF_VALS1(MQCACF_FROM_TOPIC_NAME        ),
+    DEF_VALS1(MQCACF_GROUP_ENTITY_NAMES     ),
+    DEF_VALS1(MQCACF_LAST_GET_DATE          ),
+    DEF_VALS1(MQCACF_LAST_GET_TIME          ),
+    DEF_VALS1(MQCACF_LAST_MSG_DATE          ),
+    DEF_VALS1(MQCACF_LAST_MSG_TIME          ),
+    DEF_VALS1(MQCACF_LAST_PUB_DATE          ),
+    DEF_VALS1(MQCACF_LAST_PUB_TIME          ),
+    DEF_VALS1(MQCACF_LAST_PUT_DATE          ),
+    DEF_VALS1(MQCACF_LAST_PUT_TIME          ),
+    DEF_VALS1(MQCACF_LOCAL_Q_NAMES          ),
+    DEF_VALS1(MQCACF_LOG_PATH               ),
+    DEF_VALS1(MQCACF_MEDIA_LOG_EXTENT_NAME  ),
+    DEF_VALS1(MQCACF_MODEL_Q_NAMES          ),
+    DEF_VALS1(MQCACF_NAMELIST_NAMES         ),
+    DEF_VALS1(MQCACF_NONE                   ),
+    DEF_VALS1(MQCACF_OBJECT_NAME            ),
+    DEF_VALS1(MQCACF_OBJECT_Q_MGR_NAME      ),
+    DEF_VALS1(MQCACF_OPERATION_DATE         ),
+    DEF_VALS1(MQCACF_OPERATION_TIME         ),
+    DEF_VALS1(MQCACF_ORIGIN_NAME            ),
+    DEF_VALS1(MQCACF_PARENT_Q_MGR_NAME      ),
+    DEF_VALS1(MQCACF_PRINCIPAL_ENTITY_NAMES ),
+    DEF_VALS1(MQCACF_PROCESS_NAMES          ),
+    DEF_VALS1(MQCACF_PSB_NAME               ),
+    DEF_VALS1(MQCACF_PST_ID                 ),
+    DEF_VALS1(MQCACF_PUBLISH_TIMESTAMP      ),
+    DEF_VALS1(MQCACF_PUT_DATE               ),
+    DEF_VALS1(MQCACF_PUT_TIME               ),
+    DEF_VALS1(MQCACF_Q_MGR_CPF              ),
+    DEF_VALS1(MQCACF_Q_MGR_UOW_ID           ),
+    DEF_VALS1(MQCACF_Q_NAMES                ),
+    DEF_VALS1(MQCACF_RECEIVER_CHANNEL_NAMES ),
+    DEF_VALS1(MQCACF_REG_CORREL_ID          ),
+    DEF_VALS1(MQCACF_REG_Q_MGR_NAME         ),
+    DEF_VALS1(MQCACF_REG_Q_NAME             ),
+    DEF_VALS1(MQCACF_REG_STREAM_NAME        ),
+    DEF_VALS1(MQCACF_REG_SUB_IDENTITY       ),
+    DEF_VALS1(MQCACF_REG_SUB_NAME           ),
+    DEF_VALS1(MQCACF_REG_SUB_USER_DATA      ),
+    DEF_VALS1(MQCACF_REG_TIME               ),
+    DEF_VALS1(MQCACF_REG_TOPIC              ),
+    DEF_VALS1(MQCACF_REG_USER_ID            ),
+    DEF_VALS1(MQCACF_REMOTE_Q_NAMES         ),
+    DEF_VALS1(MQCACF_REPLY_TO_Q             ),
+    DEF_VALS1(MQCACF_REPLY_TO_Q_MGR         ),
+    DEF_VALS1(MQCACF_REQUESTER_CHANNEL_NAMES),
+    DEF_VALS1(MQCACF_RESOLVED_Q_NAME        ),
+    DEF_VALS1(MQCACF_RESPONSE_Q_MGR_NAME    ),
+    DEF_VALS1(MQCACF_RESTART_LOG_EXTENT_NAME),
+    DEF_VALS1(MQCACF_ROUTING_FINGER_PRINT   ),
+    DEF_VALS1(MQCACF_SECURITY_PROFILE       ),
+    DEF_VALS1(MQCACF_SENDER_CHANNEL_NAMES   ),
+    DEF_VALS1(MQCACF_SERVER_CHANNEL_NAMES   ),
+    DEF_VALS1(MQCACF_SERVICE_COMPONENT      ),
+    DEF_VALS1(MQCACF_SERVICE_START_DATE     ),
+    DEF_VALS1(MQCACF_SERVICE_START_TIME     ),
+    DEF_VALS1(MQCACF_STORAGE_CLASS_NAMES    ),
+    DEF_VALS1(MQCACF_STREAM_NAME            ),
+    DEF_VALS1(MQCACF_STRING_DATA            ),
+    DEF_VALS1(MQCACF_STRUC_ID               ),
+    DEF_VALS1(MQCACF_SUBSCRIPTION_IDENTITY  ),
+    DEF_VALS1(MQCACF_SUBSCRIPTION_NAME      ),
+    DEF_VALS1(MQCACF_SUBSCRIPTION_POINT     ),
+    DEF_VALS1(MQCACF_SUBSCRIPTION_USER_DATA ),
+    DEF_VALS1(MQCACF_SUB_NAME               ),
+    DEF_VALS1(MQCACF_SUB_SELECTOR           ),
+    DEF_VALS1(MQCACF_SUB_USER_DATA          ),
+    DEF_VALS1(MQCACF_SUB_USER_ID            ),
+    DEF_VALS1(MQCACF_SUPPORTED_STREAM_NAME  ),
+    DEF_VALS1(MQCACF_SYSP_ARCHIVE_PFX1      ),
+    DEF_VALS1(MQCACF_SYSP_ARCHIVE_PFX2      ),
+    DEF_VALS1(MQCACF_SYSP_ARCHIVE_UNIT1     ),
+    DEF_VALS1(MQCACF_SYSP_ARCHIVE_UNIT2     ),
+    DEF_VALS1(MQCACF_SYSP_CMD_USER_ID       ),
+    DEF_VALS1(MQCACF_SYSP_LOG_CORREL_ID     ),
+    DEF_VALS1(MQCACF_SYSP_LOG_RBA           ),
+    DEF_VALS1(MQCACF_SYSP_OFFLINE_RBA       ),
+    DEF_VALS1(MQCACF_SYSP_OTMA_DRU_EXIT     ),
+    DEF_VALS1(MQCACF_SYSP_OTMA_GROUP        ),
+    DEF_VALS1(MQCACF_SYSP_OTMA_MEMBER       ),
+    DEF_VALS1(MQCACF_SYSP_OTMA_TPIPE_PFX    ),
+    DEF_VALS1(MQCACF_SYSP_Q_MGR_DATE        ),
+    DEF_VALS1(MQCACF_SYSP_Q_MGR_RBA         ),
+    DEF_VALS1(MQCACF_SYSP_Q_MGR_TIME        ),
+    DEF_VALS1(MQCACF_SYSP_SERVICE           ),
+    DEF_VALS1(MQCACF_SYSP_UNIT_VOLSER       ),
+    DEF_VALS1(MQCACF_SYSTEM_NAME            ),
+    DEF_VALS1(MQCACF_TASK_NUMBER            ),
+    DEF_VALS1(MQCACF_TOPIC                  ),
+    DEF_VALS1(MQCACF_TOPIC_NAMES            ),
+    DEF_VALS1(MQCACF_TO_AUTH_INFO_NAME      ),
+    DEF_VALS1(MQCACF_TO_CF_STRUC_NAME       ),
+    DEF_VALS1(MQCACF_TO_CHANNEL_NAME        ),
+    DEF_VALS1(MQCACF_TO_LISTENER_NAME       ),
+    DEF_VALS1(MQCACF_TO_NAMELIST_NAME       ),
+    DEF_VALS1(MQCACF_TO_PROCESS_NAME        ),
+    DEF_VALS1(MQCACF_TO_Q_NAME              ),
+    DEF_VALS1(MQCACF_TO_SERVICE_NAME        ),
+    DEF_VALS1(MQCACF_TO_STORAGE_CLASS       ),
+    DEF_VALS1(MQCACF_TO_SUB_NAME            ),
+    DEF_VALS1(MQCACF_TO_TOPIC_NAME          ),
+    DEF_VALS1(MQCACF_TRANSACTION_ID         ),
+    DEF_VALS1(MQCACF_UOW_LOG_EXTENT_NAME    ),
+    DEF_VALS1(MQCACF_UOW_LOG_START_DATE     ),
+    DEF_VALS1(MQCACF_UOW_LOG_START_TIME     ),
+    DEF_VALS1(MQCACF_UOW_START_DATE         ),
+    DEF_VALS1(MQCACF_UOW_START_TIME         ),
+    DEF_VALS1(MQCACF_USAGE_LOG_LRSN         ),
+    DEF_VALS1(MQCACF_USAGE_LOG_RBA          ),
+    DEF_VALS1(MQCACF_USER_IDENTIFIER        ),
+    DEF_VALS1(MQCACF_VALUE_NAME             ),
+    DEF_VALS1(MQCACF_ALTERNATE_USERID       ),
+    DEF_VALS1(MQCACF_APPL_DESC              ),
+    DEF_VALS1(MQCACF_APPL_FUNCTION          ),
+    DEF_VALS1(MQCACF_CF_OFFLOAD_SIZE1       ),
+    DEF_VALS1(MQCACF_CF_OFFLOAD_SIZE2       ),
+    DEF_VALS1(MQCACF_CF_OFFLOAD_SIZE3       ),
+    DEF_VALS1(MQCACF_CF_SMDS                ),
+    DEF_VALS1(MQCACF_CF_SMDSCONN            ),
+    DEF_VALS1(MQCACF_CF_SMDS_GENERIC_NAME   ),
+    DEF_VALS1(MQCACF_CF_STRUC_NAME          ),
+    DEF_VALS1(MQCACF_CHAR_ATTRS             ),
+    DEF_VALS1(MQCACF_DYNAMIC_Q_NAME         ),
+    DEF_VALS1(MQCACF_FROM_COMM_INFO_NAME    ),
+    DEF_VALS1(MQCACF_HOST_NAME              ),
+    DEF_VALS1(MQCACF_MQCB_NAME              ),
+    DEF_VALS1(MQCACF_OBJECT_STRING          ),
+    DEF_VALS1(MQCACF_Q_MGR_START_DATE       ),
+    DEF_VALS1(MQCACF_Q_MGR_START_TIME       ),
+    DEF_VALS1(MQCACF_RECOVERY_DATE          ),
+    DEF_VALS1(MQCACF_RECOVERY_TIME          ),
+    DEF_VALS1(MQCACF_RESOLVED_LOCAL_Q_MGR   ),
+    DEF_VALS1(MQCACF_RESOLVED_LOCAL_Q_NAME  ),
+    DEF_VALS1(MQCACF_RESOLVED_OBJECT_STRING ),
+    DEF_VALS1(MQCACF_RESOLVED_Q_MGR         ),
+    DEF_VALS1(MQCACF_ROUTING_FINGER_PRINT   ),
+    DEF_VALS1(MQCACF_SELECTION_STRING       ),
+    DEF_VALS1(MQCACF_TO_COMM_INFO_NAME      ),
+    DEF_VALS1(MQCACF_XA_INFO                ),
+    DEF_VALS1(MQCACF_XQH_PUT_DATE           ),
+    DEF_VALS1(MQCACF_XQH_PUT_TIME           ),
+    DEF_VALS1(MQCACF_XQH_REMOTE_Q_MGR       ),
+    DEF_VALS1(MQCACF_XQH_REMOTE_Q_NAME      ),
+
+    DEF_VALS1(MQCACH_CHANNEL_NAME           ),
+    DEF_VALS1(MQCACH_CHANNEL_NAMES          ),
+    DEF_VALS1(MQCACH_CHANNEL_START_DATE     ),
+    DEF_VALS1(MQCACH_CHANNEL_START_TIME     ),
+    DEF_VALS1(MQCACH_CLIENT_ID              ),
+    DEF_VALS1(MQCACH_CLIENT_USER_ID         ),
+    DEF_VALS1(MQCACH_CONNECTION_NAME        ),
+    DEF_VALS1(MQCACH_CONNECTION_NAME_LIST   ),
+    DEF_VALS1(MQCACH_CURRENT_LUWID          ),
+    DEF_VALS1(MQCACH_DESC                   ),
+    DEF_VALS1(MQCACH_FORMAT_NAME            ),
+    DEF_VALS1(MQCACH_GROUP_ADDRESS          ),
+    DEF_VALS1(MQCACH_IP_ADDRESS             ),
+    DEF_VALS1(MQCACH_JAAS_CONFIG            ),
+    DEF_VALS1(MQCACH_LAST_LUWID             ),
+    DEF_VALS1(MQCACH_LAST_MSG_DATE          ),
+    DEF_VALS1(MQCACH_LAST_MSG_TIME          ),
+    DEF_VALS1(MQCACH_LISTENER_DESC          ),
+    DEF_VALS1(MQCACH_LISTENER_NAME          ),
+    DEF_VALS1(MQCACH_LISTENER_START_DATE    ),
+    DEF_VALS1(MQCACH_LISTENER_START_TIME    ),
+    DEF_VALS1(MQCACH_LOCAL_ADDRESS          ),
+    DEF_VALS1(MQCACH_LOCAL_NAME             ),
+    DEF_VALS1(MQCACH_LU_NAME                ),
+    DEF_VALS1(MQCACH_MCA_JOB_NAME           ),
+    DEF_VALS1(MQCACH_MCA_NAME               ),
+    DEF_VALS1(MQCACH_MCA_USER_ID            ),
+    DEF_VALS1(MQCACH_MCA_USER_ID_LIST       ),
+    DEF_VALS1(MQCACH_MODE_NAME              ),
+    DEF_VALS1(MQCACH_MR_EXIT_NAME           ),
+    DEF_VALS1(MQCACH_MR_EXIT_USER_DATA      ),
+    DEF_VALS1(MQCACH_MSG_EXIT_NAME          ),
+    DEF_VALS1(MQCACH_MSG_EXIT_USER_DATA     ),
+    DEF_VALS1(MQCACH_PASSWORD               ),
+    DEF_VALS1(MQCACH_RCV_EXIT_NAME          ),
+    DEF_VALS1(MQCACH_RCV_EXIT_USER_DATA     ),
+    DEF_VALS1(MQCACH_REMOTE_APPL_TAG        ),
+    DEF_VALS1(MQCACH_REMOTE_VERSION         ),
+    DEF_VALS1(MQCACH_REMOTE_PRODUCT         ),
+    DEF_VALS1(MQCACH_SEC_EXIT_NAME          ),
+    DEF_VALS1(MQCACH_SEC_EXIT_USER_DATA     ),
+    DEF_VALS1(MQCACH_SEND_EXIT_NAME         ),
+    DEF_VALS1(MQCACH_SEND_EXIT_USER_DATA    ),
+    DEF_VALS1(MQCACH_SSL_CERT_ISSUER_NAME   ),
+    DEF_VALS1(MQCACH_SSL_CERT_USER_ID       ),
+    DEF_VALS1(MQCACH_SSL_CIPHER_SPEC        ),
+    DEF_VALS1(MQCACH_SSL_CIPHER_SUITE       ),
+    DEF_VALS1(MQCACH_SSL_HANDSHAKE_STAGE    ),
+    DEF_VALS1(MQCACH_SSL_KEY_RESET_DATE     ),
+    DEF_VALS1(MQCACH_SSL_KEY_RESET_TIME     ),
+    DEF_VALS1(MQCACH_SSL_KEY_PASSPHRASE     ),
+    DEF_VALS1(MQCACH_SSL_PEER_NAME          ),
+    DEF_VALS1(MQCACH_SSL_SHORT_PEER_NAME    ),
+    DEF_VALS1(MQCACH_TCP_NAME               ),
+    DEF_VALS1(MQCACH_TP_NAME                ),
+    DEF_VALS1(MQCACH_USER_ID                ),
+    DEF_VALS1(MQCACH_XMIT_Q_NAME            ),
+
+    DEF_VALS1(MQCAMO_CLOSE_DATE             ),
+    DEF_VALS1(MQCAMO_CLOSE_TIME             ),
+    DEF_VALS1(MQCAMO_CONN_DATE              ),
+    DEF_VALS1(MQCAMO_CONN_TIME              ),
+    DEF_VALS1(MQCAMO_DISC_DATE              ),
+    DEF_VALS1(MQCAMO_DISC_TIME              ),
+    DEF_VALS1(MQCAMO_END_DATE               ),
+    DEF_VALS1(MQCAMO_END_TIME               ),
+    DEF_VALS1(MQCAMO_OPEN_DATE              ),
+    DEF_VALS1(MQCAMO_OPEN_TIME              ),
+    DEF_VALS1(MQCAMO_START_DATE             ),
+    DEF_VALS1(MQCAMO_START_TIME             ),
+
+    DEF_VALS1(MQCA_ADMIN_TOPIC_NAME      ),
+    DEF_VALS1(MQCA_ALTERATION_DATE       ),
+    DEF_VALS1(MQCA_ALTERATION_TIME       ),
+    DEF_VALS1(MQCA_APPL_ID               ),
+    DEF_VALS1(MQCA_AUTH_INFO_CONN_NAME   ),
+    DEF_VALS1(MQCA_AUTH_INFO_DESC        ),
+    DEF_VALS1(MQCA_AUTH_INFO_NAME        ),
+    DEF_VALS1(MQCA_AUTH_INFO_OCSP_URL    ),
+    DEF_VALS1(MQCA_AUTO_REORG_CATALOG    ),
+    DEF_VALS1(MQCA_AUTO_REORG_START_TIME ),
+    DEF_VALS1(MQCA_BACKOUT_REQ_Q_NAME    ),
+    DEF_VALS2(MQCA_BASE_Q_NAME,"MQCA_BASE_OBJECT_NAME"),
+    DEF_VALS1(MQCA_BATCH_INTERFACE_ID    ),
+    DEF_VALS1(MQCA_CF_STRUC_DESC         ),
+    DEF_VALS1(MQCA_CF_STRUC_NAME         ),
+    DEF_VALS1(MQCA_CHANNEL_AUTO_DEF_EXIT ),
+    DEF_VALS1(MQCA_CHILD                 ),
+    DEF_VALS1(MQCA_CHINIT_SERVICE_PARM   ),
+    DEF_VALS1(MQCA_CICS_FILE_NAME        ),
+    DEF_VALS1(MQCA_CLUSTER_DATE          ),
+    DEF_VALS1(MQCA_CLUSTER_NAME          ),
+    DEF_VALS1(MQCA_CLUSTER_NAMELIST      ),
+    DEF_VALS1(MQCA_CLUSTER_Q_MGR_NAME    ),
+    DEF_VALS1(MQCA_CLUSTER_TIME          ),
+    DEF_VALS1(MQCA_CLUSTER_WORKLOAD_DATA ),
+    DEF_VALS1(MQCA_CLUSTER_WORKLOAD_EXIT ),
+    DEF_VALS1(MQCA_COMMAND_INPUT_Q_NAME  ),
+    DEF_VALS1(MQCA_COMMAND_REPLY_Q_NAME  ),
+    DEF_VALS1(MQCA_CREATION_DATE         ),
+    DEF_VALS1(MQCA_CREATION_TIME         ),
+    DEF_VALS1(MQCA_DEAD_LETTER_Q_NAME    ),
+    DEF_VALS1(MQCA_DEF_XMIT_Q_NAME       ),
+    DEF_VALS1(MQCA_DNS_GROUP             ),
+    DEF_VALS1(MQCA_ENV_DATA              ),
+    DEF_VALS1(MQCA_IGQ_USER_ID           ),
+    DEF_VALS1(MQCA_INITIATION_Q_NAME     ),
+    DEF_VALS1(MQCA_LDAP_PASSWORD         ),
+    DEF_VALS1(MQCA_LDAP_USER_NAME        ),
+    DEF_VALS1(MQCA_LU62_ARM_SUFFIX       ),
+    DEF_VALS1(MQCA_LU_GROUP_NAME         ),
+    DEF_VALS1(MQCA_LU_NAME               ),
+    DEF_VALS1(MQCA_MODEL_DURABLE_Q       ),
+    DEF_VALS1(MQCA_MODEL_NON_DURABLE_Q   ),
+    DEF_VALS1(MQCA_MONITOR_Q_NAME        ),
+    DEF_VALS1(MQCA_NAMELIST_DESC         ),
+    DEF_VALS1(MQCA_NAMELIST_NAME         ),
+    DEF_VALS1(MQCA_NAMES                 ),
+    DEF_VALS1(MQCA_PARENT                ),
+    DEF_VALS1(MQCA_PASS_TICKET_APPL      ),
+    DEF_VALS1(MQCA_PROCESS_DESC          ),
+    DEF_VALS1(MQCA_PROCESS_NAME          ),
+    DEF_VALS1(MQCA_QSG_NAME              ),
+    DEF_VALS1(MQCA_Q_DESC                ),
+    DEF_VALS1(MQCA_Q_MGR_DESC            ),
+    DEF_VALS1(MQCA_Q_MGR_IDENTIFIER      ),
+    DEF_VALS1(MQCA_Q_MGR_NAME            ),
+    DEF_VALS1(MQCA_Q_NAME                ),
+    DEF_VALS1(MQCA_REMOTE_Q_MGR_NAME     ),
+    DEF_VALS1(MQCA_REMOTE_Q_NAME         ),
+    DEF_VALS1(MQCA_REPOSITORY_NAME       ),
+    DEF_VALS1(MQCA_REPOSITORY_NAMELIST   ),
+    DEF_VALS1(MQCA_RESUME_DATE           ),
+    DEF_VALS1(MQCA_RESUME_TIME           ),
+    DEF_VALS1(MQCA_SERVICE_DESC          ),
+    DEF_VALS1(MQCA_SERVICE_NAME          ),
+    DEF_VALS1(MQCA_SERVICE_START_ARGS    ),
+    DEF_VALS1(MQCA_SERVICE_START_COMMAND ),
+    DEF_VALS1(MQCA_SERVICE_STOP_ARGS     ),
+    DEF_VALS1(MQCA_SERVICE_STOP_COMMAND  ),
+    DEF_VALS1(MQCA_SSL_CRL_NAMELIST      ),
+    DEF_VALS1(MQCA_SSL_CRYPTO_HARDWARE   ),
+    DEF_VALS1(MQCA_SSL_KEY_LIBRARY       ),
+    DEF_VALS1(MQCA_SSL_KEY_MEMBER        ),
+    DEF_VALS1(MQCA_SSL_KEY_REPOSITORY    ),
+    DEF_VALS1(MQCA_STDERR_DESTINATION    ),
+    DEF_VALS1(MQCA_STDOUT_DESTINATION    ),
+    DEF_VALS1(MQCA_STORAGE_CLASS         ),
+    DEF_VALS1(MQCA_STORAGE_CLASS_DESC    ),
+    DEF_VALS1(MQCA_SYSTEM_LOG_Q_NAME     ),
+    DEF_VALS1(MQCA_TCP_NAME              ),
+    DEF_VALS1(MQCA_TOPIC_DESC            ),
+    DEF_VALS1(MQCA_TOPIC_NAME            ),
+    DEF_VALS1(MQCA_TOPIC_STRING          ),
+    DEF_VALS1(MQCA_TOPIC_STRING_FILTER   ),
+    DEF_VALS1(MQCA_TPIPE_NAME            ),
+    DEF_VALS1(MQCA_TRIGGER_CHANNEL_NAME  ),
+    DEF_VALS1(MQCA_TRIGGER_DATA          ),
+    DEF_VALS1(MQCA_TRIGGER_PROGRAM_NAME  ),
+    DEF_VALS1(MQCA_TRIGGER_TERM_ID       ),
+    DEF_VALS1(MQCA_TRIGGER_TRANS_ID      ),
+    DEF_VALS1(MQCA_USER_DATA             ),
+    DEF_VALS1(MQCA_USER_LIST             ),
+    DEF_VALS1(MQCA_XCF_GROUP_NAME        ),
+    DEF_VALS1(MQCA_XCF_MEMBER_NAME       ),
+    DEF_VALS1(MQCA_XR_VERSION2           ),
+    DEF_VALS1(MQCA_XMIT_Q_NAME           ),
+    DEF_VALS1(MQCA_CHLAUTH_DESC          ),
+    DEF_VALS1(MQCA_CLUS_CHL_NAME         ),
+    DEF_VALS1(MQCA_COMM_INFO_NAME        ),
+    DEF_VALS1(MQCA_COMM_INFO_DESC        ),
+    DEF_VALS1(MQCA_CUSTOM                ),
+    DEF_VALS1(MQCA_INSTALLATION_DESC     ),
+    DEF_VALS1(MQCA_INSTALLATION_NAME     ),
+    DEF_VALS1(MQCA_INSTALLATION_PATH     ),
+    DEF_VALS1(MQCA_POLICY_NAME           ),
+    DEF_VALS1(MQCA_RECIPIENT_DN          ),
+    DEF_VALS1(MQCA_SIGNER_DN             ),
+    DEF_VALS1(MQCA_XR_VERSION            ),
+    DEF_VALS1(MQCA_XR_SSL_CIPHER_SUITES  ),
+
+    DEF_VALS1(MQGACF_ACTIVITY               ),
+    DEF_VALS1(MQGACF_APP_DIST_LIST          ),
+    DEF_VALS1(MQGACF_ACTIVITY_TRACE         ),
+    DEF_VALS1(MQGACF_CHL_STATISTICS_DATA    ),
+    DEF_VALS1(MQGACF_COMMAND_CONTEXT        ),
+    DEF_VALS1(MQGACF_COMMAND_DATA           ),
+    DEF_VALS1(MQGACF_EMBEDDED_MQMD          ),
+    DEF_VALS1(MQGACF_MESSAGE                ),
+    DEF_VALS1(MQGACF_MQMD                   ),
+    DEF_VALS1(MQGACF_OPERATION              ),
+    DEF_VALS1(MQGACF_Q_ACCOUNTING_DATA      ),
+    DEF_VALS1(MQGACF_Q_STATISTICS_DATA      ),
+    DEF_VALS1(MQGACF_TRACE_ROUTE            ),
+    DEF_VALS1(MQGACF_VALUE_NAMING           ),
+
+    DEF_VALS1(MQIACF_ACTION                 ),
+    DEF_VALS1(MQIACF_ALL                    ),
+    DEF_VALS1(MQIACF_ANONYMOUS_COUNT        ),
+    DEF_VALS1(MQIACF_APPL_COUNT             ),
+    DEF_VALS1(MQIACF_ASYNC_STATE            ),
+    DEF_VALS1(MQIACF_AUTHORIZATION_LIST     ),
+    DEF_VALS1(MQIACF_AUTH_ADD_AUTHS         ),
+    DEF_VALS1(MQIACF_AUTH_INFO_ATTRS        ),
+    DEF_VALS1(MQIACF_AUTH_OPTIONS           ),
+    DEF_VALS1(MQIACF_AUTH_PROFILE_ATTRS     ),
+    DEF_VALS1(MQIACF_AUTH_REMOVE_AUTHS      ),
+    DEF_VALS1(MQIACF_AUTH_SERVICE_ATTRS     ),
+    DEF_VALS1(MQIACF_AUX_ERROR_DATA_INT_1   ),
+    DEF_VALS1(MQIACF_AUX_ERROR_DATA_INT_2   ),
+    DEF_VALS1(MQIACF_BACKOUT_COUNT          ),
+    DEF_VALS1(MQIACF_BRIDGE_TYPE            ),
+    DEF_VALS1(MQIACF_BROKER_COUNT           ),
+    DEF_VALS1(MQIACF_BROKER_OPTIONS         ),
+    DEF_VALS1(MQIACF_BUFFER_POOL_ID         ),
+    DEF_VALS1(MQIACF_CF_STATUS_BACKUP       ),
+    DEF_VALS1(MQIACF_CF_STATUS_CONNECT      ),
+    DEF_VALS1(MQIACF_CF_STATUS_SUMMARY      ),
+    DEF_VALS1(MQIACF_CF_STATUS_TYPE         ),
+    DEF_VALS1(MQIACF_CF_STRUC_ATTRS         ),
+    DEF_VALS1(MQIACF_CF_STRUC_BACKUP_SIZE   ),
+    DEF_VALS1(MQIACF_CF_STRUC_ENTRIES_MAX   ),
+    DEF_VALS1(MQIACF_CF_STRUC_ENTRIES_USED  ),
+    DEF_VALS1(MQIACF_CF_STRUC_SIZE_MAX      ),
+    DEF_VALS1(MQIACF_CF_STRUC_SIZE_USED     ),
+    DEF_VALS1(MQIACF_CF_STRUC_STATUS        ),
+    DEF_VALS1(MQIACF_CF_STRUC_TYPE          ),
+    DEF_VALS1(MQIACF_CHANNEL_ATTRS          ),
+    DEF_VALS1(MQIACF_CHINIT_STATUS          ),
+    DEF_VALS1(MQIACF_CHLAUTH_TYPE           ),
+    DEF_VALS1(MQIACF_CLEAR_SCOPE            ),
+    DEF_VALS1(MQIACF_CLEAR_TYPE             ),
+    DEF_VALS1(MQIACF_CLUSTER_INFO           ),
+    DEF_VALS1(MQIACF_CLUSTER_Q_MGR_ATTRS    ),
+    DEF_VALS1(MQIACF_CMDSCOPE_Q_MGR_COUNT   ),
+    DEF_VALS1(MQIACF_CMD_SERVER_STATUS      ),
+    DEF_VALS1(MQIACF_COMMAND                ),
+    DEF_VALS1(MQIACF_COMMAND_INFO           ),
+    DEF_VALS1(MQIACF_COMP_CODE              ),
+    DEF_VALS1(MQIACF_CONFIGURATION_EVENTS   ),
+    DEF_VALS1(MQIACF_CONFIGURATION_OBJECTS  ),
+    DEF_VALS1(MQIACF_CONNECTION_ATTRS       ),
+    DEF_VALS1(MQIACF_CONNECTION_COUNT       ),
+    DEF_VALS1(MQIACF_CONNECT_OPTIONS        ),
+    DEF_VALS1(MQIACF_CONN_INFO_ALL          ),
+    DEF_VALS1(MQIACF_CONN_INFO_CONN         ),
+    DEF_VALS1(MQIACF_CONN_INFO_HANDLE       ),
+    DEF_VALS1(MQIACF_CONN_INFO_TYPE         ),
+    DEF_VALS1(MQIACF_CONV_REASON_CODE       ),
+    DEF_VALS1(MQIACF_DB2_CONN_STATUS        ),
+    DEF_VALS1(MQIACF_DELETE_OPTIONS         ),
+    DEF_VALS1(MQIACF_DESTINATION_CLASS      ),
+    DEF_VALS1(MQIACF_DISCONTINUITY_COUNT    ),
+    DEF_VALS1(MQIACF_DURABLE_SUBSCRIPTION   ),
+    DEF_VALS1(MQIACF_ENCODING               ),
+    DEF_VALS1(MQIACF_ENTITY_TYPE            ),
+    DEF_VALS2(MQIACF_ERROR_IDENTIFIER,"MQIACF_ERROR_ID"),
+    DEF_VALS1(MQIACF_ERROR_OFFSET           ),
+    DEF_VALS1(MQIACF_ESCAPE_TYPE            ),
+    DEF_VALS1(MQIACF_EVENT_APPL_TYPE        ),
+    DEF_VALS1(MQIACF_EVENT_ORIGIN           ),
+    DEF_VALS1(MQIACF_EXCLUDE_INTERVAL       ),
+    DEF_VALS1(MQIACF_EXPIRY                 ),
+    DEF_VALS1(MQIACF_EXPIRY_Q_COUNT         ),
+    DEF_VALS1(MQIACF_FEEDBACK               ),
+    DEF_VALS1(MQIACF_FORCE                  ),
+    DEF_VALS1(MQIACF_GROUPUR_CHECK_ID       ),
+    DEF_VALS1(MQIACF_HANDLE_STATE           ),
+    DEF_VALS1(MQIACF_INQUIRY                ),
+    DEF_VALS1(MQIACF_INTEGER_DATA           ),
+    DEF_VALS1(MQIACF_INTERFACE_VERSION      ),
+    DEF_VALS1(MQIACF_LISTENER_ATTRS         ),
+    DEF_VALS1(MQIACF_LISTENER_STATUS_ATTRS  ),
+    DEF_VALS1(MQIACF_LOG_COMPRESSION        ),
+    DEF_VALS1(MQIACF_MAX_ACTIVITIES         ),
+    DEF_VALS1(MQIACF_MESSAGE_COUNT          ),
+    DEF_VALS2(MQIACF_MODE,"MQIACF_QUIESCE"),
+    DEF_VALS1(MQIACF_MONITORING             ),
+    DEF_VALS1(MQIACF_MOVE_COUNT             ),
+    DEF_VALS1(MQIACF_MOVE_TYPE              ),
+    DEF_VALS1(MQIACF_MOVE_TYPE_ADD          ),
+    DEF_VALS1(MQIACF_MOVE_TYPE_MOVE         ),
+    DEF_VALS1(MQIACF_MSG_FLAGS              ),
+    DEF_VALS1(MQIACF_MSG_LENGTH             ),
+    DEF_VALS1(MQIACF_MSG_TYPE               ),
+    DEF_VALS1(MQIACF_MULC_CAPTURE           ),
+    DEF_VALS1(MQIACF_NAMELIST_ATTRS         ),
+    DEF_VALS1(MQIACF_OBJECT_TYPE            ),
+    DEF_VALS1(MQIACF_OBSOLETE_MSGS          ),
+    DEF_VALS1(MQIACF_OFFSET                 ),
+    DEF_VALS1(MQIACF_OLDEST_MSG_AGE         ),
+    DEF_VALS1(MQIACF_OPEN_BROWSE            ),
+    DEF_VALS1(MQIACF_OPEN_INPUT_TYPE        ),
+    DEF_VALS1(MQIACF_OPEN_INQUIRE           ),
+    DEF_VALS1(MQIACF_OPEN_OPTIONS           ),
+    DEF_VALS1(MQIACF_OPEN_OUTPUT            ),
+    DEF_VALS1(MQIACF_OPEN_SET               ),
+    DEF_VALS1(MQIACF_OPEN_TYPE              ),
+    DEF_VALS1(MQIACF_OPERATION_MODE         ),
+    DEF_VALS1(MQIACF_OPERATION_TYPE         ),
+    DEF_VALS1(MQIACF_OPTIONS                ),
+    DEF_VALS1(MQIACF_ORIGINAL_LENGTH        ),
+    DEF_VALS1(MQIACF_PAGESET_STATUS         ),
+    DEF_VALS1(MQIACF_PARAMETER_ID           ),
+    DEF_VALS1(MQIACF_PERMIT_STANDBY         ),
+    DEF_VALS1(MQIACF_PERSISTENCE            ),
+    DEF_VALS1(MQIACF_PRIORITY               ),
+    DEF_VALS1(MQIACF_PROCESS_ATTRS          ),
+    DEF_VALS1(MQIACF_PROCESS_ID             ),
+    DEF_VALS1(MQIACF_PS_STATUS_TYPE         ),
+    DEF_VALS1(MQIACF_PUBLICATION_OPTIONS    ),
+    DEF_VALS1(MQIACF_PUBLISH_COUNT          ),
+    DEF_VALS1(MQIACF_PUBSUB_PROPERTIES      ),
+    DEF_VALS1(MQIACF_PUBSUB_STATUS          ),
+    DEF_VALS1(MQIACF_PUBSUB_STATUS_ATTRS    ),
+    DEF_VALS1(MQIACF_PUB_PRIORITY           ),
+    DEF_VALS1(MQIACF_PURGE                  ),
+    DEF_VALS1(MQIACF_QSG_DISPS              ),
+    DEF_VALS1(MQIACF_Q_ATTRS                ),
+    DEF_VALS1(MQIACF_Q_HANDLE               ),
+    DEF_VALS1(MQIACF_Q_MGR_ATTRS            ),
+    DEF_VALS1(MQIACF_Q_MGR_CLUSTER          ),
+    DEF_VALS1(MQIACF_Q_MGR_DEFINITION_TYPE  ),
+    DEF_VALS1(MQIACF_Q_MGR_DQM              ),
+    DEF_VALS1(MQIACF_Q_MGR_EVENT            ),
+    DEF_VALS1(MQIACF_Q_MGR_FACILITY         ),
+    DEF_VALS1(MQIACF_Q_MGR_NUMBER           ),
+    DEF_VALS1(MQIACF_Q_MGR_PUBSUB           ),
+    DEF_VALS1(MQIACF_Q_MGR_STATUS           ),
+    DEF_VALS1(MQIACF_Q_MGR_STATUS_ATTRS     ),
+    DEF_VALS1(MQIACF_Q_MGR_SYSTEM           ),
+    DEF_VALS1(MQIACF_Q_MGR_TYPE             ),
+    DEF_VALS1(MQIACF_Q_MGR_VERSION          ),
+    DEF_VALS1(MQIACF_Q_STATUS               ),
+    DEF_VALS1(MQIACF_Q_STATUS_ATTRS         ),
+    DEF_VALS1(MQIACF_Q_STATUS_TYPE          ),
+    DEF_VALS1(MQIACF_Q_TIME_INDICATOR       ),
+    DEF_VALS1(MQIACF_Q_TYPES                ),
+    DEF_VALS1(MQIACF_REASON_CODE            ),
+    DEF_VALS1(MQIACF_REASON_QUALIFIER       ),
+    DEF_VALS1(MQIACF_RECORDED_ACTIVITIES    ),
+    DEF_VALS1(MQIACF_REFRESH_INTERVAL       ),
+    DEF_VALS1(MQIACF_REFRESH_REPOSITORY     ),
+    DEF_VALS1(MQIACF_REFRESH_TYPE           ),
+    DEF_VALS1(MQIACF_REGISTRATION_OPTIONS   ),
+    DEF_VALS1(MQIACF_REG_REG_OPTIONS        ),
+    DEF_VALS1(MQIACF_REMOVE_QUEUES          ),
+    DEF_VALS1(MQIACF_REPLACE                ),
+    DEF_VALS1(MQIACF_REPORT                 ),
+    DEF_VALS1(MQIACF_REQUEST_ONLY           ),
+    DEF_VALS1(MQIACF_RETAINED_PUBLICATION   ),
+    DEF_VALS1(MQIACF_ROUTE_ACCUMULATION     ),
+    DEF_VALS1(MQIACF_ROUTE_DELIVERY         ),
+    DEF_VALS1(MQIACF_ROUTE_DETAIL           ),
+    DEF_VALS1(MQIACF_ROUTE_FORWARDING       ),
+    DEF_VALS1(MQIACF_SECURITY_ATTRS         ),
+    DEF_VALS1(MQIACF_SECURITY_INTERVAL      ),
+    DEF_VALS1(MQIACF_SECURITY_ITEM          ),
+    DEF_VALS1(MQIACF_SECURITY_SETTING       ),
+    DEF_VALS1(MQIACF_SECURITY_SWITCH        ),
+    DEF_VALS1(MQIACF_SECURITY_TIMEOUT       ),
+    DEF_VALS1(MQIACF_SECURITY_TYPE          ),
+    DEF_VALS1(MQIACF_SELECTOR               ),
+    DEF_VALS1(MQIACF_SELECTOR_TYPE          ),
+    DEF_VALS1(MQIACF_SEQUENCE_NUMBER        ),
+    DEF_VALS1(MQIACF_SERVICE_ATTRS          ),
+    DEF_VALS1(MQIACF_SERVICE_STATUS         ),
+    DEF_VALS1(MQIACF_SERVICE_STATUS_ATTRS   ),
+    DEF_VALS1(MQIACF_STORAGE_CLASS_ATTRS    ),
+    DEF_VALS1(MQIACF_SUBSCRIPTION_SCOPE     ),
+    DEF_VALS1(MQIACF_SUB_ATTRS              ),
+    DEF_VALS1(MQIACF_SUB_LEVEL              ),
+    DEF_VALS1(MQIACF_SUB_OPTIONS            ),
+    DEF_VALS1(MQIACF_SUB_STATUS_ATTRS       ),
+    DEF_VALS1(MQIACF_SUB_SUMMARY            ),
+    DEF_VALS1(MQIACF_SUB_TYPE               ),
+    DEF_VALS1(MQIACF_SUSPEND                ),
+    DEF_VALS1(MQIACF_SYSP_ALLOC_PRIMARY     ),
+    DEF_VALS1(MQIACF_SYSP_ALLOC_SECONDARY   ),
+    DEF_VALS1(MQIACF_SYSP_ALLOC_UNIT        ),
+    DEF_VALS1(MQIACF_SYSP_ARCHIVE           ),
+    DEF_VALS1(MQIACF_SYSP_ARCHIVE_RETAIN    ),
+    DEF_VALS1(MQIACF_SYSP_ARCHIVE_WTOR      ),
+    DEF_VALS1(MQIACF_SYSP_BLOCK_SIZE        ),
+    DEF_VALS1(MQIACF_SYSP_CATALOG           ),
+    DEF_VALS1(MQIACF_SYSP_CHKPOINT_COUNT    ),
+    DEF_VALS1(MQIACF_SYSP_CLUSTER_CACHE     ),
+    DEF_VALS1(MQIACF_SYSP_COMPACT           ),
+    DEF_VALS1(MQIACF_SYSP_DB2_BLOB_TASKS    ),
+    DEF_VALS1(MQIACF_SYSP_DB2_TASKS         ),
+    DEF_VALS1(MQIACF_SYSP_DEALLOC_INTERVAL  ),
+    DEF_VALS1(MQIACF_SYSP_DUAL_ACTIVE       ),
+    DEF_VALS1(MQIACF_SYSP_DUAL_ARCHIVE      ),
+    DEF_VALS1(MQIACF_SYSP_DUAL_BSDS         ),
+    DEF_VALS1(MQIACF_SYSP_EXIT_INTERVAL     ),
+    DEF_VALS1(MQIACF_SYSP_EXIT_TASKS        ),
+    DEF_VALS1(MQIACF_SYSP_FULL_LOGS         ),
+    DEF_VALS1(MQIACF_SYSP_IN_BUFFER_SIZE    ),
+    DEF_VALS1(MQIACF_SYSP_LOG_COPY          ),
+    DEF_VALS1(MQIACF_SYSP_LOG_SUSPEND       ),
+    DEF_VALS1(MQIACF_SYSP_LOG_USED          ),
+    DEF_VALS1(MQIACF_SYSP_MAX_ARCHIVE       ),
+    DEF_VALS1(MQIACF_SYSP_MAX_CONNS         ),
+    DEF_VALS1(MQIACF_SYSP_MAX_CONNS_BACK    ),
+    DEF_VALS1(MQIACF_SYSP_MAX_CONNS_FORE    ),
+    DEF_VALS1(MQIACF_SYSP_MAX_READ_TAPES    ),
+    DEF_VALS1(MQIACF_SYSP_OFFLOAD_STATUS    ),
+    DEF_VALS1(MQIACF_SYSP_OTMA_INTERVAL     ),
+    DEF_VALS1(MQIACF_SYSP_OUT_BUFFER_COUNT  ),
+    DEF_VALS1(MQIACF_SYSP_OUT_BUFFER_SIZE   ),
+    DEF_VALS1(MQIACF_SYSP_PROTECT           ),
+    DEF_VALS1(MQIACF_SYSP_QUIESCE_INTERVAL  ),
+    DEF_VALS1(MQIACF_SYSP_Q_INDEX_DEFER     ),
+    DEF_VALS1(MQIACF_SYSP_RESLEVEL_AUDIT    ),
+    DEF_VALS1(MQIACF_SYSP_ROUTING_CODE      ),
+    DEF_VALS1(MQIACF_SYSP_SMF_ACCOUNTING    ),
+    DEF_VALS1(MQIACF_SYSP_SMF_INTERVAL      ),
+    DEF_VALS1(MQIACF_SYSP_SMF_STATS         ),
+    DEF_VALS1(MQIACF_SYSP_TIMESTAMP         ),
+    DEF_VALS1(MQIACF_SYSP_TOTAL_LOGS        ),
+    DEF_VALS1(MQIACF_SYSP_TRACE_CLASS       ),
+    DEF_VALS1(MQIACF_SYSP_TRACE_SIZE        ),
+    DEF_VALS1(MQIACF_SYSP_TYPE              ),
+    DEF_VALS1(MQIACF_SYSP_UNIT_ADDRESS      ),
+    DEF_VALS1(MQIACF_SYSP_UNIT_STATUS       ),
+    DEF_VALS1(MQIACF_SYSP_WLM_INTERVAL      ),
+    DEF_VALS1(MQIACF_SYSP_WLM_INT_UNITS     ),
+    DEF_VALS1(MQIACF_THREAD_ID              ),
+    DEF_VALS1(MQIACF_TOPIC_ATTRS            ),
+    DEF_VALS1(MQIACF_TOPIC_PUB              ),
+    DEF_VALS1(MQIACF_TOPIC_STATUS           ),
+    DEF_VALS1(MQIACF_TOPIC_STATUS_ATTRS     ),
+    DEF_VALS1(MQIACF_TOPIC_STATUS_TYPE      ),
+    DEF_VALS1(MQIACF_TOPIC_SUB              ),
+    DEF_VALS1(MQIACF_UNCOMMITTED_MSGS       ),
+    DEF_VALS1(MQIACF_UNRECORDED_ACTIVITIES  ),
+    DEF_VALS1(MQIACF_UOW_STATE              ),
+    DEF_VALS1(MQIACF_UOW_TYPE               ),
+    DEF_VALS1(MQIACF_USAGE_BUFFER_POOL      ),
+    DEF_VALS1(MQIACF_USAGE_DATA_SET         ),
+    DEF_VALS1(MQIACF_USAGE_DATA_SET_TYPE    ),
+    DEF_VALS1(MQIACF_USAGE_EXPAND_COUNT     ),
+    DEF_VALS1(MQIACF_USAGE_EXPAND_TYPE      ),
+    DEF_VALS1(MQIACF_USAGE_NONPERSIST_PAGES ),
+    DEF_VALS1(MQIACF_USAGE_PAGESET          ),
+    DEF_VALS1(MQIACF_USAGE_PERSIST_PAGES    ),
+    DEF_VALS1(MQIACF_USAGE_RESTART_EXTENTS  ),
+    DEF_VALS1(MQIACF_USAGE_TOTAL_BUFFERS    ),
+    DEF_VALS1(MQIACF_USAGE_TOTAL_PAGES      ),
+    DEF_VALS1(MQIACF_USAGE_TYPE             ),
+    DEF_VALS1(MQIACF_USAGE_UNUSED_PAGES     ),
+    DEF_VALS1(MQIACF_USER_ID_SUPPORT        ),
+    DEF_VALS1(MQIACF_VARIABLE_USER_ID       ),
+    DEF_VALS1(MQIACF_VERSION                ),
+    DEF_VALS1(MQIACF_WAIT_INTERVAL          ),
+    DEF_VALS1(MQIACF_WILDCARD_SCHEMA        ),
+    DEF_VALS1(MQIACF_MCAST_REL_INDICATOR    ),
+
+    DEF_VALS1(MQIACH_ACTIVE_CHL             ),
+    DEF_VALS1(MQIACH_ACTIVE_CHL_MAX         ),
+    DEF_VALS1(MQIACH_ACTIVE_CHL_PAUSED      ),
+    DEF_VALS1(MQIACH_ACTIVE_CHL_RETRY       ),
+    DEF_VALS1(MQIACH_ACTIVE_CHL_STARTED     ),
+    DEF_VALS1(MQIACH_ACTIVE_CHL_STOPPED     ),
+    DEF_VALS1(MQIACH_ADAPS_MAX              ),
+    DEF_VALS1(MQIACH_ADAPS_STARTED          ),
+    DEF_VALS1(MQIACH_ADAPTER                ),
+    DEF_VALS1(MQIACH_ALLOC_FAST_TIMER       ),
+    DEF_VALS1(MQIACH_ALLOC_RETRY            ),
+    DEF_VALS1(MQIACH_ALLOC_SLOW_TIMER       ),
+    DEF_VALS1(MQIACH_BACKLOG                ),
+    DEF_VALS1(MQIACH_BATCHES                ),
+    DEF_VALS1(MQIACH_BATCH_HB               ),
+    DEF_VALS1(MQIACH_BATCH_INTERVAL         ),
+    DEF_VALS1(MQIACH_BATCH_SIZE             ),
+    DEF_VALS1(MQIACH_BATCH_SIZE_INDICATOR   ),
+    DEF_VALS1(MQIACH_BUFFERS_SENT           ),
+    DEF_VALS1(MQIACH_BYTES_SENT             ),
+    DEF_VALS1(MQIACH_CHANNEL_DISP           ),
+    DEF_VALS1(MQIACH_CHANNEL_ERROR_DATA     ),
+    DEF_VALS1(MQIACH_CHANNEL_INSTANCE_ATTRS ),
+    DEF_VALS1(MQIACH_CHANNEL_INSTANCE_TYPE  ),
+    DEF_VALS1(MQIACH_CHANNEL_STATUS         ),
+    DEF_VALS1(MQIACH_CHANNEL_SUBSTATE       ),
+    DEF_VALS1(MQIACH_CHANNEL_TABLE          ),
+    DEF_VALS1(MQIACH_CHANNEL_TYPE           ),
+    DEF_VALS1(MQIACH_CHANNEL_TYPES          ),
+    DEF_VALS1(MQIACH_CLIENT_CHANNEL_WEIGHT  ),
+    DEF_VALS1(MQIACH_CLWL_CHANNEL_PRIORITY  ),
+    DEF_VALS1(MQIACH_CLWL_CHANNEL_RANK      ),
+    DEF_VALS1(MQIACH_CLWL_CHANNEL_WEIGHT    ),
+    DEF_VALS1(MQIACH_COMMAND_COUNT          ),
+    DEF_VALS1(MQIACH_COMPRESSION_RATE       ),
+    DEF_VALS1(MQIACH_COMPRESSION_TIME       ),
+    DEF_VALS1(MQIACH_CONNECTION_AFFINITY    ),
+    DEF_VALS1(MQIACH_CURRENT_CHL            ),
+    DEF_VALS1(MQIACH_CURRENT_CHL_LU62       ),
+    DEF_VALS1(MQIACH_CURRENT_CHL_MAX        ),
+    DEF_VALS1(MQIACH_CURRENT_CHL_TCP        ),
+    DEF_VALS1(MQIACH_CURRENT_MSGS           ),
+    DEF_VALS1(MQIACH_CURRENT_SHARING_CONVS  ),
+    DEF_VALS1(MQIACH_DATA_CONVERSION        ),
+    DEF_VALS1(MQIACH_DATA_COUNT             ),
+    DEF_VALS1(MQIACH_DEF_CHANNEL_DISP       ),
+    DEF_VALS1(MQIACH_DISC_INTERVAL          ),
+    DEF_VALS1(MQIACH_DISC_RETRY             ),
+    DEF_VALS1(MQIACH_DISPS_MAX              ),
+    DEF_VALS1(MQIACH_DISPS_STARTED          ),
+    DEF_VALS1(MQIACH_EXIT_TIME_INDICATOR    ),
+    DEF_VALS1(MQIACH_HB_INTERVAL            ),
+    DEF_VALS1(MQIACH_HDR_COMPRESSION        ),
+    DEF_VALS1(MQIACH_INBOUND_DISP           ),
+    DEF_VALS1(MQIACH_INDOUBT_STATUS         ),
+    DEF_VALS1(MQIACH_IN_DOUBT               ),
+    DEF_VALS1(MQIACH_KEEP_ALIVE_INTERVAL    ),
+    DEF_VALS1(MQIACH_LISTENER_CONTROL       ),
+    DEF_VALS1(MQIACH_LISTENER_STATUS        ),
+    DEF_VALS1(MQIACH_LONG_RETRIES_LEFT      ),
+    DEF_VALS1(MQIACH_LONG_RETRY             ),
+    DEF_VALS1(MQIACH_LONG_TIMER             ),
+    DEF_VALS1(MQIACH_MAX_INSTANCES          ),
+    DEF_VALS1(MQIACH_MAX_INSTS_PER_CLIENT   ),
+    DEF_VALS1(MQIACH_MAX_MSG_LENGTH         ),
+    DEF_VALS1(MQIACH_MAX_SHARING_CONVS      ),
+    DEF_VALS1(MQIACH_MAX_XMIT_SIZE          ),
+    DEF_VALS1(MQIACH_MCA_STATUS             ),
+    DEF_VALS1(MQIACH_MCA_TYPE               ),
+    DEF_VALS1(MQIACH_MR_COUNT               ),
+    DEF_VALS1(MQIACH_MR_INTERVAL            ),
+    DEF_VALS1(MQIACH_MSGS                   ),
+    DEF_VALS1(MQIACH_MSG_COMPRESSION        ),
+    DEF_VALS1(MQIACH_MSG_SEQUENCE_NUMBER    ),
+    DEF_VALS1(MQIACH_NAME_COUNT             ),
+    DEF_VALS1(MQIACH_NETWORK_PRIORITY       ),
+    DEF_VALS1(MQIACH_NETWORK_TIME_INDICATOR ),
+    DEF_VALS1(MQIACH_NPM_SPEED              ),
+    DEF_VALS1(MQIACH_PORT                   ),
+    DEF_VALS1(MQIACH_PORT_NUMBER            ),
+    DEF_VALS1(MQIACH_PUT_AUTHORITY          ),
+    DEF_VALS1(MQIACH_SEQUENCE_NUMBER_WRAP   ),
+    DEF_VALS1(MQIACH_SESSION_COUNT          ),
+    DEF_VALS1(MQIACH_SHARED_CHL_RESTART     ),
+    DEF_VALS1(MQIACH_SHARING_CONVERSATIONS  ),
+    DEF_VALS1(MQIACH_SHORT_RETRIES_LEFT     ),
+    DEF_VALS1(MQIACH_SHORT_RETRY            ),
+    DEF_VALS1(MQIACH_SHORT_TIMER            ),
+    DEF_VALS1(MQIACH_SOCKET                 ),
+    DEF_VALS1(MQIACH_SSLTASKS_MAX           ),
+    DEF_VALS1(MQIACH_SSLTASKS_STARTED       ),
+    DEF_VALS1(MQIACH_SSL_CLIENT_AUTH        ),
+    DEF_VALS1(MQIACH_SSL_KEY_RESETS         ),
+    DEF_VALS1(MQIACH_SSL_RETURN_CODE        ),
+    DEF_VALS1(MQIACH_STOP_REQUESTED         ),
+    DEF_VALS1(MQIACH_XMITQ_MSGS_AVAILABLE   ),
+    DEF_VALS1(MQIACH_XMITQ_TIME_INDICATOR   ),
+    DEF_VALS1(MQIACH_XMIT_PROTOCOL_TYPE     ),
+    DEF_VALS2(MQIACH_BUFFERS_RECEIVED,"MQIACH_BUFFERS_RCVD"),
+    DEF_VALS2(MQIACH_BYTES_RECEIVED,"MQIACH_BYTES_RCVD"),
+    DEF_VALS2(MQIACH_CURRENT_SEQUENCE_NUMBER,"MQIACH_CURRENT_SEQ_NUMBER"),
+    DEF_VALS2(MQIACH_LAST_SEQUENCE_NUMBER, "MQIACH_LAST_SEQ_NUMBER"),
+    DEF_VALS1(MQIACH_AVAILABLE_CIPHERSPECS  ),
+    DEF_VALS1(MQIACH_BATCH_DATA_LIMIT       ),
+    DEF_VALS1(MQIACH_CHANNEL_SUMMARY_ATTRS  ),
+    DEF_VALS1(MQIACH_DEF_RECONNECT          ),
+    DEF_VALS1(MQIACH_IN_DOUBT_IN            ),
+    DEF_VALS1(MQIACH_IN_DOUBT_OUT           ),
+    DEF_VALS1(MQIACH_MATCH                  ),
+    DEF_VALS1(MQIACH_MC_HB_INTERVAL         ),
+    DEF_VALS1(MQIACH_MQTT_KEEP_ALIVE        ),
+    DEF_VALS1(MQIACH_MSGS_RCVD              ),
+    DEF_VALS1(MQIACH_MSGS_RECEIVED          ),
+    DEF_VALS1(MQIACH_MSGS_SENT              ),
+    DEF_VALS1(MQIACH_MSG_HISTORY            ),
+    DEF_VALS1(MQIACH_MULTICAST_PROPERTIES   ),
+    DEF_VALS1(MQIACH_NEW_SUBSCRIBER_HISTORY ),
+    DEF_VALS1(MQIACH_PENDING_OUT            ),
+    DEF_VALS1(MQIACH_RESET_REQUESTED        ),
+    DEF_VALS1(MQIACH_USER_SOURCE            ),
+    DEF_VALS1(MQIACH_USE_CLIENT_ID          ),
+    DEF_VALS1(MQIACH_WARNING                ),
+
+    DEF_VALS1(MQIAMO64_BROWSE_BYTES         ),
+    DEF_VALS1(MQIAMO64_BYTES                ),
+    DEF_VALS1(MQIAMO64_GET_BYTES            ),
+    DEF_VALS1(MQIAMO64_PUBLISH_MSG_BYTES    ),
+    DEF_VALS1(MQIAMO64_PUT_BYTES            ),
+    DEF_VALS1(MQIAMO64_TOPIC_PUT_BYTES      ),
+    DEF_VALS1(MQIAMO64_AVG_Q_TIME           ),
+    DEF_VALS1(MQIAMO64_Q_TIME_AVG           ),
+    DEF_VALS1(MQIAMO64_Q_TIME_MAX           ),
+    DEF_VALS1(MQIAMO64_Q_TIME_MIN           ),
+    DEF_VALS1(MQIAMO64_HIGHRES_TIME         ),
+
+    DEF_VALS1(MQIAMO_AVG_BATCH_SIZE         ),
+    DEF_VALS1(MQIAMO_BACKOUTS               ),
+    DEF_VALS1(MQIAMO_BROWSES                ),
+    DEF_VALS1(MQIAMO_BROWSES_FAILED         ),
+    DEF_VALS1(MQIAMO_BROWSE_MAX_BYTES       ),
+    DEF_VALS1(MQIAMO_BROWSE_MIN_BYTES       ),
+    DEF_VALS1(MQIAMO_CBS                    ),
+    DEF_VALS1(MQIAMO_CBS_FAILED             ),
+    DEF_VALS1(MQIAMO_CLOSES                 ),
+    DEF_VALS1(MQIAMO_CLOSES_FAILED          ),
+    DEF_VALS1(MQIAMO_COMMITS                ),
+    DEF_VALS1(MQIAMO_COMMITS_FAILED         ),
+    DEF_VALS1(MQIAMO_CONNS                  ),
+    DEF_VALS1(MQIAMO_CONNS_FAILED           ),
+    DEF_VALS1(MQIAMO_CONNS_MAX              ),
+    DEF_VALS1(MQIAMO_CTLS                   ),
+    DEF_VALS1(MQIAMO_CTLS_FAILED            ),
+    DEF_VALS1(MQIAMO_DISCS                  ),
+    DEF_VALS1(MQIAMO_DISCS_IMPLICIT         ),
+    DEF_VALS1(MQIAMO_DISC_TYPE              ),
+    DEF_VALS1(MQIAMO_EXIT_TIME_AVG          ),
+    DEF_VALS1(MQIAMO_EXIT_TIME_MAX          ),
+    DEF_VALS1(MQIAMO_EXIT_TIME_MIN          ),
+    DEF_VALS1(MQIAMO_FULL_BATCHES           ),
+    DEF_VALS1(MQIAMO_GENERATED_MSGS         ),
+    DEF_VALS1(MQIAMO_GETS                   ),
+    DEF_VALS1(MQIAMO_GETS_FAILED            ),
+    DEF_VALS1(MQIAMO_GET_MAX_BYTES          ),
+    DEF_VALS1(MQIAMO_GET_MIN_BYTES          ),
+    DEF_VALS1(MQIAMO_INCOMPLETE_BATCHES     ),
+    DEF_VALS1(MQIAMO_INQS                   ),
+    DEF_VALS1(MQIAMO_INQS_FAILED            ),
+    DEF_VALS1(MQIAMO_MSGS                   ),
+    DEF_VALS1(MQIAMO_MSGS_EXPIRED           ),
+    DEF_VALS1(MQIAMO_MSGS_NOT_QUEUED        ),
+    DEF_VALS1(MQIAMO_MSGS_PURGED            ),
+    DEF_VALS1(MQIAMO_NET_TIME_AVG           ),
+    DEF_VALS1(MQIAMO_NET_TIME_MAX           ),
+    DEF_VALS1(MQIAMO_NET_TIME_MIN           ),
+    DEF_VALS1(MQIAMO_OBJECT_COUNT           ),
+    DEF_VALS1(MQIAMO_OPENS                  ),
+    DEF_VALS1(MQIAMO_OPENS_FAILED           ),
+    DEF_VALS1(MQIAMO_PUBLISH_MSG_COUNT      ),
+    DEF_VALS1(MQIAMO_PUT1S                  ),
+    DEF_VALS1(MQIAMO_PUT1S_FAILED           ),
+    DEF_VALS1(MQIAMO_PUTS                   ),
+    DEF_VALS1(MQIAMO_PUTS_FAILED            ),
+    DEF_VALS1(MQIAMO_PUT_MAX_BYTES          ),
+    DEF_VALS1(MQIAMO_PUT_MIN_BYTES          ),
+    DEF_VALS1(MQIAMO_PUT_RETRIES            ),
+    DEF_VALS1(MQIAMO_Q_MAX_DEPTH            ),
+    DEF_VALS1(MQIAMO_Q_MIN_DEPTH            ),
+    DEF_VALS1(MQIAMO_SETS                   ),
+    DEF_VALS1(MQIAMO_SETS_FAILED            ),
+    DEF_VALS1(MQIAMO_STATS                  ),
+    DEF_VALS1(MQIAMO_STATS_FAILED           ),
+    DEF_VALS1(MQIAMO_SUBRQS                 ),
+    DEF_VALS1(MQIAMO_SUBRQS_FAILED          ),
+    DEF_VALS1(MQIAMO_SUBS_DUR               ),
+    DEF_VALS1(MQIAMO_SUBS_FAILED            ),
+    DEF_VALS1(MQIAMO_SUBS_NDUR              ),
+    DEF_VALS1(MQIAMO_SUB_DUR_HIGHWATER      ),
+    DEF_VALS1(MQIAMO_SUB_DUR_LOWWATER       ),
+    DEF_VALS1(MQIAMO_SUB_NDUR_HIGHWATER     ),
+    DEF_VALS1(MQIAMO_SUB_NDUR_LOWWATER      ),
+    DEF_VALS1(MQIAMO_TOPIC_PUT1S            ),
+    DEF_VALS1(MQIAMO_TOPIC_PUT1S_FAILED     ),
+    DEF_VALS1(MQIAMO_TOPIC_PUTS             ),
+    DEF_VALS1(MQIAMO_TOPIC_PUTS_FAILED      ),
+    DEF_VALS1(MQIAMO_UNSUBS_DUR             ),
+    DEF_VALS1(MQIAMO_UNSUBS_FAILED          ),
+    DEF_VALS1(MQIAMO_UNSUBS_NDUR            ),
+    DEF_VALS2(MQIAMO_AVG_Q_TIME,"MQIAMO64_AVG_Q_TIME"),
+    DEF_VALS2(MQIAMO_Q_TIME_AVG,"MQIAMO64_Q_TIME_AVG"),
+    DEF_VALS2(MQIAMO_Q_TIME_MAX,"MQIAMO64_Q_TIME_MAX"),
+    DEF_VALS2(MQIAMO_Q_TIME_MIN,"MQIAMO64_Q_TIME_MIN"),
+    DEF_VALS1(MQIAMO_ACKS_RCVD              ),
+    DEF_VALS1(MQIAMO_ACK_FEEDBACK           ),
+    DEF_VALS1(MQIAMO_ACTIVE_ACKERS          ),
+    DEF_VALS1(MQIAMO_BYTES_SENT             ),
+    DEF_VALS1(MQIAMO_DEST_DATA_PORT         ),
+    DEF_VALS1(MQIAMO_DEST_REPAIR_PORT       ),
+    DEF_VALS1(MQIAMO_FEEDBACK_MODE          ),
+    DEF_VALS1(MQIAMO_HISTORY_PKTS           ),
+    DEF_VALS1(MQIAMO_INTERVAL               ),
+    DEF_VALS1(MQIAMO_LAST_USED              ),
+    DEF_VALS1(MQIAMO_LATE_JOIN_MARK         ),
+    DEF_VALS1(MQIAMO_MCAST_BATCH_TIME       ),
+    DEF_VALS1(MQIAMO_MCAST_HEARTBEAT        ),
+    DEF_VALS1(MQIAMO_MCAST_XMIT_RATE        ),
+    DEF_VALS1(MQIAMO_MSGS_DELIVERED         ),
+    DEF_VALS1(MQIAMO_MSGS_RCVD              ),
+    DEF_VALS1(MQIAMO_MSGS_SENT              ),
+    DEF_VALS1(MQIAMO_MSG_BYTES_RCVD         ),
+    DEF_VALS1(MQIAMO_NACKS_CREATED          ),
+    DEF_VALS1(MQIAMO_NACKS_RCVD             ),
+    DEF_VALS1(MQIAMO_NACK_FEEDBACK          ),
+    DEF_VALS1(MQIAMO_NACK_PKTS_SENT         ),
+    DEF_VALS1(MQIAMO_NUM_STREAMS            ),
+    DEF_VALS1(MQIAMO_PENDING_PKTS           ),
+    DEF_VALS1(MQIAMO_PKTS_DELIVERED         ),
+    DEF_VALS1(MQIAMO_PKTS_DROPPED           ),
+    DEF_VALS1(MQIAMO_PKTS_DUPLICATED        ),
+    DEF_VALS1(MQIAMO_PKTS_LOST              ),
+    DEF_VALS1(MQIAMO_PKTS_PROCESSED         ),
+    DEF_VALS1(MQIAMO_PKTS_REPAIRED          ),
+    DEF_VALS1(MQIAMO_PKTS_SENT              ),
+    DEF_VALS1(MQIAMO_PKT_RATE               ),
+    DEF_VALS1(MQIAMO_RELIABILITY_TYPE       ),
+    DEF_VALS1(MQIAMO_REPAIR_BYTES           ),
+    DEF_VALS1(MQIAMO_REPAIR_PKTS            ),
+    DEF_VALS1(MQIAMO_REPAIR_PKTS_RCVD       ),
+    DEF_VALS1(MQIAMO_REPAIR_PKTS_RQSTD      ),
+    DEF_VALS1(MQIAMO_TOTAL_BYTES_SENT       ),
+    DEF_VALS1(MQIAMO_TOTAL_MSGS_DELIVERED   ),
+    DEF_VALS1(MQIAMO_TOTAL_MSGS_EXPIRED     ),
+    DEF_VALS1(MQIAMO_TOTAL_MSGS_PROCESSED   ),
+    DEF_VALS1(MQIAMO_TOTAL_MSGS_RCVD        ),
+    DEF_VALS1(MQIAMO_TOTAL_MSGS_RETURNED    ),
+    DEF_VALS1(MQIAMO_TOTAL_MSGS_SELECTED    ),
+    DEF_VALS1(MQIAMO_TOTAL_MSGS_SENT        ),
+    DEF_VALS1(MQIAMO_TOTAL_MSG_BYTES_RCVD   ),
+    DEF_VALS1(MQIAMO_TOTAL_PKTS_SENT        ),
+    DEF_VALS1(MQIAMO_TOTAL_REPAIR_PKTS      ),
+    DEF_VALS1(MQIAMO_TOTAL_REPAIR_PKTS_RCVD ),
+    DEF_VALS1(MQIAMO_TOTAL_REPAIR_PKTS_RQSTD),
+
+    DEF_VALS1(MQIACH_AVAILABLE_CIPHERSPECS  ),
+    DEF_VALS1(MQIACH_BATCH_DATA_LIMIT       ),
+    DEF_VALS1(MQIACH_CHANNEL_SUMMARY_ATTRS  ),
+    DEF_VALS1(MQIACH_DEF_RECONNECT          ),
+    DEF_VALS1(MQIACH_MATCH                  ),
+    DEF_VALS2(MQIACH_MSGS_RECEIVED,"MQIACH_MSGS_RCVD"),
+    DEF_VALS1(MQIACH_MSGS_SENT              ),
+    DEF_VALS1(MQIACH_PENDING_OUT            ),
+    DEF_VALS1(MQCACH_REMOTE_VERSION         ),
+    DEF_VALS1(MQCACH_REMOTE_PRODUCT         ),
+    DEF_VALS1(MQIACH_RESET_REQUESTED        ),
+    DEF_VALS1(MQIACH_USER_SOURCE            ),
+    DEF_VALS1(MQIACH_WARNING                ),
+
+    DEF_VALS1(MQIA_ACCOUNTING_CONN_OVERRIDE ),
+    DEF_VALS1(MQIA_ACCOUNTING_INTERVAL      ),
+    DEF_VALS1(MQIA_ACCOUNTING_MQI           ),
+    DEF_VALS1(MQIA_ACCOUNTING_Q             ),
+    DEF_VALS1(MQIA_ACTIVE_CHANNELS          ),
+    DEF_VALS1(MQIA_ACTIVITY_RECORDING       ),
+    DEF_VALS1(MQIA_ADOPTNEWMCA_CHECK        ),
+    DEF_VALS1(MQIA_ADOPTNEWMCA_INTERVAL     ),
+    DEF_VALS1(MQIA_ADOPTNEWMCA_TYPE         ),
+    DEF_VALS1(MQIA_APPL_TYPE                ),
+    DEF_VALS1(MQIA_ARCHIVE                  ),
+    DEF_VALS1(MQIA_AUTHORITY_EVENT          ),
+    DEF_VALS1(MQIA_AUTH_INFO_TYPE           ),
+    DEF_VALS1(MQIA_AUTO_REORGANIZATION      ),
+    DEF_VALS1(MQIA_AUTO_REORG_INTERVAL      ),
+    DEF_VALS1(MQIA_BACKOUT_THRESHOLD        ),
+    DEF_VALS1(MQIA_BASE_TYPE                ),
+    DEF_VALS1(MQIA_BATCH_INTERFACE_AUTO     ),
+    DEF_VALS1(MQIA_BRIDGE_EVENT             ),
+    DEF_VALS1(MQIA_CF_LEVEL                 ),
+    DEF_VALS1(MQIA_CF_RECOVER               ),
+    DEF_VALS1(MQIA_CHANNEL_AUTO_DEF         ),
+    DEF_VALS1(MQIA_CHANNEL_AUTO_DEF_EVENT   ),
+    DEF_VALS1(MQIA_CHANNEL_EVENT            ),
+    DEF_VALS1(MQIA_CHINIT_ADAPTERS          ),
+    DEF_VALS1(MQIA_CHINIT_CONTROL           ),
+    DEF_VALS1(MQIA_CHINIT_DISPATCHERS       ),
+    DEF_VALS1(MQIA_CHINIT_TRACE_AUTO_START  ),
+    DEF_VALS1(MQIA_CHINIT_TRACE_TABLE_SIZE  ),
+    DEF_VALS1(MQIA_CLUSTER_Q_TYPE           ),
+    DEF_VALS1(MQIA_CLUSTER_WORKLOAD_LENGTH  ),
+    DEF_VALS1(MQIA_CLWL_MRU_CHANNELS        ),
+    DEF_VALS1(MQIA_CLWL_Q_PRIORITY          ),
+    DEF_VALS1(MQIA_CLWL_Q_RANK              ),
+    DEF_VALS1(MQIA_CLWL_USEQ                ),
+    DEF_VALS1(MQIA_CMD_SERVER_AUTO          ),
+    DEF_VALS1(MQIA_CMD_SERVER_CONTROL       ),
+    DEF_VALS1(MQIA_CMD_SERVER_CONVERT_MSG   ),
+    DEF_VALS1(MQIA_CMD_SERVER_DLQ_MSG       ),
+    DEF_VALS1(MQIA_CODED_CHAR_SET_ID        ),
+    DEF_VALS1(MQIA_COMMAND_EVENT            ),
+    DEF_VALS1(MQIA_COMMAND_LEVEL            ),
+    DEF_VALS1(MQIA_CONFIGURATION_EVENT      ),
+    DEF_VALS1(MQIA_CPI_LEVEL                ),
+    DEF_VALS1(MQIA_CURRENT_Q_DEPTH          ),
+    DEF_VALS1(MQIA_DEFINITION_TYPE          ),
+    DEF_VALS1(MQIA_DEF_BIND                 ),
+    DEF_VALS1(MQIA_DEF_INPUT_OPEN_OPTION    ),
+    DEF_VALS1(MQIA_DEF_PERSISTENCE          ),
+    DEF_VALS1(MQIA_DEF_PRIORITY             ),
+    DEF_VALS1(MQIA_DEF_PUT_RESPONSE_TYPE    ),
+    DEF_VALS1(MQIA_DEF_READ_AHEAD           ),
+    DEF_VALS1(MQIA_DIST_LISTS               ),
+    DEF_VALS1(MQIA_DNS_WLM                  ),
+    DEF_VALS1(MQIA_DURABLE_SUB              ),
+    DEF_VALS1(MQIA_EXPIRY_INTERVAL          ),
+    DEF_VALS1(MQIA_GROUP_UR                 ),
+    DEF_VALS1(MQIA_HARDEN_GET_BACKOUT       ),
+    DEF_VALS1(MQIA_HIGH_Q_DEPTH             ),
+    DEF_VALS1(MQIA_IGQ_PUT_AUTHORITY        ),
+    DEF_VALS1(MQIA_INDEX_TYPE               ),
+    DEF_VALS1(MQIA_INHIBIT_EVENT            ),
+    DEF_VALS1(MQIA_INHIBIT_GET              ),
+    DEF_VALS1(MQIA_INHIBIT_PUB              ),
+    DEF_VALS1(MQIA_INHIBIT_PUT              ),
+    DEF_VALS1(MQIA_INHIBIT_SUB              ),
+    DEF_VALS1(MQIA_INTRA_GROUP_QUEUING      ),
+    DEF_VALS1(MQIA_IP_ADDRESS_VERSION       ),
+    DEF_VALS1(MQIA_LISTENER_PORT_NUMBER     ),
+    DEF_VALS1(MQIA_LISTENER_TIMER           ),
+    DEF_VALS1(MQIA_LOCAL_EVENT              ),
+    DEF_VALS1(MQIA_LOGGER_EVENT             ),
+    DEF_VALS1(MQIA_LU62_CHANNELS            ),
+    DEF_VALS1(MQIA_MASTER_ADMIN             ),
+    DEF_VALS1(MQIA_MAX_CHANNELS             ),
+    DEF_VALS1(MQIA_MAX_CLIENTS              ),
+    DEF_VALS1(MQIA_MAX_GLOBAL_LOCKS         ),
+    DEF_VALS1(MQIA_MAX_HANDLES              ),
+    DEF_VALS1(MQIA_MAX_LOCAL_LOCKS          ),
+    DEF_VALS1(MQIA_MAX_MSG_LENGTH           ),
+    DEF_VALS1(MQIA_MAX_OPEN_Q               ),
+    DEF_VALS1(MQIA_MAX_PRIORITY             ),
+    DEF_VALS1(MQIA_MAX_PROPERTIES_LENGTH    ),
+    DEF_VALS1(MQIA_MAX_Q_DEPTH              ),
+    DEF_VALS1(MQIA_MAX_Q_TRIGGERS           ),
+    DEF_VALS1(MQIA_MAX_RECOVERY_TASKS       ),
+    DEF_VALS1(MQIA_MAX_UNCOMMITTED_MSGS     ),
+    DEF_VALS1(MQIA_MONITORING_AUTO_CLUSSDR  ),
+    DEF_VALS1(MQIA_MONITORING_CHANNEL       ),
+    DEF_VALS1(MQIA_MONITORING_Q             ),
+    DEF_VALS1(MQIA_MONITOR_INTERVAL         ),
+    DEF_VALS1(MQIA_MSG_DELIVERY_SEQUENCE    ),
+    DEF_VALS1(MQIA_MSG_DEQ_COUNT            ),
+    DEF_VALS1(MQIA_MSG_ENQ_COUNT            ),
+    DEF_VALS1(MQIA_MSG_MARK_BROWSE_INTERVAL ),
+    DEF_VALS1(MQIA_NAMELIST_TYPE            ),
+    DEF_VALS1(MQIA_NAME_COUNT               ),
+    DEF_VALS1(MQIA_NPM_CLASS                ),
+    DEF_VALS1(MQIA_NPM_DELIVERY             ),
+    DEF_VALS1(MQIA_OPEN_INPUT_COUNT         ),
+    DEF_VALS1(MQIA_OPEN_OUTPUT_COUNT        ),
+    DEF_VALS1(MQIA_OUTBOUND_PORT_MAX        ),
+    DEF_VALS1(MQIA_OUTBOUND_PORT_MIN        ),
+    DEF_VALS1(MQIA_PAGESET_ID               ),
+    DEF_VALS1(MQIA_PERFORMANCE_EVENT        ),
+    DEF_VALS1(MQIA_PLATFORM                 ),
+    DEF_VALS1(MQIA_PM_DELIVERY              ),
+    DEF_VALS1(MQIA_PROPERTY_CONTROL         ),
+    DEF_VALS1(MQIA_PROXY_SUB                ),
+    DEF_VALS1(MQIA_PUBSUB_MAXMSG_RETRY_COUNT),
+    DEF_VALS1(MQIA_PUBSUB_MODE              ),
+    DEF_VALS1(MQIA_PUBSUB_NP_MSG            ),
+    DEF_VALS1(MQIA_PUBSUB_NP_RESP           ),
+    DEF_VALS1(MQIA_PUBSUB_SYNC_PT           ),
+    DEF_VALS1(MQIA_PUB_COUNT                ),
+    DEF_VALS1(MQIA_PUB_SCOPE                ),
+    DEF_VALS1(MQIA_QMGR_CFCONLOS            ),
+    DEF_VALS1(MQIA_QMOPT_CONS_COMMS_MSGS    ),
+    DEF_VALS1(MQIA_QMOPT_CONS_CRITICAL_MSGS ),
+    DEF_VALS1(MQIA_QMOPT_CONS_ERROR_MSGS    ),
+    DEF_VALS1(MQIA_QMOPT_CONS_INFO_MSGS     ),
+    DEF_VALS1(MQIA_QMOPT_CONS_REORG_MSGS    ),
+    DEF_VALS1(MQIA_QMOPT_CONS_SYSTEM_MSGS   ),
+    DEF_VALS1(MQIA_QMOPT_CONS_WARNING_MSGS  ),
+    DEF_VALS1(MQIA_QMOPT_CSMT_ON_ERROR      ),
+    DEF_VALS1(MQIA_QMOPT_INTERNAL_DUMP      ),
+    DEF_VALS1(MQIA_QMOPT_LOG_COMMS_MSGS     ),
+    DEF_VALS1(MQIA_QMOPT_LOG_CRITICAL_MSGS  ),
+    DEF_VALS1(MQIA_QMOPT_LOG_ERROR_MSGS     ),
+    DEF_VALS1(MQIA_QMOPT_LOG_INFO_MSGS      ),
+    DEF_VALS1(MQIA_QMOPT_LOG_REORG_MSGS     ),
+    DEF_VALS1(MQIA_QMOPT_LOG_SYSTEM_MSGS    ),
+    DEF_VALS1(MQIA_QMOPT_LOG_WARNING_MSGS   ),
+    DEF_VALS1(MQIA_QMOPT_TRACE_COMMS        ),
+    DEF_VALS1(MQIA_QMOPT_TRACE_CONVERSION   ),
+    DEF_VALS1(MQIA_QMOPT_TRACE_MQI_CALLS    ),
+    DEF_VALS1(MQIA_QMOPT_TRACE_REORG        ),
+    DEF_VALS1(MQIA_QMOPT_TRACE_SYSTEM       ),
+    DEF_VALS1(MQIA_QSG_DISP                 ),
+    DEF_VALS1(MQIA_Q_DEPTH_HIGH_EVENT       ),
+    DEF_VALS1(MQIA_Q_DEPTH_HIGH_LIMIT       ),
+    DEF_VALS1(MQIA_Q_DEPTH_LOW_EVENT        ),
+    DEF_VALS1(MQIA_Q_DEPTH_LOW_LIMIT        ),
+    DEF_VALS1(MQIA_Q_DEPTH_MAX_EVENT        ),
+    DEF_VALS1(MQIA_Q_SERVICE_INTERVAL       ),
+    DEF_VALS1(MQIA_Q_SERVICE_INTERVAL_EVENT ),
+    DEF_VALS1(MQIA_Q_TYPE                   ),
+    DEF_VALS1(MQIA_Q_USERS                  ),
+    DEF_VALS1(MQIA_READ_AHEAD               ),
+    DEF_VALS1(MQIA_RECEIVE_TIMEOUT          ),
+    DEF_VALS1(MQIA_RECEIVE_TIMEOUT_MIN      ),
+    DEF_VALS1(MQIA_RECEIVE_TIMEOUT_TYPE     ),
+    DEF_VALS1(MQIA_REMOTE_EVENT             ),
+    DEF_VALS1(MQIA_RETENTION_INTERVAL       ),
+    DEF_VALS1(MQIA_SCOPE                    ),
+    DEF_VALS1(MQIA_SECURITY_CASE            ),
+    DEF_VALS1(MQIA_SERVICE_CONTROL          ),
+    DEF_VALS1(MQIA_SERVICE_TYPE             ),
+    DEF_VALS1(MQIA_SHAREABILITY             ),
+    DEF_VALS1(MQIA_SHARED_Q_Q_MGR_NAME      ),
+    DEF_VALS1(MQIA_SSL_EVENT                ),
+    DEF_VALS1(MQIA_SSL_FIPS_REQUIRED        ),
+    DEF_VALS1(MQIA_SSL_RESET_COUNT          ),
+    DEF_VALS1(MQIA_SSL_TASKS                ),
+    DEF_VALS1(MQIA_START_STOP_EVENT         ),
+    DEF_VALS1(MQIA_STATISTICS_AUTO_CLUSSDR  ),
+    DEF_VALS1(MQIA_STATISTICS_CHANNEL       ),
+    DEF_VALS1(MQIA_STATISTICS_INTERVAL      ),
+    DEF_VALS1(MQIA_STATISTICS_MQI           ),
+    DEF_VALS1(MQIA_STATISTICS_Q             ),
+    DEF_VALS1(MQIA_SUB_COUNT                ),
+    DEF_VALS1(MQIA_SUB_SCOPE                ),
+    DEF_VALS1(MQIA_SYNCPOINT                ),
+    DEF_VALS1(MQIA_TCP_CHANNELS             ),
+    DEF_VALS1(MQIA_TCP_KEEP_ALIVE           ),
+    DEF_VALS1(MQIA_TCP_STACK_TYPE           ),
+    DEF_VALS1(MQIA_TIME_SINCE_RESET         ),
+    DEF_VALS1(MQIA_TOPIC_DEF_PERSISTENCE    ),
+    DEF_VALS1(MQIA_TOPIC_TYPE               ),
+    DEF_VALS1(MQIA_TRACE_ROUTE_RECORDING    ),
+    DEF_VALS1(MQIA_TREE_LIFE_TIME           ),
+    DEF_VALS1(MQIA_TRIGGER_CONTROL          ),
+    DEF_VALS1(MQIA_TRIGGER_DEPTH            ),
+    DEF_VALS1(MQIA_TRIGGER_INTERVAL         ),
+    DEF_VALS1(MQIA_TRIGGER_MSG_PRIORITY     ),
+    DEF_VALS1(MQIA_TRIGGER_RESTART          ),
+    DEF_VALS1(MQIA_TRIGGER_TYPE             ),
+    DEF_VALS1(MQIA_UR_DISP                  ),
+    DEF_VALS1(MQIA_USAGE                    ),
+    DEF_VALS1(MQIA_USER_LIST                ),
+    DEF_VALS1(MQIA_WILDCARD_OPERATION       ),
+    DEF_VALS1(MQIA_ACTIVITY_CONN_OVERRIDE   ),
+    DEF_VALS1(MQIA_ACTIVITY_TRACE           ),
+    DEF_VALS1(MQIA_CERT_VAL_POLICY          ),
+    DEF_VALS1(MQIA_CHLAUTH_RECORDS          ),
+    DEF_VALS1(MQIA_COMM_EVENT               ),
+    DEF_VALS1(MQIA_COMM_INFO_TYPE           ),
+    DEF_VALS1(MQIA_DEF_CLUSTER_XMIT_Q_TYPE  ),
+    DEF_VALS1(MQIA_ENCRYPTION_ALGORITHM     ),
+    DEF_VALS1(MQIA_MCAST_BRIDGE             ),
+    DEF_VALS1(MQIA_MULTICAST                ),
+    DEF_VALS1(MQIA_POLICY_VERSION           ),
+    DEF_VALS1(MQIA_PROT_POLICY_CAPABILITY   ),
+    DEF_VALS1(MQIA_PUBSUB_CLUSTER           ),
+    DEF_VALS1(MQIA_SIGNATURE_ALGORITHM      ),
+    DEF_VALS1(MQIA_SUB_CONFIGURATION_EVENT  ),
+    DEF_VALS1(MQIA_SUITE_B_STRENGTH         ),
+    DEF_VALS1(MQIA_TOLERATE_UNPROTECTED     ),
+    DEF_VALS1(MQIA_USE_DEAD_LETTER_Q        ),
+    DEF_VALS1(MQIA_XR_CAPABILITY            ),
 DEF_VALSE;
 
 #if 0
 DEF_VALSB(CC)
-	DEF_VALS1(MQCC_OK     ),
-	DEF_VALS1(MQCC_WARNING),
-	DEF_VALS1(MQCC_FAILED ),
-	DEF_VALS1(MQCC_UNKNOWN),
+    DEF_VALS1(MQCC_OK     ),
+    DEF_VALS1(MQCC_WARNING),
+    DEF_VALS1(MQCC_FAILED ),
+    DEF_VALS1(MQCC_UNKNOWN),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(RC)
-	DEF_VALS1(MQRC_NONE                      ),
-	DEF_VALS1(MQRC_ALIAS_BASE_Q_TYPE_ERROR   ),
-	DEF_VALS1(MQRC_ALREADY_CONNECTED         ),
-	DEF_VALS1(MQRC_BACKED_OUT                ),
-	DEF_VALS1(MQRC_BUFFER_ERROR              ),
-	DEF_VALS1(MQRC_BUFFER_LENGTH_ERROR       ),
-	DEF_VALS1(MQRC_CHAR_ATTR_LENGTH_ERROR    ),
-	DEF_VALS1(MQRC_CHAR_ATTRS_ERROR          ),
-	DEF_VALS1(MQRC_CHAR_ATTRS_TOO_SHORT      ),
-	DEF_VALS1(MQRC_CONNECTION_BROKEN         ),
-	DEF_VALS1(MQRC_DATA_LENGTH_ERROR         ),
-	DEF_VALS1(MQRC_DYNAMIC_Q_NAME_ERROR      ),
-	DEF_VALS1(MQRC_ENVIRONMENT_ERROR         ),
-	DEF_VALS1(MQRC_EXPIRY_ERROR              ),
-	DEF_VALS1(MQRC_FEEDBACK_ERROR            ),
-	DEF_VALS1(MQRC_GET_INHIBITED             ),
-	DEF_VALS1(MQRC_HANDLE_NOT_AVAILABLE      ),
-	DEF_VALS1(MQRC_HCONN_ERROR               ),
-	DEF_VALS1(MQRC_HOBJ_ERROR                ),
-	DEF_VALS1(MQRC_INHIBIT_VALUE_ERROR       ),
-	DEF_VALS1(MQRC_INT_ATTR_COUNT_ERROR      ),
-	DEF_VALS1(MQRC_INT_ATTR_COUNT_TOO_SMALL  ),
-	DEF_VALS1(MQRC_INT_ATTRS_ARRAY_ERROR     ),
-	DEF_VALS1(MQRC_SYNCPOINT_LIMIT_REACHED   ),
-	DEF_VALS1(MQRC_MAX_CONNS_LIMIT_REACHED   ),
-	DEF_VALS1(MQRC_MD_ERROR                  ),
-	DEF_VALS1(MQRC_MISSING_REPLY_TO_Q        ),
-	DEF_VALS1(MQRC_MSG_TYPE_ERROR            ),
-	DEF_VALS1(MQRC_MSG_TOO_BIG_FOR_Q         ),
-	DEF_VALS1(MQRC_MSG_TOO_BIG_FOR_Q_MGR     ),
-	DEF_VALS1(MQRC_NO_MSG_AVAILABLE          ),
-	DEF_VALS1(MQRC_NO_MSG_UNDER_CURSOR       ),
-	DEF_VALS1(MQRC_NOT_AUTHORIZED            ),
-	DEF_VALS1(MQRC_NOT_OPEN_FOR_BROWSE       ),
-	DEF_VALS1(MQRC_NOT_OPEN_FOR_INPUT        ),
-	DEF_VALS1(MQRC_NOT_OPEN_FOR_INQUIRE      ),
-	DEF_VALS1(MQRC_NOT_OPEN_FOR_OUTPUT       ),
-	DEF_VALS1(MQRC_NOT_OPEN_FOR_SET          ),
-	DEF_VALS1(MQRC_OBJECT_CHANGED            ),
-	DEF_VALS1(MQRC_OBJECT_IN_USE             ),
-	DEF_VALS1(MQRC_OBJECT_TYPE_ERROR         ),
-	DEF_VALS1(MQRC_OD_ERROR                  ),
-	DEF_VALS1(MQRC_OPTION_NOT_VALID_FOR_TYPE ),
-	DEF_VALS1(MQRC_OPTIONS_ERROR             ),
-	DEF_VALS1(MQRC_PERSISTENCE_ERROR         ),
-	DEF_VALS1(MQRC_PERSISTENT_NOT_ALLOWED    ),
-	DEF_VALS1(MQRC_PRIORITY_EXCEEDS_MAXIMUM  ),
-	DEF_VALS1(MQRC_PRIORITY_ERROR            ),
-	DEF_VALS1(MQRC_PUT_INHIBITED             ),
-	DEF_VALS1(MQRC_Q_DELETED                 ),
-	DEF_VALS1(MQRC_Q_FULL                    ),
-	DEF_VALS1(MQRC_Q_NOT_EMPTY               ),
-	DEF_VALS1(MQRC_Q_SPACE_NOT_AVAILABLE     ),
-	DEF_VALS1(MQRC_Q_TYPE_ERROR              ),
-	DEF_VALS1(MQRC_Q_MGR_NAME_ERROR          ),
-	DEF_VALS1(MQRC_Q_MGR_NOT_AVAILABLE       ),
-	DEF_VALS1(MQRC_REPORT_OPTIONS_ERROR      ),
-	DEF_VALS1(MQRC_SECOND_MARK_NOT_ALLOWED   ),
-	DEF_VALS1(MQRC_SECURITY_ERROR            ),
-	DEF_VALS1(MQRC_SELECTOR_COUNT_ERROR      ),
-	DEF_VALS1(MQRC_SELECTOR_LIMIT_EXCEEDED   ),
-	DEF_VALS1(MQRC_SELECTOR_ERROR            ),
-	DEF_VALS1(MQRC_SELECTOR_NOT_FOR_TYPE     ),
-	DEF_VALS1(MQRC_SIGNAL_OUTSTANDING        ),
-	DEF_VALS1(MQRC_SIGNAL_REQUEST_ACCEPTED   ),
-	DEF_VALS1(MQRC_STORAGE_NOT_AVAILABLE     ),
-	DEF_VALS1(MQRC_SYNCPOINT_NOT_AVAILABLE   ),
-	DEF_VALS1(MQRC_TRIGGER_CONTROL_ERROR     ),
-	DEF_VALS1(MQRC_TRIGGER_DEPTH_ERROR       ),
-	DEF_VALS1(MQRC_TRIGGER_MSG_PRIORITY_ERR  ),
-	DEF_VALS1(MQRC_TRIGGER_TYPE_ERROR        ),
-	DEF_VALS1(MQRC_TRUNCATED_MSG_ACCEPTED    ),
-	DEF_VALS1(MQRC_TRUNCATED_MSG_FAILED      ),
-	DEF_VALS1(MQRC_UNKNOWN_ALIAS_BASE_Q      ),
-	DEF_VALS1(MQRC_UNKNOWN_OBJECT_NAME       ),
-	DEF_VALS1(MQRC_UNKNOWN_OBJECT_Q_MGR      ),
-	DEF_VALS1(MQRC_UNKNOWN_REMOTE_Q_MGR      ),
-	DEF_VALS1(MQRC_WAIT_INTERVAL_ERROR       ),
-	DEF_VALS1(MQRC_XMIT_Q_TYPE_ERROR         ),
-	DEF_VALS1(MQRC_XMIT_Q_USAGE_ERROR        ),
-	DEF_VALS1(MQRC_NOT_OPEN_FOR_PASS_ALL     ),
-	DEF_VALS1(MQRC_NOT_OPEN_FOR_PASS_IDENT   ),
-	DEF_VALS1(MQRC_NOT_OPEN_FOR_SET_ALL      ),
-	DEF_VALS1(MQRC_NOT_OPEN_FOR_SET_IDENT    ),
-	DEF_VALS1(MQRC_CONTEXT_HANDLE_ERROR      ),
-	DEF_VALS1(MQRC_CONTEXT_NOT_AVAILABLE     ),
-	DEF_VALS1(MQRC_SIGNAL1_ERROR             ),
-	DEF_VALS1(MQRC_OBJECT_ALREADY_EXISTS     ),
-	DEF_VALS1(MQRC_OBJECT_DAMAGED            ),
-	DEF_VALS1(MQRC_RESOURCE_PROBLEM          ),
-	DEF_VALS1(MQRC_ANOTHER_Q_MGR_CONNECTED   ),
-	DEF_VALS1(MQRC_UNKNOWN_REPORT_OPTION     ),
-	DEF_VALS1(MQRC_STORAGE_CLASS_ERROR       ),
-	DEF_VALS1(MQRC_COD_NOT_VALID_FOR_XCF_Q   ),
-	DEF_VALS1(MQRC_XWAIT_CANCELED            ),
-	DEF_VALS1(MQRC_XWAIT_ERROR               ),
-	DEF_VALS1(MQRC_SUPPRESSED_BY_EXIT        ),
-	DEF_VALS1(MQRC_FORMAT_ERROR              ),
-	DEF_VALS1(MQRC_SOURCE_CCSID_ERROR        ),
-	DEF_VALS1(MQRC_SOURCE_INTEGER_ENC_ERROR  ),
-	DEF_VALS1(MQRC_SOURCE_DECIMAL_ENC_ERROR  ),
-	DEF_VALS1(MQRC_SOURCE_FLOAT_ENC_ERROR    ),
-	DEF_VALS1(MQRC_TARGET_CCSID_ERROR        ),
-	DEF_VALS1(MQRC_TARGET_INTEGER_ENC_ERROR  ),
-	DEF_VALS1(MQRC_TARGET_DECIMAL_ENC_ERROR  ),
-	DEF_VALS1(MQRC_TARGET_FLOAT_ENC_ERROR    ),
-	DEF_VALS1(MQRC_NOT_CONVERTED             ),
-	DEF_VALS2(MQRC_TRUNCATED,"MQRC_CONVERTED_MSG_TOO_BIG"),
-	DEF_VALS1(MQRC_NO_EXTERNAL_PARTICIPANTS  ),
-	DEF_VALS1(MQRC_PARTICIPANT_NOT_AVAILABLE ),
-	DEF_VALS1(MQRC_OUTCOME_MIXED             ),
-	DEF_VALS1(MQRC_OUTCOME_PENDING           ),
-	DEF_VALS1(MQRC_BRIDGE_STARTED            ),
-	DEF_VALS1(MQRC_BRIDGE_STOPPED            ),
-	DEF_VALS1(MQRC_ADAPTER_STORAGE_SHORTAGE  ),
-	DEF_VALS1(MQRC_UOW_IN_PROGRESS           ),
-	DEF_VALS1(MQRC_ADAPTER_CONN_LOAD_ERROR   ),
-	DEF_VALS1(MQRC_ADAPTER_SERV_LOAD_ERROR   ),
-	DEF_VALS1(MQRC_ADAPTER_DEFS_ERROR        ),
-	DEF_VALS1(MQRC_ADAPTER_DEFS_LOAD_ERROR   ),
-	DEF_VALS1(MQRC_ADAPTER_CONV_LOAD_ERROR   ),
-	DEF_VALS1(MQRC_BO_ERROR                  ),
-	DEF_VALS1(MQRC_DH_ERROR                  ),
-	DEF_VALS1(MQRC_MULTIPLE_REASONS          ),
-	DEF_VALS1(MQRC_OPEN_FAILED               ),
-	DEF_VALS1(MQRC_ADAPTER_DISC_LOAD_ERROR   ),
-	DEF_VALS1(MQRC_CNO_ERROR                 ),
-	DEF_VALS1(MQRC_CICS_WAIT_FAILED          ),
-	DEF_VALS1(MQRC_DLH_ERROR                 ),
-	DEF_VALS1(MQRC_HEADER_ERROR              ),
-	DEF_VALS1(MQRC_SOURCE_LENGTH_ERROR       ),
-	DEF_VALS1(MQRC_TARGET_LENGTH_ERROR       ),
-	DEF_VALS1(MQRC_SOURCE_BUFFER_ERROR       ),
-	DEF_VALS1(MQRC_TARGET_BUFFER_ERROR       ),
-	DEF_VALS1(MQRC_IIH_ERROR                 ),
-	DEF_VALS1(MQRC_PCF_ERROR                 ),
-	DEF_VALS1(MQRC_DBCS_ERROR                ),
-	DEF_VALS1(MQRC_OBJECT_NAME_ERROR         ),
-	DEF_VALS1(MQRC_OBJECT_Q_MGR_NAME_ERROR   ),
-	DEF_VALS1(MQRC_RECS_PRESENT_ERROR        ),
-	DEF_VALS1(MQRC_OBJECT_RECORDS_ERROR      ),
-	DEF_VALS1(MQRC_RESPONSE_RECORDS_ERROR    ),
-	DEF_VALS1(MQRC_ASID_MISMATCH             ),
-	DEF_VALS1(MQRC_PMO_RECORD_FLAGS_ERROR    ),
-	DEF_VALS1(MQRC_PUT_MSG_RECORDS_ERROR     ),
-	DEF_VALS1(MQRC_CONN_ID_IN_USE            ),
-	DEF_VALS1(MQRC_Q_MGR_QUIESCING           ),
-	DEF_VALS1(MQRC_Q_MGR_STOPPING            ),
-	DEF_VALS1(MQRC_DUPLICATE_RECOV_COORD     ),
-	DEF_VALS1(MQRC_PMO_ERROR                 ),
-	DEF_VALS1(MQRC_API_EXIT_NOT_FOUND        ),
-	DEF_VALS1(MQRC_API_EXIT_LOAD_ERROR       ),
-	DEF_VALS1(MQRC_REMOTE_Q_NAME_ERROR       ),
-	DEF_VALS1(MQRC_INCONSISTENT_PERSISTENCE  ),
-	DEF_VALS1(MQRC_GMO_ERROR                 ),
-	DEF_VALS1(MQRC_CICS_BRIDGE_RESTRICTION   ),
-	DEF_VALS1(MQRC_STOPPED_BY_CLUSTER_EXIT   ),
-	DEF_VALS1(MQRC_CLUSTER_RESOLUTION_ERROR  ),
-	DEF_VALS1(MQRC_CONVERTED_STRING_TOO_BIG  ),
-	DEF_VALS1(MQRC_TMC_ERROR                 ),
-	DEF_VALS2(MQRC_STORAGE_MEDIUM_FULL,"MQRC_PAGESET_FULL"),
-	DEF_VALS1(MQRC_PAGESET_ERROR             ),
-	DEF_VALS1(MQRC_NAME_NOT_VALID_FOR_TYPE   ),
-	DEF_VALS1(MQRC_UNEXPECTED_ERROR          ),
-	DEF_VALS1(MQRC_UNKNOWN_XMIT_Q            ),
-	DEF_VALS1(MQRC_UNKNOWN_DEF_XMIT_Q        ),
-	DEF_VALS1(MQRC_DEF_XMIT_Q_TYPE_ERROR     ),
-	DEF_VALS1(MQRC_DEF_XMIT_Q_USAGE_ERROR    ),
-	DEF_VALS1(MQRC_MSG_MARKED_BROWSE_CO_OP   ),
-	DEF_VALS1(MQRC_NAME_IN_USE               ),
-	DEF_VALS1(MQRC_CONNECTION_QUIESCING      ),
-	DEF_VALS1(MQRC_CONNECTION_STOPPING       ),
-	DEF_VALS1(MQRC_ADAPTER_NOT_AVAILABLE     ),
-	DEF_VALS1(MQRC_MSG_ID_ERROR              ),
-	DEF_VALS1(MQRC_CORREL_ID_ERROR           ),
-	DEF_VALS1(MQRC_FILE_SYSTEM_ERROR         ),
-	DEF_VALS1(MQRC_NO_MSG_LOCKED             ),
-	DEF_VALS1(MQRC_SOAP_DOTNET_ERROR         ),
-	DEF_VALS1(MQRC_SOAP_AXIS_ERROR           ),
-	DEF_VALS1(MQRC_SOAP_URL_ERROR            ),
-	DEF_VALS1(MQRC_FILE_NOT_AUDITED          ),
-	DEF_VALS1(MQRC_CONNECTION_NOT_AUTHORIZED ),
-	DEF_VALS1(MQRC_MSG_TOO_BIG_FOR_CHANNEL   ),
-	DEF_VALS1(MQRC_CALL_IN_PROGRESS          ),
-	DEF_VALS1(MQRC_RMH_ERROR                 ),
-	DEF_VALS1(MQRC_Q_MGR_ACTIVE              ),
-	DEF_VALS1(MQRC_Q_MGR_NOT_ACTIVE          ),
-	DEF_VALS1(MQRC_Q_DEPTH_HIGH              ),
-	DEF_VALS1(MQRC_Q_DEPTH_LOW               ),
-	DEF_VALS1(MQRC_Q_SERVICE_INTERVAL_HIGH   ),
-	DEF_VALS1(MQRC_Q_SERVICE_INTERVAL_OK     ),
-	DEF_VALS1(MQRC_RFH_HEADER_FIELD_ERROR    ),
-	DEF_VALS1(MQRC_RAS_PROPERTY_ERROR        ),
-	DEF_VALS1(MQRC_UNIT_OF_WORK_NOT_STARTED  ),
-	DEF_VALS1(MQRC_CHANNEL_AUTO_DEF_OK       ),
-	DEF_VALS1(MQRC_CHANNEL_AUTO_DEF_ERROR    ),
-	DEF_VALS1(MQRC_CFH_ERROR                 ),
-	DEF_VALS1(MQRC_CFIL_ERROR                ),
-	DEF_VALS1(MQRC_CFIN_ERROR                ),
-	DEF_VALS1(MQRC_CFSL_ERROR                ),
-	DEF_VALS1(MQRC_CFST_ERROR                ),
-	DEF_VALS1(MQRC_INCOMPLETE_GROUP          ),
-	DEF_VALS1(MQRC_INCOMPLETE_MSG            ),
-	DEF_VALS1(MQRC_INCONSISTENT_CCSIDS       ),
-	DEF_VALS1(MQRC_INCONSISTENT_ENCODINGS    ),
-	DEF_VALS1(MQRC_INCONSISTENT_UOW          ),
-	DEF_VALS1(MQRC_INVALID_MSG_UNDER_CURSOR  ),
-	DEF_VALS1(MQRC_MATCH_OPTIONS_ERROR       ),
-	DEF_VALS1(MQRC_MDE_ERROR                 ),
-	DEF_VALS1(MQRC_MSG_FLAGS_ERROR           ),
-	DEF_VALS1(MQRC_MSG_SEQ_NUMBER_ERROR      ),
-	DEF_VALS1(MQRC_OFFSET_ERROR              ),
-	DEF_VALS1(MQRC_ORIGINAL_LENGTH_ERROR     ),
-	DEF_VALS1(MQRC_SEGMENT_LENGTH_ZERO       ),
-	DEF_VALS1(MQRC_UOW_NOT_AVAILABLE         ),
-	DEF_VALS1(MQRC_WRONG_GMO_VERSION         ),
-	DEF_VALS1(MQRC_WRONG_MD_VERSION          ),
-	DEF_VALS1(MQRC_GROUP_ID_ERROR            ),
-	DEF_VALS1(MQRC_INCONSISTENT_BROWSE       ),
-	DEF_VALS1(MQRC_XQH_ERROR                 ),
-	DEF_VALS1(MQRC_SRC_ENV_ERROR             ),
-	DEF_VALS1(MQRC_SRC_NAME_ERROR            ),
-	DEF_VALS1(MQRC_DEST_ENV_ERROR            ),
-	DEF_VALS1(MQRC_DEST_NAME_ERROR           ),
-	DEF_VALS1(MQRC_TM_ERROR                  ),
-	DEF_VALS1(MQRC_CLUSTER_EXIT_ERROR        ),
-	DEF_VALS1(MQRC_CLUSTER_EXIT_LOAD_ERROR   ),
-	DEF_VALS1(MQRC_CLUSTER_PUT_INHIBITED     ),
-	DEF_VALS1(MQRC_CLUSTER_RESOURCE_ERROR    ),
-	DEF_VALS1(MQRC_NO_DESTINATIONS_AVAILABLE ),
-	DEF_VALS1(MQRC_CONN_TAG_IN_USE           ),
-	DEF_VALS1(MQRC_PARTIALLY_CONVERTED       ),
-	DEF_VALS1(MQRC_CONNECTION_ERROR          ),
-	DEF_VALS1(MQRC_OPTION_ENVIRONMENT_ERROR  ),
-	DEF_VALS1(MQRC_CD_ERROR                  ),
-	DEF_VALS1(MQRC_CLIENT_CONN_ERROR         ),
-	DEF_VALS1(MQRC_CHANNEL_STOPPED_BY_USER   ),
-	DEF_VALS1(MQRC_HCONFIG_ERROR             ),
-	DEF_VALS1(MQRC_FUNCTION_ERROR            ),
-	DEF_VALS1(MQRC_CHANNEL_STARTED           ),
-	DEF_VALS1(MQRC_CHANNEL_STOPPED           ),
-	DEF_VALS1(MQRC_CHANNEL_CONV_ERROR        ),
-	DEF_VALS1(MQRC_SERVICE_NOT_AVAILABLE     ),
-	DEF_VALS1(MQRC_INITIALIZATION_FAILED     ),
-	DEF_VALS1(MQRC_TERMINATION_FAILED        ),
-	DEF_VALS1(MQRC_UNKNOWN_Q_NAME            ),
-	DEF_VALS1(MQRC_SERVICE_ERROR             ),
-	DEF_VALS1(MQRC_Q_ALREADY_EXISTS          ),
-	DEF_VALS1(MQRC_USER_ID_NOT_AVAILABLE     ),
-	DEF_VALS1(MQRC_UNKNOWN_ENTITY            ),
-	DEF_VALS1(MQRC_UNKNOWN_AUTH_ENTITY       ),
-	DEF_VALS1(MQRC_UNKNOWN_REF_OBJECT        ),
-	DEF_VALS1(MQRC_CHANNEL_ACTIVATED         ),
-	DEF_VALS1(MQRC_CHANNEL_NOT_ACTIVATED     ),
-	DEF_VALS1(MQRC_UOW_CANCELED              ),
-	DEF_VALS1(MQRC_FUNCTION_NOT_SUPPORTED    ),
-	DEF_VALS1(MQRC_SELECTOR_TYPE_ERROR       ),
-	DEF_VALS1(MQRC_COMMAND_TYPE_ERROR        ),
-	DEF_VALS1(MQRC_MULTIPLE_INSTANCE_ERROR   ),
-	DEF_VALS1(MQRC_SYSTEM_ITEM_NOT_ALTERABLE ),
-	DEF_VALS1(MQRC_BAG_CONVERSION_ERROR      ),
-	DEF_VALS1(MQRC_SELECTOR_OUT_OF_RANGE     ),
-	DEF_VALS1(MQRC_SELECTOR_NOT_UNIQUE       ),
-	DEF_VALS1(MQRC_INDEX_NOT_PRESENT         ),
-	DEF_VALS1(MQRC_STRING_ERROR              ),
-	DEF_VALS1(MQRC_ENCODING_NOT_SUPPORTED    ),
-	DEF_VALS1(MQRC_SELECTOR_NOT_PRESENT      ),
-	DEF_VALS1(MQRC_OUT_SELECTOR_ERROR        ),
-	DEF_VALS1(MQRC_STRING_TRUNCATED          ),
-	DEF_VALS1(MQRC_SELECTOR_WRONG_TYPE       ),
-	DEF_VALS1(MQRC_INCONSISTENT_ITEM_TYPE    ),
-	DEF_VALS1(MQRC_INDEX_ERROR               ),
-	DEF_VALS1(MQRC_SYSTEM_BAG_NOT_ALTERABLE  ),
-	DEF_VALS1(MQRC_ITEM_COUNT_ERROR          ),
-	DEF_VALS1(MQRC_FORMAT_NOT_SUPPORTED      ),
-	DEF_VALS1(MQRC_SELECTOR_NOT_SUPPORTED    ),
-	DEF_VALS1(MQRC_ITEM_VALUE_ERROR          ),
-	DEF_VALS1(MQRC_HBAG_ERROR                ),
-	DEF_VALS1(MQRC_PARAMETER_MISSING         ),
-	DEF_VALS1(MQRC_CMD_SERVER_NOT_AVAILABLE  ),
-	DEF_VALS1(MQRC_STRING_LENGTH_ERROR       ),
-	DEF_VALS1(MQRC_INQUIRY_COMMAND_ERROR     ),
-	DEF_VALS1(MQRC_NESTED_BAG_NOT_SUPPORTED  ),
-	DEF_VALS1(MQRC_BAG_WRONG_TYPE            ),
-	DEF_VALS1(MQRC_ITEM_TYPE_ERROR           ),
-	DEF_VALS1(MQRC_SYSTEM_BAG_NOT_DELETABLE  ),
-	DEF_VALS1(MQRC_SYSTEM_ITEM_NOT_DELETABLE ),
-	DEF_VALS1(MQRC_CODED_CHAR_SET_ID_ERROR   ),
-	DEF_VALS1(MQRC_MSG_TOKEN_ERROR           ),
-	DEF_VALS1(MQRC_MISSING_WIH               ),
-	DEF_VALS1(MQRC_WIH_ERROR                 ),
-	DEF_VALS1(MQRC_RFH_ERROR                 ),
-	DEF_VALS1(MQRC_RFH_STRING_ERROR          ),
-	DEF_VALS1(MQRC_RFH_COMMAND_ERROR         ),
-	DEF_VALS1(MQRC_RFH_PARM_ERROR            ),
-	DEF_VALS1(MQRC_RFH_DUPLICATE_PARM        ),
-	DEF_VALS1(MQRC_RFH_PARM_MISSING          ),
-	DEF_VALS1(MQRC_CHAR_CONVERSION_ERROR     ),
-	DEF_VALS1(MQRC_UCS2_CONVERSION_ERROR     ),
-	DEF_VALS1(MQRC_DB2_NOT_AVAILABLE         ),
-	DEF_VALS1(MQRC_OBJECT_NOT_UNIQUE         ),
-	DEF_VALS1(MQRC_CONN_TAG_NOT_RELEASED     ),
-	DEF_VALS1(MQRC_CF_NOT_AVAILABLE          ),
-	DEF_VALS1(MQRC_CF_STRUC_IN_USE           ),
-	DEF_VALS1(MQRC_CF_STRUC_LIST_HDR_IN_USE  ),
-	DEF_VALS1(MQRC_CF_STRUC_AUTH_FAILED      ),
-	DEF_VALS1(MQRC_CF_STRUC_ERROR            ),
-	DEF_VALS1(MQRC_CONN_TAG_NOT_USABLE       ),
-	DEF_VALS1(MQRC_GLOBAL_UOW_CONFLICT       ),
-	DEF_VALS1(MQRC_LOCAL_UOW_CONFLICT        ),
-	DEF_VALS1(MQRC_HANDLE_IN_USE_FOR_UOW     ),
-	DEF_VALS1(MQRC_UOW_ENLISTMENT_ERROR      ),
-	DEF_VALS1(MQRC_UOW_MIX_NOT_SUPPORTED     ),
-	DEF_VALS1(MQRC_WXP_ERROR                 ),
-	DEF_VALS1(MQRC_CURRENT_RECORD_ERROR      ),
-	DEF_VALS1(MQRC_NEXT_OFFSET_ERROR         ),
-	DEF_VALS1(MQRC_NO_RECORD_AVAILABLE       ),
-	DEF_VALS1(MQRC_OBJECT_LEVEL_INCOMPATIBLE ),
-	DEF_VALS1(MQRC_NEXT_RECORD_ERROR         ),
-	DEF_VALS1(MQRC_BACKOUT_THRESHOLD_REACHED ),
-	DEF_VALS1(MQRC_MSG_NOT_MATCHED           ),
-	DEF_VALS1(MQRC_JMS_FORMAT_ERROR          ),
-	DEF_VALS1(MQRC_SEGMENTS_NOT_SUPPORTED    ),
-	DEF_VALS1(MQRC_WRONG_CF_LEVEL            ),
-	DEF_VALS1(MQRC_CONFIG_CREATE_OBJECT      ),
-	DEF_VALS1(MQRC_CONFIG_CHANGE_OBJECT      ),
-	DEF_VALS1(MQRC_CONFIG_DELETE_OBJECT      ),
-	DEF_VALS1(MQRC_CONFIG_REFRESH_OBJECT     ),
-	DEF_VALS1(MQRC_CHANNEL_SSL_ERROR         ),
-	DEF_VALS1(MQRC_PARTICIPANT_NOT_DEFINED   ),
-	DEF_VALS1(MQRC_CF_STRUC_FAILED           ),
-	DEF_VALS1(MQRC_API_EXIT_ERROR            ),
-	DEF_VALS1(MQRC_API_EXIT_INIT_ERROR       ),
-	DEF_VALS1(MQRC_API_EXIT_TERM_ERROR       ),
-	DEF_VALS1(MQRC_EXIT_REASON_ERROR         ),
-	DEF_VALS1(MQRC_RESERVED_VALUE_ERROR      ),
-	DEF_VALS1(MQRC_NO_DATA_AVAILABLE         ),
-	DEF_VALS1(MQRC_SCO_ERROR                 ),
-	DEF_VALS1(MQRC_KEY_REPOSITORY_ERROR      ),
-	DEF_VALS1(MQRC_CRYPTO_HARDWARE_ERROR     ),
-	DEF_VALS1(MQRC_AUTH_INFO_REC_COUNT_ERROR ),
-	DEF_VALS1(MQRC_AUTH_INFO_REC_ERROR       ),
-	DEF_VALS1(MQRC_AIR_ERROR                 ),
-	DEF_VALS1(MQRC_AUTH_INFO_TYPE_ERROR      ),
-	DEF_VALS1(MQRC_AUTH_INFO_CONN_NAME_ERROR ),
-	DEF_VALS1(MQRC_LDAP_USER_NAME_ERROR      ),
-	DEF_VALS1(MQRC_LDAP_USER_NAME_LENGTH_ERR ),
-	DEF_VALS1(MQRC_LDAP_PASSWORD_ERROR       ),
-	DEF_VALS1(MQRC_SSL_ALREADY_INITIALIZED   ),
-	DEF_VALS1(MQRC_SSL_CONFIG_ERROR          ),
-	DEF_VALS1(MQRC_SSL_INITIALIZATION_ERROR  ),
-	DEF_VALS1(MQRC_Q_INDEX_TYPE_ERROR        ),
-	DEF_VALS1(MQRC_CFBS_ERROR                ),
-	DEF_VALS1(MQRC_SSL_NOT_ALLOWED           ),
-	DEF_VALS1(MQRC_JSSE_ERROR                ),
-	DEF_VALS1(MQRC_SSL_PEER_NAME_MISMATCH    ),
-	DEF_VALS1(MQRC_SSL_PEER_NAME_ERROR       ),
-	DEF_VALS1(MQRC_UNSUPPORTED_CIPHER_SUITE  ),
-	DEF_VALS1(MQRC_SSL_CERTIFICATE_REVOKED   ),
-	DEF_VALS1(MQRC_SSL_CERT_STORE_ERROR      ),
-	DEF_VALS1(MQRC_CLIENT_EXIT_LOAD_ERROR    ),
-	DEF_VALS1(MQRC_CLIENT_EXIT_ERROR         ),
-	DEF_VALS1(MQRC_UOW_COMMITTED             ),
-	DEF_VALS1(MQRC_SSL_KEY_RESET_ERROR       ),
-	DEF_VALS1(MQRC_UNKNOWN_COMPONENT_NAME    ),
-	DEF_VALS1(MQRC_LOGGER_STATUS             ),
-	DEF_VALS1(MQRC_COMMAND_MQSC              ),
-	DEF_VALS1(MQRC_COMMAND_PCF               ),
-	DEF_VALS1(MQRC_CFIF_ERROR                ),
-	DEF_VALS1(MQRC_CFSF_ERROR                ),
-	DEF_VALS1(MQRC_CFGR_ERROR                ),
-	DEF_VALS1(MQRC_MSG_NOT_ALLOWED_IN_GROUP  ),
-	DEF_VALS1(MQRC_FILTER_OPERATOR_ERROR     ),
-	DEF_VALS1(MQRC_NESTED_SELECTOR_ERROR     ),
-	DEF_VALS1(MQRC_EPH_ERROR                 ),
-	DEF_VALS1(MQRC_RFH_FORMAT_ERROR          ),
-	DEF_VALS1(MQRC_CFBF_ERROR                ),
-	DEF_VALS1(MQRC_CLIENT_CHANNEL_CONFLICT   ),
-	DEF_VALS1(MQRC_SD_ERROR                  ),
-	DEF_VALS1(MQRC_TOPIC_STRING_ERROR        ),
-	DEF_VALS1(MQRC_STS_ERROR                 ),
-	DEF_VALS1(MQRC_NO_SUBSCRIPTION           ),
-	DEF_VALS1(MQRC_SUBSCRIPTION_IN_USE       ),
-	DEF_VALS1(MQRC_STAT_TYPE_ERROR           ),
-	DEF_VALS1(MQRC_SUB_USER_DATA_ERROR       ),
-	DEF_VALS1(MQRC_SUB_ALREADY_EXISTS        ),
-	DEF_VALS1(MQRC_IDENTITY_MISMATCH         ),
-	DEF_VALS1(MQRC_ALTER_SUB_ERROR           ),
-	DEF_VALS1(MQRC_DURABILITY_NOT_ALLOWED    ),
-	DEF_VALS1(MQRC_NO_RETAINED_MSG           ),
-	DEF_VALS1(MQRC_SRO_ERROR                 ),
-	DEF_VALS1(MQRC_SUB_NAME_ERROR            ),
-	DEF_VALS1(MQRC_OBJECT_STRING_ERROR       ),
-	DEF_VALS1(MQRC_PROPERTY_NAME_ERROR       ),
-	DEF_VALS1(MQRC_SEGMENTATION_NOT_ALLOWED  ),
-	DEF_VALS1(MQRC_CBD_ERROR                 ),
-	DEF_VALS1(MQRC_CTLO_ERROR                ),
-	DEF_VALS1(MQRC_NO_CALLBACKS_ACTIVE       ),
-	DEF_VALS1(MQRC_CALLBACK_NOT_REGISTERED   ),
-	DEF_VALS1(MQRC_OPTIONS_CHANGED           ),
-	DEF_VALS1(MQRC_READ_AHEAD_MSGS           ),
-	DEF_VALS1(MQRC_SELECTOR_SYNTAX_ERROR     ),
-	DEF_VALS1(MQRC_HMSG_ERROR                ),
-	DEF_VALS1(MQRC_CMHO_ERROR                ),
-	DEF_VALS1(MQRC_DMHO_ERROR                ),
-	DEF_VALS1(MQRC_SMPO_ERROR                ),
-	DEF_VALS1(MQRC_IMPO_ERROR                ),
-	DEF_VALS1(MQRC_PROPERTY_NAME_TOO_BIG     ),
-	DEF_VALS1(MQRC_PROP_VALUE_NOT_CONVERTED  ),
-	DEF_VALS1(MQRC_PROP_TYPE_NOT_SUPPORTED   ),
-	DEF_VALS1(MQRC_PROPERTY_VALUE_TOO_BIG    ),
-	DEF_VALS1(MQRC_PROP_CONV_NOT_SUPPORTED   ),
-	DEF_VALS1(MQRC_PROPERTY_NOT_AVAILABLE    ),
-	DEF_VALS1(MQRC_PROP_NUMBER_FORMAT_ERROR  ),
-	DEF_VALS1(MQRC_PROPERTY_TYPE_ERROR       ),
-	DEF_VALS1(MQRC_PROPERTIES_TOO_BIG        ),
-	DEF_VALS1(MQRC_PUT_NOT_RETAINED          ),
-	DEF_VALS1(MQRC_ALIAS_TARGTYPE_CHANGED    ),
-	DEF_VALS1(MQRC_DMPO_ERROR                ),
-	DEF_VALS1(MQRC_PD_ERROR                  ),
-	DEF_VALS1(MQRC_CALLBACK_TYPE_ERROR       ),
-	DEF_VALS1(MQRC_CBD_OPTIONS_ERROR         ),
-	DEF_VALS1(MQRC_MAX_MSG_LENGTH_ERROR      ),
-	DEF_VALS1(MQRC_CALLBACK_ROUTINE_ERROR    ),
-	DEF_VALS1(MQRC_CALLBACK_LINK_ERROR       ),
-	DEF_VALS1(MQRC_OPERATION_ERROR           ),
-	DEF_VALS1(MQRC_BMHO_ERROR                ),
-	DEF_VALS1(MQRC_UNSUPPORTED_PROPERTY      ),
-	DEF_VALS1(MQRC_PROP_NAME_NOT_CONVERTED   ),
-	DEF_VALS1(MQRC_GET_ENABLED               ),
-	DEF_VALS1(MQRC_MODULE_NOT_FOUND          ),
-	DEF_VALS1(MQRC_MODULE_INVALID            ),
-	DEF_VALS1(MQRC_MODULE_ENTRY_NOT_FOUND    ),
-	DEF_VALS1(MQRC_MIXED_CONTENT_NOT_ALLOWED ),
-	DEF_VALS1(MQRC_MSG_HANDLE_IN_USE         ),
-	DEF_VALS1(MQRC_HCONN_ASYNC_ACTIVE        ),
-	DEF_VALS1(MQRC_MHBO_ERROR                ),
-	DEF_VALS1(MQRC_PUBLICATION_FAILURE       ),
-	DEF_VALS1(MQRC_SUB_INHIBITED             ),
-	DEF_VALS1(MQRC_SELECTOR_ALWAYS_FALSE     ),
-	DEF_VALS1(MQRC_XEPO_ERROR                ),
-	DEF_VALS1(MQRC_DURABILITY_NOT_ALTERABLE  ),
-	DEF_VALS1(MQRC_TOPIC_NOT_ALTERABLE       ),
-	DEF_VALS1(MQRC_SUBLEVEL_NOT_ALTERABLE    ),
-	DEF_VALS1(MQRC_PROPERTY_NAME_LENGTH_ERR  ),
-	DEF_VALS1(MQRC_DUPLICATE_GROUP_SUB       ),
-	DEF_VALS1(MQRC_GROUPING_NOT_ALTERABLE    ),
-	DEF_VALS1(MQRC_SELECTOR_INVALID_FOR_TYPE ),
-	DEF_VALS1(MQRC_HOBJ_QUIESCED             ),
-	DEF_VALS1(MQRC_HOBJ_QUIESCED_NO_MSGS     ),
-	DEF_VALS1(MQRC_SELECTION_STRING_ERROR    ),
-	DEF_VALS1(MQRC_RES_OBJECT_STRING_ERROR   ),
-	DEF_VALS1(MQRC_CONNECTION_SUSPENDED      ),
-	DEF_VALS1(MQRC_INVALID_DESTINATION       ),
-	DEF_VALS1(MQRC_INVALID_SUBSCRIPTION      ),
-	DEF_VALS1(MQRC_SELECTOR_NOT_ALTERABLE    ),
-	DEF_VALS1(MQRC_RETAINED_MSG_Q_ERROR      ),
-	DEF_VALS1(MQRC_RETAINED_NOT_DELIVERED    ),
-	DEF_VALS1(MQRC_RFH_RESTRICTED_FORMAT_ERR ),
-	DEF_VALS1(MQRC_CONNECTION_STOPPED        ),
-	DEF_VALS1(MQRC_ASYNC_UOW_CONFLICT        ),
-	DEF_VALS1(MQRC_ASYNC_XA_CONFLICT         ),
-	DEF_VALS1(MQRC_PUBSUB_INHIBITED          ),
-	DEF_VALS1(MQRC_MSG_HANDLE_COPY_FAILURE   ),
-	DEF_VALS1(MQRC_DEST_CLASS_NOT_ALTERABLE  ),
-	DEF_VALS1(MQRC_OPERATION_NOT_ALLOWED     ),
-	DEF_VALS1(MQRC_ACTION_ERROR              ),
-	DEF_VALS1(MQRC_CHANNEL_NOT_AVAILABLE     ),
-	DEF_VALS1(MQRC_HOST_NOT_AVAILABLE        ),
-	DEF_VALS1(MQRC_CHANNEL_CONFIG_ERROR      ),
-	DEF_VALS1(MQRC_UNKNOWN_CHANNEL_NAME      ),
-	DEF_VALS1(MQRC_LOOPING_PUBLICATION       ),
-	DEF_VALS1(MQRC_ALREADY_JOINED            ),
-	DEF_VALS1(MQRC_STANDBY_Q_MGR             ),
-	DEF_VALS1(MQRC_RECONNECTING              ),
-	DEF_VALS1(MQRC_RECONNECTED               ),
-	DEF_VALS1(MQRC_RECONNECT_QMID_MISMATCH   ),
-	DEF_VALS1(MQRC_RECONNECT_INCOMPATIBLE    ),
-	DEF_VALS1(MQRC_RECONNECT_FAILED          ),
-	DEF_VALS1(MQRC_CALL_INTERRUPTED          ),
-	DEF_VALS1(MQRC_NO_SUBS_MATCHED           ),
-	DEF_VALS1(MQRC_SELECTION_NOT_AVAILABLE   ),
-	DEF_VALS1(MQRC_CHANNEL_SSL_WARNING       ),
-	DEF_VALS1(MQRC_OCSP_URL_ERROR            ),
-	DEF_VALS1(MQRC_CONTENT_ERROR             ),
-	DEF_VALS1(MQRC_RECONNECT_Q_MGR_REQD      ),
-	DEF_VALS1(MQRC_RECONNECT_TIMED_OUT       ),
-	DEF_VALS1(MQRC_PUBLISH_EXIT_ERROR        ),
-	DEF_VALS1(MQRC_SSL_ALT_PROVIDER_REQUIRED ),
-	DEF_VALS1(MQRC_PRECONN_EXIT_LOAD_ERROR   ),
-	DEF_VALS1(MQRC_PRECONN_EXIT_NOT_FOUND    ),
-	DEF_VALS1(MQRC_PRECONN_EXIT_ERROR        ),
-	DEF_VALS1(MQRC_CD_ARRAY_ERROR            ),
-	DEF_VALS1(MQRCCF_CFH_TYPE_ERROR             ),
-	DEF_VALS1(MQRCCF_CFH_LENGTH_ERROR           ),
-	DEF_VALS1(MQRCCF_CFH_VERSION_ERROR          ),
-	DEF_VALS1(MQRCCF_CFH_MSG_SEQ_NUMBER_ERR     ),
-	DEF_VALS1(MQRCCF_CFH_CONTROL_ERROR          ),
-	DEF_VALS1(MQRCCF_CFH_PARM_COUNT_ERROR       ),
-	DEF_VALS1(MQRCCF_CFH_COMMAND_ERROR          ),
-	DEF_VALS1(MQRCCF_COMMAND_FAILED             ),
-	DEF_VALS1(MQRCCF_CFIN_LENGTH_ERROR          ),
-	DEF_VALS1(MQRCCF_CFST_LENGTH_ERROR          ),
-	DEF_VALS1(MQRCCF_CFST_STRING_LENGTH_ERR     ),
-	DEF_VALS1(MQRCCF_FORCE_VALUE_ERROR          ),
-	DEF_VALS1(MQRCCF_STRUCTURE_TYPE_ERROR       ),
-	DEF_VALS1(MQRCCF_CFIN_PARM_ID_ERROR         ),
-	DEF_VALS1(MQRCCF_CFST_PARM_ID_ERROR         ),
-	DEF_VALS1(MQRCCF_MSG_LENGTH_ERROR           ),
-	DEF_VALS1(MQRCCF_CFIN_DUPLICATE_PARM        ),
-	DEF_VALS1(MQRCCF_CFST_DUPLICATE_PARM        ),
-	DEF_VALS1(MQRCCF_PARM_COUNT_TOO_SMALL       ),
-	DEF_VALS1(MQRCCF_PARM_COUNT_TOO_BIG         ),
-	DEF_VALS1(MQRCCF_Q_ALREADY_IN_CELL          ),
-	DEF_VALS1(MQRCCF_Q_TYPE_ERROR               ),
-	DEF_VALS1(MQRCCF_MD_FORMAT_ERROR            ),
-	DEF_VALS1(MQRCCF_CFSL_LENGTH_ERROR          ),
-	DEF_VALS1(MQRCCF_REPLACE_VALUE_ERROR        ),
-	DEF_VALS1(MQRCCF_CFIL_DUPLICATE_VALUE       ),
-	DEF_VALS1(MQRCCF_CFIL_COUNT_ERROR           ),
-	DEF_VALS1(MQRCCF_CFIL_LENGTH_ERROR          ),
-	DEF_VALS2(MQRCCF_MODE_VALUE_ERROR,"MQRCCF_QUIESCE_VALUE_ERROR"),
-	DEF_VALS1(MQRCCF_MSG_SEQ_NUMBER_ERROR       ),
-	DEF_VALS1(MQRCCF_PING_DATA_COUNT_ERROR      ),
-	DEF_VALS1(MQRCCF_PING_DATA_COMPARE_ERROR    ),
-	DEF_VALS1(MQRCCF_CFSL_PARM_ID_ERROR         ),
-	DEF_VALS1(MQRCCF_CHANNEL_TYPE_ERROR         ),
-	DEF_VALS1(MQRCCF_PARM_SEQUENCE_ERROR        ),
-	DEF_VALS1(MQRCCF_XMIT_PROTOCOL_TYPE_ERR     ),
-	DEF_VALS1(MQRCCF_BATCH_SIZE_ERROR           ),
-	DEF_VALS1(MQRCCF_DISC_INT_ERROR             ),
-	DEF_VALS1(MQRCCF_SHORT_RETRY_ERROR          ),
-	DEF_VALS1(MQRCCF_SHORT_TIMER_ERROR          ),
-	DEF_VALS1(MQRCCF_LONG_RETRY_ERROR           ),
-	DEF_VALS1(MQRCCF_LONG_TIMER_ERROR           ),
-	DEF_VALS1(MQRCCF_SEQ_NUMBER_WRAP_ERROR      ),
-	DEF_VALS1(MQRCCF_MAX_MSG_LENGTH_ERROR       ),
-	DEF_VALS1(MQRCCF_PUT_AUTH_ERROR             ),
-	DEF_VALS1(MQRCCF_PURGE_VALUE_ERROR          ),
-	DEF_VALS1(MQRCCF_CFIL_PARM_ID_ERROR         ),
-	DEF_VALS1(MQRCCF_MSG_TRUNCATED              ),
-	DEF_VALS1(MQRCCF_CCSID_ERROR                ),
-	DEF_VALS1(MQRCCF_ENCODING_ERROR             ),
-	DEF_VALS1(MQRCCF_QUEUES_VALUE_ERROR         ),
-	DEF_VALS1(MQRCCF_DATA_CONV_VALUE_ERROR      ),
-	DEF_VALS1(MQRCCF_INDOUBT_VALUE_ERROR        ),
-	DEF_VALS1(MQRCCF_ESCAPE_TYPE_ERROR          ),
-	DEF_VALS1(MQRCCF_REPOS_VALUE_ERROR          ),
-	DEF_VALS1(MQRCCF_CHANNEL_TABLE_ERROR        ),
-	DEF_VALS1(MQRCCF_MCA_TYPE_ERROR             ),
-	DEF_VALS1(MQRCCF_CHL_INST_TYPE_ERROR        ),
-	DEF_VALS1(MQRCCF_CHL_STATUS_NOT_FOUND       ),
-	DEF_VALS1(MQRCCF_CFSL_DUPLICATE_PARM        ),
-	DEF_VALS1(MQRCCF_CFSL_TOTAL_LENGTH_ERROR    ),
-	DEF_VALS1(MQRCCF_CFSL_COUNT_ERROR           ),
-	DEF_VALS1(MQRCCF_CFSL_STRING_LENGTH_ERR     ),
-	DEF_VALS1(MQRCCF_BROKER_DELETED             ),
-	DEF_VALS1(MQRCCF_STREAM_ERROR               ),
-	DEF_VALS1(MQRCCF_TOPIC_ERROR                ),
-	DEF_VALS1(MQRCCF_NOT_REGISTERED             ),
-	DEF_VALS1(MQRCCF_Q_MGR_NAME_ERROR           ),
-	DEF_VALS1(MQRCCF_INCORRECT_STREAM           ),
-	DEF_VALS1(MQRCCF_Q_NAME_ERROR               ),
-	DEF_VALS1(MQRCCF_NO_RETAINED_MSG            ),
-	DEF_VALS1(MQRCCF_DUPLICATE_IDENTITY         ),
-	DEF_VALS1(MQRCCF_INCORRECT_Q                ),
-	DEF_VALS1(MQRCCF_CORREL_ID_ERROR            ),
-	DEF_VALS1(MQRCCF_NOT_AUTHORIZED             ),
-	DEF_VALS1(MQRCCF_UNKNOWN_STREAM             ),
-	DEF_VALS1(MQRCCF_REG_OPTIONS_ERROR          ),
-	DEF_VALS1(MQRCCF_PUB_OPTIONS_ERROR          ),
-	DEF_VALS1(MQRCCF_UNKNOWN_BROKER             ),
-	DEF_VALS1(MQRCCF_Q_MGR_CCSID_ERROR          ),
-	DEF_VALS1(MQRCCF_DEL_OPTIONS_ERROR          ),
-	DEF_VALS1(MQRCCF_CLUSTER_NAME_CONFLICT      ),
-	DEF_VALS1(MQRCCF_REPOS_NAME_CONFLICT        ),
-	DEF_VALS1(MQRCCF_CLUSTER_Q_USAGE_ERROR      ),
-	DEF_VALS1(MQRCCF_ACTION_VALUE_ERROR         ),
-	DEF_VALS1(MQRCCF_COMMS_LIBRARY_ERROR        ),
-	DEF_VALS1(MQRCCF_NETBIOS_NAME_ERROR         ),
-	DEF_VALS1(MQRCCF_BROKER_COMMAND_FAILED      ),
-	DEF_VALS1(MQRCCF_CFST_CONFLICTING_PARM      ),
-	DEF_VALS1(MQRCCF_PATH_NOT_VALID             ),
-	DEF_VALS1(MQRCCF_PARM_SYNTAX_ERROR          ),
-	DEF_VALS1(MQRCCF_PWD_LENGTH_ERROR           ),
-	DEF_VALS1(MQRCCF_FILTER_ERROR               ),
-	DEF_VALS1(MQRCCF_WRONG_USER                 ),
-	DEF_VALS1(MQRCCF_DUPLICATE_SUBSCRIPTION     ),
-	DEF_VALS1(MQRCCF_SUB_NAME_ERROR             ),
-	DEF_VALS1(MQRCCF_SUB_IDENTITY_ERROR         ),
-	DEF_VALS1(MQRCCF_SUBSCRIPTION_IN_USE        ),
-	DEF_VALS1(MQRCCF_SUBSCRIPTION_LOCKED        ),
-	DEF_VALS1(MQRCCF_ALREADY_JOINED             ),
-	DEF_VALS1(MQRCCF_OBJECT_IN_USE              ),
-	DEF_VALS1(MQRCCF_UNKNOWN_FILE_NAME          ),
-	DEF_VALS1(MQRCCF_FILE_NOT_AVAILABLE         ),
-	DEF_VALS1(MQRCCF_DISC_RETRY_ERROR           ),
-	DEF_VALS1(MQRCCF_ALLOC_RETRY_ERROR          ),
-	DEF_VALS1(MQRCCF_ALLOC_SLOW_TIMER_ERROR     ),
-	DEF_VALS1(MQRCCF_ALLOC_FAST_TIMER_ERROR     ),
-	DEF_VALS1(MQRCCF_PORT_NUMBER_ERROR          ),
-	DEF_VALS1(MQRCCF_CHL_SYSTEM_NOT_ACTIVE      ),
-	DEF_VALS1(MQRCCF_ENTITY_NAME_MISSING        ),
-	DEF_VALS1(MQRCCF_PROFILE_NAME_ERROR         ),
-	DEF_VALS1(MQRCCF_AUTH_VALUE_ERROR           ),
-	DEF_VALS1(MQRCCF_AUTH_VALUE_MISSING         ),
-	DEF_VALS1(MQRCCF_OBJECT_TYPE_MISSING        ),
-	DEF_VALS1(MQRCCF_CONNECTION_ID_ERROR        ),
-	DEF_VALS1(MQRCCF_LOG_TYPE_ERROR             ),
-	DEF_VALS1(MQRCCF_PROGRAM_NOT_AVAILABLE      ),
-	DEF_VALS1(MQRCCF_PROGRAM_AUTH_FAILED        ),
-	DEF_VALS1(MQRCCF_NONE_FOUND                 ),
-	DEF_VALS1(MQRCCF_SECURITY_SWITCH_OFF        ),
-	DEF_VALS1(MQRCCF_SECURITY_REFRESH_FAILED    ),
-	DEF_VALS1(MQRCCF_PARM_CONFLICT              ),
-	DEF_VALS1(MQRCCF_COMMAND_INHIBITED          ),
-	DEF_VALS1(MQRCCF_OBJECT_BEING_DELETED       ),
-	DEF_VALS1(MQRCCF_STORAGE_CLASS_IN_USE       ),
-	DEF_VALS1(MQRCCF_OBJECT_NAME_RESTRICTED     ),
-	DEF_VALS1(MQRCCF_OBJECT_LIMIT_EXCEEDED      ),
-	DEF_VALS1(MQRCCF_OBJECT_OPEN_FORCE          ),
-	DEF_VALS1(MQRCCF_DISPOSITION_CONFLICT       ),
-	DEF_VALS1(MQRCCF_Q_MGR_NOT_IN_QSG           ),
-	DEF_VALS1(MQRCCF_ATTR_VALUE_FIXED           ),
-	DEF_VALS1(MQRCCF_NAMELIST_ERROR             ),
-	DEF_VALS1(MQRCCF_NO_CHANNEL_INITIATOR       ),
-	DEF_VALS1(MQRCCF_CHANNEL_INITIATOR_ERROR    ),
-	DEF_VALS1(MQRCCF_COMMAND_LEVEL_CONFLICT     ),
-	DEF_VALS1(MQRCCF_Q_ATTR_CONFLICT            ),
-	DEF_VALS1(MQRCCF_EVENTS_DISABLED            ),
-	DEF_VALS1(MQRCCF_COMMAND_SCOPE_ERROR        ),
-	DEF_VALS1(MQRCCF_COMMAND_REPLY_ERROR        ),
-	DEF_VALS1(MQRCCF_FUNCTION_RESTRICTED        ),
-	DEF_VALS1(MQRCCF_PARM_MISSING               ),
-	DEF_VALS1(MQRCCF_PARM_VALUE_ERROR           ),
-	DEF_VALS1(MQRCCF_COMMAND_LENGTH_ERROR       ),
-	DEF_VALS1(MQRCCF_COMMAND_ORIGIN_ERROR       ),
-	DEF_VALS1(MQRCCF_LISTENER_CONFLICT          ),
-	DEF_VALS1(MQRCCF_LISTENER_STARTED           ),
-	DEF_VALS1(MQRCCF_LISTENER_STOPPED           ),
-	DEF_VALS1(MQRCCF_CHANNEL_ERROR              ),
-	DEF_VALS1(MQRCCF_CF_STRUC_ERROR             ),
-	DEF_VALS1(MQRCCF_UNKNOWN_USER_ID            ),
-	DEF_VALS1(MQRCCF_UNEXPECTED_ERROR           ),
-	DEF_VALS1(MQRCCF_NO_XCF_PARTNER             ),
-	DEF_VALS1(MQRCCF_CFGR_PARM_ID_ERROR         ),
-	DEF_VALS1(MQRCCF_CFIF_LENGTH_ERROR          ),
-	DEF_VALS1(MQRCCF_CFIF_OPERATOR_ERROR        ),
-	DEF_VALS1(MQRCCF_CFIF_PARM_ID_ERROR         ),
-	DEF_VALS1(MQRCCF_CFSF_FILTER_VAL_LEN_ERR    ),
-	DEF_VALS1(MQRCCF_CFSF_LENGTH_ERROR          ),
-	DEF_VALS1(MQRCCF_CFSF_OPERATOR_ERROR        ),
-	DEF_VALS1(MQRCCF_CFSF_PARM_ID_ERROR         ),
-	DEF_VALS1(MQRCCF_TOO_MANY_FILTERS           ),
-	DEF_VALS1(MQRCCF_LISTENER_RUNNING           ),
-	DEF_VALS1(MQRCCF_LSTR_STATUS_NOT_FOUND      ),
-	DEF_VALS1(MQRCCF_SERVICE_RUNNING            ),
-	DEF_VALS1(MQRCCF_SERV_STATUS_NOT_FOUND      ),
-	DEF_VALS1(MQRCCF_SERVICE_STOPPED            ),
-	DEF_VALS1(MQRCCF_CFBS_DUPLICATE_PARM        ),
-	DEF_VALS1(MQRCCF_CFBS_LENGTH_ERROR          ),
-	DEF_VALS1(MQRCCF_CFBS_PARM_ID_ERROR         ),
-	DEF_VALS1(MQRCCF_CFBS_STRING_LENGTH_ERR     ),
-	DEF_VALS1(MQRCCF_CFGR_LENGTH_ERROR          ),
-	DEF_VALS1(MQRCCF_CFGR_PARM_COUNT_ERROR      ),
-	DEF_VALS1(MQRCCF_CONN_NOT_STOPPED           ),
-	DEF_VALS1(MQRCCF_SERVICE_REQUEST_PENDING    ),
-	DEF_VALS1(MQRCCF_NO_START_CMD               ),
-	DEF_VALS1(MQRCCF_NO_STOP_CMD                ),
-	DEF_VALS1(MQRCCF_CFBF_LENGTH_ERROR          ),
-	DEF_VALS1(MQRCCF_CFBF_PARM_ID_ERROR         ),
-	DEF_VALS1(MQRCCF_CFBF_OPERATOR_ERROR        ),
-	DEF_VALS1(MQRCCF_CFBF_FILTER_VAL_LEN_ERR    ),
-	DEF_VALS1(MQRCCF_LISTENER_STILL_ACTIVE      ),
-	DEF_VALS1(MQRCCF_TOPICSTR_ALREADY_EXISTS    ),
-	DEF_VALS1(MQRCCF_SHARING_CONVS_ERROR        ),
-	DEF_VALS1(MQRCCF_SHARING_CONVS_TYPE         ),
-	DEF_VALS1(MQRCCF_SECURITY_CASE_CONFLICT     ),
-	DEF_VALS1(MQRCCF_TOPIC_TYPE_ERROR           ),
-	DEF_VALS1(MQRCCF_MAX_INSTANCES_ERROR        ),
-	DEF_VALS1(MQRCCF_MAX_INSTS_PER_CLNT_ERR     ),
-	DEF_VALS1(MQRCCF_TOPIC_STRING_NOT_FOUND     ),
-	DEF_VALS1(MQRCCF_SUBSCRIPTION_POINT_ERR     ),
-	DEF_VALS1(MQRCCF_SUB_ALREADY_EXISTS         ),
-	DEF_VALS1(MQRCCF_UNKNOWN_OBJECT_NAME        ),
-	DEF_VALS1(MQRCCF_REMOTE_Q_NAME_ERROR        ),
-	DEF_VALS1(MQRCCF_DURABILITY_NOT_ALLOWED     ),
-	DEF_VALS1(MQRCCF_HOBJ_ERROR                 ),
-	DEF_VALS1(MQRCCF_DEST_NAME_ERROR            ),
-	DEF_VALS1(MQRCCF_INVALID_DESTINATION        ),
-	DEF_VALS1(MQRCCF_PUBSUB_INHIBITED           ),
-	DEF_VALS1(MQRCCF_GROUPUR_CHECKS_FAILED      ),
-	DEF_VALS1(MQRCCF_SSL_ALT_PROVIDER_REQD      ),
-	DEF_VALS1(MQRCCF_OBJECT_ALREADY_EXISTS      ),
-	DEF_VALS1(MQRCCF_OBJECT_WRONG_TYPE          ),
-	DEF_VALS1(MQRCCF_LIKE_OBJECT_WRONG_TYPE     ),
-	DEF_VALS1(MQRCCF_OBJECT_OPEN                ),
-	DEF_VALS1(MQRCCF_ATTR_VALUE_ERROR           ),
-	DEF_VALS1(MQRCCF_UNKNOWN_Q_MGR              ),
-	DEF_VALS1(MQRCCF_Q_WRONG_TYPE               ),
-	DEF_VALS1(MQRCCF_OBJECT_NAME_ERROR          ),
-	DEF_VALS1(MQRCCF_ALLOCATE_FAILED            ),
-	DEF_VALS1(MQRCCF_HOST_NOT_AVAILABLE         ),
-	DEF_VALS1(MQRCCF_CONFIGURATION_ERROR        ),
-	DEF_VALS1(MQRCCF_CONNECTION_REFUSED         ),
-	DEF_VALS1(MQRCCF_ENTRY_ERROR                ),
-	DEF_VALS1(MQRCCF_SEND_FAILED                ),
-	DEF_VALS1(MQRCCF_RECEIVED_DATA_ERROR        ),
-	DEF_VALS1(MQRCCF_RECEIVE_FAILED             ),
-	DEF_VALS1(MQRCCF_CONNECTION_CLOSED          ),
-	DEF_VALS1(MQRCCF_NO_STORAGE                 ),
-	DEF_VALS1(MQRCCF_NO_COMMS_MANAGER           ),
-	DEF_VALS1(MQRCCF_LISTENER_NOT_STARTED       ),
-	DEF_VALS1(MQRCCF_BIND_FAILED                ),
-	DEF_VALS1(MQRCCF_CHANNEL_INDOUBT            ),
-	DEF_VALS1(MQRCCF_MQCONN_FAILED              ),
-	DEF_VALS1(MQRCCF_MQOPEN_FAILED              ),
-	DEF_VALS1(MQRCCF_MQGET_FAILED               ),
-	DEF_VALS1(MQRCCF_MQPUT_FAILED               ),
-	DEF_VALS1(MQRCCF_PING_ERROR                 ),
-	DEF_VALS1(MQRCCF_CHANNEL_IN_USE             ),
-	DEF_VALS1(MQRCCF_CHANNEL_NOT_FOUND          ),
-	DEF_VALS1(MQRCCF_UNKNOWN_REMOTE_CHANNEL     ),
-	DEF_VALS1(MQRCCF_REMOTE_QM_UNAVAILABLE      ),
-	DEF_VALS1(MQRCCF_REMOTE_QM_TERMINATING      ),
-	DEF_VALS1(MQRCCF_MQINQ_FAILED               ),
-	DEF_VALS1(MQRCCF_NOT_XMIT_Q                 ),
-	DEF_VALS1(MQRCCF_CHANNEL_DISABLED           ),
-	DEF_VALS1(MQRCCF_USER_EXIT_NOT_AVAILABLE    ),
-	DEF_VALS1(MQRCCF_COMMIT_FAILED              ),
-	DEF_VALS1(MQRCCF_WRONG_CHANNEL_TYPE         ),
-	DEF_VALS1(MQRCCF_CHANNEL_ALREADY_EXISTS     ),
-	DEF_VALS1(MQRCCF_DATA_TOO_LARGE             ),
-	DEF_VALS1(MQRCCF_CHANNEL_NAME_ERROR         ),
-	DEF_VALS1(MQRCCF_XMIT_Q_NAME_ERROR          ),
-	DEF_VALS1(MQRCCF_MCA_NAME_ERROR             ),
-	DEF_VALS1(MQRCCF_SEND_EXIT_NAME_ERROR       ),
-	DEF_VALS1(MQRCCF_SEC_EXIT_NAME_ERROR        ),
-	DEF_VALS1(MQRCCF_MSG_EXIT_NAME_ERROR        ),
-	DEF_VALS1(MQRCCF_RCV_EXIT_NAME_ERROR        ),
-	DEF_VALS1(MQRCCF_XMIT_Q_NAME_WRONG_TYPE     ),
-	DEF_VALS1(MQRCCF_MCA_NAME_WRONG_TYPE        ),
-	DEF_VALS1(MQRCCF_DISC_INT_WRONG_TYPE        ),
-	DEF_VALS1(MQRCCF_SHORT_RETRY_WRONG_TYPE     ),
-	DEF_VALS1(MQRCCF_SHORT_TIMER_WRONG_TYPE     ),
-	DEF_VALS1(MQRCCF_LONG_RETRY_WRONG_TYPE      ),
-	DEF_VALS1(MQRCCF_LONG_TIMER_WRONG_TYPE      ),
-	DEF_VALS1(MQRCCF_PUT_AUTH_WRONG_TYPE        ),
-	DEF_VALS1(MQRCCF_KEEP_ALIVE_INT_ERROR       ),
-	DEF_VALS1(MQRCCF_MISSING_CONN_NAME          ),
-	DEF_VALS1(MQRCCF_CONN_NAME_ERROR            ),
-	DEF_VALS1(MQRCCF_MQSET_FAILED               ),
-	DEF_VALS1(MQRCCF_CHANNEL_NOT_ACTIVE         ),
-	DEF_VALS1(MQRCCF_TERMINATED_BY_SEC_EXIT     ),
-	DEF_VALS1(MQRCCF_DYNAMIC_Q_SCOPE_ERROR      ),
-	DEF_VALS1(MQRCCF_CELL_DIR_NOT_AVAILABLE     ),
-	DEF_VALS1(MQRCCF_MR_COUNT_ERROR             ),
-	DEF_VALS1(MQRCCF_MR_COUNT_WRONG_TYPE        ),
-	DEF_VALS1(MQRCCF_MR_EXIT_NAME_ERROR         ),
-	DEF_VALS1(MQRCCF_MR_EXIT_NAME_WRONG_TYPE    ),
-	DEF_VALS1(MQRCCF_MR_INTERVAL_ERROR          ),
-	DEF_VALS1(MQRCCF_MR_INTERVAL_WRONG_TYPE     ),
-	DEF_VALS1(MQRCCF_NPM_SPEED_ERROR            ),
-	DEF_VALS1(MQRCCF_NPM_SPEED_WRONG_TYPE       ),
-	DEF_VALS1(MQRCCF_HB_INTERVAL_ERROR          ),
-	DEF_VALS1(MQRCCF_HB_INTERVAL_WRONG_TYPE     ),
-	DEF_VALS1(MQRCCF_CHAD_ERROR                 ),
-	DEF_VALS1(MQRCCF_CHAD_WRONG_TYPE            ),
-	DEF_VALS1(MQRCCF_CHAD_EVENT_ERROR           ),
-	DEF_VALS1(MQRCCF_CHAD_EVENT_WRONG_TYPE      ),
-	DEF_VALS1(MQRCCF_CHAD_EXIT_ERROR            ),
-	DEF_VALS1(MQRCCF_CHAD_EXIT_WRONG_TYPE       ),
-	DEF_VALS1(MQRCCF_SUPPRESSED_BY_EXIT         ),
-	DEF_VALS1(MQRCCF_BATCH_INT_ERROR            ),
-	DEF_VALS1(MQRCCF_BATCH_INT_WRONG_TYPE       ),
-	DEF_VALS1(MQRCCF_NET_PRIORITY_ERROR         ),
-	DEF_VALS1(MQRCCF_NET_PRIORITY_WRONG_TYPE    ),
-	DEF_VALS1(MQRCCF_CHANNEL_CLOSED             ),
-	DEF_VALS1(MQRCCF_Q_STATUS_NOT_FOUND         ),
-	DEF_VALS1(MQRCCF_SSL_CIPHER_SPEC_ERROR      ),
-	DEF_VALS1(MQRCCF_SSL_PEER_NAME_ERROR        ),
-	DEF_VALS1(MQRCCF_SSL_CLIENT_AUTH_ERROR      ),
-	DEF_VALS1(MQRCCF_RETAINED_NOT_SUPPORTED     ),
-
-	DEF_VALS1(MQRC_REOPEN_EXCL_INPUT_ERROR   ),
-	DEF_VALS1(MQRC_REOPEN_INQUIRE_ERROR      ),
-	DEF_VALS1(MQRC_REOPEN_SAVED_CONTEXT_ERR  ),
-	DEF_VALS1(MQRC_REOPEN_TEMPORARY_Q_ERROR  ),
-	DEF_VALS1(MQRC_ATTRIBUTE_LOCKED          ),
-	DEF_VALS1(MQRC_CURSOR_NOT_VALID          ),
-	DEF_VALS1(MQRC_ENCODING_ERROR            ),
-	DEF_VALS1(MQRC_STRUC_ID_ERROR            ),
-	DEF_VALS1(MQRC_NULL_POINTER              ),
-	DEF_VALS1(MQRC_NO_CONNECTION_REFERENCE   ),
-	DEF_VALS1(MQRC_NO_BUFFER                 ),
-	DEF_VALS1(MQRC_BINARY_DATA_LENGTH_ERROR  ),
-	DEF_VALS1(MQRC_BUFFER_NOT_AUTOMATIC      ),
-	DEF_VALS1(MQRC_INSUFFICIENT_BUFFER       ),
-	DEF_VALS1(MQRC_INSUFFICIENT_DATA         ),
-	DEF_VALS1(MQRC_DATA_TRUNCATED            ),
-	DEF_VALS1(MQRC_ZERO_LENGTH               ),
-	DEF_VALS1(MQRC_NEGATIVE_LENGTH           ),
-	DEF_VALS1(MQRC_NEGATIVE_OFFSET           ),
-	DEF_VALS1(MQRC_INCONSISTENT_FORMAT       ),
-	DEF_VALS1(MQRC_INCONSISTENT_OBJECT_STATE ),
-	DEF_VALS1(MQRC_CONTEXT_OBJECT_NOT_VALID  ),
-	DEF_VALS1(MQRC_CONTEXT_OPEN_ERROR        ),
-	DEF_VALS1(MQRC_STRUC_LENGTH_ERROR        ),
-	DEF_VALS1(MQRC_NOT_CONNECTED             ),
-	DEF_VALS1(MQRC_NOT_OPEN                  ),
-	DEF_VALS1(MQRC_DISTRIBUTION_LIST_EMPTY   ),
-	DEF_VALS1(MQRC_INCONSISTENT_OPEN_OPTIONS ),
-	DEF_VALS1(MQRC_WRONG_VERSION             ),
-	DEF_VALS1(MQRC_REFERENCE_ERROR           ),
+    DEF_VALS1(MQRC_NONE                      ),
+    DEF_VALS1(MQRC_ALIAS_BASE_Q_TYPE_ERROR   ),
+    DEF_VALS1(MQRC_ALREADY_CONNECTED         ),
+    DEF_VALS1(MQRC_BACKED_OUT                ),
+    DEF_VALS1(MQRC_BUFFER_ERROR              ),
+    DEF_VALS1(MQRC_BUFFER_LENGTH_ERROR       ),
+    DEF_VALS1(MQRC_CHAR_ATTR_LENGTH_ERROR    ),
+    DEF_VALS1(MQRC_CHAR_ATTRS_ERROR          ),
+    DEF_VALS1(MQRC_CHAR_ATTRS_TOO_SHORT      ),
+    DEF_VALS1(MQRC_CONNECTION_BROKEN         ),
+    DEF_VALS1(MQRC_DATA_LENGTH_ERROR         ),
+    DEF_VALS1(MQRC_DYNAMIC_Q_NAME_ERROR      ),
+    DEF_VALS1(MQRC_ENVIRONMENT_ERROR         ),
+    DEF_VALS1(MQRC_EXPIRY_ERROR              ),
+    DEF_VALS1(MQRC_FEEDBACK_ERROR            ),
+    DEF_VALS1(MQRC_GET_INHIBITED             ),
+    DEF_VALS1(MQRC_HANDLE_NOT_AVAILABLE      ),
+    DEF_VALS1(MQRC_HCONN_ERROR               ),
+    DEF_VALS1(MQRC_HOBJ_ERROR                ),
+    DEF_VALS1(MQRC_INHIBIT_VALUE_ERROR       ),
+    DEF_VALS1(MQRC_INT_ATTR_COUNT_ERROR      ),
+    DEF_VALS1(MQRC_INT_ATTR_COUNT_TOO_SMALL  ),
+    DEF_VALS1(MQRC_INT_ATTRS_ARRAY_ERROR     ),
+    DEF_VALS1(MQRC_SYNCPOINT_LIMIT_REACHED   ),
+    DEF_VALS1(MQRC_MAX_CONNS_LIMIT_REACHED   ),
+    DEF_VALS1(MQRC_MD_ERROR                  ),
+    DEF_VALS1(MQRC_MISSING_REPLY_TO_Q        ),
+    DEF_VALS1(MQRC_MSG_TYPE_ERROR            ),
+    DEF_VALS1(MQRC_MSG_TOO_BIG_FOR_Q         ),
+    DEF_VALS1(MQRC_MSG_TOO_BIG_FOR_Q_MGR     ),
+    DEF_VALS1(MQRC_NO_MSG_AVAILABLE          ),
+    DEF_VALS1(MQRC_NO_MSG_UNDER_CURSOR       ),
+    DEF_VALS1(MQRC_NOT_AUTHORIZED            ),
+    DEF_VALS1(MQRC_NOT_OPEN_FOR_BROWSE       ),
+    DEF_VALS1(MQRC_NOT_OPEN_FOR_INPUT        ),
+    DEF_VALS1(MQRC_NOT_OPEN_FOR_INQUIRE      ),
+    DEF_VALS1(MQRC_NOT_OPEN_FOR_OUTPUT       ),
+    DEF_VALS1(MQRC_NOT_OPEN_FOR_SET          ),
+    DEF_VALS1(MQRC_OBJECT_CHANGED            ),
+    DEF_VALS1(MQRC_OBJECT_IN_USE             ),
+    DEF_VALS1(MQRC_OBJECT_TYPE_ERROR         ),
+    DEF_VALS1(MQRC_OD_ERROR                  ),
+    DEF_VALS1(MQRC_OPTION_NOT_VALID_FOR_TYPE ),
+    DEF_VALS1(MQRC_OPTIONS_ERROR             ),
+    DEF_VALS1(MQRC_PERSISTENCE_ERROR         ),
+    DEF_VALS1(MQRC_PERSISTENT_NOT_ALLOWED    ),
+    DEF_VALS1(MQRC_PRIORITY_EXCEEDS_MAXIMUM  ),
+    DEF_VALS1(MQRC_PRIORITY_ERROR            ),
+    DEF_VALS1(MQRC_PUT_INHIBITED             ),
+    DEF_VALS1(MQRC_Q_DELETED                 ),
+    DEF_VALS1(MQRC_Q_FULL                    ),
+    DEF_VALS1(MQRC_Q_NOT_EMPTY               ),
+    DEF_VALS1(MQRC_Q_SPACE_NOT_AVAILABLE     ),
+    DEF_VALS1(MQRC_Q_TYPE_ERROR              ),
+    DEF_VALS1(MQRC_Q_MGR_NAME_ERROR          ),
+    DEF_VALS1(MQRC_Q_MGR_NOT_AVAILABLE       ),
+    DEF_VALS1(MQRC_REPORT_OPTIONS_ERROR      ),
+    DEF_VALS1(MQRC_SECOND_MARK_NOT_ALLOWED   ),
+    DEF_VALS1(MQRC_SECURITY_ERROR            ),
+    DEF_VALS1(MQRC_SELECTOR_COUNT_ERROR      ),
+    DEF_VALS1(MQRC_SELECTOR_LIMIT_EXCEEDED   ),
+    DEF_VALS1(MQRC_SELECTOR_ERROR            ),
+    DEF_VALS1(MQRC_SELECTOR_NOT_FOR_TYPE     ),
+    DEF_VALS1(MQRC_SIGNAL_OUTSTANDING        ),
+    DEF_VALS1(MQRC_SIGNAL_REQUEST_ACCEPTED   ),
+    DEF_VALS1(MQRC_STORAGE_NOT_AVAILABLE     ),
+    DEF_VALS1(MQRC_SYNCPOINT_NOT_AVAILABLE   ),
+    DEF_VALS1(MQRC_TRIGGER_CONTROL_ERROR     ),
+    DEF_VALS1(MQRC_TRIGGER_DEPTH_ERROR       ),
+    DEF_VALS1(MQRC_TRIGGER_MSG_PRIORITY_ERR  ),
+    DEF_VALS1(MQRC_TRIGGER_TYPE_ERROR        ),
+    DEF_VALS1(MQRC_TRUNCATED_MSG_ACCEPTED    ),
+    DEF_VALS1(MQRC_TRUNCATED_MSG_FAILED      ),
+    DEF_VALS1(MQRC_UNKNOWN_ALIAS_BASE_Q      ),
+    DEF_VALS1(MQRC_UNKNOWN_OBJECT_NAME       ),
+    DEF_VALS1(MQRC_UNKNOWN_OBJECT_Q_MGR      ),
+    DEF_VALS1(MQRC_UNKNOWN_REMOTE_Q_MGR      ),
+    DEF_VALS1(MQRC_WAIT_INTERVAL_ERROR       ),
+    DEF_VALS1(MQRC_XMIT_Q_TYPE_ERROR         ),
+    DEF_VALS1(MQRC_XMIT_Q_USAGE_ERROR        ),
+    DEF_VALS1(MQRC_NOT_OPEN_FOR_PASS_ALL     ),
+    DEF_VALS1(MQRC_NOT_OPEN_FOR_PASS_IDENT   ),
+    DEF_VALS1(MQRC_NOT_OPEN_FOR_SET_ALL      ),
+    DEF_VALS1(MQRC_NOT_OPEN_FOR_SET_IDENT    ),
+    DEF_VALS1(MQRC_CONTEXT_HANDLE_ERROR      ),
+    DEF_VALS1(MQRC_CONTEXT_NOT_AVAILABLE     ),
+    DEF_VALS1(MQRC_SIGNAL1_ERROR             ),
+    DEF_VALS1(MQRC_OBJECT_ALREADY_EXISTS     ),
+    DEF_VALS1(MQRC_OBJECT_DAMAGED            ),
+    DEF_VALS1(MQRC_RESOURCE_PROBLEM          ),
+    DEF_VALS1(MQRC_ANOTHER_Q_MGR_CONNECTED   ),
+    DEF_VALS1(MQRC_UNKNOWN_REPORT_OPTION     ),
+    DEF_VALS1(MQRC_STORAGE_CLASS_ERROR       ),
+    DEF_VALS1(MQRC_COD_NOT_VALID_FOR_XCF_Q   ),
+    DEF_VALS1(MQRC_XWAIT_CANCELED            ),
+    DEF_VALS1(MQRC_XWAIT_ERROR               ),
+    DEF_VALS1(MQRC_SUPPRESSED_BY_EXIT        ),
+    DEF_VALS1(MQRC_FORMAT_ERROR              ),
+    DEF_VALS1(MQRC_SOURCE_CCSID_ERROR        ),
+    DEF_VALS1(MQRC_SOURCE_INTEGER_ENC_ERROR  ),
+    DEF_VALS1(MQRC_SOURCE_DECIMAL_ENC_ERROR  ),
+    DEF_VALS1(MQRC_SOURCE_FLOAT_ENC_ERROR    ),
+    DEF_VALS1(MQRC_TARGET_CCSID_ERROR        ),
+    DEF_VALS1(MQRC_TARGET_INTEGER_ENC_ERROR  ),
+    DEF_VALS1(MQRC_TARGET_DECIMAL_ENC_ERROR  ),
+    DEF_VALS1(MQRC_TARGET_FLOAT_ENC_ERROR    ),
+    DEF_VALS1(MQRC_NOT_CONVERTED             ),
+    DEF_VALS2(MQRC_TRUNCATED,"MQRC_CONVERTED_MSG_TOO_BIG"),
+    DEF_VALS1(MQRC_NO_EXTERNAL_PARTICIPANTS  ),
+    DEF_VALS1(MQRC_PARTICIPANT_NOT_AVAILABLE ),
+    DEF_VALS1(MQRC_OUTCOME_MIXED             ),
+    DEF_VALS1(MQRC_OUTCOME_PENDING           ),
+    DEF_VALS1(MQRC_BRIDGE_STARTED            ),
+    DEF_VALS1(MQRC_BRIDGE_STOPPED            ),
+    DEF_VALS1(MQRC_ADAPTER_STORAGE_SHORTAGE  ),
+    DEF_VALS1(MQRC_UOW_IN_PROGRESS           ),
+    DEF_VALS1(MQRC_ADAPTER_CONN_LOAD_ERROR   ),
+    DEF_VALS1(MQRC_ADAPTER_SERV_LOAD_ERROR   ),
+    DEF_VALS1(MQRC_ADAPTER_DEFS_ERROR        ),
+    DEF_VALS1(MQRC_ADAPTER_DEFS_LOAD_ERROR   ),
+    DEF_VALS1(MQRC_ADAPTER_CONV_LOAD_ERROR   ),
+    DEF_VALS1(MQRC_BO_ERROR                  ),
+    DEF_VALS1(MQRC_DH_ERROR                  ),
+    DEF_VALS1(MQRC_MULTIPLE_REASONS          ),
+    DEF_VALS1(MQRC_OPEN_FAILED               ),
+    DEF_VALS1(MQRC_ADAPTER_DISC_LOAD_ERROR   ),
+    DEF_VALS1(MQRC_CNO_ERROR                 ),
+    DEF_VALS1(MQRC_CICS_WAIT_FAILED          ),
+    DEF_VALS1(MQRC_DLH_ERROR                 ),
+    DEF_VALS1(MQRC_HEADER_ERROR              ),
+    DEF_VALS1(MQRC_SOURCE_LENGTH_ERROR       ),
+    DEF_VALS1(MQRC_TARGET_LENGTH_ERROR       ),
+    DEF_VALS1(MQRC_SOURCE_BUFFER_ERROR       ),
+    DEF_VALS1(MQRC_TARGET_BUFFER_ERROR       ),
+    DEF_VALS1(MQRC_IIH_ERROR                 ),
+    DEF_VALS1(MQRC_PCF_ERROR                 ),
+    DEF_VALS1(MQRC_DBCS_ERROR                ),
+    DEF_VALS1(MQRC_OBJECT_NAME_ERROR         ),
+    DEF_VALS1(MQRC_OBJECT_Q_MGR_NAME_ERROR   ),
+    DEF_VALS1(MQRC_RECS_PRESENT_ERROR        ),
+    DEF_VALS1(MQRC_OBJECT_RECORDS_ERROR      ),
+    DEF_VALS1(MQRC_RESPONSE_RECORDS_ERROR    ),
+    DEF_VALS1(MQRC_ASID_MISMATCH             ),
+    DEF_VALS1(MQRC_PMO_RECORD_FLAGS_ERROR    ),
+    DEF_VALS1(MQRC_PUT_MSG_RECORDS_ERROR     ),
+    DEF_VALS1(MQRC_CONN_ID_IN_USE            ),
+    DEF_VALS1(MQRC_Q_MGR_QUIESCING           ),
+    DEF_VALS1(MQRC_Q_MGR_STOPPING            ),
+    DEF_VALS1(MQRC_DUPLICATE_RECOV_COORD     ),
+    DEF_VALS1(MQRC_PMO_ERROR                 ),
+    DEF_VALS1(MQRC_API_EXIT_NOT_FOUND        ),
+    DEF_VALS1(MQRC_API_EXIT_LOAD_ERROR       ),
+    DEF_VALS1(MQRC_REMOTE_Q_NAME_ERROR       ),
+    DEF_VALS1(MQRC_INCONSISTENT_PERSISTENCE  ),
+    DEF_VALS1(MQRC_GMO_ERROR                 ),
+    DEF_VALS1(MQRC_CICS_BRIDGE_RESTRICTION   ),
+    DEF_VALS1(MQRC_STOPPED_BY_CLUSTER_EXIT   ),
+    DEF_VALS1(MQRC_CLUSTER_RESOLUTION_ERROR  ),
+    DEF_VALS1(MQRC_CONVERTED_STRING_TOO_BIG  ),
+    DEF_VALS1(MQRC_TMC_ERROR                 ),
+    DEF_VALS2(MQRC_STORAGE_MEDIUM_FULL,"MQRC_PAGESET_FULL"),
+    DEF_VALS1(MQRC_PAGESET_ERROR             ),
+    DEF_VALS1(MQRC_NAME_NOT_VALID_FOR_TYPE   ),
+    DEF_VALS1(MQRC_UNEXPECTED_ERROR          ),
+    DEF_VALS1(MQRC_UNKNOWN_XMIT_Q            ),
+    DEF_VALS1(MQRC_UNKNOWN_DEF_XMIT_Q        ),
+    DEF_VALS1(MQRC_DEF_XMIT_Q_TYPE_ERROR     ),
+    DEF_VALS1(MQRC_DEF_XMIT_Q_USAGE_ERROR    ),
+    DEF_VALS1(MQRC_MSG_MARKED_BROWSE_CO_OP   ),
+    DEF_VALS1(MQRC_NAME_IN_USE               ),
+    DEF_VALS1(MQRC_CONNECTION_QUIESCING      ),
+    DEF_VALS1(MQRC_CONNECTION_STOPPING       ),
+    DEF_VALS1(MQRC_ADAPTER_NOT_AVAILABLE     ),
+    DEF_VALS1(MQRC_MSG_ID_ERROR              ),
+    DEF_VALS1(MQRC_CORREL_ID_ERROR           ),
+    DEF_VALS1(MQRC_FILE_SYSTEM_ERROR         ),
+    DEF_VALS1(MQRC_NO_MSG_LOCKED             ),
+    DEF_VALS1(MQRC_SOAP_DOTNET_ERROR         ),
+    DEF_VALS1(MQRC_SOAP_AXIS_ERROR           ),
+    DEF_VALS1(MQRC_SOAP_URL_ERROR            ),
+    DEF_VALS1(MQRC_FILE_NOT_AUDITED          ),
+    DEF_VALS1(MQRC_CONNECTION_NOT_AUTHORIZED ),
+    DEF_VALS1(MQRC_MSG_TOO_BIG_FOR_CHANNEL   ),
+    DEF_VALS1(MQRC_CALL_IN_PROGRESS          ),
+    DEF_VALS1(MQRC_RMH_ERROR                 ),
+    DEF_VALS1(MQRC_Q_MGR_ACTIVE              ),
+    DEF_VALS1(MQRC_Q_MGR_NOT_ACTIVE          ),
+    DEF_VALS1(MQRC_Q_DEPTH_HIGH              ),
+    DEF_VALS1(MQRC_Q_DEPTH_LOW               ),
+    DEF_VALS1(MQRC_Q_SERVICE_INTERVAL_HIGH   ),
+    DEF_VALS1(MQRC_Q_SERVICE_INTERVAL_OK     ),
+    DEF_VALS1(MQRC_RFH_HEADER_FIELD_ERROR    ),
+    DEF_VALS1(MQRC_RAS_PROPERTY_ERROR        ),
+    DEF_VALS1(MQRC_UNIT_OF_WORK_NOT_STARTED  ),
+    DEF_VALS1(MQRC_CHANNEL_AUTO_DEF_OK       ),
+    DEF_VALS1(MQRC_CHANNEL_AUTO_DEF_ERROR    ),
+    DEF_VALS1(MQRC_CFH_ERROR                 ),
+    DEF_VALS1(MQRC_CFIL_ERROR                ),
+    DEF_VALS1(MQRC_CFIN_ERROR                ),
+    DEF_VALS1(MQRC_CFSL_ERROR                ),
+    DEF_VALS1(MQRC_CFST_ERROR                ),
+    DEF_VALS1(MQRC_INCOMPLETE_GROUP          ),
+    DEF_VALS1(MQRC_INCOMPLETE_MSG            ),
+    DEF_VALS1(MQRC_INCONSISTENT_CCSIDS       ),
+    DEF_VALS1(MQRC_INCONSISTENT_ENCODINGS    ),
+    DEF_VALS1(MQRC_INCONSISTENT_UOW          ),
+    DEF_VALS1(MQRC_INVALID_MSG_UNDER_CURSOR  ),
+    DEF_VALS1(MQRC_MATCH_OPTIONS_ERROR       ),
+    DEF_VALS1(MQRC_MDE_ERROR                 ),
+    DEF_VALS1(MQRC_MSG_FLAGS_ERROR           ),
+    DEF_VALS1(MQRC_MSG_SEQ_NUMBER_ERROR      ),
+    DEF_VALS1(MQRC_OFFSET_ERROR              ),
+    DEF_VALS1(MQRC_ORIGINAL_LENGTH_ERROR     ),
+    DEF_VALS1(MQRC_SEGMENT_LENGTH_ZERO       ),
+    DEF_VALS1(MQRC_UOW_NOT_AVAILABLE         ),
+    DEF_VALS1(MQRC_WRONG_GMO_VERSION         ),
+    DEF_VALS1(MQRC_WRONG_MD_VERSION          ),
+    DEF_VALS1(MQRC_GROUP_ID_ERROR            ),
+    DEF_VALS1(MQRC_INCONSISTENT_BROWSE       ),
+    DEF_VALS1(MQRC_XQH_ERROR                 ),
+    DEF_VALS1(MQRC_SRC_ENV_ERROR             ),
+    DEF_VALS1(MQRC_SRC_NAME_ERROR            ),
+    DEF_VALS1(MQRC_DEST_ENV_ERROR            ),
+    DEF_VALS1(MQRC_DEST_NAME_ERROR           ),
+    DEF_VALS1(MQRC_TM_ERROR                  ),
+    DEF_VALS1(MQRC_CLUSTER_EXIT_ERROR        ),
+    DEF_VALS1(MQRC_CLUSTER_EXIT_LOAD_ERROR   ),
+    DEF_VALS1(MQRC_CLUSTER_PUT_INHIBITED     ),
+    DEF_VALS1(MQRC_CLUSTER_RESOURCE_ERROR    ),
+    DEF_VALS1(MQRC_NO_DESTINATIONS_AVAILABLE ),
+    DEF_VALS1(MQRC_CONN_TAG_IN_USE           ),
+    DEF_VALS1(MQRC_PARTIALLY_CONVERTED       ),
+    DEF_VALS1(MQRC_CONNECTION_ERROR          ),
+    DEF_VALS1(MQRC_OPTION_ENVIRONMENT_ERROR  ),
+    DEF_VALS1(MQRC_CD_ERROR                  ),
+    DEF_VALS1(MQRC_CLIENT_CONN_ERROR         ),
+    DEF_VALS1(MQRC_CHANNEL_STOPPED_BY_USER   ),
+    DEF_VALS1(MQRC_HCONFIG_ERROR             ),
+    DEF_VALS1(MQRC_FUNCTION_ERROR            ),
+    DEF_VALS1(MQRC_CHANNEL_STARTED           ),
+    DEF_VALS1(MQRC_CHANNEL_STOPPED           ),
+    DEF_VALS1(MQRC_CHANNEL_CONV_ERROR        ),
+    DEF_VALS1(MQRC_SERVICE_NOT_AVAILABLE     ),
+    DEF_VALS1(MQRC_INITIALIZATION_FAILED     ),
+    DEF_VALS1(MQRC_TERMINATION_FAILED        ),
+    DEF_VALS1(MQRC_UNKNOWN_Q_NAME            ),
+    DEF_VALS1(MQRC_SERVICE_ERROR             ),
+    DEF_VALS1(MQRC_Q_ALREADY_EXISTS          ),
+    DEF_VALS1(MQRC_USER_ID_NOT_AVAILABLE     ),
+    DEF_VALS1(MQRC_UNKNOWN_ENTITY            ),
+    DEF_VALS1(MQRC_UNKNOWN_AUTH_ENTITY       ),
+    DEF_VALS1(MQRC_UNKNOWN_REF_OBJECT        ),
+    DEF_VALS1(MQRC_CHANNEL_ACTIVATED         ),
+    DEF_VALS1(MQRC_CHANNEL_NOT_ACTIVATED     ),
+    DEF_VALS1(MQRC_UOW_CANCELED              ),
+    DEF_VALS1(MQRC_FUNCTION_NOT_SUPPORTED    ),
+    DEF_VALS1(MQRC_SELECTOR_TYPE_ERROR       ),
+    DEF_VALS1(MQRC_COMMAND_TYPE_ERROR        ),
+    DEF_VALS1(MQRC_MULTIPLE_INSTANCE_ERROR   ),
+    DEF_VALS1(MQRC_SYSTEM_ITEM_NOT_ALTERABLE ),
+    DEF_VALS1(MQRC_BAG_CONVERSION_ERROR      ),
+    DEF_VALS1(MQRC_SELECTOR_OUT_OF_RANGE     ),
+    DEF_VALS1(MQRC_SELECTOR_NOT_UNIQUE       ),
+    DEF_VALS1(MQRC_INDEX_NOT_PRESENT         ),
+    DEF_VALS1(MQRC_STRING_ERROR              ),
+    DEF_VALS1(MQRC_ENCODING_NOT_SUPPORTED    ),
+    DEF_VALS1(MQRC_SELECTOR_NOT_PRESENT      ),
+    DEF_VALS1(MQRC_OUT_SELECTOR_ERROR        ),
+    DEF_VALS1(MQRC_STRING_TRUNCATED          ),
+    DEF_VALS1(MQRC_SELECTOR_WRONG_TYPE       ),
+    DEF_VALS1(MQRC_INCONSISTENT_ITEM_TYPE    ),
+    DEF_VALS1(MQRC_INDEX_ERROR               ),
+    DEF_VALS1(MQRC_SYSTEM_BAG_NOT_ALTERABLE  ),
+    DEF_VALS1(MQRC_ITEM_COUNT_ERROR          ),
+    DEF_VALS1(MQRC_FORMAT_NOT_SUPPORTED      ),
+    DEF_VALS1(MQRC_SELECTOR_NOT_SUPPORTED    ),
+    DEF_VALS1(MQRC_ITEM_VALUE_ERROR          ),
+    DEF_VALS1(MQRC_HBAG_ERROR                ),
+    DEF_VALS1(MQRC_PARAMETER_MISSING         ),
+    DEF_VALS1(MQRC_CMD_SERVER_NOT_AVAILABLE  ),
+    DEF_VALS1(MQRC_STRING_LENGTH_ERROR       ),
+    DEF_VALS1(MQRC_INQUIRY_COMMAND_ERROR     ),
+    DEF_VALS1(MQRC_NESTED_BAG_NOT_SUPPORTED  ),
+    DEF_VALS1(MQRC_BAG_WRONG_TYPE            ),
+    DEF_VALS1(MQRC_ITEM_TYPE_ERROR           ),
+    DEF_VALS1(MQRC_SYSTEM_BAG_NOT_DELETABLE  ),
+    DEF_VALS1(MQRC_SYSTEM_ITEM_NOT_DELETABLE ),
+    DEF_VALS1(MQRC_CODED_CHAR_SET_ID_ERROR   ),
+    DEF_VALS1(MQRC_MSG_TOKEN_ERROR           ),
+    DEF_VALS1(MQRC_MISSING_WIH               ),
+    DEF_VALS1(MQRC_WIH_ERROR                 ),
+    DEF_VALS1(MQRC_RFH_ERROR                 ),
+    DEF_VALS1(MQRC_RFH_STRING_ERROR          ),
+    DEF_VALS1(MQRC_RFH_COMMAND_ERROR         ),
+    DEF_VALS1(MQRC_RFH_PARM_ERROR            ),
+    DEF_VALS1(MQRC_RFH_DUPLICATE_PARM        ),
+    DEF_VALS1(MQRC_RFH_PARM_MISSING          ),
+    DEF_VALS1(MQRC_CHAR_CONVERSION_ERROR     ),
+    DEF_VALS1(MQRC_UCS2_CONVERSION_ERROR     ),
+    DEF_VALS1(MQRC_DB2_NOT_AVAILABLE         ),
+    DEF_VALS1(MQRC_OBJECT_NOT_UNIQUE         ),
+    DEF_VALS1(MQRC_CONN_TAG_NOT_RELEASED     ),
+    DEF_VALS1(MQRC_CF_NOT_AVAILABLE          ),
+    DEF_VALS1(MQRC_CF_STRUC_IN_USE           ),
+    DEF_VALS1(MQRC_CF_STRUC_LIST_HDR_IN_USE  ),
+    DEF_VALS1(MQRC_CF_STRUC_AUTH_FAILED      ),
+    DEF_VALS1(MQRC_CF_STRUC_ERROR            ),
+    DEF_VALS1(MQRC_CONN_TAG_NOT_USABLE       ),
+    DEF_VALS1(MQRC_GLOBAL_UOW_CONFLICT       ),
+    DEF_VALS1(MQRC_LOCAL_UOW_CONFLICT        ),
+    DEF_VALS1(MQRC_HANDLE_IN_USE_FOR_UOW     ),
+    DEF_VALS1(MQRC_UOW_ENLISTMENT_ERROR      ),
+    DEF_VALS1(MQRC_UOW_MIX_NOT_SUPPORTED     ),
+    DEF_VALS1(MQRC_WXP_ERROR                 ),
+    DEF_VALS1(MQRC_CURRENT_RECORD_ERROR      ),
+    DEF_VALS1(MQRC_NEXT_OFFSET_ERROR         ),
+    DEF_VALS1(MQRC_NO_RECORD_AVAILABLE       ),
+    DEF_VALS1(MQRC_OBJECT_LEVEL_INCOMPATIBLE ),
+    DEF_VALS1(MQRC_NEXT_RECORD_ERROR         ),
+    DEF_VALS1(MQRC_BACKOUT_THRESHOLD_REACHED ),
+    DEF_VALS1(MQRC_MSG_NOT_MATCHED           ),
+    DEF_VALS1(MQRC_JMS_FORMAT_ERROR          ),
+    DEF_VALS1(MQRC_SEGMENTS_NOT_SUPPORTED    ),
+    DEF_VALS1(MQRC_WRONG_CF_LEVEL            ),
+    DEF_VALS1(MQRC_CONFIG_CREATE_OBJECT      ),
+    DEF_VALS1(MQRC_CONFIG_CHANGE_OBJECT      ),
+    DEF_VALS1(MQRC_CONFIG_DELETE_OBJECT      ),
+    DEF_VALS1(MQRC_CONFIG_REFRESH_OBJECT     ),
+    DEF_VALS1(MQRC_CHANNEL_SSL_ERROR         ),
+    DEF_VALS1(MQRC_PARTICIPANT_NOT_DEFINED   ),
+    DEF_VALS1(MQRC_CF_STRUC_FAILED           ),
+    DEF_VALS1(MQRC_API_EXIT_ERROR            ),
+    DEF_VALS1(MQRC_API_EXIT_INIT_ERROR       ),
+    DEF_VALS1(MQRC_API_EXIT_TERM_ERROR       ),
+    DEF_VALS1(MQRC_EXIT_REASON_ERROR         ),
+    DEF_VALS1(MQRC_RESERVED_VALUE_ERROR      ),
+    DEF_VALS1(MQRC_NO_DATA_AVAILABLE         ),
+    DEF_VALS1(MQRC_SCO_ERROR                 ),
+    DEF_VALS1(MQRC_KEY_REPOSITORY_ERROR      ),
+    DEF_VALS1(MQRC_CRYPTO_HARDWARE_ERROR     ),
+    DEF_VALS1(MQRC_AUTH_INFO_REC_COUNT_ERROR ),
+    DEF_VALS1(MQRC_AUTH_INFO_REC_ERROR       ),
+    DEF_VALS1(MQRC_AIR_ERROR                 ),
+    DEF_VALS1(MQRC_AUTH_INFO_TYPE_ERROR      ),
+    DEF_VALS1(MQRC_AUTH_INFO_CONN_NAME_ERROR ),
+    DEF_VALS1(MQRC_LDAP_USER_NAME_ERROR      ),
+    DEF_VALS1(MQRC_LDAP_USER_NAME_LENGTH_ERR ),
+    DEF_VALS1(MQRC_LDAP_PASSWORD_ERROR       ),
+    DEF_VALS1(MQRC_SSL_ALREADY_INITIALIZED   ),
+    DEF_VALS1(MQRC_SSL_CONFIG_ERROR          ),
+    DEF_VALS1(MQRC_SSL_INITIALIZATION_ERROR  ),
+    DEF_VALS1(MQRC_Q_INDEX_TYPE_ERROR        ),
+    DEF_VALS1(MQRC_CFBS_ERROR                ),
+    DEF_VALS1(MQRC_SSL_NOT_ALLOWED           ),
+    DEF_VALS1(MQRC_JSSE_ERROR                ),
+    DEF_VALS1(MQRC_SSL_PEER_NAME_MISMATCH    ),
+    DEF_VALS1(MQRC_SSL_PEER_NAME_ERROR       ),
+    DEF_VALS1(MQRC_UNSUPPORTED_CIPHER_SUITE  ),
+    DEF_VALS1(MQRC_SSL_CERTIFICATE_REVOKED   ),
+    DEF_VALS1(MQRC_SSL_CERT_STORE_ERROR      ),
+    DEF_VALS1(MQRC_CLIENT_EXIT_LOAD_ERROR    ),
+    DEF_VALS1(MQRC_CLIENT_EXIT_ERROR         ),
+    DEF_VALS1(MQRC_UOW_COMMITTED             ),
+    DEF_VALS1(MQRC_SSL_KEY_RESET_ERROR       ),
+    DEF_VALS1(MQRC_UNKNOWN_COMPONENT_NAME    ),
+    DEF_VALS1(MQRC_LOGGER_STATUS             ),
+    DEF_VALS1(MQRC_COMMAND_MQSC              ),
+    DEF_VALS1(MQRC_COMMAND_PCF               ),
+    DEF_VALS1(MQRC_CFIF_ERROR                ),
+    DEF_VALS1(MQRC_CFSF_ERROR                ),
+    DEF_VALS1(MQRC_CFGR_ERROR                ),
+    DEF_VALS1(MQRC_MSG_NOT_ALLOWED_IN_GROUP  ),
+    DEF_VALS1(MQRC_FILTER_OPERATOR_ERROR     ),
+    DEF_VALS1(MQRC_NESTED_SELECTOR_ERROR     ),
+    DEF_VALS1(MQRC_EPH_ERROR                 ),
+    DEF_VALS1(MQRC_RFH_FORMAT_ERROR          ),
+    DEF_VALS1(MQRC_CFBF_ERROR                ),
+    DEF_VALS1(MQRC_CLIENT_CHANNEL_CONFLICT   ),
+    DEF_VALS1(MQRC_SD_ERROR                  ),
+    DEF_VALS1(MQRC_TOPIC_STRING_ERROR        ),
+    DEF_VALS1(MQRC_STS_ERROR                 ),
+    DEF_VALS1(MQRC_NO_SUBSCRIPTION           ),
+    DEF_VALS1(MQRC_SUBSCRIPTION_IN_USE       ),
+    DEF_VALS1(MQRC_STAT_TYPE_ERROR           ),
+    DEF_VALS1(MQRC_SUB_USER_DATA_ERROR       ),
+    DEF_VALS1(MQRC_SUB_ALREADY_EXISTS        ),
+    DEF_VALS1(MQRC_IDENTITY_MISMATCH         ),
+    DEF_VALS1(MQRC_ALTER_SUB_ERROR           ),
+    DEF_VALS1(MQRC_DURABILITY_NOT_ALLOWED    ),
+    DEF_VALS1(MQRC_NO_RETAINED_MSG           ),
+    DEF_VALS1(MQRC_SRO_ERROR                 ),
+    DEF_VALS1(MQRC_SUB_NAME_ERROR            ),
+    DEF_VALS1(MQRC_OBJECT_STRING_ERROR       ),
+    DEF_VALS1(MQRC_PROPERTY_NAME_ERROR       ),
+    DEF_VALS1(MQRC_SEGMENTATION_NOT_ALLOWED  ),
+    DEF_VALS1(MQRC_CBD_ERROR                 ),
+    DEF_VALS1(MQRC_CTLO_ERROR                ),
+    DEF_VALS1(MQRC_NO_CALLBACKS_ACTIVE       ),
+    DEF_VALS1(MQRC_CALLBACK_NOT_REGISTERED   ),
+    DEF_VALS1(MQRC_OPTIONS_CHANGED           ),
+    DEF_VALS1(MQRC_READ_AHEAD_MSGS           ),
+    DEF_VALS1(MQRC_SELECTOR_SYNTAX_ERROR     ),
+    DEF_VALS1(MQRC_HMSG_ERROR                ),
+    DEF_VALS1(MQRC_CMHO_ERROR                ),
+    DEF_VALS1(MQRC_DMHO_ERROR                ),
+    DEF_VALS1(MQRC_SMPO_ERROR                ),
+    DEF_VALS1(MQRC_IMPO_ERROR                ),
+    DEF_VALS1(MQRC_PROPERTY_NAME_TOO_BIG     ),
+    DEF_VALS1(MQRC_PROP_VALUE_NOT_CONVERTED  ),
+    DEF_VALS1(MQRC_PROP_TYPE_NOT_SUPPORTED   ),
+    DEF_VALS1(MQRC_PROPERTY_VALUE_TOO_BIG    ),
+    DEF_VALS1(MQRC_PROP_CONV_NOT_SUPPORTED   ),
+    DEF_VALS1(MQRC_PROPERTY_NOT_AVAILABLE    ),
+    DEF_VALS1(MQRC_PROP_NUMBER_FORMAT_ERROR  ),
+    DEF_VALS1(MQRC_PROPERTY_TYPE_ERROR       ),
+    DEF_VALS1(MQRC_PROPERTIES_TOO_BIG        ),
+    DEF_VALS1(MQRC_PUT_NOT_RETAINED          ),
+    DEF_VALS1(MQRC_ALIAS_TARGTYPE_CHANGED    ),
+    DEF_VALS1(MQRC_DMPO_ERROR                ),
+    DEF_VALS1(MQRC_PD_ERROR                  ),
+    DEF_VALS1(MQRC_CALLBACK_TYPE_ERROR       ),
+    DEF_VALS1(MQRC_CBD_OPTIONS_ERROR         ),
+    DEF_VALS1(MQRC_MAX_MSG_LENGTH_ERROR      ),
+    DEF_VALS1(MQRC_CALLBACK_ROUTINE_ERROR    ),
+    DEF_VALS1(MQRC_CALLBACK_LINK_ERROR       ),
+    DEF_VALS1(MQRC_OPERATION_ERROR           ),
+    DEF_VALS1(MQRC_BMHO_ERROR                ),
+    DEF_VALS1(MQRC_UNSUPPORTED_PROPERTY      ),
+    DEF_VALS1(MQRC_PROP_NAME_NOT_CONVERTED   ),
+    DEF_VALS1(MQRC_GET_ENABLED               ),
+    DEF_VALS1(MQRC_MODULE_NOT_FOUND          ),
+    DEF_VALS1(MQRC_MODULE_INVALID            ),
+    DEF_VALS1(MQRC_MODULE_ENTRY_NOT_FOUND    ),
+    DEF_VALS1(MQRC_MIXED_CONTENT_NOT_ALLOWED ),
+    DEF_VALS1(MQRC_MSG_HANDLE_IN_USE         ),
+    DEF_VALS1(MQRC_HCONN_ASYNC_ACTIVE        ),
+    DEF_VALS1(MQRC_MHBO_ERROR                ),
+    DEF_VALS1(MQRC_PUBLICATION_FAILURE       ),
+    DEF_VALS1(MQRC_SUB_INHIBITED             ),
+    DEF_VALS1(MQRC_SELECTOR_ALWAYS_FALSE     ),
+    DEF_VALS1(MQRC_XEPO_ERROR                ),
+    DEF_VALS1(MQRC_DURABILITY_NOT_ALTERABLE  ),
+    DEF_VALS1(MQRC_TOPIC_NOT_ALTERABLE       ),
+    DEF_VALS1(MQRC_SUBLEVEL_NOT_ALTERABLE    ),
+    DEF_VALS1(MQRC_PROPERTY_NAME_LENGTH_ERR  ),
+    DEF_VALS1(MQRC_DUPLICATE_GROUP_SUB       ),
+    DEF_VALS1(MQRC_GROUPING_NOT_ALTERABLE    ),
+    DEF_VALS1(MQRC_SELECTOR_INVALID_FOR_TYPE ),
+    DEF_VALS1(MQRC_HOBJ_QUIESCED             ),
+    DEF_VALS1(MQRC_HOBJ_QUIESCED_NO_MSGS     ),
+    DEF_VALS1(MQRC_SELECTION_STRING_ERROR    ),
+    DEF_VALS1(MQRC_RES_OBJECT_STRING_ERROR   ),
+    DEF_VALS1(MQRC_CONNECTION_SUSPENDED      ),
+    DEF_VALS1(MQRC_INVALID_DESTINATION       ),
+    DEF_VALS1(MQRC_INVALID_SUBSCRIPTION      ),
+    DEF_VALS1(MQRC_SELECTOR_NOT_ALTERABLE    ),
+    DEF_VALS1(MQRC_RETAINED_MSG_Q_ERROR      ),
+    DEF_VALS1(MQRC_RETAINED_NOT_DELIVERED    ),
+    DEF_VALS1(MQRC_RFH_RESTRICTED_FORMAT_ERR ),
+    DEF_VALS1(MQRC_CONNECTION_STOPPED        ),
+    DEF_VALS1(MQRC_ASYNC_UOW_CONFLICT        ),
+    DEF_VALS1(MQRC_ASYNC_XA_CONFLICT         ),
+    DEF_VALS1(MQRC_PUBSUB_INHIBITED          ),
+    DEF_VALS1(MQRC_MSG_HANDLE_COPY_FAILURE   ),
+    DEF_VALS1(MQRC_DEST_CLASS_NOT_ALTERABLE  ),
+    DEF_VALS1(MQRC_OPERATION_NOT_ALLOWED     ),
+    DEF_VALS1(MQRC_ACTION_ERROR              ),
+    DEF_VALS1(MQRC_CHANNEL_NOT_AVAILABLE     ),
+    DEF_VALS1(MQRC_HOST_NOT_AVAILABLE        ),
+    DEF_VALS1(MQRC_CHANNEL_CONFIG_ERROR      ),
+    DEF_VALS1(MQRC_UNKNOWN_CHANNEL_NAME      ),
+    DEF_VALS1(MQRC_LOOPING_PUBLICATION       ),
+    DEF_VALS1(MQRC_ALREADY_JOINED            ),
+    DEF_VALS1(MQRC_STANDBY_Q_MGR             ),
+    DEF_VALS1(MQRC_RECONNECTING              ),
+    DEF_VALS1(MQRC_RECONNECTED               ),
+    DEF_VALS1(MQRC_RECONNECT_QMID_MISMATCH   ),
+    DEF_VALS1(MQRC_RECONNECT_INCOMPATIBLE    ),
+    DEF_VALS1(MQRC_RECONNECT_FAILED          ),
+    DEF_VALS1(MQRC_CALL_INTERRUPTED          ),
+    DEF_VALS1(MQRC_NO_SUBS_MATCHED           ),
+    DEF_VALS1(MQRC_SELECTION_NOT_AVAILABLE   ),
+    DEF_VALS1(MQRC_CHANNEL_SSL_WARNING       ),
+    DEF_VALS1(MQRC_OCSP_URL_ERROR            ),
+    DEF_VALS1(MQRC_CONTENT_ERROR             ),
+    DEF_VALS1(MQRC_RECONNECT_Q_MGR_REQD      ),
+    DEF_VALS1(MQRC_RECONNECT_TIMED_OUT       ),
+    DEF_VALS1(MQRC_PUBLISH_EXIT_ERROR        ),
+    DEF_VALS1(MQRC_SSL_ALT_PROVIDER_REQUIRED ),
+    DEF_VALS1(MQRC_PRECONN_EXIT_LOAD_ERROR   ),
+    DEF_VALS1(MQRC_PRECONN_EXIT_NOT_FOUND    ),
+    DEF_VALS1(MQRC_PRECONN_EXIT_ERROR        ),
+    DEF_VALS1(MQRC_CD_ARRAY_ERROR            ),
+    DEF_VALS1(MQRCCF_CFH_TYPE_ERROR             ),
+    DEF_VALS1(MQRCCF_CFH_LENGTH_ERROR           ),
+    DEF_VALS1(MQRCCF_CFH_VERSION_ERROR          ),
+    DEF_VALS1(MQRCCF_CFH_MSG_SEQ_NUMBER_ERR     ),
+    DEF_VALS1(MQRCCF_CFH_CONTROL_ERROR          ),
+    DEF_VALS1(MQRCCF_CFH_PARM_COUNT_ERROR       ),
+    DEF_VALS1(MQRCCF_CFH_COMMAND_ERROR          ),
+    DEF_VALS1(MQRCCF_COMMAND_FAILED             ),
+    DEF_VALS1(MQRCCF_CFIN_LENGTH_ERROR          ),
+    DEF_VALS1(MQRCCF_CFST_LENGTH_ERROR          ),
+    DEF_VALS1(MQRCCF_CFST_STRING_LENGTH_ERR     ),
+    DEF_VALS1(MQRCCF_FORCE_VALUE_ERROR          ),
+    DEF_VALS1(MQRCCF_STRUCTURE_TYPE_ERROR       ),
+    DEF_VALS1(MQRCCF_CFIN_PARM_ID_ERROR         ),
+    DEF_VALS1(MQRCCF_CFST_PARM_ID_ERROR         ),
+    DEF_VALS1(MQRCCF_MSG_LENGTH_ERROR           ),
+    DEF_VALS1(MQRCCF_CFIN_DUPLICATE_PARM        ),
+    DEF_VALS1(MQRCCF_CFST_DUPLICATE_PARM        ),
+    DEF_VALS1(MQRCCF_PARM_COUNT_TOO_SMALL       ),
+    DEF_VALS1(MQRCCF_PARM_COUNT_TOO_BIG         ),
+    DEF_VALS1(MQRCCF_Q_ALREADY_IN_CELL          ),
+    DEF_VALS1(MQRCCF_Q_TYPE_ERROR               ),
+    DEF_VALS1(MQRCCF_MD_FORMAT_ERROR            ),
+    DEF_VALS1(MQRCCF_CFSL_LENGTH_ERROR          ),
+    DEF_VALS1(MQRCCF_REPLACE_VALUE_ERROR        ),
+    DEF_VALS1(MQRCCF_CFIL_DUPLICATE_VALUE       ),
+    DEF_VALS1(MQRCCF_CFIL_COUNT_ERROR           ),
+    DEF_VALS1(MQRCCF_CFIL_LENGTH_ERROR          ),
+    DEF_VALS2(MQRCCF_MODE_VALUE_ERROR,"MQRCCF_QUIESCE_VALUE_ERROR"),
+    DEF_VALS1(MQRCCF_MSG_SEQ_NUMBER_ERROR       ),
+    DEF_VALS1(MQRCCF_PING_DATA_COUNT_ERROR      ),
+    DEF_VALS1(MQRCCF_PING_DATA_COMPARE_ERROR    ),
+    DEF_VALS1(MQRCCF_CFSL_PARM_ID_ERROR         ),
+    DEF_VALS1(MQRCCF_CHANNEL_TYPE_ERROR         ),
+    DEF_VALS1(MQRCCF_PARM_SEQUENCE_ERROR        ),
+    DEF_VALS1(MQRCCF_XMIT_PROTOCOL_TYPE_ERR     ),
+    DEF_VALS1(MQRCCF_BATCH_SIZE_ERROR           ),
+    DEF_VALS1(MQRCCF_DISC_INT_ERROR             ),
+    DEF_VALS1(MQRCCF_SHORT_RETRY_ERROR          ),
+    DEF_VALS1(MQRCCF_SHORT_TIMER_ERROR          ),
+    DEF_VALS1(MQRCCF_LONG_RETRY_ERROR           ),
+    DEF_VALS1(MQRCCF_LONG_TIMER_ERROR           ),
+    DEF_VALS1(MQRCCF_SEQ_NUMBER_WRAP_ERROR      ),
+    DEF_VALS1(MQRCCF_MAX_MSG_LENGTH_ERROR       ),
+    DEF_VALS1(MQRCCF_PUT_AUTH_ERROR             ),
+    DEF_VALS1(MQRCCF_PURGE_VALUE_ERROR          ),
+    DEF_VALS1(MQRCCF_CFIL_PARM_ID_ERROR         ),
+    DEF_VALS1(MQRCCF_MSG_TRUNCATED              ),
+    DEF_VALS1(MQRCCF_CCSID_ERROR                ),
+    DEF_VALS1(MQRCCF_ENCODING_ERROR             ),
+    DEF_VALS1(MQRCCF_QUEUES_VALUE_ERROR         ),
+    DEF_VALS1(MQRCCF_DATA_CONV_VALUE_ERROR      ),
+    DEF_VALS1(MQRCCF_INDOUBT_VALUE_ERROR        ),
+    DEF_VALS1(MQRCCF_ESCAPE_TYPE_ERROR          ),
+    DEF_VALS1(MQRCCF_REPOS_VALUE_ERROR          ),
+    DEF_VALS1(MQRCCF_CHANNEL_TABLE_ERROR        ),
+    DEF_VALS1(MQRCCF_MCA_TYPE_ERROR             ),
+    DEF_VALS1(MQRCCF_CHL_INST_TYPE_ERROR        ),
+    DEF_VALS1(MQRCCF_CHL_STATUS_NOT_FOUND       ),
+    DEF_VALS1(MQRCCF_CFSL_DUPLICATE_PARM        ),
+    DEF_VALS1(MQRCCF_CFSL_TOTAL_LENGTH_ERROR    ),
+    DEF_VALS1(MQRCCF_CFSL_COUNT_ERROR           ),
+    DEF_VALS1(MQRCCF_CFSL_STRING_LENGTH_ERR     ),
+    DEF_VALS1(MQRCCF_BROKER_DELETED             ),
+    DEF_VALS1(MQRCCF_STREAM_ERROR               ),
+    DEF_VALS1(MQRCCF_TOPIC_ERROR                ),
+    DEF_VALS1(MQRCCF_NOT_REGISTERED             ),
+    DEF_VALS1(MQRCCF_Q_MGR_NAME_ERROR           ),
+    DEF_VALS1(MQRCCF_INCORRECT_STREAM           ),
+    DEF_VALS1(MQRCCF_Q_NAME_ERROR               ),
+    DEF_VALS1(MQRCCF_NO_RETAINED_MSG            ),
+    DEF_VALS1(MQRCCF_DUPLICATE_IDENTITY         ),
+    DEF_VALS1(MQRCCF_INCORRECT_Q                ),
+    DEF_VALS1(MQRCCF_CORREL_ID_ERROR            ),
+    DEF_VALS1(MQRCCF_NOT_AUTHORIZED             ),
+    DEF_VALS1(MQRCCF_UNKNOWN_STREAM             ),
+    DEF_VALS1(MQRCCF_REG_OPTIONS_ERROR          ),
+    DEF_VALS1(MQRCCF_PUB_OPTIONS_ERROR          ),
+    DEF_VALS1(MQRCCF_UNKNOWN_BROKER             ),
+    DEF_VALS1(MQRCCF_Q_MGR_CCSID_ERROR          ),
+    DEF_VALS1(MQRCCF_DEL_OPTIONS_ERROR          ),
+    DEF_VALS1(MQRCCF_CLUSTER_NAME_CONFLICT      ),
+    DEF_VALS1(MQRCCF_REPOS_NAME_CONFLICT        ),
+    DEF_VALS1(MQRCCF_CLUSTER_Q_USAGE_ERROR      ),
+    DEF_VALS1(MQRCCF_ACTION_VALUE_ERROR         ),
+    DEF_VALS1(MQRCCF_COMMS_LIBRARY_ERROR        ),
+    DEF_VALS1(MQRCCF_NETBIOS_NAME_ERROR         ),
+    DEF_VALS1(MQRCCF_BROKER_COMMAND_FAILED      ),
+    DEF_VALS1(MQRCCF_CFST_CONFLICTING_PARM      ),
+    DEF_VALS1(MQRCCF_PATH_NOT_VALID             ),
+    DEF_VALS1(MQRCCF_PARM_SYNTAX_ERROR          ),
+    DEF_VALS1(MQRCCF_PWD_LENGTH_ERROR           ),
+    DEF_VALS1(MQRCCF_FILTER_ERROR               ),
+    DEF_VALS1(MQRCCF_WRONG_USER                 ),
+    DEF_VALS1(MQRCCF_DUPLICATE_SUBSCRIPTION     ),
+    DEF_VALS1(MQRCCF_SUB_NAME_ERROR             ),
+    DEF_VALS1(MQRCCF_SUB_IDENTITY_ERROR         ),
+    DEF_VALS1(MQRCCF_SUBSCRIPTION_IN_USE        ),
+    DEF_VALS1(MQRCCF_SUBSCRIPTION_LOCKED        ),
+    DEF_VALS1(MQRCCF_ALREADY_JOINED             ),
+    DEF_VALS1(MQRCCF_OBJECT_IN_USE              ),
+    DEF_VALS1(MQRCCF_UNKNOWN_FILE_NAME          ),
+    DEF_VALS1(MQRCCF_FILE_NOT_AVAILABLE         ),
+    DEF_VALS1(MQRCCF_DISC_RETRY_ERROR           ),
+    DEF_VALS1(MQRCCF_ALLOC_RETRY_ERROR          ),
+    DEF_VALS1(MQRCCF_ALLOC_SLOW_TIMER_ERROR     ),
+    DEF_VALS1(MQRCCF_ALLOC_FAST_TIMER_ERROR     ),
+    DEF_VALS1(MQRCCF_PORT_NUMBER_ERROR          ),
+    DEF_VALS1(MQRCCF_CHL_SYSTEM_NOT_ACTIVE      ),
+    DEF_VALS1(MQRCCF_ENTITY_NAME_MISSING        ),
+    DEF_VALS1(MQRCCF_PROFILE_NAME_ERROR         ),
+    DEF_VALS1(MQRCCF_AUTH_VALUE_ERROR           ),
+    DEF_VALS1(MQRCCF_AUTH_VALUE_MISSING         ),
+    DEF_VALS1(MQRCCF_OBJECT_TYPE_MISSING        ),
+    DEF_VALS1(MQRCCF_CONNECTION_ID_ERROR        ),
+    DEF_VALS1(MQRCCF_LOG_TYPE_ERROR             ),
+    DEF_VALS1(MQRCCF_PROGRAM_NOT_AVAILABLE      ),
+    DEF_VALS1(MQRCCF_PROGRAM_AUTH_FAILED        ),
+    DEF_VALS1(MQRCCF_NONE_FOUND                 ),
+    DEF_VALS1(MQRCCF_SECURITY_SWITCH_OFF        ),
+    DEF_VALS1(MQRCCF_SECURITY_REFRESH_FAILED    ),
+    DEF_VALS1(MQRCCF_PARM_CONFLICT              ),
+    DEF_VALS1(MQRCCF_COMMAND_INHIBITED          ),
+    DEF_VALS1(MQRCCF_OBJECT_BEING_DELETED       ),
+    DEF_VALS1(MQRCCF_STORAGE_CLASS_IN_USE       ),
+    DEF_VALS1(MQRCCF_OBJECT_NAME_RESTRICTED     ),
+    DEF_VALS1(MQRCCF_OBJECT_LIMIT_EXCEEDED      ),
+    DEF_VALS1(MQRCCF_OBJECT_OPEN_FORCE          ),
+    DEF_VALS1(MQRCCF_DISPOSITION_CONFLICT       ),
+    DEF_VALS1(MQRCCF_Q_MGR_NOT_IN_QSG           ),
+    DEF_VALS1(MQRCCF_ATTR_VALUE_FIXED           ),
+    DEF_VALS1(MQRCCF_NAMELIST_ERROR             ),
+    DEF_VALS1(MQRCCF_NO_CHANNEL_INITIATOR       ),
+    DEF_VALS1(MQRCCF_CHANNEL_INITIATOR_ERROR    ),
+    DEF_VALS1(MQRCCF_COMMAND_LEVEL_CONFLICT     ),
+    DEF_VALS1(MQRCCF_Q_ATTR_CONFLICT            ),
+    DEF_VALS1(MQRCCF_EVENTS_DISABLED            ),
+    DEF_VALS1(MQRCCF_COMMAND_SCOPE_ERROR        ),
+    DEF_VALS1(MQRCCF_COMMAND_REPLY_ERROR        ),
+    DEF_VALS1(MQRCCF_FUNCTION_RESTRICTED        ),
+    DEF_VALS1(MQRCCF_PARM_MISSING               ),
+    DEF_VALS1(MQRCCF_PARM_VALUE_ERROR           ),
+    DEF_VALS1(MQRCCF_COMMAND_LENGTH_ERROR       ),
+    DEF_VALS1(MQRCCF_COMMAND_ORIGIN_ERROR       ),
+    DEF_VALS1(MQRCCF_LISTENER_CONFLICT          ),
+    DEF_VALS1(MQRCCF_LISTENER_STARTED           ),
+    DEF_VALS1(MQRCCF_LISTENER_STOPPED           ),
+    DEF_VALS1(MQRCCF_CHANNEL_ERROR              ),
+    DEF_VALS1(MQRCCF_CF_STRUC_ERROR             ),
+    DEF_VALS1(MQRCCF_UNKNOWN_USER_ID            ),
+    DEF_VALS1(MQRCCF_UNEXPECTED_ERROR           ),
+    DEF_VALS1(MQRCCF_NO_XCF_PARTNER             ),
+    DEF_VALS1(MQRCCF_CFGR_PARM_ID_ERROR         ),
+    DEF_VALS1(MQRCCF_CFIF_LENGTH_ERROR          ),
+    DEF_VALS1(MQRCCF_CFIF_OPERATOR_ERROR        ),
+    DEF_VALS1(MQRCCF_CFIF_PARM_ID_ERROR         ),
+    DEF_VALS1(MQRCCF_CFSF_FILTER_VAL_LEN_ERR    ),
+    DEF_VALS1(MQRCCF_CFSF_LENGTH_ERROR          ),
+    DEF_VALS1(MQRCCF_CFSF_OPERATOR_ERROR        ),
+    DEF_VALS1(MQRCCF_CFSF_PARM_ID_ERROR         ),
+    DEF_VALS1(MQRCCF_TOO_MANY_FILTERS           ),
+    DEF_VALS1(MQRCCF_LISTENER_RUNNING           ),
+    DEF_VALS1(MQRCCF_LSTR_STATUS_NOT_FOUND      ),
+    DEF_VALS1(MQRCCF_SERVICE_RUNNING            ),
+    DEF_VALS1(MQRCCF_SERV_STATUS_NOT_FOUND      ),
+    DEF_VALS1(MQRCCF_SERVICE_STOPPED            ),
+    DEF_VALS1(MQRCCF_CFBS_DUPLICATE_PARM        ),
+    DEF_VALS1(MQRCCF_CFBS_LENGTH_ERROR          ),
+    DEF_VALS1(MQRCCF_CFBS_PARM_ID_ERROR         ),
+    DEF_VALS1(MQRCCF_CFBS_STRING_LENGTH_ERR     ),
+    DEF_VALS1(MQRCCF_CFGR_LENGTH_ERROR          ),
+    DEF_VALS1(MQRCCF_CFGR_PARM_COUNT_ERROR      ),
+    DEF_VALS1(MQRCCF_CONN_NOT_STOPPED           ),
+    DEF_VALS1(MQRCCF_SERVICE_REQUEST_PENDING    ),
+    DEF_VALS1(MQRCCF_NO_START_CMD               ),
+    DEF_VALS1(MQRCCF_NO_STOP_CMD                ),
+    DEF_VALS1(MQRCCF_CFBF_LENGTH_ERROR          ),
+    DEF_VALS1(MQRCCF_CFBF_PARM_ID_ERROR         ),
+    DEF_VALS1(MQRCCF_CFBF_OPERATOR_ERROR        ),
+    DEF_VALS1(MQRCCF_CFBF_FILTER_VAL_LEN_ERR    ),
+    DEF_VALS1(MQRCCF_LISTENER_STILL_ACTIVE      ),
+    DEF_VALS1(MQRCCF_TOPICSTR_ALREADY_EXISTS    ),
+    DEF_VALS1(MQRCCF_SHARING_CONVS_ERROR        ),
+    DEF_VALS1(MQRCCF_SHARING_CONVS_TYPE         ),
+    DEF_VALS1(MQRCCF_SECURITY_CASE_CONFLICT     ),
+    DEF_VALS1(MQRCCF_TOPIC_TYPE_ERROR           ),
+    DEF_VALS1(MQRCCF_MAX_INSTANCES_ERROR        ),
+    DEF_VALS1(MQRCCF_MAX_INSTS_PER_CLNT_ERR     ),
+    DEF_VALS1(MQRCCF_TOPIC_STRING_NOT_FOUND     ),
+    DEF_VALS1(MQRCCF_SUBSCRIPTION_POINT_ERR     ),
+    DEF_VALS1(MQRCCF_SUB_ALREADY_EXISTS         ),
+    DEF_VALS1(MQRCCF_UNKNOWN_OBJECT_NAME        ),
+    DEF_VALS1(MQRCCF_REMOTE_Q_NAME_ERROR        ),
+    DEF_VALS1(MQRCCF_DURABILITY_NOT_ALLOWED     ),
+    DEF_VALS1(MQRCCF_HOBJ_ERROR                 ),
+    DEF_VALS1(MQRCCF_DEST_NAME_ERROR            ),
+    DEF_VALS1(MQRCCF_INVALID_DESTINATION        ),
+    DEF_VALS1(MQRCCF_PUBSUB_INHIBITED           ),
+    DEF_VALS1(MQRCCF_GROUPUR_CHECKS_FAILED      ),
+    DEF_VALS1(MQRCCF_SSL_ALT_PROVIDER_REQD      ),
+    DEF_VALS1(MQRCCF_OBJECT_ALREADY_EXISTS      ),
+    DEF_VALS1(MQRCCF_OBJECT_WRONG_TYPE          ),
+    DEF_VALS1(MQRCCF_LIKE_OBJECT_WRONG_TYPE     ),
+    DEF_VALS1(MQRCCF_OBJECT_OPEN                ),
+    DEF_VALS1(MQRCCF_ATTR_VALUE_ERROR           ),
+    DEF_VALS1(MQRCCF_UNKNOWN_Q_MGR              ),
+    DEF_VALS1(MQRCCF_Q_WRONG_TYPE               ),
+    DEF_VALS1(MQRCCF_OBJECT_NAME_ERROR          ),
+    DEF_VALS1(MQRCCF_ALLOCATE_FAILED            ),
+    DEF_VALS1(MQRCCF_HOST_NOT_AVAILABLE         ),
+    DEF_VALS1(MQRCCF_CONFIGURATION_ERROR        ),
+    DEF_VALS1(MQRCCF_CONNECTION_REFUSED         ),
+    DEF_VALS1(MQRCCF_ENTRY_ERROR                ),
+    DEF_VALS1(MQRCCF_SEND_FAILED                ),
+    DEF_VALS1(MQRCCF_RECEIVED_DATA_ERROR        ),
+    DEF_VALS1(MQRCCF_RECEIVE_FAILED             ),
+    DEF_VALS1(MQRCCF_CONNECTION_CLOSED          ),
+    DEF_VALS1(MQRCCF_NO_STORAGE                 ),
+    DEF_VALS1(MQRCCF_NO_COMMS_MANAGER           ),
+    DEF_VALS1(MQRCCF_LISTENER_NOT_STARTED       ),
+    DEF_VALS1(MQRCCF_BIND_FAILED                ),
+    DEF_VALS1(MQRCCF_CHANNEL_INDOUBT            ),
+    DEF_VALS1(MQRCCF_MQCONN_FAILED              ),
+    DEF_VALS1(MQRCCF_MQOPEN_FAILED              ),
+    DEF_VALS1(MQRCCF_MQGET_FAILED               ),
+    DEF_VALS1(MQRCCF_MQPUT_FAILED               ),
+    DEF_VALS1(MQRCCF_PING_ERROR                 ),
+    DEF_VALS1(MQRCCF_CHANNEL_IN_USE             ),
+    DEF_VALS1(MQRCCF_CHANNEL_NOT_FOUND          ),
+    DEF_VALS1(MQRCCF_UNKNOWN_REMOTE_CHANNEL     ),
+    DEF_VALS1(MQRCCF_REMOTE_QM_UNAVAILABLE      ),
+    DEF_VALS1(MQRCCF_REMOTE_QM_TERMINATING      ),
+    DEF_VALS1(MQRCCF_MQINQ_FAILED               ),
+    DEF_VALS1(MQRCCF_NOT_XMIT_Q                 ),
+    DEF_VALS1(MQRCCF_CHANNEL_DISABLED           ),
+    DEF_VALS1(MQRCCF_USER_EXIT_NOT_AVAILABLE    ),
+    DEF_VALS1(MQRCCF_COMMIT_FAILED              ),
+    DEF_VALS1(MQRCCF_WRONG_CHANNEL_TYPE         ),
+    DEF_VALS1(MQRCCF_CHANNEL_ALREADY_EXISTS     ),
+    DEF_VALS1(MQRCCF_DATA_TOO_LARGE             ),
+    DEF_VALS1(MQRCCF_CHANNEL_NAME_ERROR         ),
+    DEF_VALS1(MQRCCF_XMIT_Q_NAME_ERROR          ),
+    DEF_VALS1(MQRCCF_MCA_NAME_ERROR             ),
+    DEF_VALS1(MQRCCF_SEND_EXIT_NAME_ERROR       ),
+    DEF_VALS1(MQRCCF_SEC_EXIT_NAME_ERROR        ),
+    DEF_VALS1(MQRCCF_MSG_EXIT_NAME_ERROR        ),
+    DEF_VALS1(MQRCCF_RCV_EXIT_NAME_ERROR        ),
+    DEF_VALS1(MQRCCF_XMIT_Q_NAME_WRONG_TYPE     ),
+    DEF_VALS1(MQRCCF_MCA_NAME_WRONG_TYPE        ),
+    DEF_VALS1(MQRCCF_DISC_INT_WRONG_TYPE        ),
+    DEF_VALS1(MQRCCF_SHORT_RETRY_WRONG_TYPE     ),
+    DEF_VALS1(MQRCCF_SHORT_TIMER_WRONG_TYPE     ),
+    DEF_VALS1(MQRCCF_LONG_RETRY_WRONG_TYPE      ),
+    DEF_VALS1(MQRCCF_LONG_TIMER_WRONG_TYPE      ),
+    DEF_VALS1(MQRCCF_PUT_AUTH_WRONG_TYPE        ),
+    DEF_VALS1(MQRCCF_KEEP_ALIVE_INT_ERROR       ),
+    DEF_VALS1(MQRCCF_MISSING_CONN_NAME          ),
+    DEF_VALS1(MQRCCF_CONN_NAME_ERROR            ),
+    DEF_VALS1(MQRCCF_MQSET_FAILED               ),
+    DEF_VALS1(MQRCCF_CHANNEL_NOT_ACTIVE         ),
+    DEF_VALS1(MQRCCF_TERMINATED_BY_SEC_EXIT     ),
+    DEF_VALS1(MQRCCF_DYNAMIC_Q_SCOPE_ERROR      ),
+    DEF_VALS1(MQRCCF_CELL_DIR_NOT_AVAILABLE     ),
+    DEF_VALS1(MQRCCF_MR_COUNT_ERROR             ),
+    DEF_VALS1(MQRCCF_MR_COUNT_WRONG_TYPE        ),
+    DEF_VALS1(MQRCCF_MR_EXIT_NAME_ERROR         ),
+    DEF_VALS1(MQRCCF_MR_EXIT_NAME_WRONG_TYPE    ),
+    DEF_VALS1(MQRCCF_MR_INTERVAL_ERROR          ),
+    DEF_VALS1(MQRCCF_MR_INTERVAL_WRONG_TYPE     ),
+    DEF_VALS1(MQRCCF_NPM_SPEED_ERROR            ),
+    DEF_VALS1(MQRCCF_NPM_SPEED_WRONG_TYPE       ),
+    DEF_VALS1(MQRCCF_HB_INTERVAL_ERROR          ),
+    DEF_VALS1(MQRCCF_HB_INTERVAL_WRONG_TYPE     ),
+    DEF_VALS1(MQRCCF_CHAD_ERROR                 ),
+    DEF_VALS1(MQRCCF_CHAD_WRONG_TYPE            ),
+    DEF_VALS1(MQRCCF_CHAD_EVENT_ERROR           ),
+    DEF_VALS1(MQRCCF_CHAD_EVENT_WRONG_TYPE      ),
+    DEF_VALS1(MQRCCF_CHAD_EXIT_ERROR            ),
+    DEF_VALS1(MQRCCF_CHAD_EXIT_WRONG_TYPE       ),
+    DEF_VALS1(MQRCCF_SUPPRESSED_BY_EXIT         ),
+    DEF_VALS1(MQRCCF_BATCH_INT_ERROR            ),
+    DEF_VALS1(MQRCCF_BATCH_INT_WRONG_TYPE       ),
+    DEF_VALS1(MQRCCF_NET_PRIORITY_ERROR         ),
+    DEF_VALS1(MQRCCF_NET_PRIORITY_WRONG_TYPE    ),
+    DEF_VALS1(MQRCCF_CHANNEL_CLOSED             ),
+    DEF_VALS1(MQRCCF_Q_STATUS_NOT_FOUND         ),
+    DEF_VALS1(MQRCCF_SSL_CIPHER_SPEC_ERROR      ),
+    DEF_VALS1(MQRCCF_SSL_PEER_NAME_ERROR        ),
+    DEF_VALS1(MQRCCF_SSL_CLIENT_AUTH_ERROR      ),
+    DEF_VALS1(MQRCCF_RETAINED_NOT_SUPPORTED     ),
+
+    DEF_VALS1(MQRC_REOPEN_EXCL_INPUT_ERROR   ),
+    DEF_VALS1(MQRC_REOPEN_INQUIRE_ERROR      ),
+    DEF_VALS1(MQRC_REOPEN_SAVED_CONTEXT_ERR  ),
+    DEF_VALS1(MQRC_REOPEN_TEMPORARY_Q_ERROR  ),
+    DEF_VALS1(MQRC_ATTRIBUTE_LOCKED          ),
+    DEF_VALS1(MQRC_CURSOR_NOT_VALID          ),
+    DEF_VALS1(MQRC_ENCODING_ERROR            ),
+    DEF_VALS1(MQRC_STRUC_ID_ERROR            ),
+    DEF_VALS1(MQRC_NULL_POINTER              ),
+    DEF_VALS1(MQRC_NO_CONNECTION_REFERENCE   ),
+    DEF_VALS1(MQRC_NO_BUFFER                 ),
+    DEF_VALS1(MQRC_BINARY_DATA_LENGTH_ERROR  ),
+    DEF_VALS1(MQRC_BUFFER_NOT_AUTOMATIC      ),
+    DEF_VALS1(MQRC_INSUFFICIENT_BUFFER       ),
+    DEF_VALS1(MQRC_INSUFFICIENT_DATA         ),
+    DEF_VALS1(MQRC_DATA_TRUNCATED            ),
+    DEF_VALS1(MQRC_ZERO_LENGTH               ),
+    DEF_VALS1(MQRC_NEGATIVE_LENGTH           ),
+    DEF_VALS1(MQRC_NEGATIVE_OFFSET           ),
+    DEF_VALS1(MQRC_INCONSISTENT_FORMAT       ),
+    DEF_VALS1(MQRC_INCONSISTENT_OBJECT_STATE ),
+    DEF_VALS1(MQRC_CONTEXT_OBJECT_NOT_VALID  ),
+    DEF_VALS1(MQRC_CONTEXT_OPEN_ERROR        ),
+    DEF_VALS1(MQRC_STRUC_LENGTH_ERROR        ),
+    DEF_VALS1(MQRC_NOT_CONNECTED             ),
+    DEF_VALS1(MQRC_NOT_OPEN                  ),
+    DEF_VALS1(MQRC_DISTRIBUTION_LIST_EMPTY   ),
+    DEF_VALS1(MQRC_INCONSISTENT_OPEN_OPTIONS ),
+    DEF_VALS1(MQRC_WRONG_VERSION             ),
+    DEF_VALS1(MQRC_REFERENCE_ERROR           ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(ActionOptions)
-	DEF_VALS1(MQACT_FORCE_REMOVE       ),
-	DEF_VALS1(MQACT_ADVANCE_LOG        ),
-	DEF_VALS1(MQACT_COLLECT_STATISTICS ),
-	DEF_VALS1(MQACT_PUBSUB             ),
+    DEF_VALS1(MQACT_FORCE_REMOVE       ),
+    DEF_VALS1(MQACT_ADVANCE_LOG        ),
+    DEF_VALS1(MQACT_COLLECT_STATISTICS ),
+    DEF_VALS1(MQACT_PUBSUB             ),
 DEF_VALSE;
 #endif
 
 DEF_VALSB(AsynchronousStateValues)
-	DEF_VALS1(MQAS_NONE                    ),
-	DEF_VALS1(MQAS_ACTIVE                  ),
-	DEF_VALS1(MQAS_INACTIVE                ),
-	DEF_VALS1(MQAS_STARTED                 ),
-	DEF_VALS1(MQAS_START_WAIT              ),
-	DEF_VALS1(MQAS_STOPPED                 ),
-	DEF_VALS1(MQAS_SUSPENDED               ),
-	DEF_VALS1(MQAS_SUSPENDED_TEMPORARY     ),
+    DEF_VALS1(MQAS_NONE                    ),
+    DEF_VALS1(MQAS_ACTIVE                  ),
+    DEF_VALS1(MQAS_INACTIVE                ),
+    DEF_VALS1(MQAS_STARTED                 ),
+    DEF_VALS1(MQAS_START_WAIT              ),
+    DEF_VALS1(MQAS_STOPPED                 ),
+    DEF_VALS1(MQAS_SUSPENDED               ),
+    DEF_VALS1(MQAS_SUSPENDED_TEMPORARY     ),
 DEF_VALSE;
 
 #if 0
 DEF_VALSB(AuthorityValues)
-	DEF_VALS1(MQAUTH_NONE                  ),
-	DEF_VALS1(MQAUTH_ALT_USER_AUTHORITY    ),
-	DEF_VALS1(MQAUTH_BROWSE                ),
-	DEF_VALS1(MQAUTH_CHANGE                ),
-	DEF_VALS1(MQAUTH_CLEAR                 ),
-	DEF_VALS1(MQAUTH_CONNECT               ),
-	DEF_VALS1(MQAUTH_CREATE                ),
-	DEF_VALS1(MQAUTH_DELETE                ),
-	DEF_VALS1(MQAUTH_DISPLAY               ),
-	DEF_VALS1(MQAUTH_INPUT                 ),
-	DEF_VALS1(MQAUTH_INQUIRE               ),
-	DEF_VALS1(MQAUTH_OUTPUT                ),
-	DEF_VALS1(MQAUTH_PASS_ALL_CONTEXT      ),
-	DEF_VALS1(MQAUTH_PASS_IDENTITY_CONTEXT ),
-	DEF_VALS1(MQAUTH_SET                   ),
-	DEF_VALS1(MQAUTH_SET_ALL_CONTEXT       ),
-	DEF_VALS1(MQAUTH_SET_IDENTITY_CONTEXT  ),
-	DEF_VALS1(MQAUTH_CONTROL               ),
-	DEF_VALS1(MQAUTH_CONTROL_EXTENDED      ),
-	DEF_VALS1(MQAUTH_PUBLISH               ),
-	DEF_VALS1(MQAUTH_SUBSCRIBE             ),
-	DEF_VALS1(MQAUTH_RESUME                ),
-	DEF_VALS1(MQAUTH_SYSTEM                ),
+    DEF_VALS1(MQAUTH_NONE                  ),
+    DEF_VALS1(MQAUTH_ALT_USER_AUTHORITY    ),
+    DEF_VALS1(MQAUTH_BROWSE                ),
+    DEF_VALS1(MQAUTH_CHANGE                ),
+    DEF_VALS1(MQAUTH_CLEAR                 ),
+    DEF_VALS1(MQAUTH_CONNECT               ),
+    DEF_VALS1(MQAUTH_CREATE                ),
+    DEF_VALS1(MQAUTH_DELETE                ),
+    DEF_VALS1(MQAUTH_DISPLAY               ),
+    DEF_VALS1(MQAUTH_INPUT                 ),
+    DEF_VALS1(MQAUTH_INQUIRE               ),
+    DEF_VALS1(MQAUTH_OUTPUT                ),
+    DEF_VALS1(MQAUTH_PASS_ALL_CONTEXT      ),
+    DEF_VALS1(MQAUTH_PASS_IDENTITY_CONTEXT ),
+    DEF_VALS1(MQAUTH_SET                   ),
+    DEF_VALS1(MQAUTH_SET_ALL_CONTEXT       ),
+    DEF_VALS1(MQAUTH_SET_IDENTITY_CONTEXT  ),
+    DEF_VALS1(MQAUTH_CONTROL               ),
+    DEF_VALS1(MQAUTH_CONTROL_EXTENDED      ),
+    DEF_VALS1(MQAUTH_PUBLISH               ),
+    DEF_VALS1(MQAUTH_SUBSCRIBE             ),
+    DEF_VALS1(MQAUTH_RESUME                ),
+    DEF_VALS1(MQAUTH_SYSTEM                ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(BridgeTypes)
-	DEF_VALS1(MQBT_OTMA ),
+    DEF_VALS1(MQBT_OTMA ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(RefreshRepositoryOptions)
-	DEF_VALS1(MQCFO_REFRESH_REPOSITORY_YES ),
-	DEF_VALS1(MQCFO_REFRESH_REPOSITORY_NO  ),
+    DEF_VALS1(MQCFO_REFRESH_REPOSITORY_YES ),
+    DEF_VALS1(MQCFO_REFRESH_REPOSITORY_NO  ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(RemoveQueuesOptions)
-	DEF_VALS1(MQCFO_REMOVE_QUEUES_YES ),
-	DEF_VALS1(MQCFO_REMOVE_QUEUES_NO  ),
+    DEF_VALS1(MQCFO_REMOVE_QUEUES_YES ),
+    DEF_VALS1(MQCFO_REMOVE_QUEUES_NO  ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(CFRecover)
-	DEF_VALS1(MQCFR_YES),
-	DEF_VALS1(MQCFR_NO ),
+    DEF_VALS1(MQCFR_YES),
+    DEF_VALS1(MQCFR_NO ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(CFStatus)
-	DEF_VALS1(MQCFSTATUS_NOT_FOUND        ),
-	DEF_VALS1(MQCFSTATUS_ACTIVE           ),
-	DEF_VALS1(MQCFSTATUS_IN_RECOVER       ),
-	DEF_VALS1(MQCFSTATUS_IN_BACKUP        ),
-	DEF_VALS1(MQCFSTATUS_FAILED           ),
-	DEF_VALS1(MQCFSTATUS_NONE             ),
-	DEF_VALS1(MQCFSTATUS_UNKNOWN          ),
-	DEF_VALS1(MQCFSTATUS_ADMIN_INCOMPLETE ),
-	DEF_VALS1(MQCFSTATUS_NEVER_USED       ),
-	DEF_VALS1(MQCFSTATUS_NO_BACKUP        ),
-	DEF_VALS1(MQCFSTATUS_NOT_FAILED       ),
-	DEF_VALS1(MQCFSTATUS_NOT_RECOVERABLE  ),
-	DEF_VALS1(MQCFSTATUS_XES_ERROR        ),
+    DEF_VALS1(MQCFSTATUS_NOT_FOUND        ),
+    DEF_VALS1(MQCFSTATUS_ACTIVE           ),
+    DEF_VALS1(MQCFSTATUS_IN_RECOVER       ),
+    DEF_VALS1(MQCFSTATUS_IN_BACKUP        ),
+    DEF_VALS1(MQCFSTATUS_FAILED           ),
+    DEF_VALS1(MQCFSTATUS_NONE             ),
+    DEF_VALS1(MQCFSTATUS_UNKNOWN          ),
+    DEF_VALS1(MQCFSTATUS_ADMIN_INCOMPLETE ),
+    DEF_VALS1(MQCFSTATUS_NEVER_USED       ),
+    DEF_VALS1(MQCFSTATUS_NO_BACKUP        ),
+    DEF_VALS1(MQCFSTATUS_NOT_FAILED       ),
+    DEF_VALS1(MQCFSTATUS_NOT_RECOVERABLE  ),
+    DEF_VALS1(MQCFSTATUS_XES_ERROR        ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(CFStatusType)
-	DEF_VALS1(MQIACF_CF_STATUS_SUMMARY    ),
-	DEF_VALS1(MQIACF_CF_STATUS_CONNECT    ),
-	DEF_VALS1(MQIACF_CF_STATUS_BACKUP     ),
+    DEF_VALS1(MQIACF_CF_STATUS_SUMMARY    ),
+    DEF_VALS1(MQIACF_CF_STATUS_CONNECT    ),
+    DEF_VALS1(MQIACF_CF_STATUS_BACKUP     ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(CFStructType)
-	DEF_VALS1(MQCFTYPE_APPL         ),
-	DEF_VALS1(MQCFTYPE_ADMIN        ),
+    DEF_VALS1(MQCFTYPE_APPL         ),
+    DEF_VALS1(MQCFTYPE_ADMIN        ),
 DEF_VALSE;
 #endif
 
 DEF_VALSB(IndoubtStatus)
-	DEF_VALS1(MQCHIDS_NOT_INDOUBT ),
-	DEF_VALS1(MQCHIDS_INDOUBT     ),
+    DEF_VALS1(MQCHIDS_NOT_INDOUBT ),
+    DEF_VALS1(MQCHIDS_INDOUBT     ),
 DEF_VALSE;
 
 DEF_VALSB(ChannelDisp)
-	DEF_VALS1(MQCHLD_ALL                      ),
-	DEF_VALS1(MQCHLD_DEFAULT                  ),
-	DEF_VALS1(MQCHLD_SHARED                   ),
-	DEF_VALS1(MQCHLD_PRIVATE                  ),
-	DEF_VALS1(MQCHLD_FIXSHARED                ),
+    DEF_VALS1(MQCHLD_ALL                      ),
+    DEF_VALS1(MQCHLD_DEFAULT                  ),
+    DEF_VALS1(MQCHLD_SHARED                   ),
+    DEF_VALS1(MQCHLD_PRIVATE                  ),
+    DEF_VALS1(MQCHLD_FIXSHARED                ),
 DEF_VALSE;
 
 #if 0
 DEF_VALSB(ChannelInstanceType)
-	DEF_VALS1(MQOT_CURRENT_CHANNEL),
-	DEF_VALS1(MQOT_SAVED_CHANNEL  ),
-	DEF_VALS1(MQOT_SHORT_CHANNEL  ),
+    DEF_VALS1(MQOT_CURRENT_CHANNEL),
+    DEF_VALS1(MQOT_SAVED_CHANNEL  ),
+    DEF_VALS1(MQOT_SHORT_CHANNEL  ),
 DEF_VALSE;
 #endif
 
 DEF_VALSB(ChannelStatus)
-	DEF_VALS1(MQCHS_INACTIVE     ),
-	DEF_VALS1(MQCHS_BINDING      ),
-	DEF_VALS1(MQCHS_STARTING     ),
-	DEF_VALS1(MQCHS_RUNNING      ),
-	DEF_VALS1(MQCHS_STOPPING     ),
-	DEF_VALS1(MQCHS_RETRYING     ),
-	DEF_VALS1(MQCHS_STOPPED      ),
-	DEF_VALS1(MQCHS_REQUESTING   ),
-	DEF_VALS1(MQCHS_PAUSED       ),
-	DEF_VALS1(MQCHS_INITIALIZING ),
+    DEF_VALS1(MQCHS_INACTIVE     ),
+    DEF_VALS1(MQCHS_BINDING      ),
+    DEF_VALS1(MQCHS_STARTING     ),
+    DEF_VALS1(MQCHS_RUNNING      ),
+    DEF_VALS1(MQCHS_STOPPING     ),
+    DEF_VALS1(MQCHS_RETRYING     ),
+    DEF_VALS1(MQCHS_STOPPED      ),
+    DEF_VALS1(MQCHS_REQUESTING   ),
+    DEF_VALS1(MQCHS_PAUSED       ),
+    DEF_VALS1(MQCHS_INITIALIZING ),
 DEF_VALSE;
 
 DEF_VALSB(ChannelSubStates)
-	DEF_VALS1(MQCHSSTATE_COMPRESSING     ),
-	DEF_VALS1(MQCHSSTATE_END_OF_BATCH    ),
-	DEF_VALS1(MQCHSSTATE_HEARTBEATING    ),
-	DEF_VALS1(MQCHSSTATE_IN_CHADEXIT     ),
-	DEF_VALS1(MQCHSSTATE_IN_MQGET        ),
-	DEF_VALS1(MQCHSSTATE_IN_MQI_CALL     ),
-	DEF_VALS1(MQCHSSTATE_IN_MQPUT        ),
-	DEF_VALS1(MQCHSSTATE_IN_MREXIT       ),
-	DEF_VALS1(MQCHSSTATE_IN_MSGEXIT      ),
-	DEF_VALS1(MQCHSSTATE_IN_SCYEXIT      ),
-	DEF_VALS1(MQCHSSTATE_IN_RCVEXIT      ),
-	DEF_VALS1(MQCHSSTATE_IN_SENDEXIT     ),
-	DEF_VALS1(MQCHSSTATE_NAME_SERVER     ),
-	DEF_VALS1(MQCHSSTATE_NET_CONNECTING  ),
-	DEF_VALS1(MQCHSSTATE_OTHER           ),
-	DEF_VALS1(MQCHSSTATE_RECEIVING       ),
-	DEF_VALS1(MQCHSSTATE_RESYNCHING      ),
-	DEF_VALS1(MQCHSSTATE_SENDING         ),
-	DEF_VALS1(MQCHSSTATE_SERIALIZING     ),
-	DEF_VALS1(MQCHSSTATE_SSL_HANDSHAKING ),
+    DEF_VALS1(MQCHSSTATE_COMPRESSING     ),
+    DEF_VALS1(MQCHSSTATE_END_OF_BATCH    ),
+    DEF_VALS1(MQCHSSTATE_HEARTBEATING    ),
+    DEF_VALS1(MQCHSSTATE_IN_CHADEXIT     ),
+    DEF_VALS1(MQCHSSTATE_IN_MQGET        ),
+    DEF_VALS1(MQCHSSTATE_IN_MQI_CALL     ),
+    DEF_VALS1(MQCHSSTATE_IN_MQPUT        ),
+    DEF_VALS1(MQCHSSTATE_IN_MREXIT       ),
+    DEF_VALS1(MQCHSSTATE_IN_MSGEXIT      ),
+    DEF_VALS1(MQCHSSTATE_IN_SCYEXIT      ),
+    DEF_VALS1(MQCHSSTATE_IN_RCVEXIT      ),
+    DEF_VALS1(MQCHSSTATE_IN_SENDEXIT     ),
+    DEF_VALS1(MQCHSSTATE_NAME_SERVER     ),
+    DEF_VALS1(MQCHSSTATE_NET_CONNECTING  ),
+    DEF_VALS1(MQCHSSTATE_OTHER           ),
+    DEF_VALS1(MQCHSSTATE_RECEIVING       ),
+    DEF_VALS1(MQCHSSTATE_RESYNCHING      ),
+    DEF_VALS1(MQCHSSTATE_SENDING         ),
+    DEF_VALS1(MQCHSSTATE_SERIALIZING     ),
+    DEF_VALS1(MQCHSSTATE_SSL_HANDSHAKING ),
 DEF_VALSE;
 
 #if 0
 DEF_VALSB(ChannelSharedRestartOptions)
-	DEF_VALS1(MQCHSH_RESTART_NO           ),
-	DEF_VALS1(MQCHSH_RESTART_YES          ),
+    DEF_VALS1(MQCHSH_RESTART_NO           ),
+    DEF_VALS1(MQCHSH_RESTART_YES          ),
 DEF_VALSE;
 #endif
 
 DEF_VALSB(ChannelStopOptions)
-	DEF_VALS1(MQCHSR_STOP_NOT_REQUESTED ),
-	DEF_VALS1(MQCHSR_STOP_REQUESTED     ),
+    DEF_VALS1(MQCHSR_STOP_NOT_REQUESTED ),
+    DEF_VALS1(MQCHSR_STOP_REQUESTED     ),
 DEF_VALSE;
 
 #if 0
 DEF_VALSB(ChannelTableTypes)
-	DEF_VALS1(MQCHTAB_Q_MGR    ),
-	DEF_VALS1(MQCHTAB_CLNTCONN ),
+    DEF_VALS1(MQCHTAB_Q_MGR    ),
+    DEF_VALS1(MQCHTAB_CLNTCONN ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(ChinitStatus)
-	DEF_VALS1(MQSVC_STATUS_STOPPED),
-	DEF_VALS1(MQSVC_STATUS_RUNNING),
-	DEF_VALS1(MQSVC_STATUS_RETRYING),
+    DEF_VALS1(MQSVC_STATUS_STOPPED),
+    DEF_VALS1(MQSVC_STATUS_RUNNING),
+    DEF_VALS1(MQSVC_STATUS_RETRYING),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(ChinitInboundDisp)
-	DEF_VALS1(MQINBD_Q_MGR),
-	DEF_VALS1(MQINBD_GROUP),
+    DEF_VALS1(MQINBD_Q_MGR),
+    DEF_VALS1(MQINBD_GROUP),
 DEF_VALSE;
 #endif
 
 DEF_VALSB(ChinitTraceAutoStart)
-	DEF_VALS1(MQTRAXSTR_YES),
-	DEF_VALS1(MQTRAXSTR_NO ),
+    DEF_VALS1(MQTRAXSTR_YES),
+    DEF_VALS1(MQTRAXSTR_NO ),
 DEF_VALSE;
 
 #if 0
 DEF_VALSB(ClearTopicStringScope)
-	DEF_VALS1(MQCLRS_LOCAL              ),
-	DEF_VALS1(MQCLRS_GLOBAL             ),
+    DEF_VALS1(MQCLRS_LOCAL              ),
+    DEF_VALS1(MQCLRS_GLOBAL             ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(ClearTopicStringType)
-	DEF_VALS1(MQCLRT_RETAINED           ),
+    DEF_VALS1(MQCLRT_RETAINED           ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(DisconnectTypes)
-	DEF_VALS1(MQDISCONNECT_NORMAL      ),
-	DEF_VALS1(MQDISCONNECT_IMPLICIT    ),
-	DEF_VALS1(MQDISCONNECT_Q_MGR       ),
+    DEF_VALS1(MQDISCONNECT_NORMAL      ),
+    DEF_VALS1(MQDISCONNECT_IMPLICIT    ),
+    DEF_VALS1(MQDISCONNECT_Q_MGR       ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(EscapeTypes)
-	DEF_VALS1(MQET_MQSC ),
+    DEF_VALS1(MQET_MQSC ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(EventRecording)
-	DEF_VALS1(MQEVR_DISABLED   ),
-	DEF_VALS1(MQEVR_ENABLED    ),
-	DEF_VALS1(MQEVR_EXCEPTION  ),
-	DEF_VALS1(MQEVR_NO_DISPLAY ),
+    DEF_VALS1(MQEVR_DISABLED   ),
+    DEF_VALS1(MQEVR_ENABLED    ),
+    DEF_VALS1(MQEVR_EXCEPTION  ),
+    DEF_VALS1(MQEVR_NO_DISPLAY ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(ForceOptions)
-	DEF_VALS1(MQFC_YES ),
-	DEF_VALS1(MQFC_NO  ),
+    DEF_VALS1(MQFC_YES ),
+    DEF_VALS1(MQFC_NO  ),
 DEF_VALSE;
 #endif
 
 DEF_VALSB(HandleStates)
-	DEF_VALS1(MQHSTATE_INACTIVE    ),
-	DEF_VALS1(MQHSTATE_ACTIVE      ),
+    DEF_VALS1(MQHSTATE_INACTIVE    ),
+    DEF_VALS1(MQHSTATE_ACTIVE      ),
 DEF_VALSE;
 
 #if 0
 DEF_VALSB(InboundDispositions)
-	DEF_VALS1(MQINBD_Q_MGR     ),
-	DEF_VALS1(MQINBD_GROUP     ),
+    DEF_VALS1(MQINBD_Q_MGR     ),
+    DEF_VALS1(MQINBD_GROUP     ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(IndoubtOptions)
-	DEF_VALS1(MQIDO_COMMIT  ),
-	DEF_VALS1(MQIDO_BACKOUT ),
+    DEF_VALS1(MQIDO_COMMIT  ),
+    DEF_VALS1(MQIDO_BACKOUT ),
 DEF_VALSE;
 #endif
 
 DEF_VALSB(MessageChannelAgentStatus)
-	DEF_VALS1(MQMCAS_STOPPED ),
-	DEF_VALS1(MQMCAS_RUNNING ),
+    DEF_VALS1(MQMCAS_STOPPED ),
+    DEF_VALS1(MQMCAS_RUNNING ),
 DEF_VALSE;
 
 #if 0
 DEF_VALSB(ModeOptions)
-	DEF_VALS1(MQMODE_FORCE     ),
-	DEF_VALS1(MQMODE_QUIESCE   ),
-	DEF_VALS1(MQMODE_TERMINATE ),
+    DEF_VALS1(MQMODE_FORCE     ),
+    DEF_VALS1(MQMODE_QUIESCE   ),
+    DEF_VALS1(MQMODE_TERMINATE ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(PurgeOptions)
-	DEF_VALS1(MQPO_YES ),
-	DEF_VALS1(MQPO_NO  ),
+    DEF_VALS1(MQPO_YES ),
+    DEF_VALS1(MQPO_NO  ),
 DEF_VALSE;
 #endif
 
 DEF_VALSB(PubSubCluster)
-	DEF_VALS1(MQPSCLUS_ENABLED ),
-	DEF_VALS1(MQPSCLUS_DISABLED),
+    DEF_VALS1(MQPSCLUS_ENABLED ),
+    DEF_VALS1(MQPSCLUS_DISABLED),
 DEF_VALSE;
 
 DEF_VALSB(PubSubMode)
-	DEF_VALS1(MQPSM_COMPAT   ),
-	DEF_VALS1(MQPSM_DISABLED ),
-	DEF_VALS1(MQPSM_ENABLED  ),
+    DEF_VALS1(MQPSM_COMPAT   ),
+    DEF_VALS1(MQPSM_DISABLED ),
+    DEF_VALS1(MQPSM_ENABLED  ),
 DEF_VALSE;
 
 DEF_VALSB(PubSubNP)
-	DEF_VALS1(MQUNDELIVERED_NORMAL ),
-	DEF_VALS1(MQUNDELIVERED_SAFE   ),
-	DEF_VALS1(MQUNDELIVERED_DISCARD),
-	DEF_VALS1(MQUNDELIVERED_KEEP   ),
+    DEF_VALS1(MQUNDELIVERED_NORMAL ),
+    DEF_VALS1(MQUNDELIVERED_SAFE   ),
+    DEF_VALS1(MQUNDELIVERED_DISCARD),
+    DEF_VALS1(MQUNDELIVERED_KEEP   ),
 DEF_VALSE;
 
 DEF_VALSB(PubSubSync)
-	DEF_VALS1(MQSYNCPOINT_YES  ),
-	DEF_VALS1(MQSYNCPOINT_IFPER),
+    DEF_VALS1(MQSYNCPOINT_YES  ),
+    DEF_VALS1(MQSYNCPOINT_IFPER),
 DEF_VALSE;
 
 #if 0
 DEF_VALSB(PubSubStatusType)
-	DEF_VALS1(MQPSST_ALL                  ),
-	DEF_VALS1(MQPSST_LOCAL                ),
-	DEF_VALS1(MQPSST_PARENT               ),
-	DEF_VALS1(MQPSST_CHILD                ),
+    DEF_VALS1(MQPSST_ALL                  ),
+    DEF_VALS1(MQPSST_LOCAL                ),
+    DEF_VALS1(MQPSST_PARENT               ),
+    DEF_VALS1(MQPSST_CHILD                ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(PubSubStatus)
-	DEF_VALS1(MQPS_STATUS_ACTIVE          ),
-	DEF_VALS1(MQPS_STATUS_COMPAT          ),
-	DEF_VALS1(MQPS_STATUS_ERROR           ),
-	DEF_VALS1(MQPS_STATUS_INACTIVE        ),
-	DEF_VALS1(MQPS_STATUS_STARTING        ),
-	DEF_VALS1(MQPS_STATUS_STOPPING        ),
-	DEF_VALS1(MQPS_STATUS_REFUSED         ),
+    DEF_VALS1(MQPS_STATUS_ACTIVE          ),
+    DEF_VALS1(MQPS_STATUS_COMPAT          ),
+    DEF_VALS1(MQPS_STATUS_ERROR           ),
+    DEF_VALS1(MQPS_STATUS_INACTIVE        ),
+    DEF_VALS1(MQPS_STATUS_STARTING        ),
+    DEF_VALS1(MQPS_STATUS_STOPPING        ),
+    DEF_VALS1(MQPS_STATUS_REFUSED         ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(QueueManagerDefinitionTypes)
-	DEF_VALS1(MQQMDT_EXPLICIT_CLUSTER_SENDER ),
-	DEF_VALS1(MQQMDT_AUTO_CLUSTER_SENDER     ),
-	DEF_VALS1(MQQMDT_AUTO_EXP_CLUSTER_SENDER ),
-	DEF_VALS1(MQQMDT_CLUSTER_RECEIVER        ),
+    DEF_VALS1(MQQMDT_EXPLICIT_CLUSTER_SENDER ),
+    DEF_VALS1(MQQMDT_AUTO_CLUSTER_SENDER     ),
+    DEF_VALS1(MQQMDT_AUTO_EXP_CLUSTER_SENDER ),
+    DEF_VALS1(MQQMDT_CLUSTER_RECEIVER        ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(QueueManagerFacility)
-	DEF_VALS1(MQQMFAC_IMS_BRIDGE             ),
-	DEF_VALS1(MQQMFAC_DB2                    ),
+    DEF_VALS1(MQQMFAC_IMS_BRIDGE             ),
+    DEF_VALS1(MQQMFAC_DB2                    ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(QueueManagerStatus)
-	DEF_VALS1(MQQMSTA_STARTING     ),
-	DEF_VALS1(MQQMSTA_RUNNING      ),
-	DEF_VALS1(MQQMSTA_QUIESCING    ),
-	DEF_VALS1(MQQMSTA_STANDBY      ),
+    DEF_VALS1(MQQMSTA_STARTING     ),
+    DEF_VALS1(MQQMSTA_RUNNING      ),
+    DEF_VALS1(MQQMSTA_QUIESCING    ),
+    DEF_VALS1(MQQMSTA_STANDBY      ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(QueueManagerTypes)
-	DEF_VALS1(MQQMT_NORMAL     ),
-	DEF_VALS1(MQQMT_REPOSITORY ),
+    DEF_VALS1(MQQMT_NORMAL     ),
+    DEF_VALS1(MQQMT_REPOSITORY ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(QuiesceOptions)
-	DEF_VALS1(MQQO_YES ),
-	DEF_VALS1(MQQO_NO  ),
+    DEF_VALS1(MQQO_YES ),
+    DEF_VALS1(MQQO_NO  ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(QueueServiceIntervalEvents)
-	DEF_VALS1(MQQSIE_NONE ),
-	DEF_VALS1(MQQSIE_HIGH ),
-	DEF_VALS1(MQQSIE_OK   ),
+    DEF_VALS1(MQQSIE_NONE ),
+    DEF_VALS1(MQQSIE_HIGH ),
+    DEF_VALS1(MQQSIE_OK   ),
 DEF_VALSE;
 #endif
 
 DEF_VALSB(QueueStatusOpenTypes)
-	DEF_VALS1(MQQSOT_ALL    ),
-	DEF_VALS1(MQQSOT_INPUT  ),
-	DEF_VALS1(MQQSOT_OUTPUT ),
+    DEF_VALS1(MQQSOT_ALL    ),
+    DEF_VALS1(MQQSOT_INPUT  ),
+    DEF_VALS1(MQQSOT_OUTPUT ),
 DEF_VALSE;
 
 #if 0
 DEF_VALSB(NameListTypes)
-	DEF_VALS1(MQNT_NONE      ),
-	DEF_VALS1(MQNT_Q         ),
-	DEF_VALS1(MQNT_CLUSTER   ),
-	DEF_VALS1(MQNT_AUTH_INFO ),
+    DEF_VALS1(MQNT_NONE      ),
+    DEF_VALS1(MQNT_Q         ),
+    DEF_VALS1(MQNT_CLUSTER   ),
+    DEF_VALS1(MQNT_AUTH_INFO ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(QSGStatus)
-	DEF_VALS1(MQQSGS_UNKNOWN   ),
-	DEF_VALS1(MQQSGS_CREATED   ),
-	DEF_VALS1(MQQSGS_ACTIVE    ),
-	DEF_VALS1(MQQSGS_INACTIVE  ),
-	DEF_VALS1(MQQSGS_FAILED    ),
-	DEF_VALS1(MQQSGS_PENDING   ),
+    DEF_VALS1(MQQSGS_UNKNOWN   ),
+    DEF_VALS1(MQQSGS_CREATED   ),
+    DEF_VALS1(MQQSGS_ACTIVE    ),
+    DEF_VALS1(MQQSGS_INACTIVE  ),
+    DEF_VALS1(MQQSGS_FAILED    ),
+    DEF_VALS1(MQQSGS_PENDING   ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(QueueStatusType)
-	DEF_VALS1(MQIACF_Q_STATUS ),
-	DEF_VALS1(MQIACF_Q_HANDLE ),
+    DEF_VALS1(MQIACF_Q_STATUS ),
+    DEF_VALS1(MQIACF_Q_HANDLE ),
 DEF_VALSE;
 #endif
 
 DEF_VALSB(QueueStatusOptionsYesNo)
-	DEF_VALS1(MQQSO_NO         ),
-	DEF_VALS1(MQQSO_YES        ),
+    DEF_VALS1(MQQSO_NO         ),
+    DEF_VALS1(MQQSO_YES        ),
 DEF_VALSE;
 
 DEF_VALSB(QueueStatusOpenOptions)
-	DEF_VALS1(MQQSO_NO        ),
-	DEF_VALS1(MQQSO_SHARED    ),
-	DEF_VALS1(MQQSO_EXCLUSIVE ),
+    DEF_VALS1(MQQSO_NO        ),
+    DEF_VALS1(MQQSO_SHARED    ),
+    DEF_VALS1(MQQSO_EXCLUSIVE ),
 DEF_VALSE;
 
 #if 0
 DEF_VALSB(QueueStatusUncommittedMessages)
-	DEF_VALS1(MQQSUM_YES ),
-	DEF_VALS1(MQQSUM_NO  ),
+    DEF_VALS1(MQQSUM_YES ),
+    DEF_VALS1(MQQSUM_NO  ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(ReplaceOptions)
-	DEF_VALS1(MQRP_YES ),
-	DEF_VALS1(MQRP_NO  ),
+    DEF_VALS1(MQRP_YES ),
+    DEF_VALS1(MQRP_NO  ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(ReasonQualifiers)
-	DEF_VALS1(MQRQ_CONN_NOT_AUTHORIZED       ),
-	DEF_VALS1(MQRQ_OPEN_NOT_AUTHORIZED       ),
-	DEF_VALS1(MQRQ_CLOSE_NOT_AUTHORIZED      ),
-	DEF_VALS1(MQRQ_CMD_NOT_AUTHORIZED        ),
-	DEF_VALS1(MQRQ_Q_MGR_STOPPING            ),
-	DEF_VALS1(MQRQ_Q_MGR_QUIESCING           ),
-	DEF_VALS1(MQRQ_CHANNEL_STOPPED_OK        ),
-	DEF_VALS1(MQRQ_CHANNEL_STOPPED_ERROR     ),
-	DEF_VALS1(MQRQ_CHANNEL_STOPPED_RETRY     ),
-	DEF_VALS1(MQRQ_CHANNEL_STOPPED_DISABLED  ),
-	DEF_VALS1(MQRQ_BRIDGE_STOPPED_OK         ),
-	DEF_VALS1(MQRQ_BRIDGE_STOPPED_ERROR      ),
-	DEF_VALS1(MQRQ_SSL_HANDSHAKE_ERROR       ),
-	DEF_VALS1(MQRQ_SSL_CIPHER_SPEC_ERROR     ),
-	DEF_VALS1(MQRQ_SSL_CLIENT_AUTH_ERROR     ),
-	DEF_VALS1(MQRQ_SSL_PEER_NAME_ERROR       ),
-	DEF_VALS1(MQRQ_SUB_NOT_AUTHORIZED        ),
-	DEF_VALS1(MQRQ_SUB_DEST_NOT_AUTHORIZED   ),
-	DEF_VALS1(MQRQ_SSL_UNKNOWN_REVOCATION    ),
-	DEF_VALS1(MQRQ_SYS_CONN_NOT_AUTHORIZED   ),
+    DEF_VALS1(MQRQ_CONN_NOT_AUTHORIZED       ),
+    DEF_VALS1(MQRQ_OPEN_NOT_AUTHORIZED       ),
+    DEF_VALS1(MQRQ_CLOSE_NOT_AUTHORIZED      ),
+    DEF_VALS1(MQRQ_CMD_NOT_AUTHORIZED        ),
+    DEF_VALS1(MQRQ_Q_MGR_STOPPING            ),
+    DEF_VALS1(MQRQ_Q_MGR_QUIESCING           ),
+    DEF_VALS1(MQRQ_CHANNEL_STOPPED_OK        ),
+    DEF_VALS1(MQRQ_CHANNEL_STOPPED_ERROR     ),
+    DEF_VALS1(MQRQ_CHANNEL_STOPPED_RETRY     ),
+    DEF_VALS1(MQRQ_CHANNEL_STOPPED_DISABLED  ),
+    DEF_VALS1(MQRQ_BRIDGE_STOPPED_OK         ),
+    DEF_VALS1(MQRQ_BRIDGE_STOPPED_ERROR      ),
+    DEF_VALS1(MQRQ_SSL_HANDSHAKE_ERROR       ),
+    DEF_VALS1(MQRQ_SSL_CIPHER_SPEC_ERROR     ),
+    DEF_VALS1(MQRQ_SSL_CLIENT_AUTH_ERROR     ),
+    DEF_VALS1(MQRQ_SSL_PEER_NAME_ERROR       ),
+    DEF_VALS1(MQRQ_SUB_NOT_AUTHORIZED        ),
+    DEF_VALS1(MQRQ_SUB_DEST_NOT_AUTHORIZED   ),
+    DEF_VALS1(MQRQ_SSL_UNKNOWN_REVOCATION    ),
+    DEF_VALS1(MQRQ_SYS_CONN_NOT_AUTHORIZED   ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(RefreshTypes)
-	DEF_VALS1(MQRT_CONFIGURATION             ),
-	DEF_VALS1(MQRT_EXPIRY                    ),
-	DEF_VALS1(MQRT_NSPROC                    ),
-	DEF_VALS1(MQRT_PROXYSUB                  ),
+    DEF_VALS1(MQRT_CONFIGURATION             ),
+    DEF_VALS1(MQRT_EXPIRY                    ),
+    DEF_VALS1(MQRT_NSPROC                    ),
+    DEF_VALS1(MQRT_PROXYSUB                  ),
 DEF_VALSE;
 #endif
 
 DEF_VALSB(QueueDefinitionScope)
-	DEF_VALS1(MQSCO_Q_MGR ),
-	DEF_VALS1(MQSCO_CELL  ),
+    DEF_VALS1(MQSCO_Q_MGR ),
+    DEF_VALS1(MQSCO_CELL  ),
 DEF_VALSE;
 
 #if 0
 DEF_VALSB(SecurityItems)
-	DEF_VALS1(MQSECITEM_ALL                    ),
-	DEF_VALS1(MQSECITEM_MQADMIN                ),
-	DEF_VALS1(MQSECITEM_MQNLIST                ),
-	DEF_VALS1(MQSECITEM_MQPROC                 ),
-	DEF_VALS1(MQSECITEM_MQQUEUE                ),
-	DEF_VALS1(MQSECITEM_MQCONN                 ),
-	DEF_VALS1(MQSECITEM_MQCMDS                 ),
-	DEF_VALS1(MQSECITEM_MXADMIN                ),
-	DEF_VALS1(MQSECITEM_MXNLIST                ),
-	DEF_VALS1(MQSECITEM_MXPROC                 ),
-	DEF_VALS1(MQSECITEM_MXQUEUE                ),
-	DEF_VALS1(MQSECITEM_MXTOPIC                ),
+    DEF_VALS1(MQSECITEM_ALL                    ),
+    DEF_VALS1(MQSECITEM_MQADMIN                ),
+    DEF_VALS1(MQSECITEM_MQNLIST                ),
+    DEF_VALS1(MQSECITEM_MQPROC                 ),
+    DEF_VALS1(MQSECITEM_MQQUEUE                ),
+    DEF_VALS1(MQSECITEM_MQCONN                 ),
+    DEF_VALS1(MQSECITEM_MQCMDS                 ),
+    DEF_VALS1(MQSECITEM_MXADMIN                ),
+    DEF_VALS1(MQSECITEM_MXNLIST                ),
+    DEF_VALS1(MQSECITEM_MXPROC                 ),
+    DEF_VALS1(MQSECITEM_MXQUEUE                ),
+    DEF_VALS1(MQSECITEM_MXTOPIC                ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(SecuritySwitches)
-	DEF_VALS1(MQSECSW_PROCESS                  ),
-	DEF_VALS1(MQSECSW_NAMELIST                 ),
-	DEF_VALS1(MQSECSW_Q                        ),
-	DEF_VALS1(MQSECSW_TOPIC                    ),
-	DEF_VALS1(MQSECSW_CONTEXT                  ),
-	DEF_VALS1(MQSECSW_ALTERNATE_USER           ),
-	DEF_VALS1(MQSECSW_COMMAND                  ),
-	DEF_VALS1(MQSECSW_CONNECTION               ),
-	DEF_VALS1(MQSECSW_SUBSYSTEM                ),
-	DEF_VALS1(MQSECSW_COMMAND_RESOURCES        ),
-	DEF_VALS1(MQSECSW_Q_MGR                    ),
-	DEF_VALS1(MQSECSW_QSG                      ),
-	DEF_VALS1(MQSECSW_OFF_FOUND                ),
-	DEF_VALS1(MQSECSW_ON_FOUND                 ),
-	DEF_VALS1(MQSECSW_OFF_NOT_FOUND            ),
-	DEF_VALS1(MQSECSW_ON_NOT_FOUND             ),
-	DEF_VALS1(MQSECSW_OFF_ERROR                ),
-	DEF_VALS1(MQSECSW_ON_OVERRIDDEN            ),
+    DEF_VALS1(MQSECSW_PROCESS                  ),
+    DEF_VALS1(MQSECSW_NAMELIST                 ),
+    DEF_VALS1(MQSECSW_Q                        ),
+    DEF_VALS1(MQSECSW_TOPIC                    ),
+    DEF_VALS1(MQSECSW_CONTEXT                  ),
+    DEF_VALS1(MQSECSW_ALTERNATE_USER           ),
+    DEF_VALS1(MQSECSW_COMMAND                  ),
+    DEF_VALS1(MQSECSW_CONNECTION               ),
+    DEF_VALS1(MQSECSW_SUBSYSTEM                ),
+    DEF_VALS1(MQSECSW_COMMAND_RESOURCES        ),
+    DEF_VALS1(MQSECSW_Q_MGR                    ),
+    DEF_VALS1(MQSECSW_QSG                      ),
+    DEF_VALS1(MQSECSW_OFF_FOUND                ),
+    DEF_VALS1(MQSECSW_ON_FOUND                 ),
+    DEF_VALS1(MQSECSW_OFF_NOT_FOUND            ),
+    DEF_VALS1(MQSECSW_ON_NOT_FOUND             ),
+    DEF_VALS1(MQSECSW_OFF_ERROR                ),
+    DEF_VALS1(MQSECSW_ON_OVERRIDDEN            ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(SecurityTypes)
-	DEF_VALS1(MQSECTYPE_AUTHSERV ),
-	DEF_VALS1(MQSECTYPE_SSL      ),
-	DEF_VALS1(MQSECTYPE_CLASSES  ),
+    DEF_VALS1(MQSECTYPE_AUTHSERV ),
+    DEF_VALS1(MQSECTYPE_SSL      ),
+    DEF_VALS1(MQSECTYPE_CLASSES  ),
 DEF_VALSE;
 #endif
 
 DEF_VALSB(InhibitPublications)
-	DEF_VALS1(MQTA_PUB_AS_PARENT ),
-	DEF_VALS1(MQTA_PUB_INHIBITED ),
-	DEF_VALS1(MQTA_PUB_ALLOWED   ),
+    DEF_VALS1(MQTA_PUB_AS_PARENT ),
+    DEF_VALS1(MQTA_PUB_INHIBITED ),
+    DEF_VALS1(MQTA_PUB_ALLOWED   ),
 DEF_VALSE;
 
 DEF_VALSB(MsgDelivery)
-	DEF_VALS1(MQDLV_AS_PARENT),
-	DEF_VALS1(MQDLV_ALL),
-	DEF_VALS1(MQDLV_ALL_DUR),
-	DEF_VALS1(MQDLV_ALL_AVAIL),
+    DEF_VALS1(MQDLV_AS_PARENT),
+    DEF_VALS1(MQDLV_ALL),
+    DEF_VALS1(MQDLV_ALL_DUR),
+    DEF_VALS1(MQDLV_ALL_AVAIL),
 DEF_VALSE;
 
 #if 0
 DEF_VALSB(ClusterCacheType)
-	DEF_VALS1(MQCLCT_STATIC  ),
-	DEF_VALS1(MQCLCT_DYNAMIC ),
+    DEF_VALS1(MQCLCT_STATIC  ),
+    DEF_VALS1(MQCLCT_DYNAMIC ),
 DEF_VALSE;
 #endif
 
 DEF_VALSB(InhibitSubscriptions)
-	DEF_VALS1(MQTA_SUB_AS_PARENT ),
-	DEF_VALS1(MQTA_SUB_INHIBITED ),
-	DEF_VALS1(MQTA_SUB_ALLOWED   ),
+    DEF_VALS1(MQTA_SUB_AS_PARENT ),
+    DEF_VALS1(MQTA_SUB_INHIBITED ),
+    DEF_VALS1(MQTA_SUB_ALLOWED   ),
 DEF_VALSE;
 
 DEF_VALSB(ProxySubscriptions)
-	DEF_VALS1(MQTA_PROXY_SUB_FORCE    ),
-	DEF_VALS1(MQTA_PROXY_SUB_FIRSTUSE ),
+    DEF_VALS1(MQTA_PROXY_SUB_FORCE    ),
+    DEF_VALS1(MQTA_PROXY_SUB_FIRSTUSE ),
 DEF_VALSE;
 
 DEF_VALSB(WildcardOperation)
-	DEF_VALS1(MQTA_PASSTHRU ),
-	DEF_VALS1(MQTA_BLOCK    ),
+    DEF_VALS1(MQTA_PASSTHRU ),
+    DEF_VALS1(MQTA_BLOCK    ),
 DEF_VALSE;
 
 DEF_VALSB(TopicType)
-	DEF_VALS1(MQTOPT_LOCAL   ),
-	DEF_VALS1(MQTOPT_CLUSTER ),
+    DEF_VALS1(MQTOPT_LOCAL   ),
+    DEF_VALS1(MQTOPT_CLUSTER ),
 DEF_VALSE;
 
 #if 0
 DEF_VALSB(WLMIntervalUnits)
-	DEF_VALS1(MQTIME_UNIT_SECS),
-	DEF_VALS1(MQTIME_UNIT_MINS),
+    DEF_VALS1(MQTIME_UNIT_SECS),
+    DEF_VALS1(MQTIME_UNIT_MINS),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(SelectorTypes)
-	DEF_VALS1(MQSELTYPE_NONE                   ),
-	DEF_VALS1(MQSELTYPE_STANDARD               ),
-	DEF_VALS1(MQSELTYPE_EXTENDED               ),
+    DEF_VALS1(MQSELTYPE_NONE                   ),
+    DEF_VALS1(MQSELTYPE_STANDARD               ),
+    DEF_VALS1(MQSELTYPE_EXTENDED               ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(SuspendStatus)
-	DEF_VALS1(MQSUS_YES ),
-	DEF_VALS1(MQSUS_NO  ),
+    DEF_VALS1(MQSUS_YES ),
+    DEF_VALS1(MQSUS_NO  ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(SyncpointPubSub)
-	DEF_VALS1(MQSYNCPOINT_YES               ),
-	DEF_VALS1(MQSYNCPOINT_IFPER             ),
+    DEF_VALS1(MQSYNCPOINT_YES               ),
+    DEF_VALS1(MQSYNCPOINT_IFPER             ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(SystemParameterValues)
-	DEF_VALS1(MQSYSP_NO                    ),
-	DEF_VALS1(MQSYSP_YES                   ),
-	DEF_VALS1(MQSYSP_EXTENDED              ),
-	DEF_VALS1(MQSYSP_TYPE_INITIAL          ),
-	DEF_VALS1(MQSYSP_TYPE_SET              ),
-	DEF_VALS1(MQSYSP_TYPE_LOG_COPY         ),
-	DEF_VALS1(MQSYSP_TYPE_LOG_STATUS       ),
-	DEF_VALS1(MQSYSP_TYPE_ARCHIVE_TAPE     ),
-	DEF_VALS1(MQSYSP_ALLOC_BLK             ),
-	DEF_VALS1(MQSYSP_ALLOC_TRK             ),
-	DEF_VALS1(MQSYSP_ALLOC_CYL             ),
-	DEF_VALS1(MQSYSP_STATUS_BUSY           ),
-	DEF_VALS1(MQSYSP_STATUS_PREMOUNT       ),
-	DEF_VALS1(MQSYSP_STATUS_AVAILABLE      ),
-	DEF_VALS1(MQSYSP_STATUS_UNKNOWN        ),
-	DEF_VALS1(MQSYSP_STATUS_ALLOC_ARCHIVE  ),
-	DEF_VALS1(MQSYSP_STATUS_COPYING_BSDS   ),
-	DEF_VALS1(MQSYSP_STATUS_COPYING_LOG    ),
+    DEF_VALS1(MQSYSP_NO                    ),
+    DEF_VALS1(MQSYSP_YES                   ),
+    DEF_VALS1(MQSYSP_EXTENDED              ),
+    DEF_VALS1(MQSYSP_TYPE_INITIAL          ),
+    DEF_VALS1(MQSYSP_TYPE_SET              ),
+    DEF_VALS1(MQSYSP_TYPE_LOG_COPY         ),
+    DEF_VALS1(MQSYSP_TYPE_LOG_STATUS       ),
+    DEF_VALS1(MQSYSP_TYPE_ARCHIVE_TAPE     ),
+    DEF_VALS1(MQSYSP_ALLOC_BLK             ),
+    DEF_VALS1(MQSYSP_ALLOC_TRK             ),
+    DEF_VALS1(MQSYSP_ALLOC_CYL             ),
+    DEF_VALS1(MQSYSP_STATUS_BUSY           ),
+    DEF_VALS1(MQSYSP_STATUS_PREMOUNT       ),
+    DEF_VALS1(MQSYSP_STATUS_AVAILABLE      ),
+    DEF_VALS1(MQSYSP_STATUS_UNKNOWN        ),
+    DEF_VALS1(MQSYSP_STATUS_ALLOC_ARCHIVE  ),
+    DEF_VALS1(MQSYSP_STATUS_COPYING_BSDS   ),
+    DEF_VALS1(MQSYSP_STATUS_COPYING_LOG    ),
 DEF_VALSE;
 #endif
 
 DEF_VALSB(DurableSubscriptions)
-	DEF_VALS1(MQSUB_DURABLE_AS_PARENT   ),
-	DEF_VALS1(MQSUB_DURABLE_ALLOWED  ),
-	DEF_VALS1(MQSUB_DURABLE_INHIBITED),
+    DEF_VALS1(MQSUB_DURABLE_AS_PARENT   ),
+    DEF_VALS1(MQSUB_DURABLE_ALLOWED  ),
+    DEF_VALS1(MQSUB_DURABLE_INHIBITED),
 DEF_VALSE;
 
 #if 0
 DEF_VALSB(Durable)
-	DEF_VALS1(MQSUB_DURABLE_ALL ),
-	DEF_VALS1(MQSUB_DURABLE_YES ),
-	DEF_VALS1(MQSUB_DURABLE_NO  ),
+    DEF_VALS1(MQSUB_DURABLE_ALL ),
+    DEF_VALS1(MQSUB_DURABLE_YES ),
+    DEF_VALS1(MQSUB_DURABLE_NO  ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(SubscriptionTypes)
-	DEF_VALS1(MQSUBTYPE_API               ),
-	DEF_VALS1(MQSUBTYPE_ADMIN             ),
-	DEF_VALS1(MQSUBTYPE_PROXY             ),
-	DEF_VALS1(MQSUBTYPE_ALL               ),
-	DEF_VALS1(MQSUBTYPE_USER              ),
+    DEF_VALS1(MQSUBTYPE_API               ),
+    DEF_VALS1(MQSUBTYPE_ADMIN             ),
+    DEF_VALS1(MQSUBTYPE_PROXY             ),
+    DEF_VALS1(MQSUBTYPE_ALL               ),
+    DEF_VALS1(MQSUBTYPE_USER              ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(SubscriptionDestinationClass)
-	DEF_VALS1(MQDC_MANAGED  ),
-	DEF_VALS1(MQDC_PROVIDED ),
+    DEF_VALS1(MQDC_MANAGED  ),
+    DEF_VALS1(MQDC_PROVIDED ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(SubscriptionRequestOnly)
-	DEF_VALS1(MQRU_PUBLISH_ON_REQUEST ),
-	DEF_VALS1(MQRU_PUBLISH_ALL        ),
+    DEF_VALS1(MQRU_PUBLISH_ON_REQUEST ),
+    DEF_VALS1(MQRU_PUBLISH_ALL        ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(TimeUnits)
-	DEF_VALS1(MQTIME_UNIT_MINS          ),
-	DEF_VALS1(MQTIME_UNIT_SECS          ),
+    DEF_VALS1(MQTIME_UNIT_MINS          ),
+    DEF_VALS1(MQTIME_UNIT_SECS          ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(VariableUser)
-	DEF_VALS1(MQVU_ANY_USER   ),
-	DEF_VALS1(MQVU_FIXED_USER ),
+    DEF_VALS1(MQVU_ANY_USER   ),
+    DEF_VALS1(MQVU_FIXED_USER ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(WildcardSchema)
-	DEF_VALS1(MQWS_CHAR  ),
-	DEF_VALS1(MQWS_TOPIC ),
+    DEF_VALS1(MQWS_CHAR  ),
+    DEF_VALS1(MQWS_TOPIC ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(UserIDSupport)
-	DEF_VALS1(MQUIDSUPP_NO              ),
-	DEF_VALS1(MQUIDSUPP_YES             ),
+    DEF_VALS1(MQUIDSUPP_NO              ),
+    DEF_VALS1(MQUIDSUPP_YES             ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(UndeliveredPubSub)
-	DEF_VALS1(MQUNDELIVERED_NORMAL      ),
-	DEF_VALS1(MQUNDELIVERED_SAFE        ),
-	DEF_VALS1(MQUNDELIVERED_DISCARD     ),
-	DEF_VALS1(MQUNDELIVERED_KEEP        ),
+    DEF_VALS1(MQUNDELIVERED_NORMAL      ),
+    DEF_VALS1(MQUNDELIVERED_SAFE        ),
+    DEF_VALS1(MQUNDELIVERED_DISCARD     ),
+    DEF_VALS1(MQUNDELIVERED_KEEP        ),
 DEF_VALSE;
 #endif
 
 DEF_VALSB(UOWStates)
-	DEF_VALS1(MQUOWST_NONE              ),
-	DEF_VALS1(MQUOWST_ACTIVE            ),
-	DEF_VALS1(MQUOWST_PREPARED          ),
-	DEF_VALS1(MQUOWST_UNRESOLVED        ),
+    DEF_VALS1(MQUOWST_NONE              ),
+    DEF_VALS1(MQUOWST_ACTIVE            ),
+    DEF_VALS1(MQUOWST_PREPARED          ),
+    DEF_VALS1(MQUOWST_UNRESOLVED        ),
 DEF_VALSE;
 
 DEF_VALSB(UOWTypes)
-	DEF_VALS1(MQUOWT_Q_MGR              ),
-	DEF_VALS1(MQUOWT_CICS               ),
-	DEF_VALS1(MQUOWT_RRS                ),
-	DEF_VALS1(MQUOWT_IMS                ),
-	DEF_VALS1(MQUOWT_XA                 ),
+    DEF_VALS1(MQUOWT_Q_MGR              ),
+    DEF_VALS1(MQUOWT_CICS               ),
+    DEF_VALS1(MQUOWT_RRS                ),
+    DEF_VALS1(MQUOWT_IMS                ),
+    DEF_VALS1(MQUOWT_XA                 ),
 DEF_VALSE;
 
 #if 0
 DEF_VALSB(UsageType)
-	DEF_VALS1(MQIACF_USAGE_PAGESET     ),
-	DEF_VALS1(MQIACF_USAGE_BUFFER_POOL ),
-	DEF_VALS1(MQIACF_USAGE_DATA_SET    ),
+    DEF_VALS1(MQIACF_USAGE_PAGESET     ),
+    DEF_VALS1(MQIACF_USAGE_BUFFER_POOL ),
+    DEF_VALS1(MQIACF_USAGE_DATA_SET    ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(PageSetStatus)
-	DEF_VALS1(MQUSAGE_PS_AVAILABLE      ),
-	DEF_VALS1(MQUSAGE_PS_DEFINED        ),
-	DEF_VALS1(MQUSAGE_PS_OFFLINE        ),
-	DEF_VALS1(MQUSAGE_PS_NOT_DEFINED    ),
+    DEF_VALS1(MQUSAGE_PS_AVAILABLE      ),
+    DEF_VALS1(MQUSAGE_PS_DEFINED        ),
+    DEF_VALS1(MQUSAGE_PS_OFFLINE        ),
+    DEF_VALS1(MQUSAGE_PS_NOT_DEFINED    ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(ExpandType)
-	DEF_VALS1(MQUSAGE_EXPAND_USER       ),
-	DEF_VALS1(MQUSAGE_EXPAND_SYSTEM     ),
-	DEF_VALS1(MQUSAGE_EXPAND_NONE       ),
+    DEF_VALS1(MQUSAGE_EXPAND_USER       ),
+    DEF_VALS1(MQUSAGE_EXPAND_SYSTEM     ),
+    DEF_VALS1(MQUSAGE_EXPAND_NONE       ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(DataSetType)
-	DEF_VALS1(MQUSAGE_DS_OLDEST_ACTIVE_UOW   ),
-	DEF_VALS1(MQUSAGE_DS_OLDEST_PS_RECOVERY  ),
-	DEF_VALS1(MQUSAGE_DS_OLDEST_CF_RECOVERY  ),
+    DEF_VALS1(MQUSAGE_DS_OLDEST_ACTIVE_UOW   ),
+    DEF_VALS1(MQUSAGE_DS_OLDEST_PS_RECOVERY  ),
+    DEF_VALS1(MQUSAGE_DS_OLDEST_CF_RECOVERY  ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(ActivityOperations)
-	DEF_VALS1(MQOPER_UNKNOWN             ),
-	DEF_VALS1(MQOPER_BROWSE              ),
-	DEF_VALS1(MQOPER_DISCARD             ),
-	DEF_VALS1(MQOPER_GET                 ),
-	DEF_VALS1(MQOPER_PUT                 ),
-	DEF_VALS1(MQOPER_PUT_REPLY           ),
-	DEF_VALS1(MQOPER_PUT_REPORT          ),
-	DEF_VALS1(MQOPER_RECEIVE             ),
-	DEF_VALS1(MQOPER_SEND                ),
-	DEF_VALS1(MQOPER_TRANSFORM           ),
-	DEF_VALS1(MQOPER_PUBLISH             ),
-	DEF_VALS1(MQOPER_EXCLUDED_PUBLISH    ),
-
-	DEF_VALS1(MQOPER_DISCARDED_PUBLISH   ),
+    DEF_VALS1(MQOPER_UNKNOWN             ),
+    DEF_VALS1(MQOPER_BROWSE              ),
+    DEF_VALS1(MQOPER_DISCARD             ),
+    DEF_VALS1(MQOPER_GET                 ),
+    DEF_VALS1(MQOPER_PUT                 ),
+    DEF_VALS1(MQOPER_PUT_REPLY           ),
+    DEF_VALS1(MQOPER_PUT_REPORT          ),
+    DEF_VALS1(MQOPER_RECEIVE             ),
+    DEF_VALS1(MQOPER_SEND                ),
+    DEF_VALS1(MQOPER_TRANSFORM           ),
+    DEF_VALS1(MQOPER_PUBLISH             ),
+    DEF_VALS1(MQOPER_EXCLUDED_PUBLISH    ),
+
+    DEF_VALS1(MQOPER_DISCARDED_PUBLISH   ),
 DEF_VALSE;
 #endif
 
 DEF_VALSB(ConnInfoType)
-	DEF_VALS1(MQIACF_CONN_INFO_ALL    ),
-	DEF_VALS1(MQIACF_CONN_INFO_CONN   ),
-	DEF_VALS1(MQIACF_CONN_INFO_HANDLE ),
+    DEF_VALS1(MQIACF_CONN_INFO_ALL    ),
+    DEF_VALS1(MQIACF_CONN_INFO_CONN   ),
+    DEF_VALS1(MQIACF_CONN_INFO_HANDLE ),
 DEF_VALSE;
 
 #if 0
 DEF_VALSB(Priority)
-	DEF_VALS1(MQPRI_PRIORITY_AS_PUBLISHED),
-	DEF_VALS1(MQPRI_PRIORITY_AS_PARENT),
-	DEF_VALS1(MQPRI_PRIORITY_AS_Q_DEF),
-	DEF_VALS1(0),
-	DEF_VALS1(1),
-	DEF_VALS1(2),
-	DEF_VALS1(3),
-	DEF_VALS1(4),
-	DEF_VALS1(5),
-	DEF_VALS1(6),
-	DEF_VALS1(7),
-	DEF_VALS1(8),
-	DEF_VALS1(9),
+    DEF_VALS1(MQPRI_PRIORITY_AS_PUBLISHED),
+    DEF_VALS1(MQPRI_PRIORITY_AS_PARENT),
+    DEF_VALS1(MQPRI_PRIORITY_AS_Q_DEF),
+    DEF_VALS1(0),
+    DEF_VALS1(1),
+    DEF_VALS1(2),
+    DEF_VALS1(3),
+    DEF_VALS1(4),
+    DEF_VALS1(5),
+    DEF_VALS1(6),
+    DEF_VALS1(7),
+    DEF_VALS1(8),
+    DEF_VALS1(9),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(PublishSubscribeProperties)
-	DEF_VALS1(MQPSPROP_NONE    ),
-	DEF_VALS1(MQPSPROP_COMPAT  ),
-	DEF_VALS1(MQPSPROP_RFH2    ),
-	DEF_VALS1(MQPSPROP_MSGPROP ),
+    DEF_VALS1(MQPSPROP_NONE    ),
+    DEF_VALS1(MQPSPROP_COMPAT  ),
+    DEF_VALS1(MQPSPROP_RFH2    ),
+    DEF_VALS1(MQPSPROP_MSGPROP ),
 DEF_VALSE;
 #endif
 
 DEF_VALSB(PubSubScope)
-	DEF_VALS1(MQSCOPE_ALL       ),
-	DEF_VALS1(MQSCOPE_AS_PARENT ),
-	DEF_VALS1(MQSCOPE_QMGR      ),
+    DEF_VALS1(MQSCOPE_ALL       ),
+    DEF_VALS1(MQSCOPE_AS_PARENT ),
+    DEF_VALS1(MQSCOPE_QMGR      ),
 DEF_VALSE;
 
 #if 0
 DEF_VALSB(EncryptionPolicySuiteB)
-	DEF_VALS1(MQ_SUITE_B_NOT_AVAILABLE ),
-	DEF_VALS1(MQ_SUITE_B_NONE          ),
-	DEF_VALS1(MQ_SUITE_B_128_BIT       ),
-	DEF_VALS1(MQ_SUITE_B_192_BIT       ),
+    DEF_VALS1(MQ_SUITE_B_NOT_AVAILABLE ),
+    DEF_VALS1(MQ_SUITE_B_NONE          ),
+    DEF_VALS1(MQ_SUITE_B_128_BIT       ),
+    DEF_VALS1(MQ_SUITE_B_192_BIT       ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(Multicast)
-	DEF_VALS1(MQMC_AS_PARENT),
-	DEF_VALS1(MQMC_ENABLED  ),
-	DEF_VALS1(MQMC_DISABLED ),
-	DEF_VALS1(MQMC_ONLY     ),
+    DEF_VALS1(MQMC_AS_PARENT),
+    DEF_VALS1(MQMC_ENABLED  ),
+    DEF_VALS1(MQMC_DISABLED ),
+    DEF_VALS1(MQMC_ONLY     ),
 DEF_VALSE;
 #endif
 
 #if 0
 DEF_VALSB(UseDLQueue)
-	DEF_VALS1(MQUSEDLQ_AS_PARENT ),
-	DEF_VALS1(MQUSEDLQ_NO        ),
-	DEF_VALS1(MQUSEDLQ_YES       ),
+    DEF_VALS1(MQUSEDLQ_AS_PARENT ),
+    DEF_VALS1(MQUSEDLQ_NO        ),
+    DEF_VALS1(MQUSEDLQ_YES       ),
 DEF_VALSE;
 #endif
 
 DEF_VALSB(IGQPutAuthority)
-	DEF_VALS1(MQIGQPA_DEFAULT         ),
-	DEF_VALS1(MQIGQPA_CONTEXT         ),
-	DEF_VALS1(MQIGQPA_ONLY_IGQ        ),
-	DEF_VALS1(MQIGQPA_ALTERNATE_OR_IGQ),
+    DEF_VALS1(MQIGQPA_DEFAULT         ),
+    DEF_VALS1(MQIGQPA_CONTEXT         ),
+    DEF_VALS1(MQIGQPA_ONLY_IGQ        ),
+    DEF_VALS1(MQIGQPA_ALTERNATE_OR_IGQ),
 DEF_VALSE;
 
 DEF_VALSB(SecurityCase)
-	DEF_VALS1(MQSCYC_UPPER),
-	DEF_VALS1(MQSCYC_MIXED),
+    DEF_VALS1(MQSCYC_UPPER),
+    DEF_VALS1(MQSCYC_MIXED),
 DEF_VALSE;
 
 DEF_VALSB(ChlauthType)
-	DEF_VALS1(MQCAUT_BLOCKUSER ),
-	DEF_VALS1(MQCAUT_BLOCKADDR ),
-	DEF_VALS1(MQCAUT_SSLPEERMAP),
-	DEF_VALS1(MQCAUT_ADDRESSMAP),
-	DEF_VALS1(MQCAUT_USERMAP   ),
-	DEF_VALS1(MQCAUT_QMGRMAP   ),
+    DEF_VALS1(MQCAUT_BLOCKUSER ),
+    DEF_VALS1(MQCAUT_BLOCKADDR ),
+    DEF_VALS1(MQCAUT_SSLPEERMAP),
+    DEF_VALS1(MQCAUT_ADDRESSMAP),
+    DEF_VALS1(MQCAUT_USERMAP   ),
+    DEF_VALS1(MQCAUT_QMGRMAP   ),
 DEF_VALSE;
 
 DEF_VALSB(UserSource)
-	DEF_VALS1(MQUSRC_MAP     ),
-	DEF_VALS1(MQUSRC_NOACCESS),
-	DEF_VALS1(MQUSRC_CHANNEL ),
+    DEF_VALS1(MQUSRC_MAP     ),
+    DEF_VALS1(MQUSRC_NOACCESS),
+    DEF_VALS1(MQUSRC_CHANNEL ),
 DEF_VALSE;
 
 DEF_VALSB(Warning)
-	DEF_VALS1(MQWARN_NO ),
-	DEF_VALS1(MQWARN_YES),
+    DEF_VALS1(MQWARN_NO ),
+    DEF_VALS1(MQWARN_YES),
 DEF_VALSE;
 
 DEF_VALSB(CertValPolicy)
-	DEF_VALS1(MQ_CERT_VAL_POLICY_ANY    ),
-	DEF_VALS1(MQ_CERT_VAL_POLICY_RFC5280),
+    DEF_VALS1(MQ_CERT_VAL_POLICY_ANY    ),
+    DEF_VALS1(MQ_CERT_VAL_POLICY_RFC5280),
 DEF_VALSE;
 
 DEF_VALSB(ChanAutoDef)
-	DEF_VALS1(MQCHAD_DISABLED),
-	DEF_VALS1(MQCHAD_ENABLED ),
+    DEF_VALS1(MQCHAD_DISABLED),
+    DEF_VALS1(MQCHAD_ENABLED ),
 DEF_VALSE;
 
 DEF_VALSB(ChlAuthRecords)
-	DEF_VALS1(MQCHLA_DISABLED),
-	DEF_VALS1(MQCHLA_ENABLED ),
+    DEF_VALS1(MQCHLA_DISABLED),
+    DEF_VALS1(MQCHLA_ENABLED ),
 DEF_VALSE;
 
 DEF_VALSB(DefClusXmitTyp)
-	DEF_VALS1(MQCLXQ_SCTQ   ),
-	DEF_VALS1(MQCLXQ_CHANNEL),
+    DEF_VALS1(MQCLXQ_SCTQ   ),
+    DEF_VALS1(MQCLXQ_CHANNEL),
 DEF_VALSE;
 
 DEF_VALSB(ServiceControl)
-	DEF_VALS1(MQSVC_CONTROL_Q_MGR      ),
-	DEF_VALS1(MQSVC_CONTROL_Q_MGR_START),
-	DEF_VALS1(MQSVC_CONTROL_MANUAL     ),
+    DEF_VALS1(MQSVC_CONTROL_Q_MGR      ),
+    DEF_VALS1(MQSVC_CONTROL_Q_MGR_START),
+    DEF_VALS1(MQSVC_CONTROL_MANUAL     ),
 DEF_VALSE;
 
 DEF_VALSB(Capability)
-	DEF_VALS1(MQCAP_NOT_SUPPORTED),
-	DEF_VALS1(MQCAP_SUPPORTED    ),
-	DEF_VALS1(MQCAP_EXPIRED      ),
+    DEF_VALS1(MQCAP_NOT_SUPPORTED),
+    DEF_VALS1(MQCAP_SUPPORTED    ),
+    DEF_VALS1(MQCAP_EXPIRED      ),
 DEF_VALSE;
 
 DEF_VALSB(FipsRequired)
-	DEF_VALS1(MQSSL_FIPS_NO ),
-	DEF_VALS1(MQSSL_FIPS_YES),
+    DEF_VALS1(MQSSL_FIPS_NO ),
+    DEF_VALS1(MQSSL_FIPS_YES),
 DEF_VALSE;
 
 DEF_VALSB(SyncpointAvailability)
-	DEF_VALS1(MQSP_AVAILABLE    ),
-	DEF_VALS1(MQSP_NOT_AVAILABLE),
+    DEF_VALS1(MQSP_AVAILABLE    ),
+    DEF_VALS1(MQSP_NOT_AVAILABLE),
 DEF_VALSE;
 
 DEF_VALSBX(MQCFINT_Parse)
-	DEF_VALS2(MQIACF_ASYNC_STATE           ,GET_VALSP(AsynchronousStateValues)),
-	DEF_VALS2(MQIACF_CHLAUTH_TYPE          ,GET_VALSP(ChlauthType)),
-	DEF_VALS2(MQIACF_CLUSTER_Q_MGR_ATTRS   ,GET_VALSP(PrmId)),
-	DEF_VALS2(MQIACF_COMMAND               ,GET_VALSP(Command)),
-	DEF_VALS2(MQIACF_CONNECTION_ATTRS      ,GET_VALSP(PrmId)),
-	DEF_VALS2(MQIACF_CONN_INFO_TYPE        ,GET_VALSP(ConnInfoType)),
-	DEF_VALS2(MQIACF_EVENT_APPL_TYPE       ,GET_VALSP(ApplType)),
-	DEF_VALS2(MQIACF_EVENT_ORIGIN          ,GET_VALSP(EvtOrig)),
-	DEF_VALS2(MQIACF_HANDLE_STATE          ,GET_VALSP(HandleStates)),
-	DEF_VALS2(MQIACF_OBJECT_TYPE           ,GET_VALSP(ObjType)),
-	DEF_VALS2(MQIACF_OPEN_BROWSE           ,GET_VALSP(QueueStatusOptionsYesNo)),
-	DEF_VALS2(MQIACF_OPEN_INPUT_TYPE       ,GET_VALSP(QueueStatusOpenOptions)),
-	DEF_VALS2(MQIACF_OPEN_INQUIRE          ,GET_VALSP(QueueStatusOptionsYesNo)),
-	DEF_VALS2(MQIACF_OPEN_OUTPUT           ,GET_VALSP(QueueStatusOptionsYesNo)),
-	DEF_VALS2(MQIACF_OPEN_SET              ,GET_VALSP(QueueStatusOptionsYesNo)),
-	DEF_VALS2(MQIACF_OPEN_TYPE             ,GET_VALSP(QueueStatusOpenTypes)),
-	DEF_VALS2(MQIACF_PARAMETER_ID          ,GET_VALSP(PrmId)),
-	DEF_VALS2(MQIACF_QSG_DISPS             ,GET_VALSP(QShrGrpDisp)),
-	DEF_VALS2(MQIACF_Q_ATTRS               ,GET_VALSP(PrmId)),
-	DEF_VALS2(MQIACF_Q_MGR_ATTRS           ,GET_VALSP(PrmId)),
-	DEF_VALS2(MQIACF_Q_STATUS_ATTRS        ,GET_VALSP(PrmId)),
-	DEF_VALS2(MQIACF_Q_STATUS_TYPE         ,GET_VALSP(PrmId)),
-	DEF_VALS2(MQIACF_Q_TYPES               ,GET_VALSP(QueueType)),
-	DEF_VALS2(MQIACF_UOW_STATE             ,GET_VALSP(UOWStates)),
-	DEF_VALS2(MQIACF_UOW_TYPE              ,GET_VALSP(UOWTypes)),
-	DEF_VALS2(MQIACH_CHANNEL_DISP          ,GET_VALSP(ChannelDisp)),
-	DEF_VALS2(MQIACH_CHANNEL_INSTANCE_TYPE ,GET_VALSP(ObjType)),
-	DEF_VALS2(MQIACH_CHANNEL_STATUS        ,GET_VALSP(ChannelStatus)),
-	DEF_VALS2(MQIACH_CHANNEL_SUBSTATE      ,GET_VALSP(ChannelSubStates)),
-	DEF_VALS2(MQIACH_CHANNEL_TYPE          ,GET_VALSP(ChannelType)),
-	DEF_VALS2(MQIACH_DATA_CONVERSION       ,GET_VALSP(DataConversion)),
-	DEF_VALS2(MQIACH_HDR_COMPRESSION       ,GET_VALSP(HeaderCompression)),
-	DEF_VALS2(MQIACH_INDOUBT_STATUS        ,GET_VALSP(IndoubtStatus)),
-	DEF_VALS2(MQIACH_MCA_STATUS            ,GET_VALSP(MessageChannelAgentStatus)),
-	DEF_VALS2(MQIACH_MCA_TYPE              ,GET_VALSP(MCAType)),
-	DEF_VALS2(MQIACH_MSG_COMPRESSION       ,GET_VALSP(MessageCompression)),
-	DEF_VALS2(MQIACH_NPM_SPEED             ,GET_VALSP(NonPersistentMsgSpeed)),
-	DEF_VALS2(MQIACH_PUT_AUTHORITY         ,GET_VALSP(PutAuthority)),
-	DEF_VALS2(MQIACH_SSL_CLIENT_AUTH       ,GET_VALSP(SSLClientAuthentication)),
-	DEF_VALS2(MQIACH_STOP_REQUESTED        ,GET_VALSP(ChannelStopOptions)),
-	DEF_VALS2(MQIACH_USER_SOURCE           ,GET_VALSP(UserSource)),
-	DEF_VALS2(MQIACH_WARNING               ,GET_VALSP(Warning)),
-	DEF_VALS2(MQIACH_XMIT_PROTOCOL_TYPE    ,GET_VALSP(TransportType)),
-	DEF_VALS2(MQIA_ACCOUNTING_CONN_OVERRIDE,GET_VALSP(Monitoring)),
-	DEF_VALS2(MQIA_ACCOUNTING_MQI          ,GET_VALSP(Monitoring)),
-	DEF_VALS2(MQIA_ACCOUNTING_Q            ,GET_VALSP(Monitoring)),
-	DEF_VALS2(MQIA_ACTIVITY_RECORDING      ,GET_VALSP(ActivityRecording)),
-	DEF_VALS2(MQIA_ACTIVITY_TRACE          ,GET_VALSP(Monitoring)),
-	DEF_VALS2(MQIA_ADOPTNEWMCA_CHECK       ,GET_VALSP(AdoptNewMCACheck)),
-	DEF_VALS2(MQIA_ADOPTNEWMCA_TYPE        ,GET_VALSP(AdoptNewMCAType)),
-	DEF_VALS2(MQIA_APPL_TYPE               ,GET_VALSP(ApplType)),
-	DEF_VALS2(MQIA_AUTHORITY_EVENT         ,GET_VALSP(EventRule)),
-	DEF_VALS2(MQIA_AUTH_INFO_TYPE          ,GET_VALSP(AuthInfoType)),
-	DEF_VALS2(MQIA_BASE_TYPE               ,GET_VALSP(BaseType)),
-	DEF_VALS2(MQIA_BRIDGE_EVENT            ,GET_VALSP(EventRule)),
-	DEF_VALS2(MQIA_CERT_VAL_POLICY         ,GET_VALSP(CertValPolicy)),
-	DEF_VALS2(MQIA_CHANNEL_AUTO_DEF        ,GET_VALSP(ChanAutoDef)),
-	DEF_VALS2(MQIA_CHANNEL_AUTO_DEF_EVENT  ,GET_VALSP(EventRule)),
-	DEF_VALS2(MQIA_CHANNEL_EVENT           ,GET_VALSP(EventRule)),
-	DEF_VALS2(MQIA_CHINIT_CONTROL          ,GET_VALSP(ServiceControl)),
-	DEF_VALS2(MQIA_CHINIT_TRACE_AUTO_START ,GET_VALSP(ChinitTraceAutoStart)),
-	DEF_VALS2(MQIA_CHLAUTH_RECORDS         ,GET_VALSP(ChlAuthRecords)),
-	DEF_VALS2(MQIA_CLWL_USEQ               ,GET_VALSP(CLWLUseQ)),
-	DEF_VALS2(MQIA_CMD_SERVER_CONTROL      ,GET_VALSP(ServiceControl)),
-	DEF_VALS2(MQIA_COMMAND_EVENT           ,GET_VALSP(EventRule)),
-	DEF_VALS2(MQIA_CONFIGURATION_EVENT     ,GET_VALSP(EventRule)),
-	DEF_VALS2(MQIA_DEFINITION_TYPE         ,GET_VALSP(DefinitionType)),
-	DEF_VALS2(MQIA_DEF_BIND                ,GET_VALSP(Bindings)),
-	DEF_VALS2(MQIA_DEF_CLUSTER_XMIT_Q_TYPE ,GET_VALSP(DefClusXmitTyp)),
-	DEF_VALS2(MQIA_DEF_INPUT_OPEN_OPTION   ,GET_VALSP(InputOpenOption)),
-	DEF_VALS2(MQIA_DEF_PERSISTENCE         ,GET_VALSP(Persistence)),
-	DEF_VALS2(MQIA_DEF_PUT_RESPONSE_TYPE   ,GET_VALSP(PutResponse)),
-	DEF_VALS2(MQIA_DEF_READ_AHEAD          ,GET_VALSP(ReadAheadValues)),
-	DEF_VALS2(MQIA_DIST_LISTS              ,GET_VALSP(DistributionLists)),
-	DEF_VALS2(MQIA_DNS_WLM                 ,GET_VALSP(DNSWLM)),
-	DEF_VALS2(MQIA_DURABLE_SUB             ,GET_VALSP(DurableSubscriptions)),
-	DEF_VALS2(MQIA_GROUP_UR                ,GET_VALSP(GroupUR)),
-	DEF_VALS2(MQIA_HARDEN_GET_BACKOUT      ,GET_VALSP(BackOutHardening)),
-	DEF_VALS2(MQIA_IGQ_PUT_AUTHORITY       ,GET_VALSP(IGQPutAuthority)),
-	DEF_VALS2(MQIA_INDEX_TYPE              ,GET_VALSP(IndexTypes)),
-	DEF_VALS2(MQIA_INHIBIT_EVENT           ,GET_VALSP(EventRule)),
-	DEF_VALS2(MQIA_INHIBIT_GET             ,GET_VALSP(InhibitGetVal)),
-	DEF_VALS2(MQIA_INHIBIT_PUB             ,GET_VALSP(InhibitPublications)),
-	DEF_VALS2(MQIA_INHIBIT_PUT             ,GET_VALSP(InhibitPutVal)),
-	DEF_VALS2(MQIA_INHIBIT_SUB             ,GET_VALSP(InhibitSubscriptions)),
-	DEF_VALS2(MQIA_INTRA_GROUP_QUEUING     ,GET_VALSP(IntraGroupQueuing)),
-	DEF_VALS2(MQIA_IP_ADDRESS_VERSION      ,GET_VALSP(IPAddressVersion)),
-	DEF_VALS2(MQIA_LOCAL_EVENT             ,GET_VALSP(EventRule)),
-	DEF_VALS2(MQIA_LOGGER_EVENT            ,GET_VALSP(EventRule)),
-	DEF_VALS2(MQIA_MONITORING_AUTO_CLUSSDR ,GET_VALSP(Monitoring)),
-	DEF_VALS2(MQIA_MONITORING_AUTO_CLUSSDR ,GET_VALSP(Monitoring)),
-	DEF_VALS2(MQIA_MONITORING_CHANNEL      ,GET_VALSP(Monitoring)),
-	DEF_VALS2(MQIA_MONITORING_Q            ,GET_VALSP(Monitoring)),
-	DEF_VALS2(MQIA_MSG_DELIVERY_SEQUENCE   ,GET_VALSP(MsgDelivSeq)),
-	DEF_VALS2(MQIA_NPM_CLASS               ,GET_VALSP(NonpersistentMsgCls)),
-	DEF_VALS2(MQIA_NPM_DELIVERY            ,GET_VALSP(MsgDelivery)),
-	DEF_VALS2(MQIA_PERFORMANCE_EVENT       ,GET_VALSP(EventRule)),
-	DEF_VALS2(MQIA_PLATFORM                ,GET_VALSP(Platform)),
-	DEF_VALS2(MQIA_PM_DELIVERY             ,GET_VALSP(MsgDelivery)),
-	DEF_VALS2(MQIA_PROPERTY_CONTROL        ,GET_VALSP(PropertyCtlVal)),
-	DEF_VALS2(MQIA_PROT_POLICY_CAPABILITY  ,GET_VALSP(Capability)),
-	DEF_VALS2(MQIA_PROXY_SUB               ,GET_VALSP(ProxySubscriptions)),
-	DEF_VALS2(MQIA_PUBSUB_CLUSTER          ,GET_VALSP(PubSubCluster)),
-	DEF_VALS2(MQIA_PUBSUB_MODE             ,GET_VALSP(PubSubMode)),
-	DEF_VALS2(MQIA_PUBSUB_NP_MSG           ,GET_VALSP(PubSubNP)),
-	DEF_VALS2(MQIA_PUBSUB_NP_RESP          ,GET_VALSP(PubSubNP)),
-	DEF_VALS2(MQIA_PUBSUB_SYNC_PT          ,GET_VALSP(PubSubSync)),
-	DEF_VALS2(MQIA_PUB_SCOPE               ,GET_VALSP(PubSubScope)),
-	DEF_VALS2(MQIA_QMGR_CFCONLOS           ,GET_VALSP(CFConLoss)),
-	DEF_VALS2(MQIA_QSG_DISP                ,GET_VALSP(QShrGrpDisp)),
-	DEF_VALS2(MQIA_Q_DEPTH_HIGH_EVENT      ,GET_VALSP(EventRule)),
-	DEF_VALS2(MQIA_Q_DEPTH_LOW_EVENT       ,GET_VALSP(EventRule)),
-	DEF_VALS2(MQIA_Q_DEPTH_MAX_EVENT       ,GET_VALSP(EventRule)),
-	DEF_VALS2(MQIA_Q_SERVICE_INTERVAL_EVENT,GET_VALSP(ServiceIntervalEvent)),
-	DEF_VALS2(MQIA_Q_TYPE                  ,GET_VALSP(QueueType)),
-	DEF_VALS2(MQIA_RECEIVE_TIMEOUT_TYPE    ,GET_VALSP(ReceiveTimeoutType)),
-	DEF_VALS2(MQIA_REMOTE_EVENT            ,GET_VALSP(EventRule)),
-	DEF_VALS2(MQIA_SCOPE                   ,GET_VALSP(QueueDefinitionScope)),
-	DEF_VALS2(MQIA_SECURITY_CASE           ,GET_VALSP(SecurityCase)),
-	DEF_VALS2(MQIA_SHAREABILITY            ,GET_VALSP(Shareability)),
-	DEF_VALS2(MQIA_SHARED_Q_Q_MGR_NAME     ,GET_VALSP(SharedQueueQueueManagerName)),
-	DEF_VALS2(MQIA_SSL_EVENT               ,GET_VALSP(EventRule)),
-	DEF_VALS2(MQIA_SSL_FIPS_REQUIRED       ,GET_VALSP(FipsRequired)),
-	DEF_VALS2(MQIA_START_STOP_EVENT        ,GET_VALSP(EventRule)),
-	DEF_VALS2(MQIA_STATISTICS_AUTO_CLUSSDR ,GET_VALSP(Monitoring)),
-	DEF_VALS2(MQIA_STATISTICS_CHANNEL      ,GET_VALSP(Monitoring)),
-	DEF_VALS2(MQIA_STATISTICS_INTERVAL     ,GET_VALSP(Monitoring)),
-	DEF_VALS2(MQIA_STATISTICS_MQI          ,GET_VALSP(Monitoring)),
-	DEF_VALS2(MQIA_STATISTICS_Q            ,GET_VALSP(Monitoring)),
-	DEF_VALS2(MQIA_SUB_SCOPE               ,GET_VALSP(PubSubScope)),
-	DEF_VALS2(MQIA_SYNCPOINT               ,GET_VALSP(SyncpointAvailability)),
-	DEF_VALS2(MQIA_TCP_KEEP_ALIVE          ,GET_VALSP(TCPKeepAlive)),
-	DEF_VALS2(MQIA_TCP_STACK_TYPE          ,GET_VALSP(TCPStackType)),
-	DEF_VALS2(MQIA_TOPIC_DEF_PERSISTENCE   ,GET_VALSP(Persistence)),
-	DEF_VALS2(MQIA_TOPIC_TYPE              ,GET_VALSP(TopicType)),
-	DEF_VALS2(MQIA_TRACE_ROUTE_RECORDING   ,GET_VALSP(TraceRouteRecording)),
-	DEF_VALS2(MQIA_TRIGGER_CONTROL         ,GET_VALSP(TriggerControl)),
-	DEF_VALS2(MQIA_TRIGGER_TYPE            ,GET_VALSP(TriggerType)),
-	DEF_VALS2(MQIA_UR_DISP                 ,GET_VALSP(QShrGrpDisp)),
-	DEF_VALS2(MQIA_USAGE                   ,GET_VALSP(Usage)),
-	DEF_VALS2(MQIA_WILDCARD_OPERATION      ,GET_VALSP(WildcardOperation)),
-	DEF_VALS2(MQIA_XR_CAPABILITY           ,GET_VALSP(Capability)),
+    DEF_VALS2(MQIACF_ASYNC_STATE           ,GET_VALSP(AsynchronousStateValues)),
+    DEF_VALS2(MQIACF_CHLAUTH_TYPE          ,GET_VALSP(ChlauthType)),
+    DEF_VALS2(MQIACF_CLUSTER_Q_MGR_ATTRS   ,GET_VALSP(PrmId)),
+    DEF_VALS2(MQIACF_COMMAND               ,GET_VALSP(Command)),
+    DEF_VALS2(MQIACF_CONNECTION_ATTRS      ,GET_VALSP(PrmId)),
+    DEF_VALS2(MQIACF_CONN_INFO_TYPE        ,GET_VALSP(ConnInfoType)),
+    DEF_VALS2(MQIACF_EVENT_APPL_TYPE       ,GET_VALSP(ApplType)),
+    DEF_VALS2(MQIACF_EVENT_ORIGIN          ,GET_VALSP(EvtOrig)),
+    DEF_VALS2(MQIACF_HANDLE_STATE          ,GET_VALSP(HandleStates)),
+    DEF_VALS2(MQIACF_OBJECT_TYPE           ,GET_VALSP(ObjType)),
+    DEF_VALS2(MQIACF_OPEN_BROWSE           ,GET_VALSP(QueueStatusOptionsYesNo)),
+    DEF_VALS2(MQIACF_OPEN_INPUT_TYPE       ,GET_VALSP(QueueStatusOpenOptions)),
+    DEF_VALS2(MQIACF_OPEN_INQUIRE          ,GET_VALSP(QueueStatusOptionsYesNo)),
+    DEF_VALS2(MQIACF_OPEN_OUTPUT           ,GET_VALSP(QueueStatusOptionsYesNo)),
+    DEF_VALS2(MQIACF_OPEN_SET              ,GET_VALSP(QueueStatusOptionsYesNo)),
+    DEF_VALS2(MQIACF_OPEN_TYPE             ,GET_VALSP(QueueStatusOpenTypes)),
+    DEF_VALS2(MQIACF_PARAMETER_ID          ,GET_VALSP(PrmId)),
+    DEF_VALS2(MQIACF_QSG_DISPS             ,GET_VALSP(QShrGrpDisp)),
+    DEF_VALS2(MQIACF_Q_ATTRS               ,GET_VALSP(PrmId)),
+    DEF_VALS2(MQIACF_Q_MGR_ATTRS           ,GET_VALSP(PrmId)),
+    DEF_VALS2(MQIACF_Q_STATUS_ATTRS        ,GET_VALSP(PrmId)),
+    DEF_VALS2(MQIACF_Q_STATUS_TYPE         ,GET_VALSP(PrmId)),
+    DEF_VALS2(MQIACF_Q_TYPES               ,GET_VALSP(QueueType)),
+    DEF_VALS2(MQIACF_UOW_STATE             ,GET_VALSP(UOWStates)),
+    DEF_VALS2(MQIACF_UOW_TYPE              ,GET_VALSP(UOWTypes)),
+    DEF_VALS2(MQIACH_CHANNEL_DISP          ,GET_VALSP(ChannelDisp)),
+    DEF_VALS2(MQIACH_CHANNEL_INSTANCE_TYPE ,GET_VALSP(ObjType)),
+    DEF_VALS2(MQIACH_CHANNEL_STATUS        ,GET_VALSP(ChannelStatus)),
+    DEF_VALS2(MQIACH_CHANNEL_SUBSTATE      ,GET_VALSP(ChannelSubStates)),
+    DEF_VALS2(MQIACH_CHANNEL_TYPE          ,GET_VALSP(ChannelType)),
+    DEF_VALS2(MQIACH_DATA_CONVERSION       ,GET_VALSP(DataConversion)),
+    DEF_VALS2(MQIACH_HDR_COMPRESSION       ,GET_VALSP(HeaderCompression)),
+    DEF_VALS2(MQIACH_INDOUBT_STATUS        ,GET_VALSP(IndoubtStatus)),
+    DEF_VALS2(MQIACH_MCA_STATUS            ,GET_VALSP(MessageChannelAgentStatus)),
+    DEF_VALS2(MQIACH_MCA_TYPE              ,GET_VALSP(MCAType)),
+    DEF_VALS2(MQIACH_MSG_COMPRESSION       ,GET_VALSP(MessageCompression)),
+    DEF_VALS2(MQIACH_NPM_SPEED             ,GET_VALSP(NonPersistentMsgSpeed)),
+    DEF_VALS2(MQIACH_PUT_AUTHORITY         ,GET_VALSP(PutAuthority)),
+    DEF_VALS2(MQIACH_SSL_CLIENT_AUTH       ,GET_VALSP(SSLClientAuthentication)),
+    DEF_VALS2(MQIACH_STOP_REQUESTED        ,GET_VALSP(ChannelStopOptions)),
+    DEF_VALS2(MQIACH_USER_SOURCE           ,GET_VALSP(UserSource)),
+    DEF_VALS2(MQIACH_WARNING               ,GET_VALSP(Warning)),
+    DEF_VALS2(MQIACH_XMIT_PROTOCOL_TYPE    ,GET_VALSP(TransportType)),
+    DEF_VALS2(MQIA_ACCOUNTING_CONN_OVERRIDE,GET_VALSP(Monitoring)),
+    DEF_VALS2(MQIA_ACCOUNTING_MQI          ,GET_VALSP(Monitoring)),
+    DEF_VALS2(MQIA_ACCOUNTING_Q            ,GET_VALSP(Monitoring)),
+    DEF_VALS2(MQIA_ACTIVITY_RECORDING      ,GET_VALSP(ActivityRecording)),
+    DEF_VALS2(MQIA_ACTIVITY_TRACE          ,GET_VALSP(Monitoring)),
+    DEF_VALS2(MQIA_ADOPTNEWMCA_CHECK       ,GET_VALSP(AdoptNewMCACheck)),
+    DEF_VALS2(MQIA_ADOPTNEWMCA_TYPE        ,GET_VALSP(AdoptNewMCAType)),
+    DEF_VALS2(MQIA_APPL_TYPE               ,GET_VALSP(ApplType)),
+    DEF_VALS2(MQIA_AUTHORITY_EVENT         ,GET_VALSP(EventRule)),
+    DEF_VALS2(MQIA_AUTH_INFO_TYPE          ,GET_VALSP(AuthInfoType)),
+    DEF_VALS2(MQIA_BASE_TYPE               ,GET_VALSP(BaseType)),
+    DEF_VALS2(MQIA_BRIDGE_EVENT            ,GET_VALSP(EventRule)),
+    DEF_VALS2(MQIA_CERT_VAL_POLICY         ,GET_VALSP(CertValPolicy)),
+    DEF_VALS2(MQIA_CHANNEL_AUTO_DEF        ,GET_VALSP(ChanAutoDef)),
+    DEF_VALS2(MQIA_CHANNEL_AUTO_DEF_EVENT  ,GET_VALSP(EventRule)),
+    DEF_VALS2(MQIA_CHANNEL_EVENT           ,GET_VALSP(EventRule)),
+    DEF_VALS2(MQIA_CHINIT_CONTROL          ,GET_VALSP(ServiceControl)),
+    DEF_VALS2(MQIA_CHINIT_TRACE_AUTO_START ,GET_VALSP(ChinitTraceAutoStart)),
+    DEF_VALS2(MQIA_CHLAUTH_RECORDS         ,GET_VALSP(ChlAuthRecords)),
+    DEF_VALS2(MQIA_CLWL_USEQ               ,GET_VALSP(CLWLUseQ)),
+    DEF_VALS2(MQIA_CMD_SERVER_CONTROL      ,GET_VALSP(ServiceControl)),
+    DEF_VALS2(MQIA_COMMAND_EVENT           ,GET_VALSP(EventRule)),
+    DEF_VALS2(MQIA_CONFIGURATION_EVENT     ,GET_VALSP(EventRule)),
+    DEF_VALS2(MQIA_DEFINITION_TYPE         ,GET_VALSP(DefinitionType)),
+    DEF_VALS2(MQIA_DEF_BIND                ,GET_VALSP(Bindings)),
+    DEF_VALS2(MQIA_DEF_CLUSTER_XMIT_Q_TYPE ,GET_VALSP(DefClusXmitTyp)),
+    DEF_VALS2(MQIA_DEF_INPUT_OPEN_OPTION   ,GET_VALSP(InputOpenOption)),
+    DEF_VALS2(MQIA_DEF_PERSISTENCE         ,GET_VALSP(Persistence)),
+    DEF_VALS2(MQIA_DEF_PUT_RESPONSE_TYPE   ,GET_VALSP(PutResponse)),
+    DEF_VALS2(MQIA_DEF_READ_AHEAD          ,GET_VALSP(ReadAheadValues)),
+    DEF_VALS2(MQIA_DIST_LISTS              ,GET_VALSP(DistributionLists)),
+    DEF_VALS2(MQIA_DNS_WLM                 ,GET_VALSP(DNSWLM)),
+    DEF_VALS2(MQIA_DURABLE_SUB             ,GET_VALSP(DurableSubscriptions)),
+    DEF_VALS2(MQIA_GROUP_UR                ,GET_VALSP(GroupUR)),
+    DEF_VALS2(MQIA_HARDEN_GET_BACKOUT      ,GET_VALSP(BackOutHardening)),
+    DEF_VALS2(MQIA_IGQ_PUT_AUTHORITY       ,GET_VALSP(IGQPutAuthority)),
+    DEF_VALS2(MQIA_INDEX_TYPE              ,GET_VALSP(IndexTypes)),
+    DEF_VALS2(MQIA_INHIBIT_EVENT           ,GET_VALSP(EventRule)),
+    DEF_VALS2(MQIA_INHIBIT_GET             ,GET_VALSP(InhibitGetVal)),
+    DEF_VALS2(MQIA_INHIBIT_PUB             ,GET_VALSP(InhibitPublications)),
+    DEF_VALS2(MQIA_INHIBIT_PUT             ,GET_VALSP(InhibitPutVal)),
+    DEF_VALS2(MQIA_INHIBIT_SUB             ,GET_VALSP(InhibitSubscriptions)),
+    DEF_VALS2(MQIA_INTRA_GROUP_QUEUING     ,GET_VALSP(IntraGroupQueuing)),
+    DEF_VALS2(MQIA_IP_ADDRESS_VERSION      ,GET_VALSP(IPAddressVersion)),
+    DEF_VALS2(MQIA_LOCAL_EVENT             ,GET_VALSP(EventRule)),
+    DEF_VALS2(MQIA_LOGGER_EVENT            ,GET_VALSP(EventRule)),
+    DEF_VALS2(MQIA_MONITORING_AUTO_CLUSSDR ,GET_VALSP(Monitoring)),
+    DEF_VALS2(MQIA_MONITORING_AUTO_CLUSSDR ,GET_VALSP(Monitoring)),
+    DEF_VALS2(MQIA_MONITORING_CHANNEL      ,GET_VALSP(Monitoring)),
+    DEF_VALS2(MQIA_MONITORING_Q            ,GET_VALSP(Monitoring)),
+    DEF_VALS2(MQIA_MSG_DELIVERY_SEQUENCE   ,GET_VALSP(MsgDelivSeq)),
+    DEF_VALS2(MQIA_NPM_CLASS               ,GET_VALSP(NonpersistentMsgCls)),
+    DEF_VALS2(MQIA_NPM_DELIVERY            ,GET_VALSP(MsgDelivery)),
+    DEF_VALS2(MQIA_PERFORMANCE_EVENT       ,GET_VALSP(EventRule)),
+    DEF_VALS2(MQIA_PLATFORM                ,GET_VALSP(Platform)),
+    DEF_VALS2(MQIA_PM_DELIVERY             ,GET_VALSP(MsgDelivery)),
+    DEF_VALS2(MQIA_PROPERTY_CONTROL        ,GET_VALSP(PropertyCtlVal)),
+    DEF_VALS2(MQIA_PROT_POLICY_CAPABILITY  ,GET_VALSP(Capability)),
+    DEF_VALS2(MQIA_PROXY_SUB               ,GET_VALSP(ProxySubscriptions)),
+    DEF_VALS2(MQIA_PUBSUB_CLUSTER          ,GET_VALSP(PubSubCluster)),
+    DEF_VALS2(MQIA_PUBSUB_MODE             ,GET_VALSP(PubSubMode)),
+    DEF_VALS2(MQIA_PUBSUB_NP_MSG           ,GET_VALSP(PubSubNP)),
+    DEF_VALS2(MQIA_PUBSUB_NP_RESP          ,GET_VALSP(PubSubNP)),
+    DEF_VALS2(MQIA_PUBSUB_SYNC_PT          ,GET_VALSP(PubSubSync)),
+    DEF_VALS2(MQIA_PUB_SCOPE               ,GET_VALSP(PubSubScope)),
+    DEF_VALS2(MQIA_QMGR_CFCONLOS           ,GET_VALSP(CFConLoss)),
+    DEF_VALS2(MQIA_QSG_DISP                ,GET_VALSP(QShrGrpDisp)),
+    DEF_VALS2(MQIA_Q_DEPTH_HIGH_EVENT      ,GET_VALSP(EventRule)),
+    DEF_VALS2(MQIA_Q_DEPTH_LOW_EVENT       ,GET_VALSP(EventRule)),
+    DEF_VALS2(MQIA_Q_DEPTH_MAX_EVENT       ,GET_VALSP(EventRule)),
+    DEF_VALS2(MQIA_Q_SERVICE_INTERVAL_EVENT,GET_VALSP(ServiceIntervalEvent)),
+    DEF_VALS2(MQIA_Q_TYPE                  ,GET_VALSP(QueueType)),
+    DEF_VALS2(MQIA_RECEIVE_TIMEOUT_TYPE    ,GET_VALSP(ReceiveTimeoutType)),
+    DEF_VALS2(MQIA_REMOTE_EVENT            ,GET_VALSP(EventRule)),
+    DEF_VALS2(MQIA_SCOPE                   ,GET_VALSP(QueueDefinitionScope)),
+    DEF_VALS2(MQIA_SECURITY_CASE           ,GET_VALSP(SecurityCase)),
+    DEF_VALS2(MQIA_SHAREABILITY            ,GET_VALSP(Shareability)),
+    DEF_VALS2(MQIA_SHARED_Q_Q_MGR_NAME     ,GET_VALSP(SharedQueueQueueManagerName)),
+    DEF_VALS2(MQIA_SSL_EVENT               ,GET_VALSP(EventRule)),
+    DEF_VALS2(MQIA_SSL_FIPS_REQUIRED       ,GET_VALSP(FipsRequired)),
+    DEF_VALS2(MQIA_START_STOP_EVENT        ,GET_VALSP(EventRule)),
+    DEF_VALS2(MQIA_STATISTICS_AUTO_CLUSSDR ,GET_VALSP(Monitoring)),
+    DEF_VALS2(MQIA_STATISTICS_CHANNEL      ,GET_VALSP(Monitoring)),
+    DEF_VALS2(MQIA_STATISTICS_INTERVAL     ,GET_VALSP(Monitoring)),
+    DEF_VALS2(MQIA_STATISTICS_MQI          ,GET_VALSP(Monitoring)),
+    DEF_VALS2(MQIA_STATISTICS_Q            ,GET_VALSP(Monitoring)),
+    DEF_VALS2(MQIA_SUB_SCOPE               ,GET_VALSP(PubSubScope)),
+    DEF_VALS2(MQIA_SYNCPOINT               ,GET_VALSP(SyncpointAvailability)),
+    DEF_VALS2(MQIA_TCP_KEEP_ALIVE          ,GET_VALSP(TCPKeepAlive)),
+    DEF_VALS2(MQIA_TCP_STACK_TYPE          ,GET_VALSP(TCPStackType)),
+    DEF_VALS2(MQIA_TOPIC_DEF_PERSISTENCE   ,GET_VALSP(Persistence)),
+    DEF_VALS2(MQIA_TOPIC_TYPE              ,GET_VALSP(TopicType)),
+    DEF_VALS2(MQIA_TRACE_ROUTE_RECORDING   ,GET_VALSP(TraceRouteRecording)),
+    DEF_VALS2(MQIA_TRIGGER_CONTROL         ,GET_VALSP(TriggerControl)),
+    DEF_VALS2(MQIA_TRIGGER_TYPE            ,GET_VALSP(TriggerType)),
+    DEF_VALS2(MQIA_UR_DISP                 ,GET_VALSP(QShrGrpDisp)),
+    DEF_VALS2(MQIA_USAGE                   ,GET_VALSP(Usage)),
+    DEF_VALS2(MQIA_WILDCARD_OPERATION      ,GET_VALSP(WildcardOperation)),
+    DEF_VALS2(MQIA_XR_CAPABILITY           ,GET_VALSP(Capability)),
 DEF_VALSE;
 
+
 /*
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
  *
  * Local variables:
  * c-basic-offset: 4
- * tab-width: 4
- * indent-tabs-mode: t
+ * tab-width: 8
+ * indent-tabs-mode: nil
  * End:
  *
- * vi: set shiftwidth=4 tabstop=4 noexpandtab:
- * :indentSize=4:tabSize=4:noTabs=false:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-mq-pcf.c b/epan/dissectors/packet-mq-pcf.c
index 3be5ae118e..adedb31c70 100644
--- a/epan/dissectors/packet-mq-pcf.c
+++ b/epan/dissectors/packet-mq-pcf.c
@@ -98,627 +98,726 @@ static gint ett_mqpcf_cfh = -1;
 
 guint32 dissect_mqpcf_getDigits(guint uCnt)
 {
-	return (guint) log10(uCnt) + 1;
+    return (guint) log10(uCnt) + 1;
 }
 
 guint8 *dissect_mqpcf_parm_getintval(guint uPrm, guint uVal)
 {
-	value_string *pVs;
-	pVs = (value_string *)try_val_to_str(uPrm, GET_VALSV(MQCFINT_Parse));
-
-	if (pVs)
-	{
-		return (guint8 *)try_val_to_str(uVal, pVs);
-	}
-	return NULL;
+    value_string *pVs;
+    pVs = (value_string *)try_val_to_str(uPrm, GET_VALSV(MQCFINT_Parse));
+
+    if (pVs)
+    {
+        return (guint8 *)try_val_to_str(uVal, pVs);
+    }
+    return NULL;
 }
 
 void dissect_mqpcf_parm_int(tvbuff_t *tvb, proto_tree *tree, guint offset, guint uPrm,
-							guint uVal, int hfindex, guint iCnt, guint iMaxCnt, guint iDigit, gboolean bParse)
+                            guint uVal, int hfindex, guint iCnt, guint iMaxCnt, guint iDigit, gboolean bParse)
 {
-	header_field_info *hfinfo;
-	guint8 *pVal = NULL;
-
-	if (bParse)
-		pVal = dissect_mqpcf_parm_getintval(uPrm, uVal);
-
-	hfinfo = proto_registrar_get_nth(hfindex);
-
-	if (iMaxCnt > 1)
-	{
-		if (pVal)
-		{
-			proto_tree_add_int_format(tree, hfindex, tvb, offset, 4, uVal,
-				"%s[%*d]: %8d-%s", hfinfo->name, iDigit, iCnt, uVal, pVal);
-		}
-		else
-		{
-			proto_tree_add_int_format(tree, hfindex, tvb, offset, 4, uVal,
-				"%s[%*d]: %8x-%d", hfinfo->name, iDigit, iCnt, uVal, uVal);
-		}
-	}
-	else
-	{
-		if (pVal)
-		{
-			proto_tree_add_int_format_value(tree, hfindex, tvb, offset, 4, uVal,
-				"%8d-%s", uVal, pVal);
-		}
-		else
-		{
-			proto_tree_add_int_format_value(tree, hfindex, tvb, offset, 4, uVal,
-				"%8x-%d", uVal, uVal);
-		}
-	}
+    header_field_info *hfinfo;
+    guint8 *pVal = NULL;
+
+    if (bParse)
+        pVal = dissect_mqpcf_parm_getintval(uPrm, uVal);
+
+    hfinfo = proto_registrar_get_nth(hfindex);
+
+    if (iMaxCnt > 1)
+    {
+        if (pVal)
+        {
+            proto_tree_add_int_format(tree, hfindex, tvb, offset, 4, uVal,
+                "%s[%*d]: %8d-%s", hfinfo->name, iDigit, iCnt, uVal, pVal);
+        }
+        else
+        {
+            proto_tree_add_int_format(tree, hfindex, tvb, offset, 4, uVal,
+                "%s[%*d]: %8x-%d", hfinfo->name, iDigit, iCnt, uVal, uVal);
+        }
+    }
+    else
+    {
+        if (pVal)
+        {
+            proto_tree_add_int_format_value(tree, hfindex, tvb, offset, 4, uVal,
+                "%8d-%s", uVal, pVal);
+        }
+        else
+        {
+            proto_tree_add_int_format_value(tree, hfindex, tvb, offset, 4, uVal,
+                "%8x-%d", uVal, uVal);
+        }
+    }
 }
 
 static void dissect_mqpcf_parm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *mq_tree,
-							   guint offset, guint32 uCount, guint bLittleEndian, gboolean bParse)
+                               guint offset, guint32 uCount, guint bLittleEndian, gboolean bParse)
 {
-	guint32 u	 = 0;
-	guint32 tOfs = 0;
-	guint32 uLenF;
-	char	strPrm[256];
-	guint32 uTyp;
-	guint32 uLen = 0;
-	guint32 uPrm;
-	guint32 uCnt;
-	guint32 uCCS;
-	guint32 uSLn;
-	guint32 uVal;
-	guint64 uVal64;
-	guint32 uDig;
-
-	const char sMaxLst[] = " Max # of List reached. DECODE interrupted   (actual %u of %u)";
-	const char sPrmLn0[] = " MQPrm[%3u] has a zero length. DECODE Failed (MQPrm Count: %u)";
-	const char sMaxPrm[] = " Max # of Parm reached. DECODE interrupted   (actual %u of %u)";
-	const char sPrmCnt[] = " Cnt=-1 and Length(%u) < 16. DECODE interrupted for elem %u";
-
-	proto_item *ti	 = NULL;
-	proto_tree *tree = NULL;
-
-	if (uCount == (guint32)-1)
-	{
-		guint32 xOfs = offset;
-
-		uCnt = 0;
-		while (tvb_length_remaining(tvb, xOfs) >= 16)
-		{
-			uLen = tvb_get_guint32_endian(tvb, xOfs + 4, bLittleEndian);
-			if (uLen < 16)
-			{
-				ti = proto_tree_add_text(mq_tree, tvb, xOfs, 16, sPrmCnt, uLen, uCnt);
-				expert_add_info(pinfo, ti, &ei_mq_pcf_PrmCnt);
-				break;
-			}
-			uCnt++;
-			xOfs += uLen;
-		}
-		uCount = uCnt;
-	}
-
-	uDig = dissect_mqpcf_getDigits(uCount);
-
-	for (u = 0; u < uCount && u < mq_pcf_maxprm; u++)
-	{
-		tOfs = offset;
-		uTyp = tvb_get_guint32_endian(tvb, offset    , bLittleEndian);
-		uLen = tvb_get_guint32_endian(tvb, offset + 4, bLittleEndian);
-		if (uLen == 0)
-		{
-			ti = proto_tree_add_text(mq_tree, tvb, offset, 12, sPrmLn0, u+1, uCount);
-			expert_add_info(pinfo, ti, &ei_mq_pcf_prmln0);
-			u = uCount;
-			break;
-		}
-		uPrm = tvb_get_guint32_endian(tvb, offset + 8, bLittleEndian);
-		uLenF = 12;
-
-		if (bParse)
-			g_snprintf(strPrm, (gulong)sizeof(strPrm) - 1, " %-s[%*u] {%2d-%-15.15s} %8x/%5d-%-30.30s",
-				"MQPrm", uDig, u+1,
-				uTyp, val_to_str_const(uTyp, GET_VALSV(PrmTyp), "      Unknown") + 6,
-				uPrm, uPrm, val_to_str_const(uPrm, GET_VALSV(PrmId), "Unknown"));
-		else
-			g_snprintf(strPrm, (gulong)sizeof(strPrm) - 1, " %-s[%*u] {%2d-%-15.15s} %8x/%5d",
-				"XtraD", uDig, u+1,
-				uTyp, val_to_str_const(uTyp, GET_VALSV(PrmTyp), "      Unknown") + 6,
-				uPrm, uPrm);
-
-		switch (uTyp)
-		{
-		case MQ_MQCFT_NONE:
-			break;
-		case MQ_MQCFT_COMMAND:
-			break;
-		case MQ_MQCFT_RESPONSE:
-			break;
-		case MQ_MQCFT_INTEGER:
-			{
-				guint8 *pVal = NULL;
-				uVal = tvb_get_guint32_endian(tvb, offset + uLenF, bLittleEndian);
-				if (bParse)
-					pVal = dissect_mqpcf_parm_getintval(uPrm, uVal);
-				if (pVal)
-				{
-					ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, "%s %d-%s",
-						strPrm, uVal, pVal);
-				}
-				else
-				{
-					ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, "%s %8x-%d",
-						strPrm, uVal, uVal);
-				}
-				tree = proto_item_add_subtree(ti, ett_mqpcf_prm);
-				proto_tree_add_item(tree, hf_mq_pcf_prmtyp, tvb, offset    , 4, bLittleEndian);
-				proto_tree_add_item(tree, hf_mq_pcf_prmlen, tvb, offset + 4, 4, bLittleEndian);
-				proto_tree_add_item(tree, (bParse) ? hf_mq_pcf_prmid : hf_mq_pcf_prmidnovals, tvb, offset + 8, 4, bLittleEndian);
-
-				dissect_mqpcf_parm_int(tvb, tree, offset+uLenF, uPrm, uVal, hf_mq_pcf_int, 0, 0, 0, bParse);
-			}
-			break;
-		case MQ_MQCFT_STRING:
-			{
-				guint8 *sStr;
-
-				uCCS = tvb_get_guint32_endian(tvb, offset + uLenF, bLittleEndian);
-				uSLn = tvb_get_guint32_endian(tvb, offset + uLenF + 4, bLittleEndian);
-				sStr = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + uLenF + 8,
-					uSLn, (uCCS != 500) ? ENC_ASCII : ENC_EBCDIC);
-				if (*sStr)
-					strip_trailing_blanks(sStr, uSLn);
-				if (*sStr)
-					format_text_chr(sStr, strlen(sStr), '.');
-
-				ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, "%s %s", strPrm, sStr);
-				tree = proto_item_add_subtree(ti, ett_mqpcf_prm);
-
-				proto_tree_add_item(tree, hf_mq_pcf_prmtyp   , tvb, offset     , 4, bLittleEndian);
-				proto_tree_add_item(tree, hf_mq_pcf_prmlen   , tvb, offset +  4, 4, bLittleEndian);
-				proto_tree_add_item(tree, (bParse) ? hf_mq_pcf_prmid : hf_mq_pcf_prmidnovals, tvb, offset +  8, 4, bLittleEndian);
-				proto_tree_add_item(tree, hf_mq_pcf_prmccsid , tvb, offset + 12, 4, bLittleEndian);
-				proto_tree_add_item(tree, hf_mq_pcf_prmstrlen, tvb, offset + 16, 4, bLittleEndian);
-
-				proto_tree_add_item(tree, hf_mq_pcf_string, tvb, offset + uLenF + 8, uSLn, (uCCS != 500) ? ENC_ASCII : ENC_EBCDIC);
-			}
-			break;
-		case MQ_MQCFT_INTEGER_LIST:
-			{
-				guint32 u2;
-				guint32 uDigit = 0;
-
-				uCnt = tvb_get_guint32_endian(tvb, offset+uLenF, bLittleEndian);
-				uDigit = dissect_mqpcf_getDigits(uCnt);
-
-				ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, "%s Cnt(%d)", strPrm, uCnt);
-				tree = proto_item_add_subtree(ti, ett_mqpcf_prm);
-
-				proto_tree_add_item(tree, hf_mq_pcf_prmtyp  , tvb, offset     , 4, bLittleEndian);
-				proto_tree_add_item(tree, hf_mq_pcf_prmlen  , tvb, offset +  4, 4, bLittleEndian);
-				proto_tree_add_item(tree, (bParse) ? hf_mq_pcf_prmid : hf_mq_pcf_prmidnovals, tvb, offset +  8, 4, bLittleEndian);
-				proto_tree_add_item(tree, hf_mq_pcf_prmcount, tvb, offset + 12, 4, bLittleEndian);
-
-				offset += uLenF+4;
-				for (u2 = 0; u2 < uCnt && u2 < mq_pcf_maxlst; u2++)
-				{
-					uVal = tvb_get_guint32_endian(tvb, offset, bLittleEndian);
-					dissect_mqpcf_parm_int(tvb, tree, offset, uPrm, uVal, hf_mq_pcf_intlist, u2+1, uCnt, uDigit, bParse);
-					offset += 4;
-				}
-				if (u2 != uCnt)
-				{
-					ti = proto_tree_add_text(tree, tvb, offset, uLen, sMaxLst, u2, uCnt);
-					expert_add_info(pinfo, ti, &ei_mq_pcf_MaxInt);
-				}
-			}
-			break;
-		case MQ_MQCFT_STRING_LIST:
-			{
-				guint32	 u2;
-				guint32	 uDigit;
-				guint8	*sStr;
-				header_field_info *hfinfo;
-
-				hfinfo = proto_registrar_get_nth(hf_mq_pcf_stringlist);
-
-				uCCS = tvb_get_guint32_endian(tvb, offset + uLenF    , bLittleEndian);
-				uCnt = tvb_get_guint32_endian(tvb, offset + uLenF + 4, bLittleEndian);
-				uSLn = tvb_get_guint32_endian(tvb, offset + uLenF + 8, bLittleEndian);
-
-				ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, "%s Cnt(%d)", strPrm, uCnt);
-
-				tree = proto_item_add_subtree(ti, ett_mqpcf_prm);
-				proto_tree_add_item(tree, hf_mq_pcf_prmtyp   , tvb, offset     , 4, bLittleEndian);
-				proto_tree_add_item(tree, hf_mq_pcf_prmlen   , tvb, offset +  4, 4, bLittleEndian);
-				proto_tree_add_item(tree, (bParse) ? hf_mq_pcf_prmid : hf_mq_pcf_prmidnovals, tvb, offset +  8, 4, bLittleEndian);
-				proto_tree_add_item(tree, hf_mq_pcf_prmccsid , tvb, offset + 12, 4, bLittleEndian);
-				proto_tree_add_item(tree, hf_mq_pcf_prmcount , tvb, offset + 16, 4, bLittleEndian);
-				proto_tree_add_item(tree, hf_mq_pcf_prmstrlen, tvb, offset + 20, 4, bLittleEndian);
-
-				uDigit = dissect_mqpcf_getDigits(uCnt);
-
-				offset += uLenF+12;
-				for (u2 = 0; u2 < uCnt && u2 < mq_pcf_maxlst; u2++)
-				{
-					sStr = tvb_get_string_enc(wmem_packet_scope(), tvb, offset,
-						uSLn, (uCCS != 500) ? ENC_ASCII : ENC_EBCDIC);
-					if (*sStr)
-						strip_trailing_blanks(sStr, uSLn);
-					if (*sStr)
-						format_text_chr(sStr, strlen(sStr),  '.');
-
-					proto_tree_add_string_format(tree, hf_mq_pcf_stringlist, tvb, offset, uSLn, sStr,
-						"%s[%*d]: %s", hfinfo->name, uDigit, u2+1, sStr);
-					offset += uSLn;
-				}
-				if (u2 != uCnt)
-				{
-					ti = proto_tree_add_text(tree, tvb, offset, uLen, sMaxLst, u2, uCnt);
-					expert_add_info(pinfo, ti, &ei_mq_pcf_MaxStr);
-				}
-			}
-			break;
-		case MQ_MQCFT_EVENT:
-			break;
-		case MQ_MQCFT_USER:
-			{
-				ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, "%s", strPrm);
-				tree = proto_item_add_subtree(ti, ett_mqpcf_prm);
-
-				proto_tree_add_item(tree, hf_mq_pcf_prmtyp   , tvb, offset     , 4, bLittleEndian);
-				proto_tree_add_item(tree, hf_mq_pcf_prmlen   , tvb, offset +  4, 4, bLittleEndian);
-
-				proto_tree_add_item(tree, hf_mq_pcf_bytestring, tvb, offset + 8, uLen - 8, bLittleEndian);
-			}
-			break;
-		case MQ_MQCFT_BYTE_STRING:
-			{
-				uSLn = tvb_get_guint32_endian(tvb, offset + uLenF, bLittleEndian);
-				if (uSLn)
-				{
-					guint8 *sStrA = format_text_chr(tvb_get_string_enc(wmem_packet_scope(), tvb, offset + uLenF + 4, uSLn, ENC_ASCII) , uSLn, '.');
-					guint8 *sStrE = format_text_chr(tvb_get_string_enc(wmem_packet_scope(), tvb, offset + uLenF + 4, uSLn, ENC_EBCDIC), uSLn, '.');
-					if (uSLn > 35)
-					{
-						ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, "%s [Truncated] A(%-.35s) E(%-.35s)", strPrm, sStrA, sStrE);
-					}
-					else
-					{
-						ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, "%s A(%s) E(%s)", strPrm, sStrA, sStrE);
-					}
-				}
-				else
-				{
-					ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, "%s <MISSING>", strPrm);
-				}
-				tree = proto_item_add_subtree(ti, ett_mqpcf_prm);
-
-				proto_tree_add_item(tree, hf_mq_pcf_prmtyp   , tvb, offset     , 4, bLittleEndian);
-				proto_tree_add_item(tree, hf_mq_pcf_prmlen   , tvb, offset +  4, 4, bLittleEndian);
-				proto_tree_add_item(tree, (bParse) ? hf_mq_pcf_prmid : hf_mq_pcf_prmidnovals, tvb, offset +  8, 4, bLittleEndian);
-				proto_tree_add_item(tree, hf_mq_pcf_prmstrlen, tvb, offset + 12, 4, bLittleEndian);
-
-				proto_tree_add_item(tree, hf_mq_pcf_bytestring, tvb, offset + uLenF + 4 , uSLn, bLittleEndian);
-			}
-			break;
-		case MQ_MQCFT_TRACE_ROUTE:
-			break;
-		case MQ_MQCFT_REPORT:
-			break;
-		case MQ_MQCFT_INTEGER_FILTER:
-			{
-				guint32 uOpe;
-
-				uOpe = tvb_get_guint32_endian(tvb, offset + uLenF    , bLittleEndian);
-				uVal = tvb_get_guint32_endian(tvb, offset + uLenF + 4, bLittleEndian);
-
-				ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, "%s %s %d",
-					strPrm, val_to_str(uOpe, GET_VALSV(FilterOP), "       Unknown (0x%02x)")+7, uVal);
-				tree = proto_item_add_subtree(ti, ett_mqpcf_prm);
-
-				proto_tree_add_item(tree, hf_mq_pcf_prmtyp   , tvb, offset     , 4, bLittleEndian);
-				proto_tree_add_item(tree, hf_mq_pcf_prmlen   , tvb, offset +  4, 4, bLittleEndian);
-				proto_tree_add_item(tree, (bParse) ? hf_mq_pcf_prmid : hf_mq_pcf_prmidnovals, tvb, offset +  8, 4, bLittleEndian);
-				proto_tree_add_item(tree, hf_mq_pcf_filterop , tvb, offset + 12, 4, bLittleEndian);
-
-				proto_tree_add_item(tree, hf_mq_pcf_int, tvb, offset + uLenF + 4, 4, bLittleEndian);
-			}
-			break;
-		case MQ_MQCFT_STRING_FILTER:
-			{
-				guint8 *sStr;
-				guint32 uOpe;
-
-				uOpe = tvb_get_guint32_endian(tvb, offset + uLenF, bLittleEndian);
-				uCCS = tvb_get_guint32_endian(tvb, offset + uLenF + 4, bLittleEndian);
-				uSLn = tvb_get_guint32_endian(tvb, offset + uLenF + 8, bLittleEndian);
-				sStr = format_text_chr(tvb_get_string_enc(wmem_packet_scope(), tvb, offset + uLenF + 12, uSLn, (uCCS != 500) ? ENC_ASCII : ENC_EBCDIC), uSLn, '.');
-				strip_trailing_blanks(sStr, uSLn);
-
-				ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, "%s %s %s",
-					strPrm, val_to_str(uOpe, GET_VALSV(FilterOP), "       Unknown (0x%02x)")+7, sStr);
-				tree = proto_item_add_subtree(ti, ett_mqpcf_prm);
-
-				proto_tree_add_item(tree, hf_mq_pcf_prmtyp   , tvb, offset     , 4, bLittleEndian);
-				proto_tree_add_item(tree, hf_mq_pcf_prmlen   , tvb, offset +  4, 4, bLittleEndian);
-				proto_tree_add_item(tree, (bParse) ? hf_mq_pcf_prmid : hf_mq_pcf_prmidnovals, tvb, offset +  8, 4, bLittleEndian);
-				proto_tree_add_item(tree, hf_mq_pcf_filterop , tvb, offset + 12, 4, bLittleEndian);
-				proto_tree_add_item(tree, hf_mq_pcf_prmccsid , tvb, offset + 16, 4, bLittleEndian);
-				proto_tree_add_item(tree, hf_mq_pcf_prmstrlen, tvb, offset + 20, 4, bLittleEndian);
-
-				proto_tree_add_item(tree, hf_mq_pcf_string, tvb, offset + uLenF + 12, uSLn, (uCCS != 500) ? ENC_ASCII : ENC_EBCDIC);
-			}
-			break;
-		case MQ_MQCFT_BYTE_STRING_FILTER:
-			{
-				guint32 uOpe;
-				uOpe = tvb_get_guint32_endian(tvb, offset + uLenF, bLittleEndian);
-				uSLn = tvb_get_guint32_endian(tvb, offset + uLenF + 4, bLittleEndian);
-				if (uSLn)
-				{
-					guint8 *sStrA = format_text_chr(tvb_get_string_enc(wmem_packet_scope(), tvb, offset + uLenF + 8, uSLn, ENC_ASCII), uSLn, '.');
-					guint8 *sStrE = format_text_chr(tvb_get_string_enc(wmem_packet_scope(), tvb, offset + uLenF + 8, uSLn, ENC_EBCDIC), uSLn, '.');
-					ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, "%s %s A(%s) E(%s)",
-						strPrm, val_to_str(uOpe, GET_VALSV(FilterOP), "       Unknown (0x%02x)")+7, sStrA, sStrE);
-				}
-				else
-				{
-					ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, "%s %s <MISSING>",
-						strPrm, val_to_str(uOpe, GET_VALSV(FilterOP), "       Unknown (0x%02x)")+7);
-				}
-				tree = proto_item_add_subtree(ti, ett_mqpcf_prm);
-
-				proto_tree_add_item(tree, hf_mq_pcf_prmtyp   , tvb, offset     , 4, bLittleEndian);
-				proto_tree_add_item(tree, hf_mq_pcf_prmlen   , tvb, offset +  4, 4, bLittleEndian);
-				proto_tree_add_item(tree, (bParse) ? hf_mq_pcf_prmid : hf_mq_pcf_prmidnovals, tvb, offset +  8, 4, bLittleEndian);
-				proto_tree_add_item(tree, hf_mq_pcf_filterop , tvb, offset + 12, 4, bLittleEndian);
-				proto_tree_add_item(tree, hf_mq_pcf_prmstrlen, tvb, offset + 16, 4, bLittleEndian);
-
-				proto_tree_add_item(tree, hf_mq_pcf_bytestring, tvb, offset + uLenF + 8 , uSLn, bLittleEndian);
-			}
-			break;
-		case MQ_MQCFT_COMMAND_XR:
-			break;
-		case MQ_MQCFT_XR_MSG:
-			break;
-		case MQ_MQCFT_XR_ITEM:
-			break;
-		case MQ_MQCFT_XR_SUMMARY:
-			break;
-		case MQ_MQCFT_GROUP:
-			break;
-		case MQ_MQCFT_STATISTICS:
-			break;
-		case MQ_MQCFT_ACCOUNTING:
-			break;
-		case MQ_MQCFT_INTEGER64:
-			{
-				uVal64 = tvb_get_guint64_endian(tvb, offset + uLenF + 4, bLittleEndian);
-				ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, "%s %" G_GINT64_MODIFIER "x (%" G_GINT64_MODIFIER "d)",
-					strPrm, uVal64, uVal64);
-				tree = proto_item_add_subtree(ti, ett_mqpcf_prm);
-
-				proto_tree_add_item(tree, hf_mq_pcf_prmtyp   , tvb, offset     , 4, bLittleEndian);
-				proto_tree_add_item(tree, hf_mq_pcf_prmlen   , tvb, offset +  4, 4, bLittleEndian);
-				proto_tree_add_item(tree, (bParse) ? hf_mq_pcf_prmid : hf_mq_pcf_prmidnovals, tvb, offset +  8, 4, bLittleEndian);
-				proto_tree_add_item(tree, hf_mq_pcf_prmunused, tvb, offset + 12, 4, bLittleEndian);
-
-				proto_tree_add_item(tree, hf_mq_pcf_int64, tvb, offset + uLenF + 4, 8, bLittleEndian);
-			}
-			break;
-		case MQ_MQCFT_INTEGER64_LIST:
-			{
-				guint32 u2;
-				guint32 uDigit;
-				header_field_info *hfinfo;
-
-				hfinfo = proto_registrar_get_nth(hf_mq_pcf_int64list);
-
-				uCnt = tvb_get_guint32_endian(tvb, offset + uLenF, bLittleEndian);
-				ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, "%s Cnt(%d)", strPrm, uCnt);
-				tree = proto_item_add_subtree(ti, ett_mqpcf_prm);
-				uDigit = dissect_mqpcf_getDigits(uCnt);
-
-				proto_tree_add_item(tree, hf_mq_pcf_prmtyp  , tvb, offset     , 4, bLittleEndian);
-				proto_tree_add_item(tree, hf_mq_pcf_prmlen  , tvb, offset +  4, 4, bLittleEndian);
-				proto_tree_add_item(tree, (bParse) ? hf_mq_pcf_prmid : hf_mq_pcf_prmidnovals, tvb, offset +  8, 4, bLittleEndian);
-				proto_tree_add_item(tree, hf_mq_pcf_prmcount, tvb, offset + 12, 4, bLittleEndian);
-
-				offset += uLenF + 4;
-				for (u2 = 0; u2 < uCnt && u2 < mq_pcf_maxlst; u2++)
-				{
-					uVal64 = tvb_get_guint64_endian(tvb, offset, bLittleEndian);
-					proto_tree_add_int64_format(tree, hf_mq_pcf_int64list, tvb, offset, 8, uVal64,
-						"%s[%*d]: %" G_GINT64_MODIFIER "d", hfinfo->name, uDigit, u2+1, uVal64);
-					offset += 8;
-				}
-				if (u2 != uCnt)
-				{
-					ti = proto_tree_add_text(tree, tvb, offset, uLen, sMaxLst, u2, uCnt);
-					expert_add_info(pinfo, ti, &ei_mq_pcf_MaxI64);
-				}
-			}
-			break;
-		}
-		offset = tOfs+uLen;
-	}
-	if (u != uCount)
-	{
-		ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, sMaxPrm, u, uCount);
-		expert_add_info(pinfo, ti, &ei_mq_pcf_MaxPrm);
-	}
+    guint32 u    = 0;
+    guint32 tOfs = 0;
+    guint32 uLenF;
+    char    strPrm[256];
+    guint32 uTyp;
+    guint32 uLen = 0;
+    guint32 uPrm;
+    guint32 uCnt;
+    guint32 uCCS;
+    guint32 uSLn;
+    guint32 uVal;
+    guint64 uVal64;
+    guint32 uDig;
+
+    const char sMaxLst[] = " Max # of List reached. DECODE interrupted   (actual %u of %u)";
+    const char sPrmLn0[] = " MQPrm[%3u] has a zero length. DECODE Failed (MQPrm Count: %u)";
+    const char sMaxPrm[] = " Max # of Parm reached. DECODE interrupted   (actual %u of %u)";
+    const char sPrmCnt[] = " Cnt=-1 and Length(%u) < 16. DECODE interrupted for elem %u";
+
+    proto_item *ti   = NULL;
+    proto_tree *tree = NULL;
+
+    if (uCount == (guint32)-1)
+    {
+        guint32 xOfs = offset;
+
+        uCnt = 0;
+        while (tvb_length_remaining(tvb, xOfs) >= 16)
+        {
+            uLen = tvb_get_guint32_endian(tvb, xOfs + 4, bLittleEndian);
+            if (uLen < 16)
+            {
+                ti = proto_tree_add_text(mq_tree, tvb, xOfs, 16, sPrmCnt, uLen, uCnt);
+                expert_add_info(pinfo, ti, &ei_mq_pcf_PrmCnt);
+                break;
+            }
+            uCnt++;
+            xOfs += uLen;
+        }
+        uCount = uCnt;
+    }
+
+    uDig = dissect_mqpcf_getDigits(uCount);
+
+    for (u = 0; u < uCount && u < mq_pcf_maxprm; u++)
+    {
+        tOfs = offset;
+        uTyp = tvb_get_guint32_endian(tvb, offset    , bLittleEndian);
+        uLen = tvb_get_guint32_endian(tvb, offset + 4, bLittleEndian);
+        if (uLen == 0)
+        {
+            ti = proto_tree_add_text(mq_tree, tvb, offset, 12, sPrmLn0, u+1, uCount);
+            expert_add_info(pinfo, ti, &ei_mq_pcf_prmln0);
+            u = uCount;
+            break;
+        }
+        uPrm = tvb_get_guint32_endian(tvb, offset + 8, bLittleEndian);
+        uLenF = 12;
+
+        if (bParse)
+            g_snprintf(strPrm, (gulong)sizeof(strPrm) - 1, " %-s[%*u] {%2d-%-15.15s} %8x/%5d-%-30.30s",
+                "MQPrm", uDig, u+1,
+                uTyp, val_to_str_const(uTyp, GET_VALSV(PrmTyp), "      Unknown") + 6,
+                uPrm, uPrm, val_to_str_const(uPrm, GET_VALSV(PrmId), "Unknown"));
+        else
+            g_snprintf(strPrm, (gulong)sizeof(strPrm) - 1, " %-s[%*u] {%2d-%-15.15s} %8x/%5d",
+                "XtraD", uDig, u+1,
+                uTyp, val_to_str_const(uTyp, GET_VALSV(PrmTyp), "      Unknown") + 6,
+                uPrm, uPrm);
+
+        switch (uTyp)
+        {
+        case MQ_MQCFT_NONE:
+            break;
+        case MQ_MQCFT_COMMAND:
+            break;
+        case MQ_MQCFT_RESPONSE:
+            break;
+        case MQ_MQCFT_INTEGER:
+            {
+                guint8 *pVal = NULL;
+                uVal = tvb_get_guint32_endian(tvb, offset + uLenF, bLittleEndian);
+                if (bParse)
+                    pVal = dissect_mqpcf_parm_getintval(uPrm, uVal);
+                if (pVal)
+                {
+                    ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, "%s %d-%s",
+                        strPrm, uVal, pVal);
+                }
+                else
+                {
+                    ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, "%s %8x-%d",
+                        strPrm, uVal, uVal);
+                }
+                tree = proto_item_add_subtree(ti, ett_mqpcf_prm);
+                proto_tree_add_item(tree, hf_mq_pcf_prmtyp, tvb, offset    , 4, bLittleEndian);
+                proto_tree_add_item(tree, hf_mq_pcf_prmlen, tvb, offset + 4, 4, bLittleEndian);
+                proto_tree_add_item(tree, (bParse) ? hf_mq_pcf_prmid : hf_mq_pcf_prmidnovals, tvb, offset + 8, 4, bLittleEndian);
+
+                dissect_mqpcf_parm_int(tvb, tree, offset+uLenF, uPrm, uVal, hf_mq_pcf_int, 0, 0, 0, bParse);
+            }
+            break;
+        case MQ_MQCFT_STRING:
+            {
+                guint8 *sStr;
+
+                uCCS = tvb_get_guint32_endian(tvb, offset + uLenF, bLittleEndian);
+                uSLn = tvb_get_guint32_endian(tvb, offset + uLenF + 4, bLittleEndian);
+                sStr = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + uLenF + 8,
+                    uSLn, (uCCS != 500) ? ENC_ASCII : ENC_EBCDIC);
+                if (*sStr)
+                    strip_trailing_blanks(sStr, uSLn);
+                if (*sStr)
+                    format_text_chr(sStr, strlen(sStr), '.');
+
+                ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, "%s %s", strPrm, sStr);
+                tree = proto_item_add_subtree(ti, ett_mqpcf_prm);
+
+                proto_tree_add_item(tree, hf_mq_pcf_prmtyp   , tvb, offset     , 4, bLittleEndian);
+                proto_tree_add_item(tree, hf_mq_pcf_prmlen   , tvb, offset +  4, 4, bLittleEndian);
+                proto_tree_add_item(tree, (bParse) ? hf_mq_pcf_prmid : hf_mq_pcf_prmidnovals, tvb, offset +  8, 4, bLittleEndian);
+                proto_tree_add_item(tree, hf_mq_pcf_prmccsid , tvb, offset + 12, 4, bLittleEndian);
+                proto_tree_add_item(tree, hf_mq_pcf_prmstrlen, tvb, offset + 16, 4, bLittleEndian);
+
+                proto_tree_add_item(tree, hf_mq_pcf_string, tvb, offset + uLenF + 8, uSLn, (uCCS != 500) ? ENC_ASCII : ENC_EBCDIC);
+            }
+            break;
+        case MQ_MQCFT_INTEGER_LIST:
+            {
+                guint32 u2;
+                guint32 uDigit = 0;
+
+                uCnt = tvb_get_guint32_endian(tvb, offset+uLenF, bLittleEndian);
+                uDigit = dissect_mqpcf_getDigits(uCnt);
+
+                ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, "%s Cnt(%d)", strPrm, uCnt);
+                tree = proto_item_add_subtree(ti, ett_mqpcf_prm);
+
+                proto_tree_add_item(tree, hf_mq_pcf_prmtyp  , tvb, offset     , 4, bLittleEndian);
+                proto_tree_add_item(tree, hf_mq_pcf_prmlen  , tvb, offset +  4, 4, bLittleEndian);
+                proto_tree_add_item(tree, (bParse) ? hf_mq_pcf_prmid : hf_mq_pcf_prmidnovals, tvb, offset +  8, 4, bLittleEndian);
+                proto_tree_add_item(tree, hf_mq_pcf_prmcount, tvb, offset + 12, 4, bLittleEndian);
+
+                offset += uLenF+4;
+                for (u2 = 0; u2 < uCnt && u2 < mq_pcf_maxlst; u2++)
+                {
+                    uVal = tvb_get_guint32_endian(tvb, offset, bLittleEndian);
+                    dissect_mqpcf_parm_int(tvb, tree, offset, uPrm, uVal, hf_mq_pcf_intlist, u2+1, uCnt, uDigit, bParse);
+                    offset += 4;
+                }
+                if (u2 != uCnt)
+                {
+                    ti = proto_tree_add_text(tree, tvb, offset, uLen, sMaxLst, u2, uCnt);
+                    expert_add_info(pinfo, ti, &ei_mq_pcf_MaxInt);
+                }
+            }
+            break;
+        case MQ_MQCFT_STRING_LIST:
+            {
+                guint32  u2;
+                guint32  uDigit;
+                guint8  *sStr;
+                header_field_info *hfinfo;
+
+                hfinfo = proto_registrar_get_nth(hf_mq_pcf_stringlist);
+
+                uCCS = tvb_get_guint32_endian(tvb, offset + uLenF    , bLittleEndian);
+                uCnt = tvb_get_guint32_endian(tvb, offset + uLenF + 4, bLittleEndian);
+                uSLn = tvb_get_guint32_endian(tvb, offset + uLenF + 8, bLittleEndian);
+
+                ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, "%s Cnt(%d)", strPrm, uCnt);
+
+                tree = proto_item_add_subtree(ti, ett_mqpcf_prm);
+                proto_tree_add_item(tree, hf_mq_pcf_prmtyp   , tvb, offset     , 4, bLittleEndian);
+                proto_tree_add_item(tree, hf_mq_pcf_prmlen   , tvb, offset +  4, 4, bLittleEndian);
+                proto_tree_add_item(tree, (bParse) ? hf_mq_pcf_prmid : hf_mq_pcf_prmidnovals, tvb, offset +  8, 4, bLittleEndian);
+                proto_tree_add_item(tree, hf_mq_pcf_prmccsid , tvb, offset + 12, 4, bLittleEndian);
+                proto_tree_add_item(tree, hf_mq_pcf_prmcount , tvb, offset + 16, 4, bLittleEndian);
+                proto_tree_add_item(tree, hf_mq_pcf_prmstrlen, tvb, offset + 20, 4, bLittleEndian);
+
+                uDigit = dissect_mqpcf_getDigits(uCnt);
+
+                offset += uLenF+12;
+                for (u2 = 0; u2 < uCnt && u2 < mq_pcf_maxlst; u2++)
+                {
+                    sStr = tvb_get_string_enc(wmem_packet_scope(), tvb, offset,
+                        uSLn, (uCCS != 500) ? ENC_ASCII : ENC_EBCDIC);
+                    if (*sStr)
+                        strip_trailing_blanks(sStr, uSLn);
+                    if (*sStr)
+                        format_text_chr(sStr, strlen(sStr),  '.');
+
+                    proto_tree_add_string_format(tree, hf_mq_pcf_stringlist, tvb, offset, uSLn, sStr,
+                        "%s[%*d]: %s", hfinfo->name, uDigit, u2+1, sStr);
+                    offset += uSLn;
+                }
+                if (u2 != uCnt)
+                {
+                    ti = proto_tree_add_text(tree, tvb, offset, uLen, sMaxLst, u2, uCnt);
+                    expert_add_info(pinfo, ti, &ei_mq_pcf_MaxStr);
+                }
+            }
+            break;
+        case MQ_MQCFT_EVENT:
+            break;
+        case MQ_MQCFT_USER:
+            {
+                ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, "%s", strPrm);
+                tree = proto_item_add_subtree(ti, ett_mqpcf_prm);
+
+                proto_tree_add_item(tree, hf_mq_pcf_prmtyp   , tvb, offset     , 4, bLittleEndian);
+                proto_tree_add_item(tree, hf_mq_pcf_prmlen   , tvb, offset +  4, 4, bLittleEndian);
+
+                proto_tree_add_item(tree, hf_mq_pcf_bytestring, tvb, offset + 8, uLen - 8, bLittleEndian);
+            }
+            break;
+        case MQ_MQCFT_BYTE_STRING:
+            {
+                uSLn = tvb_get_guint32_endian(tvb, offset + uLenF, bLittleEndian);
+                if (uSLn)
+                {
+                    guint8 *sStrA = format_text_chr(tvb_get_string_enc(wmem_packet_scope(), tvb, offset + uLenF + 4, uSLn, ENC_ASCII) , uSLn, '.');
+                    guint8 *sStrE = format_text_chr(tvb_get_string_enc(wmem_packet_scope(), tvb, offset + uLenF + 4, uSLn, ENC_EBCDIC), uSLn, '.');
+                    if (uSLn > 35)
+                    {
+                        ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, "%s [Truncated] A(%-.35s) E(%-.35s)", strPrm, sStrA, sStrE);
+                    }
+                    else
+                    {
+                        ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, "%s A(%s) E(%s)", strPrm, sStrA, sStrE);
+                    }
+                }
+                else
+                {
+                    ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, "%s <MISSING>", strPrm);
+                }
+                tree = proto_item_add_subtree(ti, ett_mqpcf_prm);
+
+                proto_tree_add_item(tree, hf_mq_pcf_prmtyp   , tvb, offset     , 4, bLittleEndian);
+                proto_tree_add_item(tree, hf_mq_pcf_prmlen   , tvb, offset +  4, 4, bLittleEndian);
+                proto_tree_add_item(tree, (bParse) ? hf_mq_pcf_prmid : hf_mq_pcf_prmidnovals, tvb, offset +  8, 4, bLittleEndian);
+                proto_tree_add_item(tree, hf_mq_pcf_prmstrlen, tvb, offset + 12, 4, bLittleEndian);
+
+                proto_tree_add_item(tree, hf_mq_pcf_bytestring, tvb, offset + uLenF + 4 , uSLn, bLittleEndian);
+            }
+            break;
+        case MQ_MQCFT_TRACE_ROUTE:
+            break;
+        case MQ_MQCFT_REPORT:
+            break;
+        case MQ_MQCFT_INTEGER_FILTER:
+            {
+                guint32 uOpe;
+
+                uOpe = tvb_get_guint32_endian(tvb, offset + uLenF    , bLittleEndian);
+                uVal = tvb_get_guint32_endian(tvb, offset + uLenF + 4, bLittleEndian);
+
+                ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, "%s %s %d",
+                    strPrm, val_to_str(uOpe, GET_VALSV(FilterOP), "       Unknown (0x%02x)")+7, uVal);
+                tree = proto_item_add_subtree(ti, ett_mqpcf_prm);
+
+                proto_tree_add_item(tree, hf_mq_pcf_prmtyp   , tvb, offset     , 4, bLittleEndian);
+                proto_tree_add_item(tree, hf_mq_pcf_prmlen   , tvb, offset +  4, 4, bLittleEndian);
+                proto_tree_add_item(tree, (bParse) ? hf_mq_pcf_prmid : hf_mq_pcf_prmidnovals, tvb, offset +  8, 4, bLittleEndian);
+                proto_tree_add_item(tree, hf_mq_pcf_filterop , tvb, offset + 12, 4, bLittleEndian);
+
+                proto_tree_add_item(tree, hf_mq_pcf_int, tvb, offset + uLenF + 4, 4, bLittleEndian);
+            }
+            break;
+        case MQ_MQCFT_STRING_FILTER:
+            {
+                guint8 *sStr;
+                guint32 uOpe;
+
+                uOpe = tvb_get_guint32_endian(tvb, offset + uLenF, bLittleEndian);
+                uCCS = tvb_get_guint32_endian(tvb, offset + uLenF + 4, bLittleEndian);
+                uSLn = tvb_get_guint32_endian(tvb, offset + uLenF + 8, bLittleEndian);
+                sStr = format_text_chr(tvb_get_string_enc(wmem_packet_scope(), tvb, offset + uLenF + 12, uSLn, (uCCS != 500) ? ENC_ASCII : ENC_EBCDIC), uSLn, '.');
+                strip_trailing_blanks(sStr, uSLn);
+
+                ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, "%s %s %s",
+                    strPrm, val_to_str(uOpe, GET_VALSV(FilterOP), "       Unknown (0x%02x)")+7, sStr);
+                tree = proto_item_add_subtree(ti, ett_mqpcf_prm);
+
+                proto_tree_add_item(tree, hf_mq_pcf_prmtyp   , tvb, offset     , 4, bLittleEndian);
+                proto_tree_add_item(tree, hf_mq_pcf_prmlen   , tvb, offset +  4, 4, bLittleEndian);
+                proto_tree_add_item(tree, (bParse) ? hf_mq_pcf_prmid : hf_mq_pcf_prmidnovals, tvb, offset +  8, 4, bLittleEndian);
+                proto_tree_add_item(tree, hf_mq_pcf_filterop , tvb, offset + 12, 4, bLittleEndian);
+                proto_tree_add_item(tree, hf_mq_pcf_prmccsid , tvb, offset + 16, 4, bLittleEndian);
+                proto_tree_add_item(tree, hf_mq_pcf_prmstrlen, tvb, offset + 20, 4, bLittleEndian);
+
+                proto_tree_add_item(tree, hf_mq_pcf_string, tvb, offset + uLenF + 12, uSLn, (uCCS != 500) ? ENC_ASCII : ENC_EBCDIC);
+            }
+            break;
+        case MQ_MQCFT_BYTE_STRING_FILTER:
+            {
+                guint32 uOpe;
+                uOpe = tvb_get_guint32_endian(tvb, offset + uLenF, bLittleEndian);
+                uSLn = tvb_get_guint32_endian(tvb, offset + uLenF + 4, bLittleEndian);
+                if (uSLn)
+                {
+                    guint8 *sStrA = format_text_chr(tvb_get_string_enc(wmem_packet_scope(), tvb, offset + uLenF + 8, uSLn, ENC_ASCII), uSLn, '.');
+                    guint8 *sStrE = format_text_chr(tvb_get_string_enc(wmem_packet_scope(), tvb, offset + uLenF + 8, uSLn, ENC_EBCDIC), uSLn, '.');
+                    ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, "%s %s A(%s) E(%s)",
+                        strPrm, val_to_str(uOpe, GET_VALSV(FilterOP), "       Unknown (0x%02x)")+7, sStrA, sStrE);
+                }
+                else
+                {
+                    ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, "%s %s <MISSING>",
+                        strPrm, val_to_str(uOpe, GET_VALSV(FilterOP), "       Unknown (0x%02x)")+7);
+                }
+                tree = proto_item_add_subtree(ti, ett_mqpcf_prm);
+
+                proto_tree_add_item(tree, hf_mq_pcf_prmtyp   , tvb, offset     , 4, bLittleEndian);
+                proto_tree_add_item(tree, hf_mq_pcf_prmlen   , tvb, offset +  4, 4, bLittleEndian);
+                proto_tree_add_item(tree, (bParse) ? hf_mq_pcf_prmid : hf_mq_pcf_prmidnovals, tvb, offset +  8, 4, bLittleEndian);
+                proto_tree_add_item(tree, hf_mq_pcf_filterop , tvb, offset + 12, 4, bLittleEndian);
+                proto_tree_add_item(tree, hf_mq_pcf_prmstrlen, tvb, offset + 16, 4, bLittleEndian);
+
+                proto_tree_add_item(tree, hf_mq_pcf_bytestring, tvb, offset + uLenF + 8 , uSLn, bLittleEndian);
+            }
+            break;
+        case MQ_MQCFT_COMMAND_XR:
+            break;
+        case MQ_MQCFT_XR_MSG:
+            break;
+        case MQ_MQCFT_XR_ITEM:
+            break;
+        case MQ_MQCFT_XR_SUMMARY:
+            break;
+        case MQ_MQCFT_GROUP:
+            break;
+        case MQ_MQCFT_STATISTICS:
+            break;
+        case MQ_MQCFT_ACCOUNTING:
+            break;
+        case MQ_MQCFT_INTEGER64:
+            {
+                uVal64 = tvb_get_guint64_endian(tvb, offset + uLenF + 4, bLittleEndian);
+                ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, "%s %" G_GINT64_MODIFIER "x (%" G_GINT64_MODIFIER "d)",
+                    strPrm, uVal64, uVal64);
+                tree = proto_item_add_subtree(ti, ett_mqpcf_prm);
+
+                proto_tree_add_item(tree, hf_mq_pcf_prmtyp   , tvb, offset     , 4, bLittleEndian);
+                proto_tree_add_item(tree, hf_mq_pcf_prmlen   , tvb, offset +  4, 4, bLittleEndian);
+                proto_tree_add_item(tree, (bParse) ? hf_mq_pcf_prmid : hf_mq_pcf_prmidnovals, tvb, offset +  8, 4, bLittleEndian);
+                proto_tree_add_item(tree, hf_mq_pcf_prmunused, tvb, offset + 12, 4, bLittleEndian);
+
+                proto_tree_add_item(tree, hf_mq_pcf_int64, tvb, offset + uLenF + 4, 8, bLittleEndian);
+            }
+            break;
+        case MQ_MQCFT_INTEGER64_LIST:
+            {
+                guint32 u2;
+                guint32 uDigit;
+                header_field_info *hfinfo;
+
+                hfinfo = proto_registrar_get_nth(hf_mq_pcf_int64list);
+
+                uCnt = tvb_get_guint32_endian(tvb, offset + uLenF, bLittleEndian);
+                ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, "%s Cnt(%d)", strPrm, uCnt);
+                tree = proto_item_add_subtree(ti, ett_mqpcf_prm);
+                uDigit = dissect_mqpcf_getDigits(uCnt);
+
+                proto_tree_add_item(tree, hf_mq_pcf_prmtyp  , tvb, offset     , 4, bLittleEndian);
+                proto_tree_add_item(tree, hf_mq_pcf_prmlen  , tvb, offset +  4, 4, bLittleEndian);
+                proto_tree_add_item(tree, (bParse) ? hf_mq_pcf_prmid : hf_mq_pcf_prmidnovals, tvb, offset +  8, 4, bLittleEndian);
+                proto_tree_add_item(tree, hf_mq_pcf_prmcount, tvb, offset + 12, 4, bLittleEndian);
+
+                offset += uLenF + 4;
+                for (u2 = 0; u2 < uCnt && u2 < mq_pcf_maxlst; u2++)
+                {
+                    uVal64 = tvb_get_guint64_endian(tvb, offset, bLittleEndian);
+                    proto_tree_add_int64_format(tree, hf_mq_pcf_int64list, tvb, offset, 8, uVal64,
+                        "%s[%*d]: %" G_GINT64_MODIFIER "d", hfinfo->name, uDigit, u2+1, uVal64);
+                    offset += 8;
+                }
+                if (u2 != uCnt)
+                {
+                    ti = proto_tree_add_text(tree, tvb, offset, uLen, sMaxLst, u2, uCnt);
+                    expert_add_info(pinfo, ti, &ei_mq_pcf_MaxI64);
+                }
+            }
+            break;
+        }
+        offset = tOfs+uLen;
+    }
+    if (u != uCount)
+    {
+        ti = proto_tree_add_text(mq_tree, tvb, offset, uLen, sMaxPrm, u, uCount);
+        expert_add_info(pinfo, ti, &ei_mq_pcf_MaxPrm);
+    }
 }
 
 static void dissect_mqpcf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, mq_parm_t* p_mq_parm)
 {
-	gint offset = 0;
-	gboolean bLittleEndian;
-
-	bLittleEndian = ((p_mq_parm->mq_cur_ccsid.encod & MQ_MQENC_INTEGER_MASK) == MQ_MQENC_INTEGER_REVERSED) ? ENC_LITTLE_ENDIAN : ENC_BIG_ENDIAN;
-
-	if (tvb_length(tvb) >= 36)
-	{
-		gint iSizeMQCFH = 36;
-		guint32 iCommand = tvb_get_guint32_endian(tvb, offset + 12, bLittleEndian);
-
-		if (tree)
-		{
-			proto_item *ti;
-			proto_tree *mq_tree;
-			proto_tree *mqroot_tree;
-			char        sTmp[256];
-			guint32     uCnt;
-			guint32     uTyp;
-			guint32     uCmd;
-			guint32     uCC;
-			guint32     uRC;
-
-			uTyp = tvb_get_guint32_endian(tvb, offset     , bLittleEndian);
-			uCmd = tvb_get_guint32_endian(tvb, offset + 12, bLittleEndian);
-			uCC  = tvb_get_guint32_endian(tvb, offset + 24, bLittleEndian);
-			uRC  = tvb_get_guint32_endian(tvb, offset + 28, bLittleEndian);
-			uCnt = tvb_get_guint32_endian(tvb, offset + 32, bLittleEndian);
-
-			if (uCC || uRC)
-			{
-				g_snprintf(sTmp, (gulong)sizeof(sTmp)-1, " %-s [%d-%s] {%d-%s} PrmCnt(%d) CC(%d-%s) RC(%d-%s)",
-					MQ_TEXT_CFH,
-					uTyp, val_to_str_const(uTyp, GET_VALSV(mqcft), "Unknown"),
-					uCmd, val_to_str_const(uCmd, GET_VALSV(mqcmd), "Unknown"),
-					uCnt,
-					uCC, val_to_str_const(uCC, GET_VALSV(mqcc), "Unknown"),
-					uRC, val_to_str_const(uRC, GET_VALSV(mqrc), "Unknown"));
-			}
-			else
-			{
-				g_snprintf(sTmp, (gulong)sizeof(sTmp)-1, " %-s [%d-%s] {%d-%s} PrmCnt(%d)",
-					MQ_TEXT_CFH,
-					uTyp, val_to_str_const(uTyp, GET_VALSV(mqcft), "Unknown"),
-					uCmd, val_to_str_const(uCmd, GET_VALSV(mqcmd), "Unknown"),
-					uCnt);
-			}
-
-			ti = proto_tree_add_item(tree, proto_mqpcf, tvb, offset, -1, ENC_NA);
-
-			proto_item_append_text(ti, " (%s)", val_to_str(iCommand, GET_VALSV(mqcmd), "Unknown (0x%02x)"));
-			mqroot_tree = proto_item_add_subtree(ti, ett_mqpcf);
-
-			ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSizeMQCFH, "%s", sTmp);
-			mq_tree = proto_item_add_subtree(ti, ett_mqpcf_cfh);
-
-			proto_tree_add_item(mq_tree, hf_mqpcf_cfh_type     , tvb, offset +  0, 4, bLittleEndian);
-			proto_tree_add_item(mq_tree, hf_mqpcf_cfh_length   , tvb, offset +  4, 4, bLittleEndian);
-			proto_tree_add_item(mq_tree, hf_mqpcf_cfh_version  , tvb, offset +  8, 4, bLittleEndian);
-			proto_tree_add_item(mq_tree, hf_mqpcf_cfh_command  , tvb, offset + 12, 4, bLittleEndian);
-			proto_tree_add_item(mq_tree, hf_mqpcf_cfh_MsgSeqNbr, tvb, offset + 16, 4, bLittleEndian);
-			proto_tree_add_item(mq_tree, hf_mqpcf_cfh_control  , tvb, offset + 20, 4, bLittleEndian);
-			proto_tree_add_item(mq_tree, hf_mqpcf_cfh_compcode , tvb, offset + 24, 4, bLittleEndian);
-			proto_tree_add_item(mq_tree, hf_mqpcf_cfh_reason   , tvb, offset + 28, 4, bLittleEndian);
-			proto_tree_add_item(mq_tree, hf_mqpcf_cfh_ParmCount, tvb, offset + 32, 4, bLittleEndian);
-			dissect_mqpcf_parm(tvb, pinfo, mqroot_tree, offset + iSizeMQCFH, uCnt, bLittleEndian, TRUE);
-		}
-	}
+    gint offset = 0;
+    gboolean bLittleEndian;
+
+    bLittleEndian = ((p_mq_parm->mq_cur_ccsid.encod & MQ_MQENC_INTEGER_MASK) == MQ_MQENC_INTEGER_REVERSED) ? ENC_LITTLE_ENDIAN : ENC_BIG_ENDIAN;
+
+    if (tvb_length(tvb) >= 36)
+    {
+        gint iSizeMQCFH = 36;
+        guint32 iCommand = tvb_get_guint32_endian(tvb, offset + 12, bLittleEndian);
+
+        if (tree)
+        {
+            proto_item *ti;
+            proto_tree *mq_tree;
+            proto_tree *mqroot_tree;
+            char        sTmp[256];
+            guint32     uCnt;
+            guint32     uTyp;
+            guint32     uCmd;
+            guint32     uCC;
+            guint32     uRC;
+
+            uTyp = tvb_get_guint32_endian(tvb, offset     , bLittleEndian);
+            uCmd = tvb_get_guint32_endian(tvb, offset + 12, bLittleEndian);
+            uCC  = tvb_get_guint32_endian(tvb, offset + 24, bLittleEndian);
+            uRC  = tvb_get_guint32_endian(tvb, offset + 28, bLittleEndian);
+            uCnt = tvb_get_guint32_endian(tvb, offset + 32, bLittleEndian);
+
+            if (uCC || uRC)
+            {
+                g_snprintf(sTmp, (gulong)sizeof(sTmp)-1, " %-s [%d-%s] {%d-%s} PrmCnt(%d) CC(%d-%s) RC(%d-%s)",
+                    MQ_TEXT_CFH,
+                    uTyp, val_to_str_const(uTyp, GET_VALSV(mqcft), "Unknown"),
+                    uCmd, val_to_str_const(uCmd, GET_VALSV(mqcmd), "Unknown"),
+                    uCnt,
+                    uCC, val_to_str_const(uCC, GET_VALSV(mqcc), "Unknown"),
+                    uRC, val_to_str_const(uRC, GET_VALSV(mqrc), "Unknown"));
+            }
+            else
+            {
+                g_snprintf(sTmp, (gulong)sizeof(sTmp)-1, " %-s [%d-%s] {%d-%s} PrmCnt(%d)",
+                    MQ_TEXT_CFH,
+                    uTyp, val_to_str_const(uTyp, GET_VALSV(mqcft), "Unknown"),
+                    uCmd, val_to_str_const(uCmd, GET_VALSV(mqcmd), "Unknown"),
+                    uCnt);
+            }
+
+            ti = proto_tree_add_item(tree, proto_mqpcf, tvb, offset, -1, ENC_NA);
+
+            proto_item_append_text(ti, " (%s)", val_to_str(iCommand, GET_VALSV(mqcmd), "Unknown (0x%02x)"));
+            mqroot_tree = proto_item_add_subtree(ti, ett_mqpcf);
+
+            ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSizeMQCFH, "%s", sTmp);
+            mq_tree = proto_item_add_subtree(ti, ett_mqpcf_cfh);
+
+            proto_tree_add_item(mq_tree, hf_mqpcf_cfh_type     , tvb, offset +  0, 4, bLittleEndian);
+            proto_tree_add_item(mq_tree, hf_mqpcf_cfh_length   , tvb, offset +  4, 4, bLittleEndian);
+            proto_tree_add_item(mq_tree, hf_mqpcf_cfh_version  , tvb, offset +  8, 4, bLittleEndian);
+            proto_tree_add_item(mq_tree, hf_mqpcf_cfh_command  , tvb, offset + 12, 4, bLittleEndian);
+            proto_tree_add_item(mq_tree, hf_mqpcf_cfh_MsgSeqNbr, tvb, offset + 16, 4, bLittleEndian);
+            proto_tree_add_item(mq_tree, hf_mqpcf_cfh_control  , tvb, offset + 20, 4, bLittleEndian);
+            proto_tree_add_item(mq_tree, hf_mqpcf_cfh_compcode , tvb, offset + 24, 4, bLittleEndian);
+            proto_tree_add_item(mq_tree, hf_mqpcf_cfh_reason   , tvb, offset + 28, 4, bLittleEndian);
+            proto_tree_add_item(mq_tree, hf_mqpcf_cfh_ParmCount, tvb, offset + 32, 4, bLittleEndian);
+            dissect_mqpcf_parm(tvb, pinfo, mqroot_tree, offset + iSizeMQCFH, uCnt, bLittleEndian, TRUE);
+        }
+    }
 }
 
 static gboolean dissect_mqpcf_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
 {
-	if (tvb_length(tvb) >= 36)
-	{
-		mq_parm_t *p_mq_parm = (mq_parm_t *)data;
-		if (strncmp((const char*)p_mq_parm->mq_format, MQ_MQFMT_ADMIN, 8) == 0
-			|| strncmp((const char*)p_mq_parm->mq_format, MQ_MQFMT_EVENT, 8) == 0
-			|| strncmp((const char*)p_mq_parm->mq_format, MQ_MQFMT_PCF, 8) == 0)
-		{
-			/* Dissect the packet */
-			dissect_mqpcf(tvb, pinfo, tree, p_mq_parm);
-			return TRUE;
-		}
-		if (strncmp((const char *)p_mq_parm->mq_format, "LPOO", 4) == 0)
-		{
-			gboolean bLittleEndian;
-			bLittleEndian = ((p_mq_parm->mq_cur_ccsid.encod & MQ_MQENC_INTEGER_MASK) == MQ_MQENC_INTEGER_REVERSED) ? ENC_LITTLE_ENDIAN:ENC_BIG_ENDIAN;
-			dissect_mqpcf_parm(tvb, pinfo, tree, 0, (guint32)-1, bLittleEndian, FALSE);
-			return TRUE;
-		}
-	}
-	return FALSE;
+    if (tvb_length(tvb) >= 36)
+    {
+        mq_parm_t *p_mq_parm = (mq_parm_t *)data;
+        if (strncmp((const char*)p_mq_parm->mq_format, MQ_MQFMT_ADMIN, 8) == 0
+            || strncmp((const char*)p_mq_parm->mq_format, MQ_MQFMT_EVENT, 8) == 0
+            || strncmp((const char*)p_mq_parm->mq_format, MQ_MQFMT_PCF, 8) == 0)
+        {
+            /* Dissect the packet */
+            dissect_mqpcf(tvb, pinfo, tree, p_mq_parm);
+            return TRUE;
+        }
+        if (strncmp((const char *)p_mq_parm->mq_format, "LPOO", 4) == 0)
+        {
+            gboolean bLittleEndian;
+            bLittleEndian = ((p_mq_parm->mq_cur_ccsid.encod & MQ_MQENC_INTEGER_MASK) == MQ_MQENC_INTEGER_REVERSED) ? ENC_LITTLE_ENDIAN:ENC_BIG_ENDIAN;
+            dissect_mqpcf_parm(tvb, pinfo, tree, 0, (guint32)-1, bLittleEndian, FALSE);
+            return TRUE;
+        }
+    }
+    return FALSE;
 }
 
 void proto_register_mqpcf(void)
 {
-	expert_module_t *expert_mqpcf;
-
-	static hf_register_info hf[] =
-	{
-		{ &hf_mqpcf_cfh_type     , { "Type.....", "mqpcf.cfh.type", FT_UINT32, BASE_DEC, VALS(&GET_VALSV(mqcft)), 0x0, "CFH type", HFILL }},
-		{ &hf_mqpcf_cfh_length   , { "Length...", "mqpcf.cfh.length", FT_UINT32, BASE_DEC, NULL, 0x0, "CFH length", HFILL }},
-		{ &hf_mqpcf_cfh_version  , { "Version..", "mqpcf.cfh.version", FT_UINT32, BASE_DEC, NULL, 0x0, "CFH version", HFILL }},
-		{ &hf_mqpcf_cfh_command  , { "Command..", "mqpcf.cfh.command", FT_UINT32, BASE_DEC, VALS(&GET_VALSV(mqcmd)), 0x0, "CFH command", HFILL }},
-		{ &hf_mqpcf_cfh_MsgSeqNbr, { "MsgSeqNbr", "mqpcf.cfh.MsgSeqNbr", FT_UINT32, BASE_DEC, NULL, 0x0, "CFH message sequence number", HFILL }},
-		{ &hf_mqpcf_cfh_control  , { "Control..", "mqpcf.cfh.control", FT_UINT32, BASE_DEC, NULL, 0x0, "CFH control", HFILL }},
-		{ &hf_mqpcf_cfh_compcode , { "CompCode.", "mqpcf.cfh.compcode", FT_UINT32, BASE_DEC, VALS(&GET_VALSV(mqcc)), 0x0, "CFH completion code", HFILL }},
-		{ &hf_mqpcf_cfh_reason   , { "ReasCode.", "mqpcf.cfh.reasoncode", FT_UINT32, BASE_DEC, VALS(&GET_VALSV(mqrc)), 0x0, "CFH reason code", HFILL }},
-		{ &hf_mqpcf_cfh_ParmCount, { "ParmCount", "mqpcf.cfh.ParmCount", FT_UINT32, BASE_DEC, NULL, 0x0, "CFH parameter count", HFILL }},
-
-		{ &hf_mq_pcf_prmtyp      , { "ParmTyp..", "mqpcf.parm.type", FT_UINT32, BASE_DEC, VALS(&GET_VALSV(PrmTyp)), 0x0, "MQPCF parameter type", HFILL }},
-		{ &hf_mq_pcf_prmlen      , { "ParmLen..", "mqpcf.parm.len", FT_UINT32, BASE_DEC, NULL, 0x0, "MQPCF parameter length", HFILL }},
-		{ &hf_mq_pcf_prmid       , { "ParmID...", "mqpcf.parm.id", FT_UINT32, BASE_DEC, VALS(&GET_VALSV(PrmId)), 0x0, "MQPCF parameter id", HFILL }},
-		{ &hf_mq_pcf_prmidnovals , { "ParmID...", "mqpcf.parm.idNoVals", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "MQPCF parameter id No Vals", HFILL }},
-		{ &hf_mq_pcf_filterop    , { "FilterOP.", "mqpcf.filter.op", FT_UINT32, BASE_DEC, VALS(&GET_VALSV(FilterOP)), 0x0, "MQPCF Filter operator", HFILL }},
-		{ &hf_mq_pcf_prmccsid    , { "ParmCCSID", "mqpcf.parm.ccsid", FT_UINT32, BASE_DEC | BASE_RANGE_STRING, RVALS(&GET_VALRV(ccsid)), 0x0, "MQPCF parameter ccsid", HFILL }},
-		{ &hf_mq_pcf_prmstrlen   , { "ParmStrLn", "mqpcf.parm.strlen", FT_UINT32, BASE_DEC, NULL, 0x0, "MQPCF parameter strlen", HFILL }},
-		{ &hf_mq_pcf_prmcount    , { "ParmCount", "mqpcf.parm.count", FT_UINT32, BASE_DEC, NULL, 0x0, "MQPCF parameter count", HFILL }},
-		{ &hf_mq_pcf_prmunused   , { "ParmUnuse", "mqpcf.parm.unused", FT_UINT32, BASE_DEC, NULL, 0x0, "MQPCF parameter unused", HFILL }},
-		{ &hf_mq_pcf_string      , { "String...", "mqpcf.parm.string", FT_STRINGZ, BASE_NONE, NULL, 0x0, "MQPCF parameter string", HFILL }},
-		{ &hf_mq_pcf_stringlist  , { "StrList..", "mqpcf.parm.stringlist", FT_STRINGZ, BASE_NONE, NULL, 0x0, "MQPCF parameter string list", HFILL }},
-		{ &hf_mq_pcf_int         , { "Integer..", "mqpcf.parm.int", FT_INT32, BASE_DEC, NULL, 0x0, "MQPCF parameter int", HFILL }},
-		{ &hf_mq_pcf_intlist     , { "IntList..", "mqpcf.parm.intlist", FT_INT32, BASE_DEC, NULL, 0x0, "MQPCF parameter int list", HFILL }},
-		{ &hf_mq_pcf_bytestring  , { "ByteStr..", "mqpcf.parm.bytestring", FT_BYTES, BASE_NONE, NULL, 0x0, "MQPCF parameter byte string", HFILL }},
-		{ &hf_mq_pcf_int64       , { "Int64....", "mqpcf.parm.int64", FT_INT64, BASE_DEC, NULL, 0x0, "MQPCF parameter int64", HFILL }},
-		{ &hf_mq_pcf_int64list   , { "Int64List", "mqpcf.parm.int64list", FT_INT64, BASE_DEC, NULL, 0x0, "MQPCF parameter int64 list", HFILL }},
-	};
-	static gint *ett[] =
-	{
-		&ett_mqpcf,
-		&ett_mqpcf_prm,
-		&ett_mqpcf_cfh,
-	};
-	static ei_register_info ei[] =
-	{
-		{ &ei_mq_pcf_prmln0, { "mqpcf.parm.len0",      PI_MALFORMED, PI_ERROR, "MQPCF Parameter length is 0", EXPFILL }},
-		{ &ei_mq_pcf_MaxInt, { "mqpcf.parm.IntList",   PI_UNDECODED, PI_WARN,  "MQPCF Parameter Integer list exhausted", EXPFILL }},
-		{ &ei_mq_pcf_MaxStr, { "mqpcf.parm.StrList",   PI_UNDECODED, PI_WARN,  "MQPCF Parameter String list exhausted", EXPFILL }},
-		{ &ei_mq_pcf_MaxI64, { "mqpcf.parm.Int64List", PI_UNDECODED, PI_WARN,  "MQPCF Parameter Int64 list exhausted", EXPFILL }},
-		{ &ei_mq_pcf_MaxPrm, { "mqpcf.parm.MaxPrm",    PI_UNDECODED, PI_WARN,  "MQPCF Max number of parameter exhausted", EXPFILL }},
-		{ &ei_mq_pcf_PrmCnt, { "mqpcf.parm.PrmCnt",    PI_UNDECODED, PI_WARN,  "MQPCF Unkn Parm Cnt Length invalid", EXPFILL }},
-	};
-
-	module_t *mq_pcf_module;
-
-	proto_mqpcf = proto_register_protocol("WebSphere MQ Programmable Command Formats", "MQ PCF", "mqpcf");
-	proto_register_field_array(proto_mqpcf, hf, array_length(hf));
-	proto_register_subtree_array(ett, array_length(ett));
-
-	expert_mqpcf = expert_register_protocol(proto_mqpcf);
-	expert_register_field_array(expert_mqpcf, ei, array_length(ei));
-
-	mq_pcf_module = prefs_register_protocol(proto_mqpcf, NULL);
-	prefs_register_uint_preference(mq_pcf_module, "maxprm",
-		"Set the maximun number of parameter in the PCF to decode",
-		"When dissecting PCF there can be a lot of parameters."
-		" You can limit the number of parameter decoded, before it continue with the next PCF.",
-		10, &mq_pcf_maxprm);
-	prefs_register_uint_preference(mq_pcf_module, "maxlst",
-		"Set the maximun number of Parameter List that are displayed",
-		"When dissecting a parameter of a PCFm, if it is a StringList, IntegerList or Integer64 List, "
-		" You can limit the number of element displayed, before it continue with the next Parameter.",
-		10, &mq_pcf_maxlst);
+    expert_module_t *expert_mqpcf;
+
+    static hf_register_info hf[] = {
+        { &hf_mqpcf_cfh_type     ,
+          { "Type.....", "mqpcf.cfh.type",
+            FT_UINT32, BASE_DEC, VALS(&GET_VALSV(mqcft)), 0x0,
+            "CFH type", HFILL }
+        },
+        { &hf_mqpcf_cfh_length   ,
+          { "Length...", "mqpcf.cfh.length",
+            FT_UINT32, BASE_DEC, NULL, 0x0,
+            "CFH length", HFILL }
+        },
+        { &hf_mqpcf_cfh_version  ,
+          { "Version..", "mqpcf.cfh.version",
+            FT_UINT32, BASE_DEC, NULL, 0x0,
+            "CFH version", HFILL }
+        },
+        { &hf_mqpcf_cfh_command  ,
+          { "Command..", "mqpcf.cfh.command",
+            FT_UINT32, BASE_DEC, VALS(&GET_VALSV(mqcmd)), 0x0,
+            "CFH command", HFILL }
+        },
+        { &hf_mqpcf_cfh_MsgSeqNbr,
+          { "MsgSeqNbr", "mqpcf.cfh.MsgSeqNbr",
+            FT_UINT32, BASE_DEC, NULL, 0x0,
+            "CFH message sequence number", HFILL }
+        },
+        { &hf_mqpcf_cfh_control  ,
+          { "Control..", "mqpcf.cfh.control",
+            FT_UINT32, BASE_DEC, NULL, 0x0,
+            "CFH control", HFILL }
+        },
+        { &hf_mqpcf_cfh_compcode ,
+          { "CompCode.", "mqpcf.cfh.compcode",
+            FT_UINT32, BASE_DEC, VALS(&GET_VALSV(mqcc)), 0x0,
+            "CFH completion code", HFILL }
+        },
+        { &hf_mqpcf_cfh_reason   ,
+          { "ReasCode.", "mqpcf.cfh.reasoncode",
+            FT_UINT32, BASE_DEC, VALS(&GET_VALSV(mqrc)), 0x0,
+            "CFH reason code", HFILL }
+        },
+        { &hf_mqpcf_cfh_ParmCount,
+          { "ParmCount", "mqpcf.cfh.ParmCount",
+            FT_UINT32, BASE_DEC, NULL, 0x0,
+            "CFH parameter count", HFILL }
+        },
+
+        { &hf_mq_pcf_prmtyp      ,
+          { "ParmTyp..", "mqpcf.parm.type",
+            FT_UINT32, BASE_DEC, VALS(&GET_VALSV(PrmTyp)), 0x0,
+            "MQPCF parameter type", HFILL }
+        },
+        { &hf_mq_pcf_prmlen      ,
+          { "ParmLen..", "mqpcf.parm.len",
+            FT_UINT32, BASE_DEC, NULL, 0x0,
+            "MQPCF parameter length", HFILL }
+        },
+        { &hf_mq_pcf_prmid       ,
+          { "ParmID...", "mqpcf.parm.id",
+            FT_UINT32, BASE_DEC, VALS(&GET_VALSV(PrmId)), 0x0,
+            "MQPCF parameter id", HFILL }
+        },
+        { &hf_mq_pcf_prmidnovals ,
+          { "ParmID...", "mqpcf.parm.idNoVals",
+            FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+            "MQPCF parameter id No Vals", HFILL }
+        },
+        { &hf_mq_pcf_filterop    ,
+          { "FilterOP.", "mqpcf.filter.op",
+            FT_UINT32, BASE_DEC, VALS(&GET_VALSV(FilterOP)), 0x0,
+            "MQPCF Filter operator", HFILL }
+        },
+        { &hf_mq_pcf_prmccsid    ,
+          { "ParmCCSID", "mqpcf.parm.ccsid",
+            FT_UINT32, BASE_DEC | BASE_RANGE_STRING, RVALS(&GET_VALRV(ccsid)), 0x0,
+            "MQPCF parameter ccsid", HFILL }
+        },
+        { &hf_mq_pcf_prmstrlen   ,
+          { "ParmStrLn", "mqpcf.parm.strlen",
+            FT_UINT32, BASE_DEC, NULL, 0x0,
+            "MQPCF parameter strlen", HFILL }
+        },
+        { &hf_mq_pcf_prmcount    ,
+          { "ParmCount", "mqpcf.parm.count",
+            FT_UINT32, BASE_DEC, NULL, 0x0,
+            "MQPCF parameter count", HFILL }
+        },
+        { &hf_mq_pcf_prmunused   ,
+          { "ParmUnuse", "mqpcf.parm.unused",
+            FT_UINT32, BASE_DEC, NULL, 0x0,
+            "MQPCF parameter unused", HFILL }
+        },
+        { &hf_mq_pcf_string      ,
+          { "String...", "mqpcf.parm.string",
+            FT_STRINGZ, BASE_NONE, NULL, 0x0,
+            "MQPCF parameter string", HFILL }
+        },
+        { &hf_mq_pcf_stringlist  ,
+          { "StrList..", "mqpcf.parm.stringlist",
+            FT_STRINGZ, BASE_NONE, NULL, 0x0,
+            "MQPCF parameter string list", HFILL }
+        },
+        { &hf_mq_pcf_int         ,
+          { "Integer..", "mqpcf.parm.int",
+            FT_INT32, BASE_DEC, NULL, 0x0,
+            "MQPCF parameter int", HFILL }
+        },
+        { &hf_mq_pcf_intlist     ,
+          { "IntList..", "mqpcf.parm.intlist",
+            FT_INT32, BASE_DEC, NULL, 0x0,
+            "MQPCF parameter int list", HFILL }
+        },
+        { &hf_mq_pcf_bytestring  ,
+          { "ByteStr..", "mqpcf.parm.bytestring",
+            FT_BYTES, BASE_NONE, NULL, 0x0,
+            "MQPCF parameter byte string", HFILL }
+        },
+        { &hf_mq_pcf_int64       ,
+          { "Int64....", "mqpcf.parm.int64",
+            FT_INT64, BASE_DEC, NULL, 0x0,
+            "MQPCF parameter int64", HFILL }
+        },
+        { &hf_mq_pcf_int64list   ,
+          { "Int64List", "mqpcf.parm.int64list",
+            FT_INT64, BASE_DEC, NULL, 0x0,
+            "MQPCF parameter int64 list", HFILL }
+        },
+    };
+    static gint *ett[] =
+        {
+            &ett_mqpcf,
+            &ett_mqpcf_prm,
+            &ett_mqpcf_cfh,
+        };
+    static ei_register_info ei[] =
+        {
+            { &ei_mq_pcf_prmln0, { "mqpcf.parm.len0",      PI_MALFORMED, PI_ERROR, "MQPCF Parameter length is 0", EXPFILL }},
+            { &ei_mq_pcf_MaxInt, { "mqpcf.parm.IntList",   PI_UNDECODED, PI_WARN,  "MQPCF Parameter Integer list exhausted", EXPFILL }},
+            { &ei_mq_pcf_MaxStr, { "mqpcf.parm.StrList",   PI_UNDECODED, PI_WARN,  "MQPCF Parameter String list exhausted", EXPFILL }},
+            { &ei_mq_pcf_MaxI64, { "mqpcf.parm.Int64List", PI_UNDECODED, PI_WARN,  "MQPCF Parameter Int64 list exhausted", EXPFILL }},
+            { &ei_mq_pcf_MaxPrm, { "mqpcf.parm.MaxPrm",    PI_UNDECODED, PI_WARN,  "MQPCF Max number of parameter exhausted", EXPFILL }},
+            { &ei_mq_pcf_PrmCnt, { "mqpcf.parm.PrmCnt",    PI_UNDECODED, PI_WARN,  "MQPCF Unkn Parm Cnt Length invalid", EXPFILL }},
+        };
+
+    module_t *mq_pcf_module;
+
+    proto_mqpcf = proto_register_protocol("WebSphere MQ Programmable Command Formats", "MQ PCF", "mqpcf");
+    proto_register_field_array(proto_mqpcf, hf, array_length(hf));
+    proto_register_subtree_array(ett, array_length(ett));
+
+    expert_mqpcf = expert_register_protocol(proto_mqpcf);
+    expert_register_field_array(expert_mqpcf, ei, array_length(ei));
+
+    mq_pcf_module = prefs_register_protocol(proto_mqpcf, NULL);
+    prefs_register_uint_preference(mq_pcf_module, "maxprm",
+                                   "Set the maximun number of parameter in the PCF to decode",
+                                   "When dissecting PCF there can be a lot of parameters."
+                                   " You can limit the number of parameter decoded, before it continue with the next PCF.",
+                                   10, &mq_pcf_maxprm);
+    prefs_register_uint_preference(mq_pcf_module, "maxlst",
+                                   "Set the maximun number of Parameter List that are displayed",
+                                   "When dissecting a parameter of a PCFm, if it is a StringList, IntegerList or Integer64 List, "
+                                   " You can limit the number of element displayed, before it continue with the next Parameter.",
+                                   10, &mq_pcf_maxlst);
 
 }
 
 void proto_reg_handoff_mqpcf(void)
 {
-	heur_dissector_add("mq", dissect_mqpcf_heur, proto_mqpcf);
+    heur_dissector_add("mq", dissect_mqpcf_heur, proto_mqpcf);
 }
 
 /*
@@ -726,10 +825,10 @@ void proto_reg_handoff_mqpcf(void)
  *
  * Local variables:
  * c-basic-offset: 4
- * tab-width: 4
- * indent-tabs-mode: t
+ * tab-width: 8
+ * indent-tabs-mode: nil
  * End:
  *
- * vi: set shiftwidth=4 tabstop=4 noexpandtab:
- * :indentSize=4:tabSize=4:noTabs=false:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c
index fc2d185f5e..3fc1917628 100644
--- a/epan/dissectors/packet-mq.c
+++ b/epan/dissectors/packet-mq.c
@@ -116,15 +116,15 @@ static int hf_mq_tsh_tcf_reqacc = -1;
 static int hf_mq_tsh_tcf_dlq = -1;
 static const int *pf_flds_tcf[] =
 {
-	&hf_mq_tsh_tcf_dlq       ,
-	&hf_mq_tsh_tcf_reqacc    ,
-	&hf_mq_tsh_tcf_last      ,
-	&hf_mq_tsh_tcf_first     ,
-	&hf_mq_tsh_tcf_closechann,
-	&hf_mq_tsh_tcf_reqclose  ,
-	&hf_mq_tsh_tcf_error     ,
-	&hf_mq_tsh_tcf_confirmreq,
-	NULL
+    &hf_mq_tsh_tcf_dlq       ,
+    &hf_mq_tsh_tcf_reqacc    ,
+    &hf_mq_tsh_tcf_last      ,
+    &hf_mq_tsh_tcf_first     ,
+    &hf_mq_tsh_tcf_closechann,
+    &hf_mq_tsh_tcf_reqclose  ,
+    &hf_mq_tsh_tcf_error     ,
+    &hf_mq_tsh_tcf_confirmreq,
+    NULL
 };
 
 /* Transmission Segment Control Flags 2 */
@@ -134,11 +134,11 @@ static int hf_mq_tsh_tcf2_CSH      = -1;
 static int hf_mq_tsh_tcf2_CmitIntv = -1;
 static const int *pf_flds_tcf2[] =
 {
-	&hf_mq_tsh_tcf2_CmitIntv,
-	&hf_mq_tsh_tcf2_CSH     ,
-	&hf_mq_tsh_tcf2_MsgComp ,
-	&hf_mq_tsh_tcf2_HdrComp ,
-	NULL
+    &hf_mq_tsh_tcf2_CmitIntv,
+    &hf_mq_tsh_tcf2_CSH     ,
+    &hf_mq_tsh_tcf2_MsgComp ,
+    &hf_mq_tsh_tcf2_HdrComp ,
+    NULL
 };
 
 static int hf_mq_api_replylen = -1;
@@ -204,15 +204,15 @@ static int hf_mq_id_icf1_svrsec = -1;
 static int hf_mq_id_icf1_runtime = -1;
 static const int *pf_flds_icf1[] =
 {
-	&hf_mq_id_icf1_runtime ,
-	&hf_mq_id_icf1_svrsec  ,
-	&hf_mq_id_icf1_mqreq   ,
-	&hf_mq_id_icf1_RqstSecu,
-	&hf_mq_id_icf1_RqstInit,
-	&hf_mq_id_icf1_splitmsg,
-	&hf_mq_id_icf1_convcap ,
-	&hf_mq_id_icf1_msgseq  ,
-	NULL
+    &hf_mq_id_icf1_runtime ,
+    &hf_mq_id_icf1_svrsec  ,
+    &hf_mq_id_icf1_mqreq   ,
+    &hf_mq_id_icf1_RqstSecu,
+    &hf_mq_id_icf1_RqstInit,
+    &hf_mq_id_icf1_splitmsg,
+    &hf_mq_id_icf1_convcap ,
+    &hf_mq_id_icf1_msgseq  ,
+    NULL
 };
 
 /* Initial Data Error Flag 1 */
@@ -226,15 +226,15 @@ static int hf_mq_id_ief1_seqwrap = -1;
 static int hf_mq_id_ief1_hbint = -1;
 static const int *pf_flds_ief1[] =
 {
-	&hf_mq_id_ief1_hbint  ,
-	&hf_mq_id_ief1_seqwrap,
-	&hf_mq_id_ief1_mxmsgpb,
-	&hf_mq_id_ief1_mxmsgsz,
-	&hf_mq_id_ief1_fap    ,
-	&hf_mq_id_ief1_mxtrsz ,
-	&hf_mq_id_ief1_enc    ,
-	&hf_mq_id_ief1_ccsid  ,
-	NULL
+    &hf_mq_id_ief1_hbint  ,
+    &hf_mq_id_ief1_seqwrap,
+    &hf_mq_id_ief1_mxmsgpb,
+    &hf_mq_id_ief1_mxmsgsz,
+    &hf_mq_id_ief1_fap    ,
+    &hf_mq_id_ief1_mxtrsz ,
+    &hf_mq_id_ief1_enc    ,
+    &hf_mq_id_ief1_ccsid  ,
+    NULL
 };
 
 /* Initial Data Capability Flag 2 */
@@ -248,15 +248,15 @@ static int hf_mq_id_icf2_DualUOW   = -1;
 static int hf_mq_id_icf2_CanTrcRte = -1;
 static const int *pf_flds_icf2[] =
 {
-	&hf_mq_id_icf2_CanTrcRte,
-	&hf_mq_id_icf2_SPIRqst  ,
-	&hf_mq_id_icf2_XARunTApp,
-	&hf_mq_id_icf2_XARequest,
-	&hf_mq_id_icf2_DualUOW  ,
-	&hf_mq_id_icf2_RespConv ,
-	&hf_mq_id_icf2_FstMsgReq,
-	&hf_mq_id_icf2_CanDstLst,
-	NULL
+    &hf_mq_id_icf2_CanTrcRte,
+    &hf_mq_id_icf2_SPIRqst  ,
+    &hf_mq_id_icf2_XARunTApp,
+    &hf_mq_id_icf2_XARequest,
+    &hf_mq_id_icf2_DualUOW  ,
+    &hf_mq_id_icf2_RespConv ,
+    &hf_mq_id_icf2_FstMsgReq,
+    &hf_mq_id_icf2_CanDstLst,
+    NULL
 };
 
 /* Initial Data Error Flag 2 */
@@ -265,10 +265,10 @@ static int hf_mq_id_ief2_MsgCmpLst = -1;
 static int hf_mq_id_ief2_SSLReset  = -1;
 static const int *pf_flds_ief2[] =
 {
-	&hf_mq_id_ief2_HdrCmpLst,
-	&hf_mq_id_ief2_MsgCmpLst,
-	&hf_mq_id_ief2_SSLReset ,
-	NULL
+    &hf_mq_id_ief2_HdrCmpLst,
+    &hf_mq_id_ief2_MsgCmpLst,
+    &hf_mq_id_ief2_SSLReset ,
+    NULL
 };
 
 /* Initial Data Capability Flag 3 */
@@ -276,9 +276,9 @@ static int hf_mq_id_icf3_CanMsgPrp = -1;
 static int hf_mq_id_icf3_Unknown02 = -1;
 static const int *pf_flds_icf3[] =
 {
-	&hf_mq_id_icf3_Unknown02,
-	&hf_mq_id_icf3_CanMsgPrp,
-	NULL
+    &hf_mq_id_icf3_Unknown02,
+    &hf_mq_id_icf3_CanMsgPrp,
+    NULL
 };
 
 static int hf_mq_uid_StructID = -1;
@@ -336,10 +336,10 @@ static int hf_mq_spi_opt_syncp = -1;
 static int hf_mq_spi_opt_deferred = -1;
 static const int *pf_flds_spiopt[] =
 {
-	&hf_mq_spi_opt_deferred,
-	&hf_mq_spi_opt_syncp,
-	&hf_mq_spi_opt_blank,
-	NULL
+    &hf_mq_spi_opt_deferred,
+    &hf_mq_spi_opt_syncp,
+    &hf_mq_spi_opt_blank,
+    NULL
 };
 
 static int hf_mq_put_length = -1;
@@ -352,12 +352,12 @@ static int hf_mq_close_options_REMOVE_SUB             = -1;
 static int hf_mq_close_options_QUIESCE                = -1;
 static const int *pf_flds_clsopt[] =
 {
-	&hf_mq_close_options_QUIESCE     ,
-	&hf_mq_close_options_REMOVE_SUB  ,
-	&hf_mq_close_options_KEEP_SUB    ,
-	&hf_mq_close_options_DELETE_PURGE,
-	&hf_mq_close_options_DELETE      ,
-	NULL
+    &hf_mq_close_options_QUIESCE     ,
+    &hf_mq_close_options_REMOVE_SUB  ,
+    &hf_mq_close_options_KEEP_SUB    ,
+    &hf_mq_close_options_DELETE_PURGE,
+    &hf_mq_close_options_DELETE      ,
+    NULL
 };
 
 static int hf_mq_open_options = -1;
@@ -386,30 +386,30 @@ static int hf_mq_open_options_NO_MULTICAST = -1;
 static int hf_mq_open_options_BIND_ON_GROUP = -1;
 static const int *pf_flds_opnopt[] =
 {
-	&hf_mq_open_options_BIND_ON_GROUP  ,
-	&hf_mq_open_options_NO_MULTICAST   ,
-	&hf_mq_open_options_READ_AHEAD     ,
-	&hf_mq_open_options_NO_READ_AHEAD  ,
-	&hf_mq_open_options_RESOLVE_LOCAL_Q,
-	&hf_mq_open_options_CO_OP          ,
-	&hf_mq_open_options_RESOLVE_NAMES  ,
-	&hf_mq_open_options_BIND_NOT_FIXED ,
-	&hf_mq_open_options_BIND_ON_OPEN   ,
-	&hf_mq_open_options_FAIL_IF_QUIESC ,
-	&hf_mq_open_options_ALT_USER_AUTH  ,
-	&hf_mq_open_options_SET_ALL_CONTEXT,
-	&hf_mq_open_options_SET_IDENT_CTX  ,
-	&hf_mq_open_options_PASS_ALL_CTX   ,
-	&hf_mq_open_options_PASS_IDENT_CTX ,
-	&hf_mq_open_options_SAVE_ALL_CTX   ,
-	&hf_mq_open_options_SET            ,
-	&hf_mq_open_options_INQUIRE        ,
-	&hf_mq_open_options_OUTPUT         ,
-	&hf_mq_open_options_BROWSE         ,
-	&hf_mq_open_options_INPUT_EXCLUSIVE,
-	&hf_mq_open_options_INPUT_SHARED   ,
-	&hf_mq_open_options_INPUT_AS_Q_DEF ,
-	NULL
+    &hf_mq_open_options_BIND_ON_GROUP  ,
+    &hf_mq_open_options_NO_MULTICAST   ,
+    &hf_mq_open_options_READ_AHEAD     ,
+    &hf_mq_open_options_NO_READ_AHEAD  ,
+    &hf_mq_open_options_RESOLVE_LOCAL_Q,
+    &hf_mq_open_options_CO_OP          ,
+    &hf_mq_open_options_RESOLVE_NAMES  ,
+    &hf_mq_open_options_BIND_NOT_FIXED ,
+    &hf_mq_open_options_BIND_ON_OPEN   ,
+    &hf_mq_open_options_FAIL_IF_QUIESC ,
+    &hf_mq_open_options_ALT_USER_AUTH  ,
+    &hf_mq_open_options_SET_ALL_CONTEXT,
+    &hf_mq_open_options_SET_IDENT_CTX  ,
+    &hf_mq_open_options_PASS_ALL_CTX   ,
+    &hf_mq_open_options_PASS_IDENT_CTX ,
+    &hf_mq_open_options_SAVE_ALL_CTX   ,
+    &hf_mq_open_options_SET            ,
+    &hf_mq_open_options_INQUIRE        ,
+    &hf_mq_open_options_OUTPUT         ,
+    &hf_mq_open_options_BROWSE         ,
+    &hf_mq_open_options_INPUT_EXCLUSIVE,
+    &hf_mq_open_options_INPUT_SHARED   ,
+    &hf_mq_open_options_INPUT_AS_Q_DEF ,
+    NULL
 };
 
 static int hf_mq_fopa_StructID = -1;
@@ -558,35 +558,35 @@ static int hf_mq_gmo_options_SYNCPOINT = -1;
 static int hf_mq_gmo_options_WAIT = -1;
 static const int *pf_flds_gmoopt[] =
 {
-	&hf_mq_gmo_options_PROPERTIES_COMPATIBILITY,
-	&hf_mq_gmo_options_PROPERTIES_IN_HANDLE    ,
-	&hf_mq_gmo_options_NO_PROPERTIES           ,
-	&hf_mq_gmo_options_PROPERTIES_FORCE_MQRFH2 ,
-	&hf_mq_gmo_options_UNMARKED_BROWSE_MSG     ,
-	&hf_mq_gmo_options_UNMARK_BROWSE_HANDLE    ,
-	&hf_mq_gmo_options_UNMARK_BROWSE_CO_OP     ,
-	&hf_mq_gmo_options_MARK_BROWSE_CO_OP       ,
-	&hf_mq_gmo_options_MARK_BROWSE_HANDLE      ,
-	&hf_mq_gmo_options_ALL_SEGMENTS_AVAILABLE  ,
-	&hf_mq_gmo_options_ALL_MSGS_AVAILABLE      ,
-	&hf_mq_gmo_options_COMPLETE_MSG            ,
-	&hf_mq_gmo_options_LOGICAL_ORDER           ,
-	&hf_mq_gmo_options_CONVERT                 ,
-	&hf_mq_gmo_options_FAIL_IF_QUIESCING       ,
-	&hf_mq_gmo_options_SYNCPOINT_IF_PERSISTENT ,
-	&hf_mq_gmo_options_BROWSE_MSG_UNDER_CURSOR ,
-	&hf_mq_gmo_options_UNLOCK                  ,
-	&hf_mq_gmo_options_LOCK                    ,
-	&hf_mq_gmo_options_MSG_UNDER_CURSOR        ,
-	&hf_mq_gmo_options_MARK_SKIP_BACKOUT       ,
-	&hf_mq_gmo_options_ACCEPT_TRUNCATED_MSG    ,
-	&hf_mq_gmo_options_BROWSE_NEXT             ,
-	&hf_mq_gmo_options_BROWSE_FIRST            ,
-	&hf_mq_gmo_options_SET_SIGNAL              ,
-	&hf_mq_gmo_options_NO_SYNCPOINT            ,
-	&hf_mq_gmo_options_SYNCPOINT               ,
-	&hf_mq_gmo_options_WAIT                    ,
-	NULL
+    &hf_mq_gmo_options_PROPERTIES_COMPATIBILITY,
+    &hf_mq_gmo_options_PROPERTIES_IN_HANDLE    ,
+    &hf_mq_gmo_options_NO_PROPERTIES           ,
+    &hf_mq_gmo_options_PROPERTIES_FORCE_MQRFH2 ,
+    &hf_mq_gmo_options_UNMARKED_BROWSE_MSG     ,
+    &hf_mq_gmo_options_UNMARK_BROWSE_HANDLE    ,
+    &hf_mq_gmo_options_UNMARK_BROWSE_CO_OP     ,
+    &hf_mq_gmo_options_MARK_BROWSE_CO_OP       ,
+    &hf_mq_gmo_options_MARK_BROWSE_HANDLE      ,
+    &hf_mq_gmo_options_ALL_SEGMENTS_AVAILABLE  ,
+    &hf_mq_gmo_options_ALL_MSGS_AVAILABLE      ,
+    &hf_mq_gmo_options_COMPLETE_MSG            ,
+    &hf_mq_gmo_options_LOGICAL_ORDER           ,
+    &hf_mq_gmo_options_CONVERT                 ,
+    &hf_mq_gmo_options_FAIL_IF_QUIESCING       ,
+    &hf_mq_gmo_options_SYNCPOINT_IF_PERSISTENT ,
+    &hf_mq_gmo_options_BROWSE_MSG_UNDER_CURSOR ,
+    &hf_mq_gmo_options_UNLOCK                  ,
+    &hf_mq_gmo_options_LOCK                    ,
+    &hf_mq_gmo_options_MSG_UNDER_CURSOR        ,
+    &hf_mq_gmo_options_MARK_SKIP_BACKOUT       ,
+    &hf_mq_gmo_options_ACCEPT_TRUNCATED_MSG    ,
+    &hf_mq_gmo_options_BROWSE_NEXT             ,
+    &hf_mq_gmo_options_BROWSE_FIRST            ,
+    &hf_mq_gmo_options_SET_SIGNAL              ,
+    &hf_mq_gmo_options_NO_SYNCPOINT            ,
+    &hf_mq_gmo_options_SYNCPOINT               ,
+    &hf_mq_gmo_options_WAIT                    ,
+    NULL
 };
 
 static int hf_mq_gmo_matchoptions_MATCH_MSG_TOKEN = -1;
@@ -597,13 +597,13 @@ static int hf_mq_gmo_matchoptions_MATCH_CORREL_ID = -1;
 static int hf_mq_gmo_matchoptions_MATCH_MSG_ID = -1;
 static const int *pf_flds_mtchopt[] =
 {
-	&hf_mq_gmo_matchoptions_MATCH_MSG_TOKEN     ,
-	&hf_mq_gmo_matchoptions_MATCH_OFFSET        ,
-	&hf_mq_gmo_matchoptions_MATCH_MSG_SEQ_NUMBER,
-	&hf_mq_gmo_matchoptions_MATCH_GROUP_ID      ,
-	&hf_mq_gmo_matchoptions_MATCH_CORREL_ID     ,
-	&hf_mq_gmo_matchoptions_MATCH_MSG_ID        ,
-	NULL
+    &hf_mq_gmo_matchoptions_MATCH_MSG_TOKEN     ,
+    &hf_mq_gmo_matchoptions_MATCH_OFFSET        ,
+    &hf_mq_gmo_matchoptions_MATCH_MSG_SEQ_NUMBER,
+    &hf_mq_gmo_matchoptions_MATCH_GROUP_ID      ,
+    &hf_mq_gmo_matchoptions_MATCH_CORREL_ID     ,
+    &hf_mq_gmo_matchoptions_MATCH_MSG_ID        ,
+    NULL
 };
 
 static int hf_mq_lpoo_StructID = -1;
@@ -623,10 +623,10 @@ static int hf_mq_lpoo_lpiopts_SAVE_ORIGIN_CTXT = -1 ;
 static int hf_mq_lpoo_lpiopts_SAVE_USER_CTXT = -1;
 static const int *pf_flds_lpooopt[] =
 {
-	&hf_mq_lpoo_lpiopts_SAVE_IDENTITY_CTXT,
-	&hf_mq_lpoo_lpiopts_SAVE_ORIGIN_CTXT,
-	&hf_mq_lpoo_lpiopts_SAVE_USER_CTXT,
-	NULL
+    &hf_mq_lpoo_lpiopts_SAVE_IDENTITY_CTXT,
+    &hf_mq_lpoo_lpiopts_SAVE_ORIGIN_CTXT,
+    &hf_mq_lpoo_lpiopts_SAVE_USER_CTXT,
+    NULL
 };
 
 
@@ -698,29 +698,29 @@ static int hf_mq_pmo_options_NO_SYNCPOINT = -1;
 static int hf_mq_pmo_options_SYNCPOINT = -1;
 static const int *pf_flds_pmoopt[] =
 {
-	&hf_mq_pmo_options_NOT_OWN_SUBS            ,
-	&hf_mq_pmo_options_SUPPRESS_REPLYTO        ,
-	&hf_mq_pmo_options_SCOPE_QMGR              ,
-	&hf_mq_pmo_options_MD_FOR_OUTPUT_ONLY      ,
-	&hf_mq_pmo_options_RETAIN                  ,
-	&hf_mq_pmo_options_WARN_IF_NO_SUBS_MATCHED ,
-	&hf_mq_pmo_options_RESOLVE_LOCAL_Q         ,
-	&hf_mq_pmo_options_SYNC_RESPONSE           ,
-	&hf_mq_pmo_options_ASYNC_RESPONSE          ,
-	&hf_mq_pmo_options_LOGICAL_ORDER           ,
-	&hf_mq_pmo_options_NO_CONTEXT              ,
-	&hf_mq_pmo_options_FAIL_IF_QUIESCING       ,
-	&hf_mq_pmo_options_ALTERNATE_USER_AUTHORITY,
-	&hf_mq_pmo_options_SET_ALL_CONTEXT         ,
-	&hf_mq_pmo_options_SET_IDENTITY_CONTEXT    ,
-	&hf_mq_pmo_options_PASS_ALL_CONTEXT        ,
-	&hf_mq_pmo_options_PASS_IDENTITY_CONTEXT   ,
-	&hf_mq_pmo_options_NEW_CORREL_ID           ,
-	&hf_mq_pmo_options_NEW_MSG_ID              ,
-	&hf_mq_pmo_options_DEFAULT_CONTEXT         ,
-	&hf_mq_pmo_options_NO_SYNCPOINT            ,
-	&hf_mq_pmo_options_SYNCPOINT               ,
-	NULL
+    &hf_mq_pmo_options_NOT_OWN_SUBS            ,
+    &hf_mq_pmo_options_SUPPRESS_REPLYTO        ,
+    &hf_mq_pmo_options_SCOPE_QMGR              ,
+    &hf_mq_pmo_options_MD_FOR_OUTPUT_ONLY      ,
+    &hf_mq_pmo_options_RETAIN                  ,
+    &hf_mq_pmo_options_WARN_IF_NO_SUBS_MATCHED ,
+    &hf_mq_pmo_options_RESOLVE_LOCAL_Q         ,
+    &hf_mq_pmo_options_SYNC_RESPONSE           ,
+    &hf_mq_pmo_options_ASYNC_RESPONSE          ,
+    &hf_mq_pmo_options_LOGICAL_ORDER           ,
+    &hf_mq_pmo_options_NO_CONTEXT              ,
+    &hf_mq_pmo_options_FAIL_IF_QUIESCING       ,
+    &hf_mq_pmo_options_ALTERNATE_USER_AUTHORITY,
+    &hf_mq_pmo_options_SET_ALL_CONTEXT         ,
+    &hf_mq_pmo_options_SET_IDENTITY_CONTEXT    ,
+    &hf_mq_pmo_options_PASS_ALL_CONTEXT        ,
+    &hf_mq_pmo_options_PASS_IDENTITY_CONTEXT   ,
+    &hf_mq_pmo_options_NEW_CORREL_ID           ,
+    &hf_mq_pmo_options_NEW_MSG_ID              ,
+    &hf_mq_pmo_options_DEFAULT_CONTEXT         ,
+    &hf_mq_pmo_options_NO_SYNCPOINT            ,
+    &hf_mq_pmo_options_SYNCPOINT               ,
+    NULL
 };
 
 static int hf_mq_xa_tmflags_join = -1;
@@ -733,15 +733,15 @@ static int hf_mq_xa_tmflags_fail = -1;
 static int hf_mq_xa_tmflags_onephase = -1;
 static const int *pf_flds_tmflags[] =
 {
-	&hf_mq_xa_tmflags_onephase  ,
-	&hf_mq_xa_tmflags_fail      ,
-	&hf_mq_xa_tmflags_resume    ,
-	&hf_mq_xa_tmflags_success   ,
-	&hf_mq_xa_tmflags_suspend   ,
-	&hf_mq_xa_tmflags_startrscan,
-	&hf_mq_xa_tmflags_endrscan  ,
-	&hf_mq_xa_tmflags_join      ,
-	NULL
+    &hf_mq_xa_tmflags_onephase  ,
+    &hf_mq_xa_tmflags_fail      ,
+    &hf_mq_xa_tmflags_resume    ,
+    &hf_mq_xa_tmflags_success   ,
+    &hf_mq_xa_tmflags_suspend   ,
+    &hf_mq_xa_tmflags_startrscan,
+    &hf_mq_xa_tmflags_endrscan  ,
+    &hf_mq_xa_tmflags_join      ,
+    NULL
 };
 
 static int hf_mq_msgreq_version = -1;
@@ -1193,29 +1193,29 @@ static reassembly_table mq_reassembly_table;
 
 /* MQ structures */
 /* Undocumented structures */
-#define MQ_TEXT_TSH						"Transmission Segment Header"
-#define MQ_TEXT_TSHC					"Transmission Segment Header Common"
-#define MQ_TEXT_TSHM					"Transmission Segment Header Multiplexed"
-#define MQ_TEXT_FCNO					"F Connect Option"
-#define MQ_TEXT_API						"API Header"
-#define MQ_TEXT_SOCKET					"Socket Action"
-#define MQ_TEXT_ID						"Initial Data"
-#define MQ_TEXT_UID						"User Id Data"
-#define MQ_TEXT_MSH						"Message Segment Header"
-#define MQ_TEXT_CAUT					"Connection Authority"
-#define MQ_TEXT_CONN					"MQCONN"
-#define MQ_TEXT_INQ						"MQINQ/MQSET"
-#define MQ_TEXT_PUT						"MQPUT/MQGET"
-#define MQ_TEXT_OPEN					"MQOPEN/MQCLOSE"
-#define MQ_TEXT_REQMSG					"REQUEST MESSAGE"
-#define MQ_TEXT_ASYMSG					"ASYNC MESSAGE"
-#define MQ_TEXT_NOTIFICATION			"NOTIFICATION"
+#define MQ_TEXT_TSH                     "Transmission Segment Header"
+#define MQ_TEXT_TSHC                    "Transmission Segment Header Common"
+#define MQ_TEXT_TSHM                    "Transmission Segment Header Multiplexed"
+#define MQ_TEXT_FCNO                    "F Connect Option"
+#define MQ_TEXT_API                     "API Header"
+#define MQ_TEXT_SOCKET                  "Socket Action"
+#define MQ_TEXT_ID                      "Initial Data"
+#define MQ_TEXT_UID                     "User Id Data"
+#define MQ_TEXT_MSH                     "Message Segment Header"
+#define MQ_TEXT_CAUT                    "Connection Authority"
+#define MQ_TEXT_CONN                    "MQCONN"
+#define MQ_TEXT_INQ                     "MQINQ/MQSET"
+#define MQ_TEXT_PUT                     "MQPUT/MQGET"
+#define MQ_TEXT_OPEN                    "MQOPEN/MQCLOSE"
+#define MQ_TEXT_REQMSG                  "REQUEST MESSAGE"
+#define MQ_TEXT_ASYMSG                  "ASYNC MESSAGE"
+#define MQ_TEXT_NOTIFICATION            "NOTIFICATION"
 #define MQ_TEXT_BIND_READAHEAD_AS_Q_DEF "Bind/Read Ahead As Q Def"
-#define MQ_TEXT_IMMEDIATE_NONE			"Close Immediate/No option"
-#define MQ_TEXT_MQPMO_NONE				"Resp as Q Def/Resp as Topic Def/None"
-#define MQ_TEXT_MQGMO_NONE				"No Wait/Prop as Q Def/None"
-#define MQ_TEXT_MQMO_NONE				"None"
-#define MQ_TEXT_LPOOOPT_NONE			"None"
+#define MQ_TEXT_IMMEDIATE_NONE          "Close Immediate/No option"
+#define MQ_TEXT_MQPMO_NONE              "Resp as Q Def/Resp as Topic Def/None"
+#define MQ_TEXT_MQGMO_NONE              "No Wait/Prop as Q Def/None"
+#define MQ_TEXT_MQMO_NONE               "None"
+#define MQ_TEXT_LPOOOPT_NONE            "None"
 
 #define MQ_TEXT_PING  "PING"
 #define MQ_TEXT_RESET "RESET"
@@ -1283,3186 +1283,4995 @@ static reassembly_table mq_reassembly_table;
 #define MQ_NC_RECONNECTION_COMPLETE 17
 
 DEF_VALSB(notifcode)
-	DEF_VALS2(NC_GET_INHIBITED,		 "GET_INHIBITED"),
-	DEF_VALS2(NC_GET_ALLOWED,		 "GET_ALLOWED"),
-	DEF_VALS2(NC_CONN_STATE,		 "CONN_STATE"),
-	DEF_VALS2(NC_CONN_STATE_REPLY,	 "CONN_STATE_REPLY"),
-	DEF_VALS2(NC_Q_STATE,			 "Q_STATE"),
-	DEF_VALS2(NC_Q_STATE_REPLY,		 "Q_STATE_REPLY"),
-	DEF_VALS2(NC_QM_QUIESCING,		 "QM_QUIESCING"),
-	DEF_VALS2(NC_TXN_ALLOWED,		 "TXN_ALLOWED"),
-	DEF_VALS2(NC_TXN_REVOKE,		 "TXN_REVOKE"),
-	DEF_VALS2(NC_TXN_REVOKE_REPLY,	 "TXN_REVOKE_REPLY"),
-	DEF_VALS2(NC_CHECK_MSG,			 "CHECK_MSG"),
-	DEF_VALS2(NC_BROWSE_FIRST,		 "BROWSE_FIRST"),
-	DEF_VALS2(NC_MESSAGE_TOO_LARGE,	 "MESSAGE_TOO_LARGE"),
-	DEF_VALS2(NC_STREAMING_FAILURE,	 "STREAMING_FAILURE"),
-	DEF_VALS2(NC_CLIENT_ASYNC_EMPTY, "CLIENT_ASYNC_EMPTY"),
+    DEF_VALS2(NC_GET_INHIBITED,      "GET_INHIBITED"),
+    DEF_VALS2(NC_GET_ALLOWED,        "GET_ALLOWED"),
+    DEF_VALS2(NC_CONN_STATE,         "CONN_STATE"),
+    DEF_VALS2(NC_CONN_STATE_REPLY,   "CONN_STATE_REPLY"),
+    DEF_VALS2(NC_Q_STATE,            "Q_STATE"),
+    DEF_VALS2(NC_Q_STATE_REPLY,      "Q_STATE_REPLY"),
+    DEF_VALS2(NC_QM_QUIESCING,       "QM_QUIESCING"),
+    DEF_VALS2(NC_TXN_ALLOWED,        "TXN_ALLOWED"),
+    DEF_VALS2(NC_TXN_REVOKE,         "TXN_REVOKE"),
+    DEF_VALS2(NC_TXN_REVOKE_REPLY,   "TXN_REVOKE_REPLY"),
+    DEF_VALS2(NC_CHECK_MSG,          "CHECK_MSG"),
+    DEF_VALS2(NC_BROWSE_FIRST,       "BROWSE_FIRST"),
+    DEF_VALS2(NC_MESSAGE_TOO_LARGE,  "MESSAGE_TOO_LARGE"),
+    DEF_VALS2(NC_STREAMING_FAILURE,  "STREAMING_FAILURE"),
+    DEF_VALS2(NC_CLIENT_ASYNC_EMPTY, "CLIENT_ASYNC_EMPTY"),
 DEF_VALSE;
 
 DEF_VALSB(opcode)
-	DEF_VALS2(TST_INITIAL,			 "INITIAL_DATA"),
-	DEF_VALS2(TST_RESYNC,			 "RESYNC_DATA"),
-	DEF_VALS2(TST_RESET,			 "RESET_DATA"),
-	DEF_VALS2(TST_MESSAGE,			 "MESSAGE_DATA"),
-	DEF_VALS2(TST_STATUS,			 "STATUS_DATA"),
-	DEF_VALS2(TST_SECURITY,			 "SECURITY_DATA"),
-	DEF_VALS2(TST_PING,				 "PING_DATA"),
-	DEF_VALS2(TST_USERID,			 "USERID_DATA"),
-	DEF_VALS2(TST_HEARTBEAT,		 "HEARTBEAT"),
-	DEF_VALS2(TST_CONAUTH_INFO,		 "CONAUTH_INFO"),
-	DEF_VALS2(TST_RENEGOTIATE_DATA,	 "RENEGOTIATE_DATA"),
-	DEF_VALS2(TST_SOCKET_ACTION,	 "SOCKET_ACTION"),
-	DEF_VALS2(TST_ASYNC_MESSAGE,	 "ASYNC_MESSAGE"),
-	DEF_VALS2(TST_REQUEST_MSGS,		 "REQUEST_MSGS"),
-	DEF_VALS2(TST_NOTIFICATION,		 "NOTIFICATION"),
-	DEF_VALS2(TST_MQCONN,			 "MQCONN"),
-	DEF_VALS2(TST_MQDISC,			 "MQDISC"),
-	DEF_VALS2(TST_MQOPEN,			 "MQOPEN"),
-	DEF_VALS2(TST_MQCLOSE,			 "MQCLOSE"),
-	DEF_VALS2(TST_MQGET,			 "MQGET"),
-	DEF_VALS2(TST_MQPUT,			 "MQPUT"),
-	DEF_VALS2(TST_MQPUT1,			 "MQPUT1"),
-	DEF_VALS2(TST_MQSET,			 "MQSET"),
-	DEF_VALS2(TST_MQINQ,			 "MQINQ"),
-	DEF_VALS2(TST_MQCMIT,			 "MQCMIT"),
-	DEF_VALS2(TST_MQBACK,			 "MQBACK"),
-	DEF_VALS2(TST_SPI,				 "SPI"),
-	DEF_VALS2(TST_MQSTAT,			 "MQSTAT"),
-	DEF_VALS2(TST_MQSUB,			 "MQSUB"),
-	DEF_VALS2(TST_MQSUBRQ,			 "MQSUBRQ"),
-	DEF_VALS2(TST_MQCONN_REPLY,		 "MQCONN_REPLY"),
-	DEF_VALS2(TST_MQDISC_REPLY,		 "MQDISC_REPLY"),
-	DEF_VALS2(TST_MQOPEN_REPLY,		 "MQOPEN_REPLY"),
-	DEF_VALS2(TST_MQCLOSE_REPLY,	 "MQCLOSE_REPLY"),
-	DEF_VALS2(TST_MQGET_REPLY,		 "MQGET_REPLY"),
-	DEF_VALS2(TST_MQPUT_REPLY,		 "MQPUT_REPLY"),
-	DEF_VALS2(TST_MQPUT1_REPLY,		 "MQPUT1_REPLY"),
-	DEF_VALS2(TST_MQSET_REPLY,		 "MQSET_REPLY"),
-	DEF_VALS2(TST_MQINQ_REPLY,		 "MQINQ_REPLY"),
-	DEF_VALS2(TST_MQCMIT_REPLY,		 "MQCMIT_REPLY"),
-	DEF_VALS2(TST_MQBACK_REPLY,		 "MQBACK_REPLY"),
-	DEF_VALS2(TST_SPI_REPLY,		 "SPI_REPLY"),
-	DEF_VALS2(TST_MQSTAT_REPLY,		 "MQSTAT_REPLY"),
-	DEF_VALS2(TST_MQSUB_REPLY,		 "MQSUB_REPLY"),
-	DEF_VALS2(TST_MQSUBRQ_REPLY,	 "MQSUBRQ_REPLY"),
-	DEF_VALS2(TST_XA_START,			 "XA_START"),
-	DEF_VALS2(TST_XA_END,			 "XA_END"),
-	DEF_VALS2(TST_XA_OPEN,			 "XA_OPEN"),
-	DEF_VALS2(TST_XA_CLOSE,			 "XA_CLOSE"),
-	DEF_VALS2(TST_XA_PREPARE,		 "XA_PREPARE"),
-	DEF_VALS2(TST_XA_COMMIT,		 "XA_COMMIT"),
-	DEF_VALS2(TST_XA_ROLLBACK,		 "XA_ROLLBACK"),
-	DEF_VALS2(TST_XA_FORGET,		 "XA_FORGET"),
-	DEF_VALS2(TST_XA_RECOVER,		 "XA_RECOVER"),
-	DEF_VALS2(TST_XA_COMPLETE,		 "XA_COMPLETE"),
-	DEF_VALS2(TST_XA_START_REPLY,	 "XA_START_REPLY"),
-	DEF_VALS2(TST_XA_END_REPLY,		 "XA_END_REPLY"),
-	DEF_VALS2(TST_XA_OPEN_REPLY,	 "XA_OPEN_REPLY"),
-	DEF_VALS2(TST_XA_CLOSE_REPLY,	 "XA_CLOSE_REPLY"),
-	DEF_VALS2(TST_XA_PREPARE_REPLY,	 "XA_PREPARE_REPLY"),
-	DEF_VALS2(TST_XA_COMMIT_REPLY,	 "XA_COMMIT_REPLY"),
-	DEF_VALS2(TST_XA_ROLLBACK_REPLY, "XA_ROLLBACK_REPLY"),
-	DEF_VALS2(TST_XA_FORGET_REPLY,	 "XA_FORGET_REPLY"),
-	DEF_VALS2(TST_XA_RECOVER_REPLY,	 "XA_RECOVER_REPLY"),
-	DEF_VALS2(TST_XA_COMPLETE_REPLY, "XA_COMPLETE_REPLY"),
+    DEF_VALS2(TST_INITIAL,           "INITIAL_DATA"),
+    DEF_VALS2(TST_RESYNC,            "RESYNC_DATA"),
+    DEF_VALS2(TST_RESET,             "RESET_DATA"),
+    DEF_VALS2(TST_MESSAGE,           "MESSAGE_DATA"),
+    DEF_VALS2(TST_STATUS,            "STATUS_DATA"),
+    DEF_VALS2(TST_SECURITY,          "SECURITY_DATA"),
+    DEF_VALS2(TST_PING,              "PING_DATA"),
+    DEF_VALS2(TST_USERID,            "USERID_DATA"),
+    DEF_VALS2(TST_HEARTBEAT,         "HEARTBEAT"),
+    DEF_VALS2(TST_CONAUTH_INFO,      "CONAUTH_INFO"),
+    DEF_VALS2(TST_RENEGOTIATE_DATA,  "RENEGOTIATE_DATA"),
+    DEF_VALS2(TST_SOCKET_ACTION,     "SOCKET_ACTION"),
+    DEF_VALS2(TST_ASYNC_MESSAGE,     "ASYNC_MESSAGE"),
+    DEF_VALS2(TST_REQUEST_MSGS,      "REQUEST_MSGS"),
+    DEF_VALS2(TST_NOTIFICATION,      "NOTIFICATION"),
+    DEF_VALS2(TST_MQCONN,            "MQCONN"),
+    DEF_VALS2(TST_MQDISC,            "MQDISC"),
+    DEF_VALS2(TST_MQOPEN,            "MQOPEN"),
+    DEF_VALS2(TST_MQCLOSE,           "MQCLOSE"),
+    DEF_VALS2(TST_MQGET,             "MQGET"),
+    DEF_VALS2(TST_MQPUT,             "MQPUT"),
+    DEF_VALS2(TST_MQPUT1,            "MQPUT1"),
+    DEF_VALS2(TST_MQSET,             "MQSET"),
+    DEF_VALS2(TST_MQINQ,             "MQINQ"),
+    DEF_VALS2(TST_MQCMIT,            "MQCMIT"),
+    DEF_VALS2(TST_MQBACK,            "MQBACK"),
+    DEF_VALS2(TST_SPI,               "SPI"),
+    DEF_VALS2(TST_MQSTAT,            "MQSTAT"),
+    DEF_VALS2(TST_MQSUB,             "MQSUB"),
+    DEF_VALS2(TST_MQSUBRQ,           "MQSUBRQ"),
+    DEF_VALS2(TST_MQCONN_REPLY,      "MQCONN_REPLY"),
+    DEF_VALS2(TST_MQDISC_REPLY,      "MQDISC_REPLY"),
+    DEF_VALS2(TST_MQOPEN_REPLY,      "MQOPEN_REPLY"),
+    DEF_VALS2(TST_MQCLOSE_REPLY,     "MQCLOSE_REPLY"),
+    DEF_VALS2(TST_MQGET_REPLY,       "MQGET_REPLY"),
+    DEF_VALS2(TST_MQPUT_REPLY,       "MQPUT_REPLY"),
+    DEF_VALS2(TST_MQPUT1_REPLY,      "MQPUT1_REPLY"),
+    DEF_VALS2(TST_MQSET_REPLY,       "MQSET_REPLY"),
+    DEF_VALS2(TST_MQINQ_REPLY,       "MQINQ_REPLY"),
+    DEF_VALS2(TST_MQCMIT_REPLY,      "MQCMIT_REPLY"),
+    DEF_VALS2(TST_MQBACK_REPLY,      "MQBACK_REPLY"),
+    DEF_VALS2(TST_SPI_REPLY,         "SPI_REPLY"),
+    DEF_VALS2(TST_MQSTAT_REPLY,      "MQSTAT_REPLY"),
+    DEF_VALS2(TST_MQSUB_REPLY,       "MQSUB_REPLY"),
+    DEF_VALS2(TST_MQSUBRQ_REPLY,     "MQSUBRQ_REPLY"),
+    DEF_VALS2(TST_XA_START,          "XA_START"),
+    DEF_VALS2(TST_XA_END,            "XA_END"),
+    DEF_VALS2(TST_XA_OPEN,           "XA_OPEN"),
+    DEF_VALS2(TST_XA_CLOSE,          "XA_CLOSE"),
+    DEF_VALS2(TST_XA_PREPARE,        "XA_PREPARE"),
+    DEF_VALS2(TST_XA_COMMIT,         "XA_COMMIT"),
+    DEF_VALS2(TST_XA_ROLLBACK,       "XA_ROLLBACK"),
+    DEF_VALS2(TST_XA_FORGET,         "XA_FORGET"),
+    DEF_VALS2(TST_XA_RECOVER,        "XA_RECOVER"),
+    DEF_VALS2(TST_XA_COMPLETE,       "XA_COMPLETE"),
+    DEF_VALS2(TST_XA_START_REPLY,    "XA_START_REPLY"),
+    DEF_VALS2(TST_XA_END_REPLY,      "XA_END_REPLY"),
+    DEF_VALS2(TST_XA_OPEN_REPLY,     "XA_OPEN_REPLY"),
+    DEF_VALS2(TST_XA_CLOSE_REPLY,    "XA_CLOSE_REPLY"),
+    DEF_VALS2(TST_XA_PREPARE_REPLY,  "XA_PREPARE_REPLY"),
+    DEF_VALS2(TST_XA_COMMIT_REPLY,   "XA_COMMIT_REPLY"),
+    DEF_VALS2(TST_XA_ROLLBACK_REPLY, "XA_ROLLBACK_REPLY"),
+    DEF_VALS2(TST_XA_FORGET_REPLY,   "XA_FORGET_REPLY"),
+    DEF_VALS2(TST_XA_RECOVER_REPLY,  "XA_RECOVER_REPLY"),
+    DEF_VALS2(TST_XA_COMPLETE_REPLY, "XA_COMPLETE_REPLY"),
 DEF_VALSE;
 
 DEF_VALSB(spi_verbs)
-	DEF_VALS2(SPI_QUERY,	"QUERY"),
-	DEF_VALS2(SPI_PUT,		"PUT"),
-	DEF_VALS2(SPI_GET,		"GET"),
-	DEF_VALS2(SPI_ACTIVATE, "ACTIVATE"),
-	DEF_VALS2(SPI_OPEN,		"OPEN"),
+    DEF_VALS2(SPI_QUERY,    "QUERY"),
+    DEF_VALS2(SPI_PUT,      "PUT"),
+    DEF_VALS2(SPI_GET,      "GET"),
+    DEF_VALS2(SPI_ACTIVATE, "ACTIVATE"),
+    DEF_VALS2(SPI_OPEN,     "OPEN"),
 DEF_VALSE;
 
 DEF_VALSB(spi_activate)
-	DEF_VALS2(SPI_ACTIVATE_ENABLE,	"ENABLE"),
-	DEF_VALS2(SPI_ACTIVATE_DISABLE, "DISABLE"),
+    DEF_VALS2(SPI_ACTIVATE_ENABLE,  "ENABLE"),
+    DEF_VALS2(SPI_ACTIVATE_DISABLE, "DISABLE"),
 DEF_VALSE;
 
 DEF_VALSB(status)
-	DEF_VALS2(STATUS_ERR_NO_CHANNEL,			 "NO_CHANNEL"),
-	DEF_VALS2(STATUS_ERR_CHANNEL_WRONG_TYPE,	 "CHANNEL_WRONG_TYPE"),
-	DEF_VALS2(STATUS_ERR_QM_UNAVAILABLE,		 "QM_UNAVAILABLE"),
-	DEF_VALS2(STATUS_ERR_MSG_SEQUENCE_ERROR,	 "MSG_SEQUENCE_ERROR"),
-	DEF_VALS2(STATUS_ERR_QM_TERMINATING,		 "QM_TERMINATING"),
-	DEF_VALS2(STATUS_ERR_CAN_NOT_STORE,			 "CAN_NOT_STORE"),
-	DEF_VALS2(STATUS_ERR_USER_CLOSED,			 "USER_CLOSED"),
-	DEF_VALS2(STATUS_ERR_PROTOCOL_SEGMENT_TYPE,	 "REMOTE_PROTOCOL_ERROR"),
-	DEF_VALS2(STATUS_ERR_PROTOCOL_LENGTH_ERROR,	 "BIND_FAILED"),
-	DEF_VALS2(STATUS_ERR_PROTOCOL_INVALID_DATA,	 "MSGWRAP_DIFFERENT"),
-	DEF_VALS2(STATUS_ERR_PROTOCOL_ID_ERROR,		 "REMOTE_CHANNEL_UNAVAILABLE"),
-	DEF_VALS2(STATUS_ERR_PROTOCOL_MSH_ERROR,	 "TERMINATED_BY_REMOTE_EXIT"),
-	DEF_VALS2(STATUS_ERR_PROTOCOL_GENERAL,		 "PROTOCOL_GENERAL"),
-	DEF_VALS2(STATUS_ERR_BATCH_FAILURE,			 "BATCH_FAILURE"),
-	DEF_VALS2(STATUS_ERR_MESSAGE_LENGTH_ERROR,	 "MESSAGE_LENGTH_ERROR"),
-	DEF_VALS2(STATUS_ERR_SEGMENT_NUMBER_ERROR,	 "SEGMENT_NUMBER_ERROR"),
-	DEF_VALS2(STATUS_ERR_SECURITY_FAILURE,		 "SECURITY_FAILURE"),
-	DEF_VALS2(STATUS_ERR_WRAP_VALUE_ERROR,		 "WRAP_VALUE_ERROR"),
-	DEF_VALS2(STATUS_ERR_CHANNEL_UNAVAILABLE,	 "CHANNEL_UNAVAILABLE"),
-	DEF_VALS2(STATUS_ERR_CLOSED_BY_EXIT,		 "CLOSED_BY_EXIT"),
-	DEF_VALS2(STATUS_ERR_CIPHER_SPEC,			 "CIPHER_SPEC"),
-	DEF_VALS2(STATUS_ERR_PEER_NAME,				 "PEER_NAME"),
-	DEF_VALS2(STATUS_ERR_SSL_CLIENT_CERTIFICATE, "SSL_CLIENT_CERTIFICATE"),
-	DEF_VALS2(STATUS_ERR_RMT_RSRCS_IN_RECOVERY,	 "RMT_RSRCS_IN_RECOVERY"),
-	DEF_VALS2(STATUS_ERR_SSL_REFRESHING,		 "SSL_REFRESHING"),
-	DEF_VALS2(STATUS_ERR_INVALID_HOBJ,			 "INVALID_HOBJ"),
-	DEF_VALS2(STATUS_ERR_CONV_ID_ERROR,			 "CONV_ID_ERROR"),
-	DEF_VALS2(STATUS_ERR_SOCKET_ACTION_TYPE,	 "SOCKET_ACTION_TYPE"),
-	DEF_VALS2(STATUS_ERR_STANDBY_Q_MGR,			 "STANDBY_Q_MGR"),
-
-	DEF_VALS2(STATUS_ERR_CCSID_NOT_SUPPORTED,	 "CCSID_NOT_SUPPORTED"),
-	DEF_VALS2(STATUS_ERR_ENCODING_INVALID,		 "ENCODING_INVALID"),
-	DEF_VALS2(STATUS_ERR_FAP_LEVEL,				 "FAP_LEVEL"),
-	DEF_VALS2(STATUS_ERR_NEGOTIATION_FAILED,	 "NEGOTIATION_FAILED"),
+    DEF_VALS2(STATUS_ERR_NO_CHANNEL,             "NO_CHANNEL"),
+    DEF_VALS2(STATUS_ERR_CHANNEL_WRONG_TYPE,     "CHANNEL_WRONG_TYPE"),
+    DEF_VALS2(STATUS_ERR_QM_UNAVAILABLE,         "QM_UNAVAILABLE"),
+    DEF_VALS2(STATUS_ERR_MSG_SEQUENCE_ERROR,     "MSG_SEQUENCE_ERROR"),
+    DEF_VALS2(STATUS_ERR_QM_TERMINATING,         "QM_TERMINATING"),
+    DEF_VALS2(STATUS_ERR_CAN_NOT_STORE,          "CAN_NOT_STORE"),
+    DEF_VALS2(STATUS_ERR_USER_CLOSED,            "USER_CLOSED"),
+    DEF_VALS2(STATUS_ERR_PROTOCOL_SEGMENT_TYPE,  "REMOTE_PROTOCOL_ERROR"),
+    DEF_VALS2(STATUS_ERR_PROTOCOL_LENGTH_ERROR,  "BIND_FAILED"),
+    DEF_VALS2(STATUS_ERR_PROTOCOL_INVALID_DATA,  "MSGWRAP_DIFFERENT"),
+    DEF_VALS2(STATUS_ERR_PROTOCOL_ID_ERROR,      "REMOTE_CHANNEL_UNAVAILABLE"),
+    DEF_VALS2(STATUS_ERR_PROTOCOL_MSH_ERROR,     "TERMINATED_BY_REMOTE_EXIT"),
+    DEF_VALS2(STATUS_ERR_PROTOCOL_GENERAL,       "PROTOCOL_GENERAL"),
+    DEF_VALS2(STATUS_ERR_BATCH_FAILURE,          "BATCH_FAILURE"),
+    DEF_VALS2(STATUS_ERR_MESSAGE_LENGTH_ERROR,   "MESSAGE_LENGTH_ERROR"),
+    DEF_VALS2(STATUS_ERR_SEGMENT_NUMBER_ERROR,   "SEGMENT_NUMBER_ERROR"),
+    DEF_VALS2(STATUS_ERR_SECURITY_FAILURE,       "SECURITY_FAILURE"),
+    DEF_VALS2(STATUS_ERR_WRAP_VALUE_ERROR,       "WRAP_VALUE_ERROR"),
+    DEF_VALS2(STATUS_ERR_CHANNEL_UNAVAILABLE,    "CHANNEL_UNAVAILABLE"),
+    DEF_VALS2(STATUS_ERR_CLOSED_BY_EXIT,         "CLOSED_BY_EXIT"),
+    DEF_VALS2(STATUS_ERR_CIPHER_SPEC,            "CIPHER_SPEC"),
+    DEF_VALS2(STATUS_ERR_PEER_NAME,              "PEER_NAME"),
+    DEF_VALS2(STATUS_ERR_SSL_CLIENT_CERTIFICATE, "SSL_CLIENT_CERTIFICATE"),
+    DEF_VALS2(STATUS_ERR_RMT_RSRCS_IN_RECOVERY,  "RMT_RSRCS_IN_RECOVERY"),
+    DEF_VALS2(STATUS_ERR_SSL_REFRESHING,         "SSL_REFRESHING"),
+    DEF_VALS2(STATUS_ERR_INVALID_HOBJ,           "INVALID_HOBJ"),
+    DEF_VALS2(STATUS_ERR_CONV_ID_ERROR,          "CONV_ID_ERROR"),
+    DEF_VALS2(STATUS_ERR_SOCKET_ACTION_TYPE,     "SOCKET_ACTION_TYPE"),
+    DEF_VALS2(STATUS_ERR_STANDBY_Q_MGR,          "STANDBY_Q_MGR"),
+
+    DEF_VALS2(STATUS_ERR_CCSID_NOT_SUPPORTED,    "CCSID_NOT_SUPPORTED"),
+    DEF_VALS2(STATUS_ERR_ENCODING_INVALID,       "ENCODING_INVALID"),
+    DEF_VALS2(STATUS_ERR_FAP_LEVEL,              "FAP_LEVEL"),
+    DEF_VALS2(STATUS_ERR_NEGOTIATION_FAILED,     "NEGOTIATION_FAILED"),
 DEF_VALSE;
 
 DEF_VALSB(xaer)
-	DEF_VALS2(XA_RBROLLBACK,  "XA_RBROLLBACK"),
-	DEF_VALS2(XA_RBCOMMFAIL,  "XA_RBCOMMFAIL"),
-	DEF_VALS2(XA_RBDEADLOCK,  "XA_RBDEADLOCK"),
-	DEF_VALS2(XA_RBINTEGRITY, "XA_RBINTEGRITY"),
-	DEF_VALS2(XA_RBOTHER,	  "XA_RBOTHER"),
-	DEF_VALS2(XA_RBPROTO,	  "XA_RBPROTO"),
-	DEF_VALS2(XA_RBTIMEOUT,	  "XA_RBTIMEOUT"),
-	DEF_VALS2(XA_RBTRANSIENT, "XA_RBTRANSIENT"),
-	DEF_VALS2(XA_NOMIGRATE,	  "XA_NOMIGRATE"),
-	DEF_VALS2(XA_HEURHAZ,	  "XA_HEURHAZ"),
-	DEF_VALS2(XA_HEURCOM,	  "XA_HEURCOM"),
-	DEF_VALS2(XA_HEURRB,	  "XA_HEURRB"),
-	DEF_VALS2(XA_HEURMIX,	  "XA_HEURMIX"),
-	DEF_VALS2(XA_RETRY,		  "XA_RETRY"),
-	DEF_VALS2(XA_RDONLY,	  "XA_RDONLY"),
-	DEF_VALS2(XA_OK,		  "XA_OK"),
-	DEF_VALS2(XAER_ASYNC,	  "XAER_ASYNC"),
-	DEF_VALS2(XAER_RMERR,	  "XAER_RMERR"),
-	DEF_VALS2(XAER_NOTA,	  "XAER_NOTA"),
-	DEF_VALS2(XAER_INVAL,	  "XAER_INVAL"),
-	DEF_VALS2(XAER_PROTO,	  "XAER_PROTO"),
-	DEF_VALS2(XAER_RMFAIL,	  "XAER_RMFAIL"),
-	DEF_VALS2(XAER_DUPID,	  "XAER_DUPID"),
-	DEF_VALS2(XAER_OUTSIDE,	  "XAER_OUTSIDE"),
+    DEF_VALS2(XA_RBROLLBACK,  "XA_RBROLLBACK"),
+    DEF_VALS2(XA_RBCOMMFAIL,  "XA_RBCOMMFAIL"),
+    DEF_VALS2(XA_RBDEADLOCK,  "XA_RBDEADLOCK"),
+    DEF_VALS2(XA_RBINTEGRITY, "XA_RBINTEGRITY"),
+    DEF_VALS2(XA_RBOTHER,     "XA_RBOTHER"),
+    DEF_VALS2(XA_RBPROTO,     "XA_RBPROTO"),
+    DEF_VALS2(XA_RBTIMEOUT,   "XA_RBTIMEOUT"),
+    DEF_VALS2(XA_RBTRANSIENT, "XA_RBTRANSIENT"),
+    DEF_VALS2(XA_NOMIGRATE,   "XA_NOMIGRATE"),
+    DEF_VALS2(XA_HEURHAZ,     "XA_HEURHAZ"),
+    DEF_VALS2(XA_HEURCOM,     "XA_HEURCOM"),
+    DEF_VALS2(XA_HEURRB,      "XA_HEURRB"),
+    DEF_VALS2(XA_HEURMIX,     "XA_HEURMIX"),
+    DEF_VALS2(XA_RETRY,       "XA_RETRY"),
+    DEF_VALS2(XA_RDONLY,      "XA_RDONLY"),
+    DEF_VALS2(XA_OK,          "XA_OK"),
+    DEF_VALS2(XAER_ASYNC,     "XAER_ASYNC"),
+    DEF_VALS2(XAER_RMERR,     "XAER_RMERR"),
+    DEF_VALS2(XAER_NOTA,      "XAER_NOTA"),
+    DEF_VALS2(XAER_INVAL,     "XAER_INVAL"),
+    DEF_VALS2(XAER_PROTO,     "XAER_PROTO"),
+    DEF_VALS2(XAER_RMFAIL,    "XAER_RMFAIL"),
+    DEF_VALS2(XAER_DUPID,     "XAER_DUPID"),
+    DEF_VALS2(XAER_OUTSIDE,   "XAER_OUTSIDE"),
 DEF_VALSE;
 
 DEF_VALSB(StructID)
-	DEF_VALS2(STRUCTID_CIH,			 MQ_TEXT_CIH),
-	DEF_VALS2(STRUCTID_DH,			 MQ_TEXT_DH),
-	DEF_VALS2(STRUCTID_DLH,			 MQ_TEXT_DLH),
-	DEF_VALS2(STRUCTID_GMO,			 MQ_TEXT_GMO),
-	DEF_VALS2(STRUCTID_ID,			 MQ_TEXT_ID),
-	DEF_VALS2(STRUCTID_IIH,			 MQ_TEXT_IIH),
-	DEF_VALS2(STRUCTID_MD,			 MQ_TEXT_MD),
-	DEF_VALS2(STRUCTID_MDE,			 MQ_TEXT_MDE),
-	DEF_VALS2(STRUCTID_MSH,			 MQ_TEXT_MSH),
-	DEF_VALS2(STRUCTID_OD,			 MQ_TEXT_OD),
-	DEF_VALS2(STRUCTID_PMO,			 MQ_TEXT_PMO),
-	DEF_VALS2(STRUCTID_RMH,			 MQ_TEXT_RMH),
-	DEF_VALS2(STRUCTID_TM,			 MQ_TEXT_TM),
-	DEF_VALS2(STRUCTID_TMC2,		 MQ_TEXT_TMC2),
-	DEF_VALS2(STRUCTID_CAUT,		 MQ_TEXT_CAUT),
-	DEF_VALS2(STRUCTID_TSH,			 MQ_TEXT_TSH),
-	DEF_VALS2(STRUCTID_TSHC,		 MQ_TEXT_TSHC),
-	DEF_VALS2(STRUCTID_TSHM,		 MQ_TEXT_TSHM),
-	DEF_VALS2(STRUCTID_UID,			 MQ_TEXT_UID),
-	DEF_VALS2(STRUCTID_WIH,			 MQ_TEXT_WIH),
-	DEF_VALS2(STRUCTID_XQH,			 MQ_TEXT_XQH),
-	DEF_VALS2(STRUCTID_SPQU ,		 MQ_TEXT_SPQU),
-	DEF_VALS2(STRUCTID_SPQI ,		 MQ_TEXT_SPQI),
-	DEF_VALS2(STRUCTID_SPQO ,		 MQ_TEXT_SPQO),
-	DEF_VALS2(STRUCTID_SPPU ,		 MQ_TEXT_SPPU),
-	DEF_VALS2(STRUCTID_SPPI ,		 MQ_TEXT_SPPI),
-	DEF_VALS2(STRUCTID_SPPO ,		 MQ_TEXT_SPPO),
-	DEF_VALS2(STRUCTID_SPGU ,		 MQ_TEXT_SPGU),
-	DEF_VALS2(STRUCTID_SPGI ,		 MQ_TEXT_SPGI),
-	DEF_VALS2(STRUCTID_SPGO ,		 MQ_TEXT_SPGO),
-	DEF_VALS2(STRUCTID_SPAU ,		 MQ_TEXT_SPAU),
-	DEF_VALS2(STRUCTID_SPAI ,		 MQ_TEXT_SPAI),
-	DEF_VALS2(STRUCTID_SPAO ,		 MQ_TEXT_SPAO),
-	DEF_VALS2(STRUCTID_SPOU ,		 MQ_TEXT_SPOU),
-	DEF_VALS2(STRUCTID_SPOI ,		 MQ_TEXT_SPOI),
-	DEF_VALS2(STRUCTID_SPOO ,		 MQ_TEXT_SPOO),
-	DEF_VALS2(STRUCTID_LPOO ,		 MQ_TEXT_LPOO),
-	DEF_VALS2(STRUCTID_FOPA ,		 MQ_TEXT_FOPA),
-	DEF_VALS2(STRUCTID_FCNO ,		 MQ_TEXT_FCNO),
-	DEF_VALS2(STRUCTID_CIH_EBCDIC,	 MQ_TEXT_CIH),
-	DEF_VALS2(STRUCTID_DH_EBCDIC,	 MQ_TEXT_DH),
-	DEF_VALS2(STRUCTID_DLH_EBCDIC,	 MQ_TEXT_DLH),
-	DEF_VALS2(STRUCTID_GMO_EBCDIC,	 MQ_TEXT_GMO),
-	DEF_VALS2(STRUCTID_ID_EBCDIC,	 MQ_TEXT_ID),
-	DEF_VALS2(STRUCTID_IIH_EBCDIC,	 MQ_TEXT_IIH),
-	DEF_VALS2(STRUCTID_MD_EBCDIC,	 MQ_TEXT_MD),
-	DEF_VALS2(STRUCTID_MDE_EBCDIC,	 MQ_TEXT_MDE),
-	DEF_VALS2(STRUCTID_OD_EBCDIC,	 MQ_TEXT_OD),
-	DEF_VALS2(STRUCTID_PMO_EBCDIC,	 MQ_TEXT_PMO),
-	DEF_VALS2(STRUCTID_RMH_EBCDIC,	 MQ_TEXT_RMH),
-	DEF_VALS2(STRUCTID_TM_EBCDIC,	 MQ_TEXT_TM),
-	DEF_VALS2(STRUCTID_TMC2_EBCDIC,	 MQ_TEXT_TMC2),
-	DEF_VALS2(STRUCTID_CAUT_EBCDIC,	 MQ_TEXT_CAUT),
-	DEF_VALS2(STRUCTID_TSH_EBCDIC,	 MQ_TEXT_TSH),
-	DEF_VALS2(STRUCTID_TSHC_EBCDIC,	 MQ_TEXT_TSHC),
-	DEF_VALS2(STRUCTID_TSHM_EBCDIC,	 MQ_TEXT_TSHM),
-	DEF_VALS2(STRUCTID_UID_EBCDIC,	 MQ_TEXT_UID),
-	DEF_VALS2(STRUCTID_WIH_EBCDIC,	 MQ_TEXT_WIH),
-	DEF_VALS2(STRUCTID_XQH_EBCDIC,	 MQ_TEXT_XQH),
-	DEF_VALS2(STRUCTID_SPQU_EBCDIC,	 MQ_TEXT_SPQU),
-	DEF_VALS2(STRUCTID_SPQI_EBCDIC,	 MQ_TEXT_SPQI),
-	DEF_VALS2(STRUCTID_SPQO_EBCDIC,	 MQ_TEXT_SPQO),
-	DEF_VALS2(STRUCTID_SPPU_EBCDIC,	 MQ_TEXT_SPPU),
-	DEF_VALS2(STRUCTID_SPPI_EBCDIC,	 MQ_TEXT_SPPI),
-	DEF_VALS2(STRUCTID_SPPO_EBCDIC,	 MQ_TEXT_SPPO),
-	DEF_VALS2(STRUCTID_SPGU_EBCDIC,	 MQ_TEXT_SPGU),
-	DEF_VALS2(STRUCTID_SPGI_EBCDIC,	 MQ_TEXT_SPGI),
-	DEF_VALS2(STRUCTID_SPGO_EBCDIC,	 MQ_TEXT_SPGO),
-	DEF_VALS2(STRUCTID_SPAU_EBCDIC,	 MQ_TEXT_SPAU),
-	DEF_VALS2(STRUCTID_SPAI_EBCDIC,	 MQ_TEXT_SPAI),
-	DEF_VALS2(STRUCTID_SPAO_EBCDIC,	 MQ_TEXT_SPAO),
-	DEF_VALS2(STRUCTID_SPOU_EBCDIC,	 MQ_TEXT_SPOU),
-	DEF_VALS2(STRUCTID_SPOI_EBCDIC,	 MQ_TEXT_SPOI),
-	DEF_VALS2(STRUCTID_SPOO_EBCDIC,	 MQ_TEXT_SPOO),
-	DEF_VALS2(STRUCTID_LPOO_EBCDIC,	 MQ_TEXT_LPOO),
-	DEF_VALS2(STRUCTID_FOPA_EBCDIC,	 MQ_TEXT_FOPA),
-	DEF_VALS2(STRUCTID_FCNO_EBCDIC , MQ_TEXT_FCNO),
+    DEF_VALS2(STRUCTID_CIH,          MQ_TEXT_CIH),
+    DEF_VALS2(STRUCTID_DH,           MQ_TEXT_DH),
+    DEF_VALS2(STRUCTID_DLH,          MQ_TEXT_DLH),
+    DEF_VALS2(STRUCTID_GMO,          MQ_TEXT_GMO),
+    DEF_VALS2(STRUCTID_ID,           MQ_TEXT_ID),
+    DEF_VALS2(STRUCTID_IIH,          MQ_TEXT_IIH),
+    DEF_VALS2(STRUCTID_MD,           MQ_TEXT_MD),
+    DEF_VALS2(STRUCTID_MDE,          MQ_TEXT_MDE),
+    DEF_VALS2(STRUCTID_MSH,          MQ_TEXT_MSH),
+    DEF_VALS2(STRUCTID_OD,           MQ_TEXT_OD),
+    DEF_VALS2(STRUCTID_PMO,          MQ_TEXT_PMO),
+    DEF_VALS2(STRUCTID_RMH,          MQ_TEXT_RMH),
+    DEF_VALS2(STRUCTID_TM,           MQ_TEXT_TM),
+    DEF_VALS2(STRUCTID_TMC2,         MQ_TEXT_TMC2),
+    DEF_VALS2(STRUCTID_CAUT,         MQ_TEXT_CAUT),
+    DEF_VALS2(STRUCTID_TSH,          MQ_TEXT_TSH),
+    DEF_VALS2(STRUCTID_TSHC,         MQ_TEXT_TSHC),
+    DEF_VALS2(STRUCTID_TSHM,         MQ_TEXT_TSHM),
+    DEF_VALS2(STRUCTID_UID,          MQ_TEXT_UID),
+    DEF_VALS2(STRUCTID_WIH,          MQ_TEXT_WIH),
+    DEF_VALS2(STRUCTID_XQH,          MQ_TEXT_XQH),
+    DEF_VALS2(STRUCTID_SPQU ,        MQ_TEXT_SPQU),
+    DEF_VALS2(STRUCTID_SPQI ,        MQ_TEXT_SPQI),
+    DEF_VALS2(STRUCTID_SPQO ,        MQ_TEXT_SPQO),
+    DEF_VALS2(STRUCTID_SPPU ,        MQ_TEXT_SPPU),
+    DEF_VALS2(STRUCTID_SPPI ,        MQ_TEXT_SPPI),
+    DEF_VALS2(STRUCTID_SPPO ,        MQ_TEXT_SPPO),
+    DEF_VALS2(STRUCTID_SPGU ,        MQ_TEXT_SPGU),
+    DEF_VALS2(STRUCTID_SPGI ,        MQ_TEXT_SPGI),
+    DEF_VALS2(STRUCTID_SPGO ,        MQ_TEXT_SPGO),
+    DEF_VALS2(STRUCTID_SPAU ,        MQ_TEXT_SPAU),
+    DEF_VALS2(STRUCTID_SPAI ,        MQ_TEXT_SPAI),
+    DEF_VALS2(STRUCTID_SPAO ,        MQ_TEXT_SPAO),
+    DEF_VALS2(STRUCTID_SPOU ,        MQ_TEXT_SPOU),
+    DEF_VALS2(STRUCTID_SPOI ,        MQ_TEXT_SPOI),
+    DEF_VALS2(STRUCTID_SPOO ,        MQ_TEXT_SPOO),
+    DEF_VALS2(STRUCTID_LPOO ,        MQ_TEXT_LPOO),
+    DEF_VALS2(STRUCTID_FOPA ,        MQ_TEXT_FOPA),
+    DEF_VALS2(STRUCTID_FCNO ,        MQ_TEXT_FCNO),
+    DEF_VALS2(STRUCTID_CIH_EBCDIC,   MQ_TEXT_CIH),
+    DEF_VALS2(STRUCTID_DH_EBCDIC,    MQ_TEXT_DH),
+    DEF_VALS2(STRUCTID_DLH_EBCDIC,   MQ_TEXT_DLH),
+    DEF_VALS2(STRUCTID_GMO_EBCDIC,   MQ_TEXT_GMO),
+    DEF_VALS2(STRUCTID_ID_EBCDIC,    MQ_TEXT_ID),
+    DEF_VALS2(STRUCTID_IIH_EBCDIC,   MQ_TEXT_IIH),
+    DEF_VALS2(STRUCTID_MD_EBCDIC,    MQ_TEXT_MD),
+    DEF_VALS2(STRUCTID_MDE_EBCDIC,   MQ_TEXT_MDE),
+    DEF_VALS2(STRUCTID_OD_EBCDIC,    MQ_TEXT_OD),
+    DEF_VALS2(STRUCTID_PMO_EBCDIC,   MQ_TEXT_PMO),
+    DEF_VALS2(STRUCTID_RMH_EBCDIC,   MQ_TEXT_RMH),
+    DEF_VALS2(STRUCTID_TM_EBCDIC,    MQ_TEXT_TM),
+    DEF_VALS2(STRUCTID_TMC2_EBCDIC,  MQ_TEXT_TMC2),
+    DEF_VALS2(STRUCTID_CAUT_EBCDIC,  MQ_TEXT_CAUT),
+    DEF_VALS2(STRUCTID_TSH_EBCDIC,   MQ_TEXT_TSH),
+    DEF_VALS2(STRUCTID_TSHC_EBCDIC,  MQ_TEXT_TSHC),
+    DEF_VALS2(STRUCTID_TSHM_EBCDIC,  MQ_TEXT_TSHM),
+    DEF_VALS2(STRUCTID_UID_EBCDIC,   MQ_TEXT_UID),
+    DEF_VALS2(STRUCTID_WIH_EBCDIC,   MQ_TEXT_WIH),
+    DEF_VALS2(STRUCTID_XQH_EBCDIC,   MQ_TEXT_XQH),
+    DEF_VALS2(STRUCTID_SPQU_EBCDIC,  MQ_TEXT_SPQU),
+    DEF_VALS2(STRUCTID_SPQI_EBCDIC,  MQ_TEXT_SPQI),
+    DEF_VALS2(STRUCTID_SPQO_EBCDIC,  MQ_TEXT_SPQO),
+    DEF_VALS2(STRUCTID_SPPU_EBCDIC,  MQ_TEXT_SPPU),
+    DEF_VALS2(STRUCTID_SPPI_EBCDIC,  MQ_TEXT_SPPI),
+    DEF_VALS2(STRUCTID_SPPO_EBCDIC,  MQ_TEXT_SPPO),
+    DEF_VALS2(STRUCTID_SPGU_EBCDIC,  MQ_TEXT_SPGU),
+    DEF_VALS2(STRUCTID_SPGI_EBCDIC,  MQ_TEXT_SPGI),
+    DEF_VALS2(STRUCTID_SPGO_EBCDIC,  MQ_TEXT_SPGO),
+    DEF_VALS2(STRUCTID_SPAU_EBCDIC,  MQ_TEXT_SPAU),
+    DEF_VALS2(STRUCTID_SPAI_EBCDIC,  MQ_TEXT_SPAI),
+    DEF_VALS2(STRUCTID_SPAO_EBCDIC,  MQ_TEXT_SPAO),
+    DEF_VALS2(STRUCTID_SPOU_EBCDIC,  MQ_TEXT_SPOU),
+    DEF_VALS2(STRUCTID_SPOI_EBCDIC,  MQ_TEXT_SPOI),
+    DEF_VALS2(STRUCTID_SPOO_EBCDIC,  MQ_TEXT_SPOO),
+    DEF_VALS2(STRUCTID_LPOO_EBCDIC,  MQ_TEXT_LPOO),
+    DEF_VALS2(STRUCTID_FOPA_EBCDIC,  MQ_TEXT_FOPA),
+    DEF_VALS2(STRUCTID_FCNO_EBCDIC , MQ_TEXT_FCNO),
 DEF_VALSE;
 
 DEF_VALSB(byteorder)
-	DEF_VALS2(LITTLE_ENDIAN, "Little endian"),
-	DEF_VALS2(BIG_ENDIAN,	 "Big endian"),
+    DEF_VALS2(LITTLE_ENDIAN, "Little endian"),
+    DEF_VALS2(BIG_ENDIAN,    "Big endian"),
 DEF_VALSE;
 
 DEF_VALSB(conn_version)
-	DEF_VALS2(CONN_VERSION,  "MQCONN"),
-	DEF_VALS2(CONNX_VERSION, "MQCONNX"),
+    DEF_VALS2(CONN_VERSION,  "MQCONN"),
+    DEF_VALS2(CONNX_VERSION, "MQCONNX"),
 DEF_VALSE;
 
 DEF_VALSB(sidtype)
-	DEF_VALS1(MQSIDT_NONE),
-	DEF_VALS1(MQSIDT_NT_SECURITY_ID),
-	DEF_VALS1(MQSIDT_WAS_SECURITY_ID),
+    DEF_VALS1(MQSIDT_NONE),
+    DEF_VALS1(MQSIDT_NT_SECURITY_ID),
+    DEF_VALS1(MQSIDT_WAS_SECURITY_ID),
 DEF_VALSE;
 
 static gint dissect_mq_encoding(proto_tree *tree, int hfindex, tvbuff_t *tvb, const gint start, gint length, const guint encoding)
 {
-	gchar  sEnc[128] = "";
-	gchar *pEnc;
-	guint  uEnc;
-
-	if (length == 2)
-	{
-		uEnc = (gint)tvb_get_guint16_endian(tvb, start, encoding);
-	}
-	else
-	{
-		uEnc = tvb_get_guint32_endian(tvb, start, encoding);
-	}
-	pEnc = sEnc;
+    gchar  sEnc[128] = "";
+    gchar *pEnc;
+    guint  uEnc;
+
+    if (length == 2)
+    {
+        uEnc = (gint)tvb_get_guint16_endian(tvb, start, encoding);
+    }
+    else
+    {
+        uEnc = tvb_get_guint32_endian(tvb, start, encoding);
+    }
+    pEnc = sEnc;
 
 #define CHECK_ENC(M, T) ((uEnc & M) == T)
 #define DOPRT(A) pEnc += g_snprintf(pEnc, (gulong)(sizeof(sEnc)-1-(pEnc-sEnc)), A);
-	if (CHECK_ENC(MQ_MQENC_FLOAT_MASK, MQ_MQENC_FLOAT_UNDEFINED))
-	{
-		DOPRT("FLT_UNDEFINED");
-	}
-	else if (CHECK_ENC(MQ_MQENC_FLOAT_MASK, MQ_MQENC_FLOAT_IEEE_NORMAL))
-	{
-		DOPRT("FLT_IEEE_NORMAL");
-	}
-	else if (CHECK_ENC(MQ_MQENC_FLOAT_MASK, MQ_MQENC_FLOAT_IEEE_REVERSED))
-	{
-		DOPRT("FLT_IEEE_REVERSED");
-	}
-	else if (CHECK_ENC(MQ_MQENC_FLOAT_MASK, MQ_MQENC_FLOAT_S390))
-	{
-		DOPRT("FLT_S390");
-	}
-	else if (CHECK_ENC(MQ_MQENC_FLOAT_MASK, MQ_MQENC_FLOAT_TNS))
-	{
-		DOPRT("FLT_TNS");
-	} else
-	{
-		DOPRT("FLT_UNKNOWN");
-	}
-
-	DOPRT("/");
-	if (CHECK_ENC(MQ_MQENC_DECIMAL_MASK, MQ_MQENC_DECIMAL_UNDEFINED))
-	{
-		DOPRT("DEC_UNDEFINED");
-	}
-	else if (CHECK_ENC(MQ_MQENC_DECIMAL_MASK, MQ_MQENC_DECIMAL_NORMAL))
-	{
-		DOPRT("DEC_NORMAL");
-	}
-	else if (CHECK_ENC(MQ_MQENC_DECIMAL_MASK, MQ_MQENC_DECIMAL_REVERSED))
-	{
-		DOPRT("DEC_REVERSED");
-	}
-	else
-	{
-		DOPRT("DEC_UNKNOWN");
-	}
-
-	DOPRT("/");
-	if (CHECK_ENC(MQ_MQENC_INTEGER_MASK, MQ_MQENC_INTEGER_UNDEFINED))
-	{
-		DOPRT("INT_UNDEFINED");
-	}
-	else if (CHECK_ENC(MQ_MQENC_INTEGER_MASK, MQ_MQENC_INTEGER_NORMAL))
-	{
-		DOPRT("INT_NORMAL");
-	}
-	else if (CHECK_ENC(MQ_MQENC_INTEGER_MASK, MQ_MQENC_INTEGER_REVERSED))
-	{
-		DOPRT("INT_REVERSED");
-	}
-	else
-	{
-		DOPRT("INT_UNKNOWN");
-	}
+    if (CHECK_ENC(MQ_MQENC_FLOAT_MASK, MQ_MQENC_FLOAT_UNDEFINED))
+    {
+        DOPRT("FLT_UNDEFINED");
+    }
+    else if (CHECK_ENC(MQ_MQENC_FLOAT_MASK, MQ_MQENC_FLOAT_IEEE_NORMAL))
+    {
+        DOPRT("FLT_IEEE_NORMAL");
+    }
+    else if (CHECK_ENC(MQ_MQENC_FLOAT_MASK, MQ_MQENC_FLOAT_IEEE_REVERSED))
+    {
+        DOPRT("FLT_IEEE_REVERSED");
+    }
+    else if (CHECK_ENC(MQ_MQENC_FLOAT_MASK, MQ_MQENC_FLOAT_S390))
+    {
+        DOPRT("FLT_S390");
+    }
+    else if (CHECK_ENC(MQ_MQENC_FLOAT_MASK, MQ_MQENC_FLOAT_TNS))
+    {
+        DOPRT("FLT_TNS");
+    } else
+    {
+        DOPRT("FLT_UNKNOWN");
+    }
+
+    DOPRT("/");
+    if (CHECK_ENC(MQ_MQENC_DECIMAL_MASK, MQ_MQENC_DECIMAL_UNDEFINED))
+    {
+        DOPRT("DEC_UNDEFINED");
+    }
+    else if (CHECK_ENC(MQ_MQENC_DECIMAL_MASK, MQ_MQENC_DECIMAL_NORMAL))
+    {
+        DOPRT("DEC_NORMAL");
+    }
+    else if (CHECK_ENC(MQ_MQENC_DECIMAL_MASK, MQ_MQENC_DECIMAL_REVERSED))
+    {
+        DOPRT("DEC_REVERSED");
+    }
+    else
+    {
+        DOPRT("DEC_UNKNOWN");
+    }
+
+    DOPRT("/");
+    if (CHECK_ENC(MQ_MQENC_INTEGER_MASK, MQ_MQENC_INTEGER_UNDEFINED))
+    {
+        DOPRT("INT_UNDEFINED");
+    }
+    else if (CHECK_ENC(MQ_MQENC_INTEGER_MASK, MQ_MQENC_INTEGER_NORMAL))
+    {
+        DOPRT("INT_NORMAL");
+    }
+    else if (CHECK_ENC(MQ_MQENC_INTEGER_MASK, MQ_MQENC_INTEGER_REVERSED))
+    {
+        DOPRT("INT_REVERSED");
+    }
+    else
+    {
+        DOPRT("INT_UNKNOWN");
+    }
 #undef CHECK_ENC
 #undef DOPRT
 
-	proto_tree_add_uint_format_value(tree, hfindex, tvb, start, length, uEnc,
-		"%8x-%d (%s)", uEnc, uEnc, sEnc);
+    proto_tree_add_uint_format_value(tree, hfindex, tvb, start, length, uEnc,
+        "%8x-%d (%s)", uEnc, uEnc, sEnc);
 
-	return length;
+    return length;
 }
 
 static gint dissect_mq_MQMO(tvbuff_t *tvb, proto_tree *mq_tree, gint offset, gint ett_subtree, mq_parm_t *p_mq_parm)
 {
-	guint        uMoOpt;
-
-	uMoOpt = tvb_get_guint32_endian(tvb, offset, p_mq_parm->mq_int_enc);
-
-	if (uMoOpt == 0)
-	{
-		proto_item  *ti;
-		proto_tree  *mq_tree_sub;
-		ti = proto_tree_add_item(mq_tree, hf_mq_gmo_matchoptions, tvb, offset, 4, p_mq_parm->mq_int_enc); /* ENC_BIG_ENDIAN); */
-		mq_tree_sub = proto_item_add_subtree(ti, ett_subtree);
-		proto_tree_add_text(mq_tree_sub, tvb, offset, 4, MQ_TEXT_MQMO_NONE);
-	}
-	else
-	{
-		proto_tree_add_bitmask(mq_tree, tvb, offset, hf_mq_gmo_matchoptions, ett_subtree, pf_flds_mtchopt, p_mq_parm->mq_int_enc);
-	}
-	return 4;
+    guint        uMoOpt;
+
+    uMoOpt = tvb_get_guint32_endian(tvb, offset, p_mq_parm->mq_int_enc);
+
+    if (uMoOpt == 0)
+    {
+        proto_item  *ti;
+        proto_tree  *mq_tree_sub;
+        ti = proto_tree_add_item(mq_tree, hf_mq_gmo_matchoptions, tvb, offset, 4, p_mq_parm->mq_int_enc); /* ENC_BIG_ENDIAN); */
+        mq_tree_sub = proto_item_add_subtree(ti, ett_subtree);
+        proto_tree_add_text(mq_tree_sub, tvb, offset, 4, MQ_TEXT_MQMO_NONE);
+    }
+    else
+    {
+        proto_tree_add_bitmask(mq_tree, tvb, offset, hf_mq_gmo_matchoptions, ett_subtree, pf_flds_mtchopt, p_mq_parm->mq_int_enc);
+    }
+    return 4;
 }
 static gint dissect_mq_LPOO_LPIOPTS(tvbuff_t *tvb, proto_tree *mq_tree, gint offset, gint ett_subtree, mq_parm_t *p_mq_parm)
 {
-	guint        uLpiOpts;
-
-	uLpiOpts = tvb_get_guint32_endian(tvb, offset, p_mq_parm->mq_int_enc);
-
-	if (uLpiOpts == 0)
-	{
-		proto_item  *ti;
-		proto_tree  *mq_tree_sub;
-		ti = proto_tree_add_item(mq_tree, hf_mq_lpoo_lpiopts, tvb, offset, 4, p_mq_parm->mq_int_enc);
-		mq_tree_sub = proto_item_add_subtree(ti, ett_subtree);
-		proto_tree_add_text(mq_tree_sub, tvb, offset, 4, MQ_TEXT_LPOOOPT_NONE);
-	}
-	else
-	{
-		proto_tree_add_bitmask(mq_tree, tvb, offset, hf_mq_lpoo_lpiopts, ett_subtree, pf_flds_lpooopt, p_mq_parm->mq_int_enc);
-	}
-	return 4;
+    guint        uLpiOpts;
+
+    uLpiOpts = tvb_get_guint32_endian(tvb, offset, p_mq_parm->mq_int_enc);
+
+    if (uLpiOpts == 0)
+    {
+        proto_item  *ti;
+        proto_tree  *mq_tree_sub;
+        ti = proto_tree_add_item(mq_tree, hf_mq_lpoo_lpiopts, tvb, offset, 4, p_mq_parm->mq_int_enc);
+        mq_tree_sub = proto_item_add_subtree(ti, ett_subtree);
+        proto_tree_add_text(mq_tree_sub, tvb, offset, 4, MQ_TEXT_LPOOOPT_NONE);
+    }
+    else
+    {
+        proto_tree_add_bitmask(mq_tree, tvb, offset, hf_mq_lpoo_lpiopts, ett_subtree, pf_flds_lpooopt, p_mq_parm->mq_int_enc);
+    }
+    return 4;
 }
 static gint dissect_mq_MQGMO(tvbuff_t *tvb, proto_tree *mq_tree, gint offset, gint ett_subtree, mq_parm_t *p_mq_parm)
 {
-	guint        uGmoOpt;
-
-	uGmoOpt = tvb_get_guint32_endian(tvb, offset, p_mq_parm->mq_int_enc);
-
-	if (uGmoOpt == 0)
-	{
-		proto_item  *ti;
-		proto_tree  *mq_tree_sub;
-		ti = proto_tree_add_item(mq_tree, hf_mq_gmo_options, tvb, offset, 4, p_mq_parm->mq_int_enc); /* ENC_BIG_ENDIAN); */
-		mq_tree_sub = proto_item_add_subtree(ti, ett_subtree);
-		proto_tree_add_text(mq_tree_sub, tvb, offset, 4, MQ_TEXT_MQGMO_NONE);
-	}
-	else
-	{
-		proto_tree_add_bitmask(mq_tree, tvb, offset, hf_mq_gmo_options, ett_subtree, pf_flds_gmoopt, p_mq_parm->mq_int_enc);
-	}
-	return 4;
+    guint        uGmoOpt;
+
+    uGmoOpt = tvb_get_guint32_endian(tvb, offset, p_mq_parm->mq_int_enc);
+
+    if (uGmoOpt == 0)
+    {
+        proto_item  *ti;
+        proto_tree  *mq_tree_sub;
+        ti = proto_tree_add_item(mq_tree, hf_mq_gmo_options, tvb, offset, 4, p_mq_parm->mq_int_enc); /* ENC_BIG_ENDIAN); */
+        mq_tree_sub = proto_item_add_subtree(ti, ett_subtree);
+        proto_tree_add_text(mq_tree_sub, tvb, offset, 4, MQ_TEXT_MQGMO_NONE);
+    }
+    else
+    {
+        proto_tree_add_bitmask(mq_tree, tvb, offset, hf_mq_gmo_options, ett_subtree, pf_flds_gmoopt, p_mq_parm->mq_int_enc);
+    }
+    return 4;
 }
 
 static gint dissect_mq_MQPMO(tvbuff_t *tvb, proto_tree *mq_tree, gint offset, gint ett_subtree, mq_parm_t *p_mq_parm)
 {
-	guint        uPmoOpt;
-
-	uPmoOpt = tvb_get_guint32_endian(tvb, offset, p_mq_parm->mq_int_enc);
-
-	if (uPmoOpt == 0)
-	{
-		proto_item  *ti;
-		proto_tree  *mq_tree_sub;
-		ti = proto_tree_add_item(mq_tree, hf_mq_pmo_options, tvb, offset, 4, p_mq_parm->mq_int_enc); /* ENC_BIG_ENDIAN); */
-		mq_tree_sub = proto_item_add_subtree(ti, ett_subtree);
-		proto_tree_add_text(mq_tree_sub, tvb, offset, 4, MQ_TEXT_MQPMO_NONE);
-	}
-	else
-	{
-		proto_tree_add_bitmask(mq_tree, tvb, offset, hf_mq_pmo_options, ett_subtree, pf_flds_pmoopt, p_mq_parm->mq_int_enc);
-	}
-	return 4;
+    guint        uPmoOpt;
+
+    uPmoOpt = tvb_get_guint32_endian(tvb, offset, p_mq_parm->mq_int_enc);
+
+    if (uPmoOpt == 0)
+    {
+        proto_item  *ti;
+        proto_tree  *mq_tree_sub;
+        ti = proto_tree_add_item(mq_tree, hf_mq_pmo_options, tvb, offset, 4, p_mq_parm->mq_int_enc); /* ENC_BIG_ENDIAN); */
+        mq_tree_sub = proto_item_add_subtree(ti, ett_subtree);
+        proto_tree_add_text(mq_tree_sub, tvb, offset, 4, MQ_TEXT_MQPMO_NONE);
+    }
+    else
+    {
+        proto_tree_add_bitmask(mq_tree, tvb, offset, hf_mq_pmo_options, ett_subtree, pf_flds_pmoopt, p_mq_parm->mq_int_enc);
+    }
+    return 4;
 }
 
 static gint dissect_mq_MQOO(tvbuff_t *tvb, proto_tree *mq_tree, gint offset, gint ett_subtree, gint hfindex, mq_parm_t *p_mq_parm)
 {
-	guint        uOpenOpt;
-
-	uOpenOpt = tvb_get_guint32_endian(tvb, offset, p_mq_parm->mq_int_enc);
-
-	if (uOpenOpt == 0)
-	{
-		proto_item  *ti;
-		proto_tree  *mq_tree_sub;
-		ti = proto_tree_add_item(mq_tree, hfindex, tvb, offset, 4, p_mq_parm->mq_int_enc);
-		mq_tree_sub = proto_item_add_subtree(ti, ett_subtree);
-		proto_tree_add_text(mq_tree_sub, tvb, offset, 4, MQ_TEXT_BIND_READAHEAD_AS_Q_DEF);
-	}
-	else
-	{
-		proto_tree_add_bitmask(mq_tree, tvb, offset, hfindex, ett_subtree, pf_flds_opnopt, p_mq_parm->mq_int_enc);
-	}
-	return 4;
+    guint        uOpenOpt;
+
+    uOpenOpt = tvb_get_guint32_endian(tvb, offset, p_mq_parm->mq_int_enc);
+
+    if (uOpenOpt == 0)
+    {
+        proto_item  *ti;
+        proto_tree  *mq_tree_sub;
+        ti = proto_tree_add_item(mq_tree, hfindex, tvb, offset, 4, p_mq_parm->mq_int_enc);
+        mq_tree_sub = proto_item_add_subtree(ti, ett_subtree);
+        proto_tree_add_text(mq_tree_sub, tvb, offset, 4, MQ_TEXT_BIND_READAHEAD_AS_Q_DEF);
+    }
+    else
+    {
+        proto_tree_add_bitmask(mq_tree, tvb, offset, hfindex, ett_subtree, pf_flds_opnopt, p_mq_parm->mq_int_enc);
+    }
+    return 4;
 }
 static gint dissect_mq_MQCO(tvbuff_t *tvb, proto_tree *mq_tree, gint offset, mq_parm_t *p_mq_parm)
 {
-	guint        iCloseOpt;
-
-	iCloseOpt = tvb_get_guint32_endian(tvb, offset, p_mq_parm->mq_int_enc);
-
-	if (iCloseOpt == 0)
-	{
-		proto_item  *ti;
-		proto_tree  *mq_tree_sub;
-		ti = proto_tree_add_item(mq_tree, hf_mq_close_options, tvb, offset, 4, p_mq_parm->mq_int_enc);
-		mq_tree_sub = proto_item_add_subtree(ti, ett_mq_close_option);
-		proto_tree_add_text(mq_tree_sub, tvb, offset, 4, MQ_TEXT_IMMEDIATE_NONE);
-	}
-	else
-	{
-		proto_tree_add_bitmask(mq_tree, tvb, offset, hf_mq_close_options, ett_mq_close_option, pf_flds_clsopt, ENC_BIG_ENDIAN);
-	}
-	return 4;
+    guint        iCloseOpt;
+
+    iCloseOpt = tvb_get_guint32_endian(tvb, offset, p_mq_parm->mq_int_enc);
+
+    if (iCloseOpt == 0)
+    {
+        proto_item  *ti;
+        proto_tree  *mq_tree_sub;
+        ti = proto_tree_add_item(mq_tree, hf_mq_close_options, tvb, offset, 4, p_mq_parm->mq_int_enc);
+        mq_tree_sub = proto_item_add_subtree(ti, ett_mq_close_option);
+        proto_tree_add_text(mq_tree_sub, tvb, offset, 4, MQ_TEXT_IMMEDIATE_NONE);
+    }
+    else
+    {
+        proto_tree_add_bitmask(mq_tree, tvb, offset, hf_mq_close_options, ett_mq_close_option, pf_flds_clsopt, ENC_BIG_ENDIAN);
+    }
+    return 4;
 }
 static gint dissect_mq_charv(tvbuff_t *tvb, proto_tree *tree, gint offset, gint iSize, gint idx, guint8 *pStr, mq_parm_t *p_mq_parm)
 {
-	proto_item *ti;
-	proto_tree *mq_tree_sub;
-	guint32		lStr;
-	guint32		oStr;
-	gint32		eStr;
-	guint8	   *sStr;
-	static guint8 sEmpty[]	= "[Empty]";
-
-	lStr = tvb_get_guint32_endian(tvb, offset + 12, p_mq_parm->mq_int_enc);
-	oStr = tvb_get_guint32_endian(tvb, offset +  4, p_mq_parm->mq_int_enc);
-	eStr = tvb_get_guint32_endian(tvb, offset + 16, p_mq_parm->mq_int_enc);
-	if (lStr && oStr)
-	{
-		sStr = tvb_get_string_enc(wmem_packet_scope(), tvb, oStr, lStr, p_mq_parm->mq_str_enc);
-	}
-	else
-		sStr = NULL;
-
-	ti = proto_tree_add_text(tree, tvb, offset, iSize, "%s - %s", pStr, (sStr) ? sStr : sEmpty);
-	mq_tree_sub = proto_item_add_subtree(ti, idx);
-	proto_tree_add_item(mq_tree_sub, hf_mq_charv_vsptr,		tvb, offset,      4, p_mq_parm->mq_int_enc);
-	proto_tree_add_item(mq_tree_sub, hf_mq_charv_vsoffset,	tvb, offset +  4, 4, p_mq_parm->mq_int_enc);
-	proto_tree_add_item(mq_tree_sub, hf_mq_charv_vsbufsize, tvb, offset +  8, 4, p_mq_parm->mq_int_enc);
-	proto_tree_add_item(mq_tree_sub, hf_mq_charv_vslength,	tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
-	proto_tree_add_item(mq_tree_sub, hf_mq_charv_vsccsid,	tvb, offset + 16, 4, p_mq_parm->mq_int_enc);
-	proto_tree_add_item(mq_tree_sub, hf_mq_charv_vsvalue,	tvb, oStr, lStr, (eStr == 500) ? ENC_EBCDIC : ENC_ASCII);
-
-	return 20;
+    proto_item *ti;
+    proto_tree *mq_tree_sub;
+    guint32     lStr;
+    guint32     oStr;
+    gint32      eStr;
+    guint8     *sStr;
+    static guint8 sEmpty[]  = "[Empty]";
+
+    lStr = tvb_get_guint32_endian(tvb, offset + 12, p_mq_parm->mq_int_enc);
+    oStr = tvb_get_guint32_endian(tvb, offset +  4, p_mq_parm->mq_int_enc);
+    eStr = tvb_get_guint32_endian(tvb, offset + 16, p_mq_parm->mq_int_enc);
+    if (lStr && oStr)
+    {
+        sStr = tvb_get_string_enc(wmem_packet_scope(), tvb, oStr, lStr, p_mq_parm->mq_str_enc);
+    }
+    else
+        sStr = NULL;
+
+    ti = proto_tree_add_text(tree, tvb, offset, iSize, "%s - %s", pStr, (sStr) ? sStr : sEmpty);
+    mq_tree_sub = proto_item_add_subtree(ti, idx);
+    proto_tree_add_item(mq_tree_sub, hf_mq_charv_vsptr,     tvb, offset,      4, p_mq_parm->mq_int_enc);
+    proto_tree_add_item(mq_tree_sub, hf_mq_charv_vsoffset,  tvb, offset +  4, 4, p_mq_parm->mq_int_enc);
+    proto_tree_add_item(mq_tree_sub, hf_mq_charv_vsbufsize, tvb, offset +  8, 4, p_mq_parm->mq_int_enc);
+    proto_tree_add_item(mq_tree_sub, hf_mq_charv_vslength,  tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
+    proto_tree_add_item(mq_tree_sub, hf_mq_charv_vsccsid,   tvb, offset + 16, 4, p_mq_parm->mq_int_enc);
+    proto_tree_add_item(mq_tree_sub, hf_mq_charv_vsvalue,   tvb, oStr, lStr, (eStr == 500) ? ENC_EBCDIC : ENC_ASCII);
+
+    return 20;
 }
 static gint dissect_mq_pmr(tvbuff_t *tvb, proto_tree *tree, gint offset, gint iNbrRecords, gint offsetPMR, guint32 recFlags, mq_parm_t *p_mq_parm)
 {
-	gint iSizePMR1 = 0;
-	gint iSizePMR  = 0;
-
-	iSizePMR1 =  ((((recFlags & MQ_PMRF_MSG_ID) != 0) * 24)
-		+(((recFlags & MQ_PMRF_CORREL_ID) != 0) * 24)
-		+(((recFlags & MQ_PMRF_GROUP_ID) != 0) * 24)
-		+(((recFlags & MQ_PMRF_FEEDBACK) != 0) * 4)
-		+(((recFlags & MQ_PMRF_ACCOUNTING_TOKEN) != 0) * 32));
-
-	if (offsetPMR != 0 && iSizePMR1 != 0)
-	{
-		iSizePMR = iNbrRecords * iSizePMR1;
-		if (tvb_length_remaining(tvb, offset) >= iSizePMR)
-		{
-			if (tree)
-			{
-				gint iOffsetPMR = 0;
-				gint iRecord = 0;
-				for (iRecord = 0; iRecord < iNbrRecords; iRecord++)
-				{
-					proto_item *ti = proto_tree_add_text(tree, tvb, offset + iOffsetPMR, iSizePMR1, MQ_TEXT_PMR);
-					proto_tree *mq_tree = proto_item_add_subtree(ti, ett_mq_pmr);
-					if ((recFlags & MQ_PMRF_MSG_ID) != 0)
-					{
-						proto_tree_add_item(mq_tree, hf_mq_pmr_msgid, tvb, offset + iOffsetPMR, 24, ENC_NA);
-						iOffsetPMR += 24;
-					}
-					if ((recFlags & MQ_PMRF_CORREL_ID) != 0)
-					{
-						proto_tree_add_item(mq_tree, hf_mq_pmr_correlid, tvb, offset + iOffsetPMR, 24, ENC_NA);
-						iOffsetPMR += 24;
-					}
-					if ((recFlags & MQ_PMRF_GROUP_ID) != 0)
-					{
-						proto_tree_add_item(mq_tree, hf_mq_pmr_groupid, tvb, offset + iOffsetPMR, 24, ENC_NA);
-						iOffsetPMR += 24;
-					}
-					if ((recFlags & MQ_PMRF_FEEDBACK) != 0)
-					{
-						proto_tree_add_item(mq_tree, hf_mq_pmr_feedback, tvb, offset + iOffsetPMR, 4, p_mq_parm->mq_int_enc);
-						iOffsetPMR += 4;
-					}
-					if ((recFlags & MQ_PMRF_ACCOUNTING_TOKEN) != 0)
-					{
-						proto_tree_add_item(mq_tree, hf_mq_pmr_acttoken, tvb, offset + iOffsetPMR, 32, ENC_NA);
-						iOffsetPMR += 32;
-					}
-				}
-			}
-		}
-		else iSizePMR = 0;
-	}
-	return iSizePMR;
+    gint iSizePMR1 = 0;
+    gint iSizePMR  = 0;
+
+    iSizePMR1 =  ((((recFlags & MQ_PMRF_MSG_ID) != 0) * 24)
+        +(((recFlags & MQ_PMRF_CORREL_ID) != 0) * 24)
+        +(((recFlags & MQ_PMRF_GROUP_ID) != 0) * 24)
+        +(((recFlags & MQ_PMRF_FEEDBACK) != 0) * 4)
+        +(((recFlags & MQ_PMRF_ACCOUNTING_TOKEN) != 0) * 32));
+
+    if (offsetPMR != 0 && iSizePMR1 != 0)
+    {
+        iSizePMR = iNbrRecords * iSizePMR1;
+        if (tvb_length_remaining(tvb, offset) >= iSizePMR)
+        {
+            if (tree)
+            {
+                gint iOffsetPMR = 0;
+                gint iRecord = 0;
+                for (iRecord = 0; iRecord < iNbrRecords; iRecord++)
+                {
+                    proto_item *ti = proto_tree_add_text(tree, tvb, offset + iOffsetPMR, iSizePMR1, MQ_TEXT_PMR);
+                    proto_tree *mq_tree = proto_item_add_subtree(ti, ett_mq_pmr);
+                    if ((recFlags & MQ_PMRF_MSG_ID) != 0)
+                    {
+                        proto_tree_add_item(mq_tree, hf_mq_pmr_msgid, tvb, offset + iOffsetPMR, 24, ENC_NA);
+                        iOffsetPMR += 24;
+                    }
+                    if ((recFlags & MQ_PMRF_CORREL_ID) != 0)
+                    {
+                        proto_tree_add_item(mq_tree, hf_mq_pmr_correlid, tvb, offset + iOffsetPMR, 24, ENC_NA);
+                        iOffsetPMR += 24;
+                    }
+                    if ((recFlags & MQ_PMRF_GROUP_ID) != 0)
+                    {
+                        proto_tree_add_item(mq_tree, hf_mq_pmr_groupid, tvb, offset + iOffsetPMR, 24, ENC_NA);
+                        iOffsetPMR += 24;
+                    }
+                    if ((recFlags & MQ_PMRF_FEEDBACK) != 0)
+                    {
+                        proto_tree_add_item(mq_tree, hf_mq_pmr_feedback, tvb, offset + iOffsetPMR, 4, p_mq_parm->mq_int_enc);
+                        iOffsetPMR += 4;
+                    }
+                    if ((recFlags & MQ_PMRF_ACCOUNTING_TOKEN) != 0)
+                    {
+                        proto_tree_add_item(mq_tree, hf_mq_pmr_acttoken, tvb, offset + iOffsetPMR, 32, ENC_NA);
+                        iOffsetPMR += 32;
+                    }
+                }
+            }
+        }
+        else iSizePMR = 0;
+    }
+    return iSizePMR;
 }
 static gint dissect_mq_or(tvbuff_t *tvb, proto_tree *tree, gint offset, gint iNbrRecords, gint offsetOR, mq_parm_t *p_mq_parm)
 {
-	gint iSizeOR = 0;
-	if (offsetOR != 0)
-	{
-		iSizeOR = iNbrRecords * 96;
-		if (tvb_length_remaining(tvb, offset) >= iSizeOR)
-		{
-			if (tree)
-			{
-				gint iOffsetOR = 0;
-				gint iRecord = 0;
-				for (iRecord = 0; iRecord < iNbrRecords ; iRecord++)
-				{
-					proto_item *ti = proto_tree_add_text(tree, tvb, offset + iOffsetOR, 96, MQ_TEXT_OR);
-					proto_tree *mq_tree = proto_item_add_subtree(ti, ett_mq_or);
-					proto_tree_add_item(mq_tree, hf_mq_or_objname, tvb, offset + iOffsetOR, 48, p_mq_parm->mq_str_enc);
-					proto_tree_add_item(mq_tree, hf_mq_or_objqmgrname, tvb, offset + iOffsetOR + 48, 48, p_mq_parm->mq_str_enc);
-					iOffsetOR += 96;
-				}
-			}
-		}
-		else iSizeOR = 0;
-	}
-	return iSizeOR;
+    gint iSizeOR = 0;
+    if (offsetOR != 0)
+    {
+        iSizeOR = iNbrRecords * 96;
+        if (tvb_length_remaining(tvb, offset) >= iSizeOR)
+        {
+            if (tree)
+            {
+                gint iOffsetOR = 0;
+                gint iRecord = 0;
+                for (iRecord = 0; iRecord < iNbrRecords ; iRecord++)
+                {
+                    proto_item *ti = proto_tree_add_text(tree, tvb, offset + iOffsetOR, 96, MQ_TEXT_OR);
+                    proto_tree *mq_tree = proto_item_add_subtree(ti, ett_mq_or);
+                    proto_tree_add_item(mq_tree, hf_mq_or_objname, tvb, offset + iOffsetOR, 48, p_mq_parm->mq_str_enc);
+                    proto_tree_add_item(mq_tree, hf_mq_or_objqmgrname, tvb, offset + iOffsetOR + 48, 48, p_mq_parm->mq_str_enc);
+                    iOffsetOR += 96;
+                }
+            }
+        }
+        else iSizeOR = 0;
+    }
+    return iSizeOR;
 }
 static gint dissect_mq_rr(tvbuff_t *tvb, proto_tree *tree, gint offset, gint iNbrRecords, gint offsetRR, mq_parm_t *p_mq_parm)
 {
-	gint iSizeRR = 0;
-	if (offsetRR != 0)
-	{
-		iSizeRR = iNbrRecords * 8;
-		if (tvb_length_remaining(tvb, offset) >= iSizeRR)
-		{
-			if (tree)
-			{
-				gint iOffsetRR = 0;
-				gint iRecord = 0;
-				for (iRecord = 0; iRecord < iNbrRecords; iRecord++)
-				{
-					proto_item *ti = proto_tree_add_text(tree, tvb, offset + iOffsetRR, 8, MQ_TEXT_RR);
-					proto_tree *mq_tree = proto_item_add_subtree(ti, ett_mq_rr);
-					proto_tree_add_item(mq_tree, hf_mq_rr_compcode, tvb, offset + iOffsetRR, 4, p_mq_parm->mq_int_enc);
-					proto_tree_add_item(mq_tree, hf_mq_rr_reascode, tvb, offset + iOffsetRR + 4, 4, p_mq_parm->mq_int_enc);
-					iOffsetRR += 8;
-				}
-			}
-		}
-		else iSizeRR = 0;
-	}
-	return iSizeRR;
+    gint iSizeRR = 0;
+    if (offsetRR != 0)
+    {
+        iSizeRR = iNbrRecords * 8;
+        if (tvb_length_remaining(tvb, offset) >= iSizeRR)
+        {
+            if (tree)
+            {
+                gint iOffsetRR = 0;
+                gint iRecord = 0;
+                for (iRecord = 0; iRecord < iNbrRecords; iRecord++)
+                {
+                    proto_item *ti = proto_tree_add_text(tree, tvb, offset + iOffsetRR, 8, MQ_TEXT_RR);
+                    proto_tree *mq_tree = proto_item_add_subtree(ti, ett_mq_rr);
+                    proto_tree_add_item(mq_tree, hf_mq_rr_compcode, tvb, offset + iOffsetRR, 4, p_mq_parm->mq_int_enc);
+                    proto_tree_add_item(mq_tree, hf_mq_rr_reascode, tvb, offset + iOffsetRR + 4, 4, p_mq_parm->mq_int_enc);
+                    iOffsetRR += 8;
+                }
+            }
+        }
+        else iSizeRR = 0;
+    }
+    return iSizeRR;
 }
 static gint dissect_mq_gmo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset, mq_parm_t *p_mq_parm)
 {
-	gint iSize = 0;
-
-	p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
-	if (p_mq_parm->mq_strucID == MQ_STRUCTID_GMO || p_mq_parm->mq_strucID == MQ_STRUCTID_GMO_EBCDIC)
-	{
-		guint32 iVersion = 0;
-		iVersion = tvb_get_guint32_endian(tvb, offset + 4, p_mq_parm->mq_int_enc);
-		/* Compute length according to version */
-		switch (iVersion)
-		{
-		case 1: iSize = 72; break;
-		case 2: iSize = 80; break;
-		case 3: iSize = 100; break;
-		}
-
-		if (iSize != 0 && tvb_length_remaining(tvb, offset) >= iSize)
-		{
-			guint8 *sQueue;
-			sQueue = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 24, 48, p_mq_parm->mq_str_enc);
-			if (strip_trailing_blanks(sQueue, 48) > 0)
-			{
-				col_append_fstr(pinfo->cinfo, COL_INFO, " Q=%s", sQueue);
-			}
-
-			if (tree)
-			{
-				proto_tree *mq_tree;
-				proto_item *ti;
-
-				ti = proto_tree_add_text(tree, tvb, offset, iSize, MQ_TEXT_GMO);
-				mq_tree = proto_item_add_subtree(ti, ett_mq_gmo);
-
-				proto_tree_add_item(mq_tree, hf_mq_gmo_StructID, tvb, offset, 4, p_mq_parm->mq_str_enc);
-				proto_tree_add_item(mq_tree, hf_mq_gmo_version, tvb, offset + 4, 4, p_mq_parm->mq_int_enc);
-
-				dissect_mq_MQGMO(tvb, mq_tree, offset + 8, ett_mq_gmo_option, p_mq_parm);
-
-				proto_tree_add_item(mq_tree, hf_mq_gmo_waitinterval, tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
-				proto_tree_add_item(mq_tree, hf_mq_gmo_signal1, tvb, offset + 16, 4, p_mq_parm->mq_int_enc);
-				proto_tree_add_item(mq_tree, hf_mq_gmo_signal2, tvb, offset + 20, 4, p_mq_parm->mq_int_enc);
-				proto_tree_add_item(mq_tree, hf_mq_gmo_resolvqname, tvb, offset + 24, 48, p_mq_parm->mq_str_enc);
-
-				if (iVersion >= 2)
-				{
-					/*proto_tree_add_item(mq_tree, hf_mq_gmo_matchoptions, tvb, offset + 72, 4, ENC_BIG_ENDIAN);*/
-					dissect_mq_MQMO(tvb, mq_tree, offset + 8, ett_mq_gmo_matchoption, p_mq_parm);
-
-					proto_tree_add_item(mq_tree, hf_mq_gmo_groupstatus, tvb, offset + 76, 1, ENC_BIG_ENDIAN);
-					proto_tree_add_item(mq_tree, hf_mq_gmo_segmstatus, tvb, offset + 77, 1, ENC_BIG_ENDIAN);
-					proto_tree_add_item(mq_tree, hf_mq_gmo_segmentation, tvb, offset + 78, 1, ENC_BIG_ENDIAN);
-					proto_tree_add_item(mq_tree, hf_mq_gmo_reserved, tvb, offset + 79, 1, ENC_BIG_ENDIAN);
-				}
-
-				if (iVersion >= 3)
-				{
-					proto_tree_add_item(mq_tree, hf_mq_gmo_msgtoken, tvb, offset + 80, 16, ENC_NA);
-					proto_tree_add_item(mq_tree, hf_mq_gmo_returnedlen, tvb, offset + 96, 4, p_mq_parm->mq_int_enc);
-				}
-			}
-		}
-	}
-	return iSize;
+    gint iSize = 0;
+
+    p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
+    if (p_mq_parm->mq_strucID == MQ_STRUCTID_GMO || p_mq_parm->mq_strucID == MQ_STRUCTID_GMO_EBCDIC)
+    {
+        guint32 iVersion = 0;
+        iVersion = tvb_get_guint32_endian(tvb, offset + 4, p_mq_parm->mq_int_enc);
+        /* Compute length according to version */
+        switch (iVersion)
+        {
+        case 1: iSize = 72; break;
+        case 2: iSize = 80; break;
+        case 3: iSize = 100; break;
+        }
+
+        if (iSize != 0 && tvb_length_remaining(tvb, offset) >= iSize)
+        {
+            guint8 *sQueue;
+            sQueue = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 24, 48, p_mq_parm->mq_str_enc);
+            if (strip_trailing_blanks(sQueue, 48) > 0)
+            {
+                col_append_fstr(pinfo->cinfo, COL_INFO, " Q=%s", sQueue);
+            }
+
+            if (tree)
+            {
+                proto_tree *mq_tree;
+                proto_item *ti;
+
+                ti = proto_tree_add_text(tree, tvb, offset, iSize, MQ_TEXT_GMO);
+                mq_tree = proto_item_add_subtree(ti, ett_mq_gmo);
+
+                proto_tree_add_item(mq_tree, hf_mq_gmo_StructID, tvb, offset, 4, p_mq_parm->mq_str_enc);
+                proto_tree_add_item(mq_tree, hf_mq_gmo_version, tvb, offset + 4, 4, p_mq_parm->mq_int_enc);
+
+                dissect_mq_MQGMO(tvb, mq_tree, offset + 8, ett_mq_gmo_option, p_mq_parm);
+
+                proto_tree_add_item(mq_tree, hf_mq_gmo_waitinterval, tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
+                proto_tree_add_item(mq_tree, hf_mq_gmo_signal1, tvb, offset + 16, 4, p_mq_parm->mq_int_enc);
+                proto_tree_add_item(mq_tree, hf_mq_gmo_signal2, tvb, offset + 20, 4, p_mq_parm->mq_int_enc);
+                proto_tree_add_item(mq_tree, hf_mq_gmo_resolvqname, tvb, offset + 24, 48, p_mq_parm->mq_str_enc);
+
+                if (iVersion >= 2)
+                {
+                    /*proto_tree_add_item(mq_tree, hf_mq_gmo_matchoptions, tvb, offset + 72, 4, ENC_BIG_ENDIAN);*/
+                    dissect_mq_MQMO(tvb, mq_tree, offset + 8, ett_mq_gmo_matchoption, p_mq_parm);
+
+                    proto_tree_add_item(mq_tree, hf_mq_gmo_groupstatus, tvb, offset + 76, 1, ENC_BIG_ENDIAN);
+                    proto_tree_add_item(mq_tree, hf_mq_gmo_segmstatus, tvb, offset + 77, 1, ENC_BIG_ENDIAN);
+                    proto_tree_add_item(mq_tree, hf_mq_gmo_segmentation, tvb, offset + 78, 1, ENC_BIG_ENDIAN);
+                    proto_tree_add_item(mq_tree, hf_mq_gmo_reserved, tvb, offset + 79, 1, ENC_BIG_ENDIAN);
+                }
+
+                if (iVersion >= 3)
+                {
+                    proto_tree_add_item(mq_tree, hf_mq_gmo_msgtoken, tvb, offset + 80, 16, ENC_NA);
+                    proto_tree_add_item(mq_tree, hf_mq_gmo_returnedlen, tvb, offset + 96, 4, p_mq_parm->mq_int_enc);
+                }
+            }
+        }
+    }
+    return iSize;
 }
 
 static gint dissect_mq_pmo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset, mq_parm_t *p_mq_parm, gint *iDistributionListSize)
 {
-	gint iSize = 0;
-
-	p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
-	if (p_mq_parm->mq_strucID == MQ_STRUCTID_PMO || p_mq_parm->mq_strucID == MQ_STRUCTID_PMO_EBCDIC)
-	{
-		guint32 iVersion = 0;
-		iVersion = tvb_get_guint32_endian(tvb, offset + 4, p_mq_parm->mq_int_enc);
-		/* Compute length according to version */
-		switch (iVersion)
-		{
-		case 1: iSize = 128; break;
-		case 2: iSize = 152;break;
-		}
-
-		if (iSize != 0 && tvb_length_remaining(tvb, offset) >= iSize)
-		{
-			guint8 *sQueue;
-
-			sQueue = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 32, 48, p_mq_parm->mq_str_enc);
-			if (strip_trailing_blanks(sQueue, 48) > 0)
-			{
-				col_append_fstr(pinfo->cinfo, COL_INFO, " Q=%s", sQueue);
-			}
-
-			if (tree)
-			{
-				proto_tree  *mq_tree;
-				proto_item  *ti;
-
-				ti = proto_tree_add_text(tree, tvb, offset, iSize, MQ_TEXT_PMO);
-				mq_tree = proto_item_add_subtree(ti, ett_mq_pmo);
-				proto_tree_add_item(mq_tree, hf_mq_pmo_StructID, tvb, offset, 4, p_mq_parm->mq_str_enc);
-				proto_tree_add_item(mq_tree, hf_mq_pmo_version, tvb, offset + 4, 4, p_mq_parm->mq_int_enc);
-
-				dissect_mq_MQPMO(tvb, mq_tree, offset + 8, ett_mq_pmo_option, p_mq_parm);
-
-				proto_tree_add_item(mq_tree, hf_mq_pmo_timeout, tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
-				proto_tree_add_item(mq_tree, hf_mq_pmo_context, tvb, offset + 16, 4, p_mq_parm->mq_int_enc);
-				proto_tree_add_item(mq_tree, hf_mq_pmo_knowndstcnt, tvb, offset + 20, 4, p_mq_parm->mq_int_enc);
-				proto_tree_add_item(mq_tree, hf_mq_pmo_unkndstcnt, tvb, offset + 24, 4, p_mq_parm->mq_int_enc);
-				proto_tree_add_item(mq_tree, hf_mq_pmo_invaldstcnt, tvb, offset + 28, 4, p_mq_parm->mq_int_enc);
-				proto_tree_add_item(mq_tree, hf_mq_pmo_resolvqname, tvb, offset + 32, 48, p_mq_parm->mq_str_enc);
-				proto_tree_add_item(mq_tree, hf_mq_pmo_resolvqmgr, tvb, offset + 80, 48, p_mq_parm->mq_str_enc);
-
-				if (iVersion >= 2)
-				{
-					proto_tree_add_item(mq_tree, hf_mq_pmo_recspresent, tvb, offset + 128, 4, p_mq_parm->mq_int_enc);
-					proto_tree_add_item(mq_tree, hf_mq_pmo_putmsgrecfld, tvb, offset + 132, 4, p_mq_parm->mq_int_enc);
-					proto_tree_add_item(mq_tree, hf_mq_pmo_putmsgrecofs, tvb, offset + 136, 4, p_mq_parm->mq_int_enc);
-					proto_tree_add_item(mq_tree, hf_mq_pmo_resprecofs, tvb, offset + 140, 4, p_mq_parm->mq_int_enc);
-					proto_tree_add_item(mq_tree, hf_mq_pmo_putmsgrecptr, tvb, offset + 144, 4, p_mq_parm->mq_int_enc);
-					proto_tree_add_item(mq_tree, hf_mq_pmo_resprecptr, tvb, offset + 148, 4, p_mq_parm->mq_int_enc);
-				}
-			}
-			if (iVersion >= 2)
-			{
-				gint iNbrRecords = 0;
-				guint32 iRecFlags = 0;
-
-				iNbrRecords = tvb_get_guint32_endian(tvb, offset + 128, p_mq_parm->mq_int_enc);
-				iRecFlags = tvb_get_guint32_endian(tvb, offset + 132, p_mq_parm->mq_int_enc);
-
-				if (iNbrRecords > 0)
-				{
-					gint iOffsetPMR = 0;
-					gint iOffsetRR = 0;
-
-					*iDistributionListSize = iNbrRecords;
-					iOffsetPMR = tvb_get_guint32_endian(tvb, offset + 136, p_mq_parm->mq_int_enc);
-					iOffsetRR  = tvb_get_guint32_endian(tvb, offset + 140, p_mq_parm->mq_int_enc);
-					iSize += dissect_mq_pmr(tvb, tree, offset + iSize, iNbrRecords, iOffsetPMR, iRecFlags, p_mq_parm);
-					iSize += dissect_mq_rr(tvb, tree, offset + iSize, iNbrRecords, iOffsetRR, p_mq_parm);
-				}
-			}
-		}
-	}
-	return iSize;
+    gint iSize = 0;
+
+    p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
+    if (p_mq_parm->mq_strucID == MQ_STRUCTID_PMO || p_mq_parm->mq_strucID == MQ_STRUCTID_PMO_EBCDIC)
+    {
+        guint32 iVersion = 0;
+        iVersion = tvb_get_guint32_endian(tvb, offset + 4, p_mq_parm->mq_int_enc);
+        /* Compute length according to version */
+        switch (iVersion)
+        {
+        case 1: iSize = 128; break;
+        case 2: iSize = 152;break;
+        }
+
+        if (iSize != 0 && tvb_length_remaining(tvb, offset) >= iSize)
+        {
+            guint8 *sQueue;
+
+            sQueue = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 32, 48, p_mq_parm->mq_str_enc);
+            if (strip_trailing_blanks(sQueue, 48) > 0)
+            {
+                col_append_fstr(pinfo->cinfo, COL_INFO, " Q=%s", sQueue);
+            }
+
+            if (tree)
+            {
+                proto_tree  *mq_tree;
+                proto_item  *ti;
+
+                ti = proto_tree_add_text(tree, tvb, offset, iSize, MQ_TEXT_PMO);
+                mq_tree = proto_item_add_subtree(ti, ett_mq_pmo);
+                proto_tree_add_item(mq_tree, hf_mq_pmo_StructID, tvb, offset, 4, p_mq_parm->mq_str_enc);
+                proto_tree_add_item(mq_tree, hf_mq_pmo_version, tvb, offset + 4, 4, p_mq_parm->mq_int_enc);
+
+                dissect_mq_MQPMO(tvb, mq_tree, offset + 8, ett_mq_pmo_option, p_mq_parm);
+
+                proto_tree_add_item(mq_tree, hf_mq_pmo_timeout, tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
+                proto_tree_add_item(mq_tree, hf_mq_pmo_context, tvb, offset + 16, 4, p_mq_parm->mq_int_enc);
+                proto_tree_add_item(mq_tree, hf_mq_pmo_knowndstcnt, tvb, offset + 20, 4, p_mq_parm->mq_int_enc);
+                proto_tree_add_item(mq_tree, hf_mq_pmo_unkndstcnt, tvb, offset + 24, 4, p_mq_parm->mq_int_enc);
+                proto_tree_add_item(mq_tree, hf_mq_pmo_invaldstcnt, tvb, offset + 28, 4, p_mq_parm->mq_int_enc);
+                proto_tree_add_item(mq_tree, hf_mq_pmo_resolvqname, tvb, offset + 32, 48, p_mq_parm->mq_str_enc);
+                proto_tree_add_item(mq_tree, hf_mq_pmo_resolvqmgr, tvb, offset + 80, 48, p_mq_parm->mq_str_enc);
+
+                if (iVersion >= 2)
+                {
+                    proto_tree_add_item(mq_tree, hf_mq_pmo_recspresent, tvb, offset + 128, 4, p_mq_parm->mq_int_enc);
+                    proto_tree_add_item(mq_tree, hf_mq_pmo_putmsgrecfld, tvb, offset + 132, 4, p_mq_parm->mq_int_enc);
+                    proto_tree_add_item(mq_tree, hf_mq_pmo_putmsgrecofs, tvb, offset + 136, 4, p_mq_parm->mq_int_enc);
+                    proto_tree_add_item(mq_tree, hf_mq_pmo_resprecofs, tvb, offset + 140, 4, p_mq_parm->mq_int_enc);
+                    proto_tree_add_item(mq_tree, hf_mq_pmo_putmsgrecptr, tvb, offset + 144, 4, p_mq_parm->mq_int_enc);
+                    proto_tree_add_item(mq_tree, hf_mq_pmo_resprecptr, tvb, offset + 148, 4, p_mq_parm->mq_int_enc);
+                }
+            }
+            if (iVersion >= 2)
+            {
+                gint iNbrRecords = 0;
+                guint32 iRecFlags = 0;
+
+                iNbrRecords = tvb_get_guint32_endian(tvb, offset + 128, p_mq_parm->mq_int_enc);
+                iRecFlags = tvb_get_guint32_endian(tvb, offset + 132, p_mq_parm->mq_int_enc);
+
+                if (iNbrRecords > 0)
+                {
+                    gint iOffsetPMR = 0;
+                    gint iOffsetRR = 0;
+
+                    *iDistributionListSize = iNbrRecords;
+                    iOffsetPMR = tvb_get_guint32_endian(tvb, offset + 136, p_mq_parm->mq_int_enc);
+                    iOffsetRR  = tvb_get_guint32_endian(tvb, offset + 140, p_mq_parm->mq_int_enc);
+                    iSize += dissect_mq_pmr(tvb, tree, offset + iSize, iNbrRecords, iOffsetPMR, iRecFlags, p_mq_parm);
+                    iSize += dissect_mq_rr(tvb, tree, offset + iSize, iNbrRecords, iOffsetRR, p_mq_parm);
+                }
+            }
+        }
+    }
+    return iSize;
 }
 
 static gint dissect_mq_od(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset, mq_parm_t *p_mq_parm, gint *iDistributionListSize)
 {
-	gint iSize = 0;
-
-	p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
-	if (p_mq_parm->mq_strucID == MQ_STRUCTID_OD || p_mq_parm->mq_strucID == MQ_STRUCTID_OD_EBCDIC)
-	{
-		/* The OD struct can be present in several messages at different levels */
-		guint32 iVersion = 0;
-		iVersion = tvb_get_guint32_endian(tvb, offset + 4, p_mq_parm->mq_int_enc);
-		/* Compute length according to version */
-		switch (iVersion)
-		{
-		case 1: iSize = 168; break;
-		case 2: iSize = 200; break;
-		case 3: iSize = 336; break;
-		case 4: iSize = 336+3*20+4; break;
-		}
-
-		if (iSize != 0 && tvb_length_remaining(tvb, offset) >= iSize)
-		{
-			gint	 iNbrRecords = 0;
-			guint8	*sObj;
-			guint32	 uTyp;
-
-			if (iVersion >= 2)
-				iNbrRecords = tvb_get_guint32_endian(tvb, offset + 168, p_mq_parm->mq_int_enc);
-
-			uTyp = tvb_get_guint32_endian(tvb, offset + 8, p_mq_parm->mq_int_enc);
-			sObj = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 12, 48, p_mq_parm->mq_str_enc);
-			col_append_fstr(pinfo->cinfo, COL_INFO, " Typ=%s", try_val_to_str(uTyp, GET_VALSV(objtype)));
-			if (strip_trailing_blanks(sObj, 48) > 0)
-			{
-				col_append_fstr(pinfo->cinfo, COL_INFO, " Obj=%s", sObj);
-			}
-
-			if (tree)
-			{
-				proto_tree  *mq_tree;
-				proto_item  *ti;
-
-				ti = proto_tree_add_text(tree, tvb, offset, iSize, MQ_TEXT_OD);
-				mq_tree = proto_item_add_subtree(ti, ett_mq_od);
-
-				proto_tree_add_item(mq_tree, hf_mq_od_StructID,	   tvb, offset,        4, p_mq_parm->mq_str_enc);
-				proto_tree_add_item(mq_tree, hf_mq_od_version,	   tvb, offset +   4,  4, p_mq_parm->mq_int_enc);
-				proto_tree_add_item(mq_tree, hf_mq_od_objecttype,  tvb, offset +   8,  4, p_mq_parm->mq_int_enc);
-				proto_tree_add_item(mq_tree, hf_mq_od_objectname,  tvb, offset +  12, 48, p_mq_parm->mq_str_enc);
-				proto_tree_add_item(mq_tree, hf_mq_od_objqmgrname, tvb, offset +  60, 48, p_mq_parm->mq_str_enc);
-				proto_tree_add_item(mq_tree, hf_mq_od_dynqname,	   tvb, offset + 108, 48, p_mq_parm->mq_str_enc);
-				proto_tree_add_item(mq_tree, hf_mq_od_altuserid,   tvb, offset + 156, 12, p_mq_parm->mq_str_enc);
-
-				if (iVersion >= 2)
-				{
-					proto_tree_add_item(mq_tree, hf_mq_od_recspresent,	tvb, offset + 168, 4, p_mq_parm->mq_int_enc);
-					proto_tree_add_item(mq_tree, hf_mq_od_knowndstcnt,	tvb, offset + 172, 4, p_mq_parm->mq_int_enc);
-					proto_tree_add_item(mq_tree, hf_mq_od_unknowdstcnt, tvb, offset + 176, 4, p_mq_parm->mq_int_enc);
-					proto_tree_add_item(mq_tree, hf_mq_od_invaldstcnt,	tvb, offset + 180, 4, p_mq_parm->mq_int_enc);
-					proto_tree_add_item(mq_tree, hf_mq_od_objrecofs,	tvb, offset + 184, 4, p_mq_parm->mq_int_enc);
-					proto_tree_add_item(mq_tree, hf_mq_od_resprecofs,	tvb, offset + 188, 4, p_mq_parm->mq_int_enc);
-					proto_tree_add_item(mq_tree, hf_mq_od_objrecptr,	tvb, offset + 192, 4, p_mq_parm->mq_int_enc);
-					proto_tree_add_item(mq_tree, hf_mq_od_resprecptr,	tvb, offset + 196, 4, p_mq_parm->mq_int_enc);
-				}
-				if (iVersion >= 3)
-				{
-					proto_tree_add_item(mq_tree, hf_mq_od_altsecurid,	tvb, offset + 200, 40, p_mq_parm->mq_str_enc);
-					proto_tree_add_item(mq_tree, hf_mq_od_resolvqname,	tvb, offset + 240, 48, p_mq_parm->mq_str_enc);
-					proto_tree_add_item(mq_tree, hf_mq_od_resolvqmgrnm, tvb, offset + 288, 48, p_mq_parm->mq_str_enc);
-				}
-				if (iVersion >= 4)
-				{
-					dissect_mq_charv(tvb, mq_tree, offset+336, 20, ett_mq_od_objstr,    (guint8 *)"Object string",          p_mq_parm);
-					dissect_mq_charv(tvb, mq_tree, offset+356, 20, ett_mq_od_selstr,    (guint8 *)"Selection string",       p_mq_parm);
-					dissect_mq_charv(tvb, mq_tree, offset+376, 20, ett_mq_od_resobjstr, (guint8 *)"Resolved object string", p_mq_parm);
-					proto_tree_add_item(mq_tree, hf_mq_od_resolvobjtyp, tvb, offset + 396, 4, p_mq_parm->mq_int_enc);
-				}
-			}
-			if (iNbrRecords > 0)
-			{
-				gint iOffsetOR = 0;
-				gint iOffsetRR = 0;
-
-				*iDistributionListSize = iNbrRecords;
-				iOffsetOR = tvb_get_guint32_endian(tvb, offset + 184, p_mq_parm->mq_int_enc);
-				iOffsetRR = tvb_get_guint32_endian(tvb, offset + 188, p_mq_parm->mq_int_enc);
-
-				iSize += dissect_mq_or(tvb, tree, offset, iNbrRecords, iOffsetOR, p_mq_parm);
-				iSize += dissect_mq_rr(tvb, tree, offset, iNbrRecords, iOffsetRR, p_mq_parm);
-			}
-		}
-	}
-	return iSize;
+    gint iSize = 0;
+
+    p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
+    if (p_mq_parm->mq_strucID == MQ_STRUCTID_OD || p_mq_parm->mq_strucID == MQ_STRUCTID_OD_EBCDIC)
+    {
+        /* The OD struct can be present in several messages at different levels */
+        guint32 iVersion = 0;
+        iVersion = tvb_get_guint32_endian(tvb, offset + 4, p_mq_parm->mq_int_enc);
+        /* Compute length according to version */
+        switch (iVersion)
+        {
+        case 1: iSize = 168; break;
+        case 2: iSize = 200; break;
+        case 3: iSize = 336; break;
+        case 4: iSize = 336+3*20+4; break;
+        }
+
+        if (iSize != 0 && tvb_length_remaining(tvb, offset) >= iSize)
+        {
+            gint     iNbrRecords = 0;
+            guint8  *sObj;
+            guint32  uTyp;
+
+            if (iVersion >= 2)
+                iNbrRecords = tvb_get_guint32_endian(tvb, offset + 168, p_mq_parm->mq_int_enc);
+
+            uTyp = tvb_get_guint32_endian(tvb, offset + 8, p_mq_parm->mq_int_enc);
+            sObj = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 12, 48, p_mq_parm->mq_str_enc);
+            col_append_fstr(pinfo->cinfo, COL_INFO, " Typ=%s", try_val_to_str(uTyp, GET_VALSV(objtype)));
+            if (strip_trailing_blanks(sObj, 48) > 0)
+            {
+                col_append_fstr(pinfo->cinfo, COL_INFO, " Obj=%s", sObj);
+            }
+
+            if (tree)
+            {
+                proto_tree  *mq_tree;
+                proto_item  *ti;
+
+                ti = proto_tree_add_text(tree, tvb, offset, iSize, MQ_TEXT_OD);
+                mq_tree = proto_item_add_subtree(ti, ett_mq_od);
+
+                proto_tree_add_item(mq_tree, hf_mq_od_StructID,    tvb, offset,        4, p_mq_parm->mq_str_enc);
+                proto_tree_add_item(mq_tree, hf_mq_od_version,     tvb, offset +   4,  4, p_mq_parm->mq_int_enc);
+                proto_tree_add_item(mq_tree, hf_mq_od_objecttype,  tvb, offset +   8,  4, p_mq_parm->mq_int_enc);
+                proto_tree_add_item(mq_tree, hf_mq_od_objectname,  tvb, offset +  12, 48, p_mq_parm->mq_str_enc);
+                proto_tree_add_item(mq_tree, hf_mq_od_objqmgrname, tvb, offset +  60, 48, p_mq_parm->mq_str_enc);
+                proto_tree_add_item(mq_tree, hf_mq_od_dynqname,    tvb, offset + 108, 48, p_mq_parm->mq_str_enc);
+                proto_tree_add_item(mq_tree, hf_mq_od_altuserid,   tvb, offset + 156, 12, p_mq_parm->mq_str_enc);
+
+                if (iVersion >= 2)
+                {
+                    proto_tree_add_item(mq_tree, hf_mq_od_recspresent,  tvb, offset + 168, 4, p_mq_parm->mq_int_enc);
+                    proto_tree_add_item(mq_tree, hf_mq_od_knowndstcnt,  tvb, offset + 172, 4, p_mq_parm->mq_int_enc);
+                    proto_tree_add_item(mq_tree, hf_mq_od_unknowdstcnt, tvb, offset + 176, 4, p_mq_parm->mq_int_enc);
+                    proto_tree_add_item(mq_tree, hf_mq_od_invaldstcnt,  tvb, offset + 180, 4, p_mq_parm->mq_int_enc);
+                    proto_tree_add_item(mq_tree, hf_mq_od_objrecofs,    tvb, offset + 184, 4, p_mq_parm->mq_int_enc);
+                    proto_tree_add_item(mq_tree, hf_mq_od_resprecofs,   tvb, offset + 188, 4, p_mq_parm->mq_int_enc);
+                    proto_tree_add_item(mq_tree, hf_mq_od_objrecptr,    tvb, offset + 192, 4, p_mq_parm->mq_int_enc);
+                    proto_tree_add_item(mq_tree, hf_mq_od_resprecptr,   tvb, offset + 196, 4, p_mq_parm->mq_int_enc);
+                }
+                if (iVersion >= 3)
+                {
+                    proto_tree_add_item(mq_tree, hf_mq_od_altsecurid,   tvb, offset + 200, 40, p_mq_parm->mq_str_enc);
+                    proto_tree_add_item(mq_tree, hf_mq_od_resolvqname,  tvb, offset + 240, 48, p_mq_parm->mq_str_enc);
+                    proto_tree_add_item(mq_tree, hf_mq_od_resolvqmgrnm, tvb, offset + 288, 48, p_mq_parm->mq_str_enc);
+                }
+                if (iVersion >= 4)
+                {
+                    dissect_mq_charv(tvb, mq_tree, offset+336, 20, ett_mq_od_objstr,    (guint8 *)"Object string",          p_mq_parm);
+                    dissect_mq_charv(tvb, mq_tree, offset+356, 20, ett_mq_od_selstr,    (guint8 *)"Selection string",       p_mq_parm);
+                    dissect_mq_charv(tvb, mq_tree, offset+376, 20, ett_mq_od_resobjstr, (guint8 *)"Resolved object string", p_mq_parm);
+                    proto_tree_add_item(mq_tree, hf_mq_od_resolvobjtyp, tvb, offset + 396, 4, p_mq_parm->mq_int_enc);
+                }
+            }
+            if (iNbrRecords > 0)
+            {
+                gint iOffsetOR = 0;
+                gint iOffsetRR = 0;
+
+                *iDistributionListSize = iNbrRecords;
+                iOffsetOR = tvb_get_guint32_endian(tvb, offset + 184, p_mq_parm->mq_int_enc);
+                iOffsetRR = tvb_get_guint32_endian(tvb, offset + 188, p_mq_parm->mq_int_enc);
+
+                iSize += dissect_mq_or(tvb, tree, offset, iNbrRecords, iOffsetOR, p_mq_parm);
+                iSize += dissect_mq_rr(tvb, tree, offset, iNbrRecords, iOffsetRR, p_mq_parm);
+            }
+        }
+    }
+    return iSize;
 }
 
 static gint dissect_mq_xid(tvbuff_t *tvb, proto_tree *tree, mq_parm_t *p_mq_parm, gint offset)
 {
-	gint iSizeXid = 0;
-	if (tvb_length_remaining(tvb, offset) >= 6)
-	{
-		guint8 iXidLength = 0;
-		guint8 iBqLength  = 0;
-
-		iXidLength = tvb_get_guint8(tvb, offset + 4);
-		iBqLength  = tvb_get_guint8(tvb, offset + 5);
-		iSizeXid   = 6 + iXidLength + iBqLength;
-
-		if (tvb_length_remaining(tvb, offset) >= iSizeXid)
-		{
-			if (tree)
-			{
-				proto_tree  *mq_tree;
-				proto_item  *ti;
-
-				ti = proto_tree_add_text(tree, tvb, offset, iSizeXid, MQ_TEXT_XID);
-				mq_tree = proto_item_add_subtree(ti, ett_mq_xa_xid);
-
-				proto_tree_add_item(mq_tree, hf_mq_xa_xid_formatid,	  tvb, offset,                  4, p_mq_parm->mq_int_enc);
-				proto_tree_add_item(mq_tree, hf_mq_xa_xid_glbxid_len, tvb, offset + 4,              1, p_mq_parm->mq_int_enc);
-				proto_tree_add_item(mq_tree, hf_mq_xa_xid_brq_length, tvb, offset + 5,              1, p_mq_parm->mq_int_enc);
-				proto_tree_add_item(mq_tree, hf_mq_xa_xid_globalxid,  tvb, offset + 6,              iXidLength, ENC_NA);
-				proto_tree_add_item(mq_tree, hf_mq_xa_xid_brq,		  tvb, offset + 6 + iXidLength, iBqLength,  ENC_NA);
-			}
-			iSizeXid += (4 - (iSizeXid % 4)) % 4; /* Pad for alignment with 4 byte word boundary */
-			if (tvb_length_remaining(tvb, offset) < iSizeXid)
-				iSizeXid = 0;
-		}
-		else iSizeXid = 0;
-	}
-	return iSizeXid;
+    gint iSizeXid = 0;
+    if (tvb_length_remaining(tvb, offset) >= 6)
+    {
+        guint8 iXidLength = 0;
+        guint8 iBqLength  = 0;
+
+        iXidLength = tvb_get_guint8(tvb, offset + 4);
+        iBqLength  = tvb_get_guint8(tvb, offset + 5);
+        iSizeXid   = 6 + iXidLength + iBqLength;
+
+        if (tvb_length_remaining(tvb, offset) >= iSizeXid)
+        {
+            if (tree)
+            {
+                proto_tree  *mq_tree;
+                proto_item  *ti;
+
+                ti = proto_tree_add_text(tree, tvb, offset, iSizeXid, MQ_TEXT_XID);
+                mq_tree = proto_item_add_subtree(ti, ett_mq_xa_xid);
+
+                proto_tree_add_item(mq_tree, hf_mq_xa_xid_formatid,   tvb, offset,                  4, p_mq_parm->mq_int_enc);
+                proto_tree_add_item(mq_tree, hf_mq_xa_xid_glbxid_len, tvb, offset + 4,              1, p_mq_parm->mq_int_enc);
+                proto_tree_add_item(mq_tree, hf_mq_xa_xid_brq_length, tvb, offset + 5,              1, p_mq_parm->mq_int_enc);
+                proto_tree_add_item(mq_tree, hf_mq_xa_xid_globalxid,  tvb, offset + 6,              iXidLength, ENC_NA);
+                proto_tree_add_item(mq_tree, hf_mq_xa_xid_brq,        tvb, offset + 6 + iXidLength, iBqLength,  ENC_NA);
+            }
+            iSizeXid += (4 - (iSizeXid % 4)) % 4; /* Pad for alignment with 4 byte word boundary */
+            if (tvb_length_remaining(tvb, offset) < iSizeXid)
+                iSizeXid = 0;
+        }
+        else iSizeXid = 0;
+    }
+    return iSizeXid;
 }
 
 static gint dissect_mq_sid(tvbuff_t *tvb, proto_tree *tree, mq_parm_t *p_mq_parm, gint offset)
 {
-	guint8	iSIDL;
-	guint8	iSID;
-	guint8 *sid_str;
-	gint	bOffset	= offset;
-
-	iSIDL = tvb_get_guint8(tvb, offset);
-	proto_tree_add_item(tree, hf_mq_sidlen, tvb, offset, 1, p_mq_parm->mq_int_enc);
-	offset++;
-	if (iSIDL > 0)
-	{
-		iSID = tvb_get_guint8(tvb, offset);
-		proto_tree_add_item(tree, hf_mq_sidtyp, tvb, offset, 1, p_mq_parm->mq_int_enc);
-		offset++;
-		if (iSID == MQ_MQSIDT_NT_SECURITY_ID)
-		{
-			offset = dissect_nt_sid(tvb, offset, tree, "SID", (char **)&sid_str, -1);
-		}
-		else
-		{
-			proto_tree_add_item(tree, hf_mq_securityid, tvb, offset, 40, ENC_NA);
-			offset += 40;
-		}
-	}
-	return offset - bOffset;
+    guint8  iSIDL;
+    guint8  iSID;
+    guint8 *sid_str;
+    gint    bOffset = offset;
+
+    iSIDL = tvb_get_guint8(tvb, offset);
+    proto_tree_add_item(tree, hf_mq_sidlen, tvb, offset, 1, p_mq_parm->mq_int_enc);
+    offset++;
+    if (iSIDL > 0)
+    {
+        iSID = tvb_get_guint8(tvb, offset);
+        proto_tree_add_item(tree, hf_mq_sidtyp, tvb, offset, 1, p_mq_parm->mq_int_enc);
+        offset++;
+        if (iSID == MQ_MQSIDT_NT_SECURITY_ID)
+        {
+            offset = dissect_nt_sid(tvb, offset, tree, "SID", (char **)&sid_str, -1);
+        }
+        else
+        {
+            proto_tree_add_item(tree, hf_mq_securityid, tvb, offset, 40, ENC_NA);
+            offset += 40;
+        }
+    }
+    return offset - bOffset;
 }
 static gint dissect_mq_id(tvbuff_t *tvb, packet_info *pinfo, proto_tree *mqroot_tree, gint offset, mq_parm_t *p_mq_parm)
 {
-	guint8 iFAPLvl;
-	gint   iSize;
-
-	iFAPLvl = tvb_get_guint8(tvb, offset + 4);
-
-	if (iFAPLvl < 4)
-		iSize = 44;
-	else if (iFAPLvl < 10)
-		iSize = 102;
-	else
-		iSize = 208;
-
-	if (iSize != 0 && tvb_length_remaining(tvb, offset) >= iSize)
-	{
-		guint8 *sChannel;
-		sChannel = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 24, 20, p_mq_parm->mq_str_enc);
-		col_append_fstr(pinfo->cinfo, COL_INFO, " FAPLvl=%d", iFAPLvl);
-		if (strip_trailing_blanks(sChannel, 20) > 0)
-		{
-			col_append_fstr(pinfo->cinfo, COL_INFO, ", CHL=%s", sChannel);
-		}
-		if (iFAPLvl >= 4)
-		{
-			guint8 *sQMgr;
-			sQMgr = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 48, 48, p_mq_parm->mq_str_enc);
-			if (strip_trailing_blanks(sQMgr, 48) > 0)
-			{
-				col_append_fstr(pinfo->cinfo, COL_INFO, ", QM=%s", sQMgr);
-			}
-			p_mq_parm->mq_id_ccsid.ccsid = (guint32)tvb_get_guint16_endian(tvb, offset +  46,  p_mq_parm->mq_int_enc);
-		}
-		if (mqroot_tree)
-		{
-			proto_item *ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSize, MQ_TEXT_ID);
-			proto_tree *mq_tree = proto_item_add_subtree(ti, ett_mq_id);
-
-			proto_tree_add_item(mq_tree, hf_mq_id_StructID, tvb, offset, 4, p_mq_parm->mq_str_enc);
-			proto_tree_add_item(mq_tree, hf_mq_id_FapLevel, tvb, offset + 4, 1, ENC_BIG_ENDIAN);
-
-			/* ID Capability flags 1 */
-			proto_tree_add_bitmask(mq_tree, tvb, offset + 44, hf_mq_id_icf1, ett_mq_id_icf1, pf_flds_icf1, ENC_BIG_ENDIAN);
-			proto_tree_add_item(mq_tree, hf_mq_id_Eicf1, tvb, offset + 6, 1, ENC_BIG_ENDIAN);
-
-			/* Error flags 1*/
-			proto_tree_add_bitmask(mq_tree, tvb, offset + 7, hf_mq_id_ief1, ett_mq_id_ief1, pf_flds_ief1, ENC_BIG_ENDIAN);
-
-			proto_tree_add_item(mq_tree, hf_mq_id_Reserved,	   tvb, offset +  8,  2, p_mq_parm->mq_int_enc);
-			proto_tree_add_item(mq_tree, hf_mq_id_MaxMsgBatch, tvb, offset + 10,  2, p_mq_parm->mq_int_enc);
-			proto_tree_add_item(mq_tree, hf_mq_id_MaxTrSize,   tvb, offset + 12,  4, p_mq_parm->mq_int_enc);
-			proto_tree_add_item(mq_tree, hf_mq_id_MaxMsgSize,  tvb, offset + 16,  4, p_mq_parm->mq_int_enc);
-			proto_tree_add_item(mq_tree, hf_mq_id_SeqWrapVal,  tvb, offset + 20,  4, p_mq_parm->mq_int_enc);
-			proto_tree_add_item(mq_tree, hf_mq_id_channel,	   tvb, offset + 24, 20, p_mq_parm->mq_str_enc);
-
-			if (iFAPLvl >= 4)
-			{
-				/* ID Capability flags 2 */
-				proto_tree_add_bitmask(mq_tree, tvb, offset + 44, hf_mq_id_icf2, ett_mq_id_icf2, pf_flds_icf2, ENC_BIG_ENDIAN);
-				proto_tree_add_item(mq_tree, hf_mq_id_Eicf2, tvb, offset + 45, 1, ENC_BIG_ENDIAN);
-
-				proto_tree_add_item(mq_tree, hf_mq_id_ccsid     , tvb, offset +  46,  2, p_mq_parm->mq_int_enc);
-				proto_tree_add_item(mq_tree, hf_mq_id_qmgrname  , tvb, offset +  48, 48, p_mq_parm->mq_str_enc);
-				proto_tree_add_item(mq_tree, hf_mq_id_HBInterval, tvb, offset +  96,  4, p_mq_parm->mq_int_enc);
-				proto_tree_add_item(mq_tree, hf_mq_id_EFLLength , tvb, offset + 100,  2, p_mq_parm->mq_int_enc);
-				if (iFAPLvl >= 10)
-				{
-					/* Error flags 2*/
-					proto_tree_add_bitmask(mq_tree, tvb, offset + 102, hf_mq_id_ief2, ett_mq_id_ief2, pf_flds_ief2, ENC_BIG_ENDIAN);
-					proto_tree_add_item(mq_tree, hf_mq_id_Reserved1 , tvb, offset + 103,  1, ENC_BIG_ENDIAN);
-
-					proto_tree_add_item(mq_tree, hf_mq_id_HdrCprsLst, tvb, offset + 104,  2, p_mq_parm->mq_int_enc);
-					proto_tree_add_item(mq_tree, hf_mq_id_MsgCprsLst, tvb, offset + 106, 16, p_mq_parm->mq_int_enc);
-					proto_tree_add_item(mq_tree, hf_mq_id_Reserved2 , tvb, offset + 122,  2, p_mq_parm->mq_int_enc);
-					proto_tree_add_item(mq_tree, hf_mq_id_SSLKeyRst , tvb, offset + 124,  4, p_mq_parm->mq_int_enc);
-					proto_tree_add_item(mq_tree, hf_mq_id_ConvBySkt , tvb, offset + 128,  4, p_mq_parm->mq_int_enc);
-
-					/* ID Capability flags 3 */
-					proto_tree_add_bitmask(mq_tree, tvb, offset + 132, hf_mq_id_icf3, ett_mq_id_icf3, pf_flds_icf3, ENC_BIG_ENDIAN);
-					proto_tree_add_item(mq_tree, hf_mq_id_Eicf3, tvb, offset + 133, 1, ENC_BIG_ENDIAN);
-
-					proto_tree_add_item(mq_tree, hf_mq_id_Reserved3, tvb, offset + 134,  2, p_mq_parm->mq_int_enc);
-					proto_tree_add_item(mq_tree, hf_mq_id_ProcessId, tvb, offset + 136,  4, p_mq_parm->mq_int_enc);
-					proto_tree_add_item(mq_tree, hf_mq_id_ThreadId , tvb, offset + 140,  4, p_mq_parm->mq_int_enc);
-					proto_tree_add_item(mq_tree, hf_mq_id_TraceId  , tvb, offset + 144,  4, p_mq_parm->mq_int_enc);
-					proto_tree_add_item(mq_tree, hf_mq_id_ProdId   , tvb, offset + 148, 12, p_mq_parm->mq_str_enc);
-					proto_tree_add_item(mq_tree, hf_mq_id_mqmid    , tvb, offset + 160, 48, p_mq_parm->mq_str_enc);
-				}
-			}
-		}
-	}
-	return iSize;
+    guint8 iFAPLvl;
+    gint   iSize;
+
+    iFAPLvl = tvb_get_guint8(tvb, offset + 4);
+
+    if (iFAPLvl < 4)
+        iSize = 44;
+    else if (iFAPLvl < 10)
+        iSize = 102;
+    else
+        iSize = 208;
+
+    if (iSize != 0 && tvb_length_remaining(tvb, offset) >= iSize)
+    {
+        guint8 *sChannel;
+        sChannel = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 24, 20, p_mq_parm->mq_str_enc);
+        col_append_fstr(pinfo->cinfo, COL_INFO, " FAPLvl=%d", iFAPLvl);
+        if (strip_trailing_blanks(sChannel, 20) > 0)
+        {
+            col_append_fstr(pinfo->cinfo, COL_INFO, ", CHL=%s", sChannel);
+        }
+        if (iFAPLvl >= 4)
+        {
+            guint8 *sQMgr;
+            sQMgr = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 48, 48, p_mq_parm->mq_str_enc);
+            if (strip_trailing_blanks(sQMgr, 48) > 0)
+            {
+                col_append_fstr(pinfo->cinfo, COL_INFO, ", QM=%s", sQMgr);
+            }
+            p_mq_parm->mq_id_ccsid.ccsid = (guint32)tvb_get_guint16_endian(tvb, offset +  46,  p_mq_parm->mq_int_enc);
+        }
+        if (mqroot_tree)
+        {
+            proto_item *ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSize, MQ_TEXT_ID);
+            proto_tree *mq_tree = proto_item_add_subtree(ti, ett_mq_id);
+
+            proto_tree_add_item(mq_tree, hf_mq_id_StructID, tvb, offset, 4, p_mq_parm->mq_str_enc);
+            proto_tree_add_item(mq_tree, hf_mq_id_FapLevel, tvb, offset + 4, 1, ENC_BIG_ENDIAN);
+
+            /* ID Capability flags 1 */
+            proto_tree_add_bitmask(mq_tree, tvb, offset + 44, hf_mq_id_icf1, ett_mq_id_icf1, pf_flds_icf1, ENC_BIG_ENDIAN);
+            proto_tree_add_item(mq_tree, hf_mq_id_Eicf1, tvb, offset + 6, 1, ENC_BIG_ENDIAN);
+
+            /* Error flags 1*/
+            proto_tree_add_bitmask(mq_tree, tvb, offset + 7, hf_mq_id_ief1, ett_mq_id_ief1, pf_flds_ief1, ENC_BIG_ENDIAN);
+
+            proto_tree_add_item(mq_tree, hf_mq_id_Reserved,    tvb, offset +  8,  2, p_mq_parm->mq_int_enc);
+            proto_tree_add_item(mq_tree, hf_mq_id_MaxMsgBatch, tvb, offset + 10,  2, p_mq_parm->mq_int_enc);
+            proto_tree_add_item(mq_tree, hf_mq_id_MaxTrSize,   tvb, offset + 12,  4, p_mq_parm->mq_int_enc);
+            proto_tree_add_item(mq_tree, hf_mq_id_MaxMsgSize,  tvb, offset + 16,  4, p_mq_parm->mq_int_enc);
+            proto_tree_add_item(mq_tree, hf_mq_id_SeqWrapVal,  tvb, offset + 20,  4, p_mq_parm->mq_int_enc);
+            proto_tree_add_item(mq_tree, hf_mq_id_channel,     tvb, offset + 24, 20, p_mq_parm->mq_str_enc);
+
+            if (iFAPLvl >= 4)
+            {
+                /* ID Capability flags 2 */
+                proto_tree_add_bitmask(mq_tree, tvb, offset + 44, hf_mq_id_icf2, ett_mq_id_icf2, pf_flds_icf2, ENC_BIG_ENDIAN);
+                proto_tree_add_item(mq_tree, hf_mq_id_Eicf2, tvb, offset + 45, 1, ENC_BIG_ENDIAN);
+
+                proto_tree_add_item(mq_tree, hf_mq_id_ccsid     , tvb, offset +  46,  2, p_mq_parm->mq_int_enc);
+                proto_tree_add_item(mq_tree, hf_mq_id_qmgrname  , tvb, offset +  48, 48, p_mq_parm->mq_str_enc);
+                proto_tree_add_item(mq_tree, hf_mq_id_HBInterval, tvb, offset +  96,  4, p_mq_parm->mq_int_enc);
+                proto_tree_add_item(mq_tree, hf_mq_id_EFLLength , tvb, offset + 100,  2, p_mq_parm->mq_int_enc);
+                if (iFAPLvl >= 10)
+                {
+                    /* Error flags 2*/
+                    proto_tree_add_bitmask(mq_tree, tvb, offset + 102, hf_mq_id_ief2, ett_mq_id_ief2, pf_flds_ief2, ENC_BIG_ENDIAN);
+                    proto_tree_add_item(mq_tree, hf_mq_id_Reserved1 , tvb, offset + 103,  1, ENC_BIG_ENDIAN);
+
+                    proto_tree_add_item(mq_tree, hf_mq_id_HdrCprsLst, tvb, offset + 104,  2, p_mq_parm->mq_int_enc);
+                    proto_tree_add_item(mq_tree, hf_mq_id_MsgCprsLst, tvb, offset + 106, 16, p_mq_parm->mq_int_enc);
+                    proto_tree_add_item(mq_tree, hf_mq_id_Reserved2 , tvb, offset + 122,  2, p_mq_parm->mq_int_enc);
+                    proto_tree_add_item(mq_tree, hf_mq_id_SSLKeyRst , tvb, offset + 124,  4, p_mq_parm->mq_int_enc);
+                    proto_tree_add_item(mq_tree, hf_mq_id_ConvBySkt , tvb, offset + 128,  4, p_mq_parm->mq_int_enc);
+
+                    /* ID Capability flags 3 */
+                    proto_tree_add_bitmask(mq_tree, tvb, offset + 132, hf_mq_id_icf3, ett_mq_id_icf3, pf_flds_icf3, ENC_BIG_ENDIAN);
+                    proto_tree_add_item(mq_tree, hf_mq_id_Eicf3, tvb, offset + 133, 1, ENC_BIG_ENDIAN);
+
+                    proto_tree_add_item(mq_tree, hf_mq_id_Reserved3, tvb, offset + 134,  2, p_mq_parm->mq_int_enc);
+                    proto_tree_add_item(mq_tree, hf_mq_id_ProcessId, tvb, offset + 136,  4, p_mq_parm->mq_int_enc);
+                    proto_tree_add_item(mq_tree, hf_mq_id_ThreadId , tvb, offset + 140,  4, p_mq_parm->mq_int_enc);
+                    proto_tree_add_item(mq_tree, hf_mq_id_TraceId  , tvb, offset + 144,  4, p_mq_parm->mq_int_enc);
+                    proto_tree_add_item(mq_tree, hf_mq_id_ProdId   , tvb, offset + 148, 12, p_mq_parm->mq_str_enc);
+                    proto_tree_add_item(mq_tree, hf_mq_id_mqmid    , tvb, offset + 160, 48, p_mq_parm->mq_str_enc);
+                }
+            }
+        }
+    }
+    return iSize;
 }
 static gint dissect_mq_md(tvbuff_t *tvb, proto_tree *tree, gint offset, mq_parm_t *p_mq_parm, gboolean bDecode)
 {
-	gint iSize = 0;
-
-	p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
-	if (p_mq_parm->mq_strucID == MQ_STRUCTID_MD || p_mq_parm->mq_strucID == MQ_STRUCTID_MD_EBCDIC)
-	{
-		guint32 iVersion = 0;
-		iVersion = tvb_get_guint32_endian(tvb, offset + 4, p_mq_parm->mq_int_enc);
-		/* Compute length according to version */
-		switch (iVersion)
-		{
-		case 1: iSize = 324; break;
-		case 2: iSize = 364; break;
-		}
-
-		if (bDecode && iSize != 0 && tvb_length_remaining(tvb, offset) >= iSize)
-		{
-			p_mq_parm->iOfsEnc = offset + 24;
-			p_mq_parm->iOfsCcs = offset + 28;
-			p_mq_parm->iOfsFmt = offset + 32;
-
-			p_mq_parm->mq_md_ccsid.encod = tvb_get_guint32_endian(tvb, offset +  24,  p_mq_parm->mq_int_enc);
-			p_mq_parm->mq_md_ccsid.ccsid = tvb_get_guint32_endian(tvb, offset +  28,  p_mq_parm->mq_int_enc);
-			if (tree)
-			{
-				proto_item *ti = proto_tree_add_text(tree, tvb, offset, iSize, MQ_TEXT_MD);
-				proto_tree *mq_tree = proto_item_add_subtree(ti, ett_mq_md);
-
-				proto_tree_add_item(mq_tree, hf_mq_md_StructID,	   tvb, offset,        4, p_mq_parm->mq_str_enc);
-				proto_tree_add_item(mq_tree, hf_mq_md_version,	   tvb, offset +   4,  4, p_mq_parm->mq_int_enc);
-				proto_tree_add_item(mq_tree, hf_mq_md_report,	   tvb, offset +   8,  4, p_mq_parm->mq_int_enc);
-				proto_tree_add_item(mq_tree, hf_mq_md_msgtype,	   tvb, offset +  12,  4, p_mq_parm->mq_int_enc);
-				proto_tree_add_item(mq_tree, hf_mq_md_expiry,	   tvb, offset +  16,  4, p_mq_parm->mq_int_enc);
-				proto_tree_add_item(mq_tree, hf_mq_md_feedback,	   tvb, offset +  20,  4, p_mq_parm->mq_int_enc);
-				dissect_mq_encoding(mq_tree, hf_mq_md_encoding,	   tvb, offset +  24,  4, p_mq_parm->mq_int_enc);
-				proto_tree_add_item(mq_tree, hf_mq_md_ccsid,	   tvb, offset +  28,  4, p_mq_parm->mq_int_enc);
-				proto_tree_add_item(mq_tree, hf_mq_md_format,	   tvb, offset +  32,  8, p_mq_parm->mq_str_enc);
-				proto_tree_add_item(mq_tree, hf_mq_md_priority,	   tvb, offset +  40,  4, p_mq_parm->mq_int_enc);
-				proto_tree_add_item(mq_tree, hf_mq_md_persistence, tvb, offset +  44,  4, p_mq_parm->mq_int_enc);
-				proto_tree_add_item(mq_tree, hf_mq_md_msgid,	   tvb, offset +  48, 24, ENC_NA);
-				proto_tree_add_item(mq_tree, hf_mq_md_correlid,	   tvb, offset +  72, 24, ENC_NA);
-				proto_tree_add_item(mq_tree, hf_mq_md_backoutcnt,  tvb, offset +  96,  4, p_mq_parm->mq_int_enc);
-				proto_tree_add_item(mq_tree, hf_mq_md_replytoq,	   tvb, offset + 100, 48, p_mq_parm->mq_str_enc);
-				proto_tree_add_item(mq_tree, hf_mq_md_replytoqmgr, tvb, offset + 148, 48, p_mq_parm->mq_str_enc);
-				proto_tree_add_item(mq_tree, hf_mq_md_userid,	   tvb, offset + 196, 12, p_mq_parm->mq_str_enc);
-				proto_tree_add_item(mq_tree, hf_mq_md_acttoken,	   tvb, offset + 208, 32, ENC_NA);
-				proto_tree_add_item(mq_tree, hf_mq_md_appliddata,  tvb, offset + 240, 32, p_mq_parm->mq_str_enc);
-				proto_tree_add_item(mq_tree, hf_mq_md_putappltype, tvb, offset + 272,  4, p_mq_parm->mq_int_enc);
-				proto_tree_add_item(mq_tree, hf_mq_md_putapplname, tvb, offset + 276, 28, p_mq_parm->mq_str_enc);
-				proto_tree_add_item(mq_tree, hf_mq_md_putdate,	   tvb, offset + 304,  8, p_mq_parm->mq_str_enc);
-				proto_tree_add_item(mq_tree, hf_mq_md_puttime,	   tvb, offset + 312,  8, p_mq_parm->mq_str_enc);
-				proto_tree_add_item(mq_tree, hf_mq_md_apporigdata, tvb, offset + 320,  4, p_mq_parm->mq_str_enc);
-
-				if (iVersion >= 2)
-				{
-					proto_tree_add_item(mq_tree, hf_mq_md_groupid,		tvb, offset + 324, 24, ENC_NA);
-					proto_tree_add_item(mq_tree, hf_mq_md_msgseqnumber, tvb, offset + 348,  4, p_mq_parm->mq_int_enc);
-					proto_tree_add_item(mq_tree, hf_mq_md_offset,		tvb, offset + 352,  4, p_mq_parm->mq_int_enc);
-					proto_tree_add_item(mq_tree, hf_mq_md_msgflags,		tvb, offset + 356,  4, p_mq_parm->mq_int_enc);
-					proto_tree_add_item(mq_tree, hf_mq_md_origlen,		tvb, offset + 360,  4, p_mq_parm->mq_int_enc);
-				}
-			}
-		}
-	}
-	return iSize;
+    gint iSize = 0;
+
+    p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
+    if (p_mq_parm->mq_strucID == MQ_STRUCTID_MD || p_mq_parm->mq_strucID == MQ_STRUCTID_MD_EBCDIC)
+    {
+        guint32 iVersion = 0;
+        iVersion = tvb_get_guint32_endian(tvb, offset + 4, p_mq_parm->mq_int_enc);
+        /* Compute length according to version */
+        switch (iVersion)
+        {
+        case 1: iSize = 324; break;
+        case 2: iSize = 364; break;
+        }
+
+        if (bDecode && iSize != 0 && tvb_length_remaining(tvb, offset) >= iSize)
+        {
+            p_mq_parm->iOfsEnc = offset + 24;
+            p_mq_parm->iOfsCcs = offset + 28;
+            p_mq_parm->iOfsFmt = offset + 32;
+
+            p_mq_parm->mq_md_ccsid.encod = tvb_get_guint32_endian(tvb, offset +  24,  p_mq_parm->mq_int_enc);
+            p_mq_parm->mq_md_ccsid.ccsid = tvb_get_guint32_endian(tvb, offset +  28,  p_mq_parm->mq_int_enc);
+            if (tree)
+            {
+                proto_item *ti = proto_tree_add_text(tree, tvb, offset, iSize, MQ_TEXT_MD);
+                proto_tree *mq_tree = proto_item_add_subtree(ti, ett_mq_md);
+
+                proto_tree_add_item(mq_tree, hf_mq_md_StructID,    tvb, offset,        4, p_mq_parm->mq_str_enc);
+                proto_tree_add_item(mq_tree, hf_mq_md_version,     tvb, offset +   4,  4, p_mq_parm->mq_int_enc);
+                proto_tree_add_item(mq_tree, hf_mq_md_report,      tvb, offset +   8,  4, p_mq_parm->mq_int_enc);
+                proto_tree_add_item(mq_tree, hf_mq_md_msgtype,     tvb, offset +  12,  4, p_mq_parm->mq_int_enc);
+                proto_tree_add_item(mq_tree, hf_mq_md_expiry,      tvb, offset +  16,  4, p_mq_parm->mq_int_enc);
+                proto_tree_add_item(mq_tree, hf_mq_md_feedback,    tvb, offset +  20,  4, p_mq_parm->mq_int_enc);
+                dissect_mq_encoding(mq_tree, hf_mq_md_encoding,    tvb, offset +  24,  4, p_mq_parm->mq_int_enc);
+                proto_tree_add_item(mq_tree, hf_mq_md_ccsid,       tvb, offset +  28,  4, p_mq_parm->mq_int_enc);
+                proto_tree_add_item(mq_tree, hf_mq_md_format,      tvb, offset +  32,  8, p_mq_parm->mq_str_enc);
+                proto_tree_add_item(mq_tree, hf_mq_md_priority,    tvb, offset +  40,  4, p_mq_parm->mq_int_enc);
+                proto_tree_add_item(mq_tree, hf_mq_md_persistence, tvb, offset +  44,  4, p_mq_parm->mq_int_enc);
+                proto_tree_add_item(mq_tree, hf_mq_md_msgid,       tvb, offset +  48, 24, ENC_NA);
+                proto_tree_add_item(mq_tree, hf_mq_md_correlid,    tvb, offset +  72, 24, ENC_NA);
+                proto_tree_add_item(mq_tree, hf_mq_md_backoutcnt,  tvb, offset +  96,  4, p_mq_parm->mq_int_enc);
+                proto_tree_add_item(mq_tree, hf_mq_md_replytoq,    tvb, offset + 100, 48, p_mq_parm->mq_str_enc);
+                proto_tree_add_item(mq_tree, hf_mq_md_replytoqmgr, tvb, offset + 148, 48, p_mq_parm->mq_str_enc);
+                proto_tree_add_item(mq_tree, hf_mq_md_userid,      tvb, offset + 196, 12, p_mq_parm->mq_str_enc);
+                proto_tree_add_item(mq_tree, hf_mq_md_acttoken,    tvb, offset + 208, 32, ENC_NA);
+                proto_tree_add_item(mq_tree, hf_mq_md_appliddata,  tvb, offset + 240, 32, p_mq_parm->mq_str_enc);
+                proto_tree_add_item(mq_tree, hf_mq_md_putappltype, tvb, offset + 272,  4, p_mq_parm->mq_int_enc);
+                proto_tree_add_item(mq_tree, hf_mq_md_putapplname, tvb, offset + 276, 28, p_mq_parm->mq_str_enc);
+                proto_tree_add_item(mq_tree, hf_mq_md_putdate,     tvb, offset + 304,  8, p_mq_parm->mq_str_enc);
+                proto_tree_add_item(mq_tree, hf_mq_md_puttime,     tvb, offset + 312,  8, p_mq_parm->mq_str_enc);
+                proto_tree_add_item(mq_tree, hf_mq_md_apporigdata, tvb, offset + 320,  4, p_mq_parm->mq_str_enc);
+
+                if (iVersion >= 2)
+                {
+                    proto_tree_add_item(mq_tree, hf_mq_md_groupid,      tvb, offset + 324, 24, ENC_NA);
+                    proto_tree_add_item(mq_tree, hf_mq_md_msgseqnumber, tvb, offset + 348,  4, p_mq_parm->mq_int_enc);
+                    proto_tree_add_item(mq_tree, hf_mq_md_offset,       tvb, offset + 352,  4, p_mq_parm->mq_int_enc);
+                    proto_tree_add_item(mq_tree, hf_mq_md_msgflags,     tvb, offset + 356,  4, p_mq_parm->mq_int_enc);
+                    proto_tree_add_item(mq_tree, hf_mq_md_origlen,      tvb, offset + 360,  4, p_mq_parm->mq_int_enc);
+                }
+            }
+        }
+    }
+    return iSize;
 }
 static gint dissect_mq_fopa(tvbuff_t *tvb, proto_tree *tree, gint offset, mq_parm_t *p_mq_parm)
 {
-	gint iSize = 0;
-
-	p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
-	if (p_mq_parm->mq_strucID == MQ_STRUCTID_FOPA || p_mq_parm->mq_strucID == MQ_STRUCTID_FOPA_EBCDIC)
-	{
-		iSize = tvb_get_guint32_endian(tvb, offset+8, p_mq_parm->mq_int_enc);
-		if (iSize != 0 && tvb_length_remaining(tvb, offset) >= iSize)
-		{
-			if (tree)
-			{
-				proto_item *ti = proto_tree_add_text(tree, tvb, offset, iSize, MQ_TEXT_FOPA);
-				proto_tree *mq_tree = proto_item_add_subtree(ti, ett_mq_fopa);
-
-				proto_tree_add_item(mq_tree, hf_mq_fopa_StructID, tvb, offset,      4, p_mq_parm->mq_str_enc);
-				proto_tree_add_item(mq_tree, hf_mq_fopa_version,  tvb, offset +  4, 4, p_mq_parm->mq_int_enc);
-				proto_tree_add_item(mq_tree, hf_mq_fopa_length,	  tvb, offset +  8, 4, p_mq_parm->mq_int_enc);
-				proto_tree_add_item(mq_tree, hf_mq_fopa_unknown1, tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
-				proto_tree_add_item(mq_tree, hf_mq_fopa_unknown2, tvb, offset + 16, 4, p_mq_parm->mq_int_enc);
-				proto_tree_add_item(mq_tree, hf_mq_fopa_unknown3, tvb, offset + 20, 8, p_mq_parm->mq_str_enc);
-				if (iSize > 28)
-				{
-					proto_tree_add_item(mq_tree, hf_mq_fopa_qprotect, tvb, offset + 28, 48, p_mq_parm->mq_int_enc);
-					proto_tree_add_item(mq_tree, hf_mq_fopa_unknown4, tvb, offset + 76, 4, p_mq_parm->mq_int_enc);
-					proto_tree_add_item(mq_tree, hf_mq_fopa_unknown5, tvb, offset + 80, 4, p_mq_parm->mq_int_enc);
-				}
-			}
-		}
-	}
-	return iSize;
+    gint iSize = 0;
+
+    p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
+    if (p_mq_parm->mq_strucID == MQ_STRUCTID_FOPA || p_mq_parm->mq_strucID == MQ_STRUCTID_FOPA_EBCDIC)
+    {
+        iSize = tvb_get_guint32_endian(tvb, offset+8, p_mq_parm->mq_int_enc);
+        if (iSize != 0 && tvb_length_remaining(tvb, offset) >= iSize)
+        {
+            if (tree)
+            {
+                proto_item *ti = proto_tree_add_text(tree, tvb, offset, iSize, MQ_TEXT_FOPA);
+                proto_tree *mq_tree = proto_item_add_subtree(ti, ett_mq_fopa);
+
+                proto_tree_add_item(mq_tree, hf_mq_fopa_StructID, tvb, offset,      4, p_mq_parm->mq_str_enc);
+                proto_tree_add_item(mq_tree, hf_mq_fopa_version,  tvb, offset +  4, 4, p_mq_parm->mq_int_enc);
+                proto_tree_add_item(mq_tree, hf_mq_fopa_length,   tvb, offset +  8, 4, p_mq_parm->mq_int_enc);
+                proto_tree_add_item(mq_tree, hf_mq_fopa_unknown1, tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
+                proto_tree_add_item(mq_tree, hf_mq_fopa_unknown2, tvb, offset + 16, 4, p_mq_parm->mq_int_enc);
+                proto_tree_add_item(mq_tree, hf_mq_fopa_unknown3, tvb, offset + 20, 8, p_mq_parm->mq_str_enc);
+                if (iSize > 28)
+                {
+                    proto_tree_add_item(mq_tree, hf_mq_fopa_qprotect, tvb, offset + 28, 48, p_mq_parm->mq_int_enc);
+                    proto_tree_add_item(mq_tree, hf_mq_fopa_unknown4, tvb, offset + 76, 4, p_mq_parm->mq_int_enc);
+                    proto_tree_add_item(mq_tree, hf_mq_fopa_unknown5, tvb, offset + 80, 4, p_mq_parm->mq_int_enc);
+                }
+            }
+        }
+    }
+    return iSize;
 }
 static void dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-	gint	   offset				 = 0;
-	guint32	   iSegmentLength		 = 0;
-	guint32	   iSizePayload			 = 0;
-	gint	   iSizeMD				 = 0;
-	gboolean   bPayload				 = FALSE;
-	gboolean   bEBCDIC				 = FALSE;
-	gint	   iDistributionListSize = 0;
-	mq_parm_t *p_mq_parm;
-
-	p_mq_parm = wmem_new0(wmem_packet_scope(), mq_parm_t);
-
-	p_mq_parm->mq_strucID = MQ_STRUCTID_NULL;
-	p_mq_parm->mq_int_enc = ENC_BIG_ENDIAN;
-	p_mq_parm->mq_str_enc = ENC_UTF_8|ENC_NA;
-
-	col_set_str(pinfo->cinfo, COL_PROTOCOL, "MQ");
-
-	p_mq_parm->iOfsEnc = 0;
-	p_mq_parm->iOfsFmt = 0;
-	p_mq_parm->iOfsCcs = 0;
-	if (tvb_length(tvb) >= 4)
-	{
-		p_mq_parm->mq_strucID = tvb_get_ntohl(tvb, offset);
-		if (((p_mq_parm->mq_strucID & MQ_MASK_TSHx) == MQ_STRUCTID_TSHx ||
-		     (p_mq_parm->mq_strucID & MQ_MASK_TSHx) == MQ_STRUCTID_TSHx_EBCDIC)
-			&& tvb_length_remaining(tvb, offset) >= 28)
-		{
-			proto_tree *mq_tree		= NULL;
-			proto_tree *mqroot_tree = NULL;
-			proto_item *ti			= NULL;
-
-			/* An MQ packet always starts with this structure*/
-			gint iSizeTSH = 28;
-			gint iSizeMPF = 0;  /* Size Of Multiplexed Field */
-
-			if ((p_mq_parm->mq_strucID & MQ_MASK_TSHx) == MQ_STRUCTID_TSHx_EBCDIC)
-			{
-				bEBCDIC = TRUE;
-				p_mq_parm->mq_str_enc = ENC_EBCDIC|ENC_NA;
-			}
-
-			iSegmentLength = tvb_get_ntohl(tvb, offset + 4);
-
-			if (p_mq_parm->mq_strucID == MQ_STRUCTID_TSHM || p_mq_parm->mq_strucID == MQ_STRUCTID_TSHM_EBCDIC)
-			{
-				if (tvb_length_remaining(tvb, offset) < 36)
-					return;
-				iSizeMPF += 8;
-				iSizeTSH  = 36;
-			}
-			p_mq_parm->mq_opcode = tvb_get_guint8(tvb, offset + iSizeMPF + 9);
-
-			if (p_mq_parm->mq_opcode == MQ_TST_REQUEST_MSGS || p_mq_parm->mq_opcode == MQ_TST_ASYNC_MESSAGE)
-			{
-				p_mq_parm->iOfsEnc = offset + iSizeMPF + 20;
-				p_mq_parm->iOfsCcs = offset + iSizeMPF + 24;
-				p_mq_parm->iOfsFmt = offset ;
-			}
-			p_mq_parm->mq_int_enc = (tvb_get_guint8(tvb, offset + iSizeMPF + 8) == MQ_LITTLE_ENDIAN ? ENC_LITTLE_ENDIAN : ENC_BIG_ENDIAN);
-			p_mq_parm->mq_ctlf1 = tvb_get_guint8(tvb, offset + iSizeMPF + 10);
-			p_mq_parm->mq_ctlf2 = tvb_get_guint8(tvb, offset + iSizeMPF + 11);
-
-			p_mq_parm->mq_tsh_ccsid.encod = tvb_get_guint32_endian(tvb, offset + iSizeMPF + 20, p_mq_parm->mq_int_enc);
-			p_mq_parm->mq_tsh_ccsid.ccsid = tvb_get_guint16_endian(tvb, offset + iSizeMPF + 24, p_mq_parm->mq_int_enc);
-
-			if (p_mq_parm->mq_tsh_ccsid.ccsid == 500 && !bEBCDIC)
-			{
-				bEBCDIC = TRUE;
-				p_mq_parm->mq_str_enc = ENC_EBCDIC|ENC_NA;
-			}
-
-			if (!mq_in_reassembly)
-			{
-				col_clear(pinfo->cinfo, COL_INFO);
-				col_append_sep_fstr(pinfo->cinfo, COL_INFO, " | ", "%-17s", val_to_str(p_mq_parm->mq_opcode, mq_opcode_vals, "Unknown (0x%02x)"));
-				col_set_fence(pinfo->cinfo, COL_INFO);
-			}
-
-			if (tree)
-			{
-				if (p_mq_parm->mq_opcode!=MQ_TST_ASYNC_MESSAGE)
-				{
-					ti = proto_tree_add_item(tree, proto_mq, tvb, offset, -1, ENC_NA);
-					proto_item_append_text(ti, " (%s)", val_to_str(p_mq_parm->mq_opcode, mq_opcode_vals, "Unknown (0x%02x)"));
-					if (bEBCDIC == TRUE)
-						proto_item_append_text(ti, " (EBCDIC)");
-					mqroot_tree = proto_item_add_subtree(ti, ett_mq);
-				}
-				else
-				{
-					mqroot_tree = tree;
-				}
-
-				ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSizeTSH, MQ_TEXT_TSH);
-				mq_tree = proto_item_add_subtree(ti, ett_mq_tsh);
-
-				proto_tree_add_item(mq_tree, hf_mq_tsh_StructID, tvb, offset + 0, 4, p_mq_parm->mq_str_enc);
-				proto_tree_add_item(mq_tree, hf_mq_tsh_mqseglen, tvb, offset + 4, 4, ENC_BIG_ENDIAN);
-
-				if (iSizeTSH == 36)
-				{
-					proto_tree_add_item(mq_tree, hf_mq_tsh_convid,    tvb, offset +  8, 4, ENC_BIG_ENDIAN);
-					proto_tree_add_item(mq_tree, hf_mq_tsh_requestid, tvb, offset + 12, 4, ENC_BIG_ENDIAN);
-				}
-
-				proto_tree_add_item(mq_tree, hf_mq_tsh_byteorder, tvb, offset + iSizeMPF + 8, 1, ENC_BIG_ENDIAN);
-				proto_tree_add_item(mq_tree, hf_mq_tsh_opcode,    tvb, offset + iSizeMPF + 9, 1, ENC_BIG_ENDIAN);
-
-				proto_tree_add_bitmask(mq_tree, tvb, offset + iSizeMPF + 10, hf_mq_tsh_ctlflgs1, ett_mq_tsh_tcf, pf_flds_tcf, ENC_BIG_ENDIAN);
-				proto_tree_add_bitmask(mq_tree, tvb, offset + iSizeMPF + 11, hf_mq_tsh_ctlflgs2, ett_mq_tsh_tcf2, pf_flds_tcf2, ENC_BIG_ENDIAN);
-
-				proto_tree_add_item(mq_tree, hf_mq_tsh_luwid,    tvb, offset + iSizeMPF + 12, 8, ENC_NA);
-				dissect_mq_encoding(mq_tree, hf_mq_tsh_encoding, tvb, offset + iSizeMPF + 20, 4, p_mq_parm->mq_int_enc);
-				proto_tree_add_item(mq_tree, hf_mq_tsh_ccsid,    tvb, offset + iSizeMPF + 24, 2, p_mq_parm->mq_int_enc);
-				proto_tree_add_item(mq_tree, hf_mq_tsh_reserved, tvb, offset + iSizeMPF + 26, 2, p_mq_parm->mq_int_enc);
-			}
-			offset += iSizeTSH;
-
-			/* Now dissect the embedded structures */
-			if (tvb_length_remaining(tvb, offset) >= 4)
-			{
-				p_mq_parm->mq_strucID = tvb_get_ntohl(tvb, offset);
-				if (((p_mq_parm->mq_ctlf1 & MQ_TCF_FIRST) != 0) || p_mq_parm->mq_opcode < 0x80)
-				{
-					/* First MQ segment (opcodes below 0x80 never span several TSH) */
-					gint iSizeAPI = 16;
-					if (p_mq_parm->mq_opcode >= 0x80 && p_mq_parm->mq_opcode <= 0x9F && tvb_length_remaining(tvb, offset) >= 16)
-					{
-						guint32 iReturnCode = 0;
-						guint32 iHdl = 0;
-						iReturnCode = tvb_get_guint32_endian(tvb, offset + 8, p_mq_parm->mq_int_enc);
-						iHdl = tvb_get_guint32_endian(tvb, offset + 12, p_mq_parm->mq_int_enc);
-						if (iHdl != 0 && iHdl != 0xffffffff)
-							col_append_fstr(pinfo->cinfo, COL_INFO, " Hdl=0x%08x", iHdl);
-						if (iReturnCode != 0)
-							col_append_fstr(pinfo->cinfo, COL_INFO, " [RC=%d]", iReturnCode);
-
-						if (tree)
-						{
-							ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSizeAPI, MQ_TEXT_API);
-							mq_tree = proto_item_add_subtree(ti, ett_mq_api);
-
-							proto_tree_add_item(mq_tree, hf_mq_api_replylen,  tvb, offset,      4, ENC_BIG_ENDIAN);
-							proto_tree_add_item(mq_tree, hf_mq_api_compcode,  tvb, offset +  4, 4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_api_reascode,  tvb, offset +  8, 4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_api_objecthdl, tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
-						}
-						offset += iSizeAPI;
-						p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
-					}
-					if ((p_mq_parm->mq_strucID == MQ_STRUCTID_MSH || p_mq_parm->mq_strucID == MQ_STRUCTID_MSH_EBCDIC) && tvb_length_remaining(tvb, offset) >= 20)
-					{
-						gint iSize = 20;
-						iSizePayload = tvb_get_guint32_endian(tvb, offset + 16, p_mq_parm->mq_int_enc);
-						bPayload = TRUE;
-						if (tree)
-						{
-							ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSize, MQ_TEXT_MSH);
-							mq_tree = proto_item_add_subtree(ti, ett_mq_msh);
-
-							proto_tree_add_item(mq_tree, hf_mq_msh_StructID,   tvb, offset +  0, 4, p_mq_parm->mq_str_enc);
-							proto_tree_add_item(mq_tree, hf_mq_msh_seqnum,	   tvb, offset +  4, 4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_msh_datalength, tvb, offset +  8, 4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_msh_unknown1,   tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_msh_msglength,  tvb, offset + 16, 4, p_mq_parm->mq_int_enc);
-						}
-						offset += iSize;
-					}
-					else if (p_mq_parm->mq_opcode == MQ_TST_CONAUTH_INFO && tvb_length_remaining(tvb, offset) >= 20)
-					{
-						gint iSize = 24;
-						gint iUsr  = 0;
-						gint iPsw  = 0;
-
-						iUsr = tvb_get_guint32_endian(tvb, offset + 16, p_mq_parm->mq_int_enc);
-						iPsw = tvb_get_guint32_endian(tvb, offset + 20, p_mq_parm->mq_int_enc);
-
-						if (tree)
-						{
-							ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSize, MQ_TEXT_CAUT);
-							mq_tree = proto_item_add_subtree(ti, ett_mq_caut);
-
-							proto_tree_add_item(mq_tree, hf_mq_caut_StructID,  tvb, offset,      4, p_mq_parm->mq_str_enc);
-							proto_tree_add_item(mq_tree, hf_mq_caut_AuthType,  tvb, offset +  4, 4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_caut_UsrMaxLen, tvb, offset +  8, 4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_caut_PwdMaxLen, tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_caut_UsrLength, tvb, offset + 16, 4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_caut_PwdLength, tvb, offset + 20, 4, p_mq_parm->mq_int_enc);
-
-							if (iUsr)
-								proto_tree_add_item(mq_tree, hf_mq_caut_usr, tvb, offset + 24,        iUsr, p_mq_parm->mq_str_enc);
-							if (iPsw)
-								proto_tree_add_item(mq_tree, hf_mq_caut_psw, tvb, offset + 24 + iUsr, iPsw, p_mq_parm->mq_str_enc);
+    gint       offset                = 0;
+    guint32    iSegmentLength        = 0;
+    guint32    iSizePayload          = 0;
+    gint       iSizeMD               = 0;
+    gboolean   bPayload              = FALSE;
+    gboolean   bEBCDIC               = FALSE;
+    gint       iDistributionListSize = 0;
+    mq_parm_t *p_mq_parm;
+
+    p_mq_parm = wmem_new0(wmem_packet_scope(), mq_parm_t);
+
+    p_mq_parm->mq_strucID = MQ_STRUCTID_NULL;
+    p_mq_parm->mq_int_enc = ENC_BIG_ENDIAN;
+    p_mq_parm->mq_str_enc = ENC_UTF_8|ENC_NA;
+
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "MQ");
+
+    p_mq_parm->iOfsEnc = 0;
+    p_mq_parm->iOfsFmt = 0;
+    p_mq_parm->iOfsCcs = 0;
+    if (tvb_length(tvb) >= 4)
+    {
+        p_mq_parm->mq_strucID = tvb_get_ntohl(tvb, offset);
+        if (((p_mq_parm->mq_strucID & MQ_MASK_TSHx) == MQ_STRUCTID_TSHx ||
+             (p_mq_parm->mq_strucID & MQ_MASK_TSHx) == MQ_STRUCTID_TSHx_EBCDIC)
+            && tvb_length_remaining(tvb, offset) >= 28)
+        {
+            proto_tree *mq_tree     = NULL;
+            proto_tree *mqroot_tree = NULL;
+            proto_item *ti          = NULL;
+
+            /* An MQ packet always starts with this structure*/
+            gint iSizeTSH = 28;
+            gint iSizeMPF = 0;  /* Size Of Multiplexed Field */
+
+            if ((p_mq_parm->mq_strucID & MQ_MASK_TSHx) == MQ_STRUCTID_TSHx_EBCDIC)
+            {
+                bEBCDIC = TRUE;
+                p_mq_parm->mq_str_enc = ENC_EBCDIC|ENC_NA;
+            }
+
+            iSegmentLength = tvb_get_ntohl(tvb, offset + 4);
+
+            if (p_mq_parm->mq_strucID == MQ_STRUCTID_TSHM || p_mq_parm->mq_strucID == MQ_STRUCTID_TSHM_EBCDIC)
+            {
+                if (tvb_length_remaining(tvb, offset) < 36)
+                    return;
+                iSizeMPF += 8;
+                iSizeTSH  = 36;
+            }
+            p_mq_parm->mq_opcode = tvb_get_guint8(tvb, offset + iSizeMPF + 9);
+
+            if (p_mq_parm->mq_opcode == MQ_TST_REQUEST_MSGS || p_mq_parm->mq_opcode == MQ_TST_ASYNC_MESSAGE)
+            {
+                p_mq_parm->iOfsEnc = offset + iSizeMPF + 20;
+                p_mq_parm->iOfsCcs = offset + iSizeMPF + 24;
+                p_mq_parm->iOfsFmt = offset ;
+            }
+            p_mq_parm->mq_int_enc = (tvb_get_guint8(tvb, offset + iSizeMPF + 8) == MQ_LITTLE_ENDIAN ? ENC_LITTLE_ENDIAN : ENC_BIG_ENDIAN);
+            p_mq_parm->mq_ctlf1 = tvb_get_guint8(tvb, offset + iSizeMPF + 10);
+            p_mq_parm->mq_ctlf2 = tvb_get_guint8(tvb, offset + iSizeMPF + 11);
+
+            p_mq_parm->mq_tsh_ccsid.encod = tvb_get_guint32_endian(tvb, offset + iSizeMPF + 20, p_mq_parm->mq_int_enc);
+            p_mq_parm->mq_tsh_ccsid.ccsid = tvb_get_guint16_endian(tvb, offset + iSizeMPF + 24, p_mq_parm->mq_int_enc);
+
+            if (p_mq_parm->mq_tsh_ccsid.ccsid == 500 && !bEBCDIC)
+            {
+                bEBCDIC = TRUE;
+                p_mq_parm->mq_str_enc = ENC_EBCDIC|ENC_NA;
+            }
+
+            if (!mq_in_reassembly)
+            {
+                col_clear(pinfo->cinfo, COL_INFO);
+                col_append_sep_fstr(pinfo->cinfo, COL_INFO, " | ", "%-17s", val_to_str(p_mq_parm->mq_opcode, mq_opcode_vals, "Unknown (0x%02x)"));
+                col_set_fence(pinfo->cinfo, COL_INFO);
+            }
+
+            if (tree)
+            {
+                if (p_mq_parm->mq_opcode!=MQ_TST_ASYNC_MESSAGE)
+                {
+                    ti = proto_tree_add_item(tree, proto_mq, tvb, offset, -1, ENC_NA);
+                    proto_item_append_text(ti, " (%s)", val_to_str(p_mq_parm->mq_opcode, mq_opcode_vals, "Unknown (0x%02x)"));
+                    if (bEBCDIC == TRUE)
+                        proto_item_append_text(ti, " (EBCDIC)");
+                    mqroot_tree = proto_item_add_subtree(ti, ett_mq);
+                }
+                else
+                {
+                    mqroot_tree = tree;
+                }
+
+                ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSizeTSH, MQ_TEXT_TSH);
+                mq_tree = proto_item_add_subtree(ti, ett_mq_tsh);
+
+                proto_tree_add_item(mq_tree, hf_mq_tsh_StructID, tvb, offset + 0, 4, p_mq_parm->mq_str_enc);
+                proto_tree_add_item(mq_tree, hf_mq_tsh_mqseglen, tvb, offset + 4, 4, ENC_BIG_ENDIAN);
+
+                if (iSizeTSH == 36)
+                {
+                    proto_tree_add_item(mq_tree, hf_mq_tsh_convid,    tvb, offset +  8, 4, ENC_BIG_ENDIAN);
+                    proto_tree_add_item(mq_tree, hf_mq_tsh_requestid, tvb, offset + 12, 4, ENC_BIG_ENDIAN);
+                }
+
+                proto_tree_add_item(mq_tree, hf_mq_tsh_byteorder, tvb, offset + iSizeMPF + 8, 1, ENC_BIG_ENDIAN);
+                proto_tree_add_item(mq_tree, hf_mq_tsh_opcode,    tvb, offset + iSizeMPF + 9, 1, ENC_BIG_ENDIAN);
+
+                proto_tree_add_bitmask(mq_tree, tvb, offset + iSizeMPF + 10, hf_mq_tsh_ctlflgs1, ett_mq_tsh_tcf, pf_flds_tcf, ENC_BIG_ENDIAN);
+                proto_tree_add_bitmask(mq_tree, tvb, offset + iSizeMPF + 11, hf_mq_tsh_ctlflgs2, ett_mq_tsh_tcf2, pf_flds_tcf2, ENC_BIG_ENDIAN);
+
+                proto_tree_add_item(mq_tree, hf_mq_tsh_luwid,    tvb, offset + iSizeMPF + 12, 8, ENC_NA);
+                dissect_mq_encoding(mq_tree, hf_mq_tsh_encoding, tvb, offset + iSizeMPF + 20, 4, p_mq_parm->mq_int_enc);
+                proto_tree_add_item(mq_tree, hf_mq_tsh_ccsid,    tvb, offset + iSizeMPF + 24, 2, p_mq_parm->mq_int_enc);
+                proto_tree_add_item(mq_tree, hf_mq_tsh_reserved, tvb, offset + iSizeMPF + 26, 2, p_mq_parm->mq_int_enc);
+            }
+            offset += iSizeTSH;
+
+            /* Now dissect the embedded structures */
+            if (tvb_length_remaining(tvb, offset) >= 4)
+            {
+                p_mq_parm->mq_strucID = tvb_get_ntohl(tvb, offset);
+                if (((p_mq_parm->mq_ctlf1 & MQ_TCF_FIRST) != 0) || p_mq_parm->mq_opcode < 0x80)
+                {
+                    /* First MQ segment (opcodes below 0x80 never span several TSH) */
+                    gint iSizeAPI = 16;
+                    if (p_mq_parm->mq_opcode >= 0x80 && p_mq_parm->mq_opcode <= 0x9F && tvb_length_remaining(tvb, offset) >= 16)
+                    {
+                        guint32 iReturnCode = 0;
+                        guint32 iHdl = 0;
+                        iReturnCode = tvb_get_guint32_endian(tvb, offset + 8, p_mq_parm->mq_int_enc);
+                        iHdl = tvb_get_guint32_endian(tvb, offset + 12, p_mq_parm->mq_int_enc);
+                        if (iHdl != 0 && iHdl != 0xffffffff)
+                            col_append_fstr(pinfo->cinfo, COL_INFO, " Hdl=0x%08x", iHdl);
+                        if (iReturnCode != 0)
+                            col_append_fstr(pinfo->cinfo, COL_INFO, " [RC=%d]", iReturnCode);
+
+                        if (tree)
+                        {
+                            ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSizeAPI, MQ_TEXT_API);
+                            mq_tree = proto_item_add_subtree(ti, ett_mq_api);
+
+                            proto_tree_add_item(mq_tree, hf_mq_api_replylen,  tvb, offset,      4, ENC_BIG_ENDIAN);
+                            proto_tree_add_item(mq_tree, hf_mq_api_compcode,  tvb, offset +  4, 4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_api_reascode,  tvb, offset +  8, 4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_api_objecthdl, tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
+                        }
+                        offset += iSizeAPI;
+                        p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
+                    }
+                    if ((p_mq_parm->mq_strucID == MQ_STRUCTID_MSH || p_mq_parm->mq_strucID == MQ_STRUCTID_MSH_EBCDIC) && tvb_length_remaining(tvb, offset) >= 20)
+                    {
+                        gint iSize = 20;
+                        iSizePayload = tvb_get_guint32_endian(tvb, offset + 16, p_mq_parm->mq_int_enc);
+                        bPayload = TRUE;
+                        if (tree)
+                        {
+                            ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSize, MQ_TEXT_MSH);
+                            mq_tree = proto_item_add_subtree(ti, ett_mq_msh);
+
+                            proto_tree_add_item(mq_tree, hf_mq_msh_StructID,   tvb, offset +  0, 4, p_mq_parm->mq_str_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_msh_seqnum,     tvb, offset +  4, 4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_msh_datalength, tvb, offset +  8, 4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_msh_unknown1,   tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_msh_msglength,  tvb, offset + 16, 4, p_mq_parm->mq_int_enc);
+                        }
+                        offset += iSize;
+                    }
+                    else if (p_mq_parm->mq_opcode == MQ_TST_CONAUTH_INFO && tvb_length_remaining(tvb, offset) >= 20)
+                    {
+                        gint iSize = 24;
+                        gint iUsr  = 0;
+                        gint iPsw  = 0;
+
+                        iUsr = tvb_get_guint32_endian(tvb, offset + 16, p_mq_parm->mq_int_enc);
+                        iPsw = tvb_get_guint32_endian(tvb, offset + 20, p_mq_parm->mq_int_enc);
+
+                        if (tree)
+                        {
+                            ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSize, MQ_TEXT_CAUT);
+                            mq_tree = proto_item_add_subtree(ti, ett_mq_caut);
+
+                            proto_tree_add_item(mq_tree, hf_mq_caut_StructID,  tvb, offset,      4, p_mq_parm->mq_str_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_caut_AuthType,  tvb, offset +  4, 4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_caut_UsrMaxLen, tvb, offset +  8, 4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_caut_PwdMaxLen, tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_caut_UsrLength, tvb, offset + 16, 4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_caut_PwdLength, tvb, offset + 20, 4, p_mq_parm->mq_int_enc);
+
+                            if (iUsr)
+                                proto_tree_add_item(mq_tree, hf_mq_caut_usr, tvb, offset + 24,        iUsr, p_mq_parm->mq_str_enc);
+                            if (iPsw)
+                                proto_tree_add_item(mq_tree, hf_mq_caut_psw, tvb, offset + 24 + iUsr, iPsw, p_mq_parm->mq_str_enc);
 }
-						offset += iSize + iUsr + iPsw;
-						p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
-					}
-					else if (p_mq_parm->mq_opcode == MQ_TST_SOCKET_ACTION && tvb_length_remaining(tvb, offset) >= 20)
-					{
-						gint iSize = 20;
-						if (tree)
-						{
-							ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSizeAPI, MQ_TEXT_SOCKET);
-							mq_tree = proto_item_add_subtree(ti, ett_mq_socket);
-
-							proto_tree_add_item(mq_tree, hf_mq_socket_conversid, tvb, offset,      4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_socket_requestid, tvb, offset +  4, 4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_socket_type,      tvb, offset +  8, 4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_socket_parm1,     tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_socket_parm2,     tvb, offset + 16, 4, p_mq_parm->mq_int_enc);
-						}
-						offset += iSize;
-						p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
-					}
-					else if (p_mq_parm->mq_opcode == MQ_TST_STATUS && tvb_length_remaining(tvb, offset) >= 8)
-					{
-						/* Some status are 28 bytes long and some are 36 bytes long */
-						gint iStatus	   = 0;
-						gint iStatusLength = 0;
-
-						iStatus = tvb_get_guint32_endian(tvb, offset + 4, p_mq_parm->mq_int_enc);
-						iStatusLength = tvb_get_guint32_endian(tvb, offset, p_mq_parm->mq_int_enc);
-
-						if (tvb_length_remaining(tvb, offset) >= iStatusLength)
-						{
-							if (iStatus != 0)
-								col_append_fstr(pinfo->cinfo, COL_INFO, " Code=%s", val_to_str(iStatus, GET_VALSV(status), "Unknown (0x%08x)"));
-
-							if (tree)
-							{
-								ti = proto_tree_add_text(mqroot_tree, tvb, offset, 8, MQ_TEXT_STAT);
-								mq_tree = proto_item_add_subtree(ti, ett_mq_status);
-
-								proto_tree_add_item(mq_tree, hf_mq_status_length, tvb, offset,     4, p_mq_parm->mq_int_enc);
-								proto_tree_add_item(mq_tree, hf_mq_status_code,   tvb, offset + 4, 4, p_mq_parm->mq_int_enc);
-
-								if (iStatusLength >= 12)
-									proto_tree_add_item(mq_tree, hf_mq_status_value, tvb, offset + 8, 4, p_mq_parm->mq_int_enc);
-							}
-							offset += iStatusLength;
-						}
-					}
-					else if (p_mq_parm->mq_opcode == MQ_TST_PING && tvb_length_remaining(tvb, offset) > 4)
-					{
-						if (tree)
-						{
-							ti = proto_tree_add_text(mqroot_tree, tvb, offset, -1, MQ_TEXT_PING);
-							mq_tree = proto_item_add_subtree(ti, ett_mq_ping);
-
-							proto_tree_add_item(mq_tree, hf_mq_ping_length, tvb, offset,      4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_ping_buffer, tvb, offset + 4, -1, ENC_NA);
-						}
-						offset = tvb_length(tvb);
-					}
-					else if (p_mq_parm->mq_opcode == MQ_TST_RESET && tvb_length_remaining(tvb, offset) >= 8)
-					{
-						if (tree)
-						{
-							ti = proto_tree_add_text(mqroot_tree, tvb, offset, -1, MQ_TEXT_RESET);
-							mq_tree = proto_item_add_subtree(ti, ett_mq_reset);
-
-							proto_tree_add_item(mq_tree, hf_mq_reset_length, tvb, offset,     4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_reset_seqnum, tvb, offset + 4, 4, p_mq_parm->mq_int_enc);
-						}
-						offset = tvb_length(tvb);
-					}
-					else if ((p_mq_parm->mq_opcode == MQ_TST_MQOPEN || p_mq_parm->mq_opcode == MQ_TST_MQCLOSE ||
-						 p_mq_parm->mq_opcode == MQ_TST_MQOPEN_REPLY || p_mq_parm->mq_opcode == MQ_TST_MQCLOSE_REPLY)
-						 && tvb_length_remaining(tvb, offset) >= 4)
-					{
-						offset += dissect_mq_od(tvb, pinfo, mqroot_tree, offset, p_mq_parm, &iDistributionListSize);
-						if (tree)
-						{
-							ti = proto_tree_add_text(mqroot_tree, tvb, offset, 4, MQ_TEXT_OPEN);
-							mq_tree = proto_item_add_subtree(ti, ett_mq_open);
-							if (p_mq_parm->mq_opcode == MQ_TST_MQOPEN || p_mq_parm->mq_opcode == MQ_TST_MQOPEN_REPLY)
-							{
-								dissect_mq_MQOO(tvb, mq_tree, offset, ett_mq_open_option, hf_mq_open_options, p_mq_parm);
-							}
-							if (p_mq_parm->mq_opcode == MQ_TST_MQCLOSE || p_mq_parm->mq_opcode == MQ_TST_MQCLOSE_REPLY)
-							{
-								dissect_mq_MQCO(tvb, mq_tree, offset, p_mq_parm);
-							}
-						}
-						offset += 4;
-						p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
-						offset += dissect_mq_fopa(tvb, mqroot_tree, offset, p_mq_parm);
-					}
-					else if ((p_mq_parm->mq_opcode == MQ_TST_MQCONN || p_mq_parm->mq_opcode == MQ_TST_MQCONN_REPLY) &&
-						tvb_length_remaining(tvb, offset) > 0)
-					{
-						gint iSizeCONN = 0;
-						gint nofs;
-
-						/*iSizeCONN = ((iVersionID == 4 || iVersionID == 6) ? 120 : 112);*/ /* guess */
-						/* The iVersionID is available in the previous ID segment, we should keep a state
-						* Instead we rely on the segment length announced in the TSH */
-						/* The MQCONN structure is special because it does not start with a structid */
-						iSizeCONN = iSegmentLength - iSizeTSH - iSizeAPI;
-						if (iSizeCONN != 112 && iSizeCONN != 120 && iSizeCONN != 260 && iSizeCONN != 332)
-							iSizeCONN = 0;
-
-						if (iSizeCONN != 0 && tvb_length_remaining(tvb, offset) >= iSizeCONN)
-						{
-							guint8 *sApplicationName;
-							guint8 *sQMgr;
-							sApplicationName = format_text_chr(tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 48, 28, p_mq_parm->mq_str_enc), 28, '.');
-							if (strip_trailing_blanks(sApplicationName, 28) > 0)
-							{
-								col_append_fstr(pinfo->cinfo, COL_INFO, " App=%s", sApplicationName);
-							}
-							sQMgr = format_text_chr(tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 48, p_mq_parm->mq_str_enc), 28, '.');
-							if (strip_trailing_blanks(sQMgr, 48) > 0)
-							{
-								col_append_fstr(pinfo->cinfo, COL_INFO, " QM=%s", sQMgr);
-							}
+                        offset += iSize + iUsr + iPsw;
+                        p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
+                    }
+                    else if (p_mq_parm->mq_opcode == MQ_TST_SOCKET_ACTION && tvb_length_remaining(tvb, offset) >= 20)
+                    {
+                        gint iSize = 20;
+                        if (tree)
+                        {
+                            ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSizeAPI, MQ_TEXT_SOCKET);
+                            mq_tree = proto_item_add_subtree(ti, ett_mq_socket);
+
+                            proto_tree_add_item(mq_tree, hf_mq_socket_conversid, tvb, offset,      4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_socket_requestid, tvb, offset +  4, 4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_socket_type,      tvb, offset +  8, 4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_socket_parm1,     tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_socket_parm2,     tvb, offset + 16, 4, p_mq_parm->mq_int_enc);
+                        }
+                        offset += iSize;
+                        p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
+                    }
+                    else if (p_mq_parm->mq_opcode == MQ_TST_STATUS && tvb_length_remaining(tvb, offset) >= 8)
+                    {
+                        /* Some status are 28 bytes long and some are 36 bytes long */
+                        gint iStatus       = 0;
+                        gint iStatusLength = 0;
+
+                        iStatus = tvb_get_guint32_endian(tvb, offset + 4, p_mq_parm->mq_int_enc);
+                        iStatusLength = tvb_get_guint32_endian(tvb, offset, p_mq_parm->mq_int_enc);
+
+                        if (tvb_length_remaining(tvb, offset) >= iStatusLength)
+                        {
+                            if (iStatus != 0)
+                                col_append_fstr(pinfo->cinfo, COL_INFO, " Code=%s", val_to_str(iStatus, GET_VALSV(status), "Unknown (0x%08x)"));
+
+                            if (tree)
+                            {
+                                ti = proto_tree_add_text(mqroot_tree, tvb, offset, 8, MQ_TEXT_STAT);
+                                mq_tree = proto_item_add_subtree(ti, ett_mq_status);
+
+                                proto_tree_add_item(mq_tree, hf_mq_status_length, tvb, offset,     4, p_mq_parm->mq_int_enc);
+                                proto_tree_add_item(mq_tree, hf_mq_status_code,   tvb, offset + 4, 4, p_mq_parm->mq_int_enc);
+
+                                if (iStatusLength >= 12)
+                                    proto_tree_add_item(mq_tree, hf_mq_status_value, tvb, offset + 8, 4, p_mq_parm->mq_int_enc);
+                            }
+                            offset += iStatusLength;
+                        }
+                    }
+                    else if (p_mq_parm->mq_opcode == MQ_TST_PING && tvb_length_remaining(tvb, offset) > 4)
+                    {
+                        if (tree)
+                        {
+                            ti = proto_tree_add_text(mqroot_tree, tvb, offset, -1, MQ_TEXT_PING);
+                            mq_tree = proto_item_add_subtree(ti, ett_mq_ping);
+
+                            proto_tree_add_item(mq_tree, hf_mq_ping_length, tvb, offset,      4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_ping_buffer, tvb, offset + 4, -1, ENC_NA);
+                        }
+                        offset = tvb_length(tvb);
+                    }
+                    else if (p_mq_parm->mq_opcode == MQ_TST_RESET && tvb_length_remaining(tvb, offset) >= 8)
+                    {
+                        if (tree)
+                        {
+                            ti = proto_tree_add_text(mqroot_tree, tvb, offset, -1, MQ_TEXT_RESET);
+                            mq_tree = proto_item_add_subtree(ti, ett_mq_reset);
+
+                            proto_tree_add_item(mq_tree, hf_mq_reset_length, tvb, offset,     4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_reset_seqnum, tvb, offset + 4, 4, p_mq_parm->mq_int_enc);
+                        }
+                        offset = tvb_length(tvb);
+                    }
+                    else if ((p_mq_parm->mq_opcode == MQ_TST_MQOPEN || p_mq_parm->mq_opcode == MQ_TST_MQCLOSE ||
+                         p_mq_parm->mq_opcode == MQ_TST_MQOPEN_REPLY || p_mq_parm->mq_opcode == MQ_TST_MQCLOSE_REPLY)
+                         && tvb_length_remaining(tvb, offset) >= 4)
+                    {
+                        offset += dissect_mq_od(tvb, pinfo, mqroot_tree, offset, p_mq_parm, &iDistributionListSize);
+                        if (tree)
+                        {
+                            ti = proto_tree_add_text(mqroot_tree, tvb, offset, 4, MQ_TEXT_OPEN);
+                            mq_tree = proto_item_add_subtree(ti, ett_mq_open);
+                            if (p_mq_parm->mq_opcode == MQ_TST_MQOPEN || p_mq_parm->mq_opcode == MQ_TST_MQOPEN_REPLY)
+                            {
+                                dissect_mq_MQOO(tvb, mq_tree, offset, ett_mq_open_option, hf_mq_open_options, p_mq_parm);
+                            }
+                            if (p_mq_parm->mq_opcode == MQ_TST_MQCLOSE || p_mq_parm->mq_opcode == MQ_TST_MQCLOSE_REPLY)
+                            {
+                                dissect_mq_MQCO(tvb, mq_tree, offset, p_mq_parm);
+                            }
+                        }
+                        offset += 4;
+                        p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
+                        offset += dissect_mq_fopa(tvb, mqroot_tree, offset, p_mq_parm);
+                    }
+                    else if ((p_mq_parm->mq_opcode == MQ_TST_MQCONN || p_mq_parm->mq_opcode == MQ_TST_MQCONN_REPLY) &&
+                        tvb_length_remaining(tvb, offset) > 0)
+                    {
+                        gint iSizeCONN = 0;
+                        gint nofs;
+
+                        /*iSizeCONN = ((iVersionID == 4 || iVersionID == 6) ? 120 : 112);*/ /* guess */
+                        /* The iVersionID is available in the previous ID segment, we should keep a state
+                        * Instead we rely on the segment length announced in the TSH */
+                        /* The MQCONN structure is special because it does not start with a structid */
+                        iSizeCONN = iSegmentLength - iSizeTSH - iSizeAPI;
+                        if (iSizeCONN != 112 && iSizeCONN != 120 && iSizeCONN != 260 && iSizeCONN != 332)
+                            iSizeCONN = 0;
+
+                        if (iSizeCONN != 0 && tvb_length_remaining(tvb, offset) >= iSizeCONN)
+                        {
+                            guint8 *sApplicationName;
+                            guint8 *sQMgr;
+                            sApplicationName = format_text_chr(tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 48, 28, p_mq_parm->mq_str_enc), 28, '.');
+                            if (strip_trailing_blanks(sApplicationName, 28) > 0)
+                            {
+                                col_append_fstr(pinfo->cinfo, COL_INFO, " App=%s", sApplicationName);
+                            }
+                            sQMgr = format_text_chr(tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 48, p_mq_parm->mq_str_enc), 28, '.');
+                            if (strip_trailing_blanks(sQMgr, 48) > 0)
+                            {
+                                col_append_fstr(pinfo->cinfo, COL_INFO, " QM=%s", sQMgr);
+                            }
 
 #define do_proto_add_item(a, b) b; nofs += a;
-							nofs = offset;
-							if (tree)
-							{
-								ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSizeCONN, MQ_TEXT_CONN);
-								mq_tree = proto_item_add_subtree(ti, ett_mq_conn);
-
-								do_proto_add_item(48, proto_tree_add_item(mq_tree, hf_mq_conn_QMgr    , tvb, nofs, 48, p_mq_parm->mq_str_enc));
-								do_proto_add_item(28, proto_tree_add_item(mq_tree, hf_mq_conn_appname , tvb, nofs, 28, p_mq_parm->mq_str_enc));
-								do_proto_add_item( 4, proto_tree_add_item(mq_tree, hf_mq_conn_apptype , tvb, nofs,  4, p_mq_parm->mq_int_enc));
-								do_proto_add_item(32, proto_tree_add_item(mq_tree, hf_mq_conn_acttoken, tvb, nofs, 32, ENC_NA));
-
-								if (iSizeCONN >= 120)
-								{
-									do_proto_add_item(4, proto_tree_add_item(mq_tree, hf_mq_conn_version, tvb, nofs, 4, p_mq_parm->mq_int_enc));
-									do_proto_add_item(4, proto_tree_add_item(mq_tree, hf_mq_conn_options, tvb, nofs, 4, p_mq_parm->mq_int_enc));
-								}
-								if (iSizeCONN >= 260)
-								{
-									proto_tree  *mq_tree_sub;
-
-									ti =  proto_tree_add_text(mq_tree, tvb, nofs, iSizeCONN - nofs, MQ_TEXT_FCNO);
-									mq_tree_sub = proto_item_add_subtree(ti, ett_mq_fcno);
-
-									do_proto_add_item(  4, proto_tree_add_item(mq_tree_sub, hf_mq_fcno_StructID , tvb, nofs, 4, p_mq_parm->mq_str_enc));
-									do_proto_add_item(  4, proto_tree_add_item(mq_tree_sub, hf_mq_fcno_unknown00, tvb, nofs, 4, p_mq_parm->mq_int_enc));
-									do_proto_add_item(  4, proto_tree_add_item(mq_tree_sub, hf_mq_fcno_unknown01, tvb, nofs, 4, p_mq_parm->mq_int_enc));
-
-									if (iSizeCONN == 260)
-									{
-										do_proto_add_item( 12, proto_tree_add_item(mq_tree_sub, hf_mq_fcno_msgid    , tvb, nofs, 12, p_mq_parm->mq_str_enc));
-										do_proto_add_item( 48, proto_tree_add_item(mq_tree_sub, hf_mq_fcno_mqmid    , tvb, nofs, 48, p_mq_parm->mq_str_enc));
-										do_proto_add_item( 68, proto_tree_add_item(mq_tree_sub, hf_mq_fcno_unknown02, tvb, nofs, 68, ENC_NA));
-									}
-									if (iSizeCONN >= 332)
-									{
-										do_proto_add_item(152, proto_tree_add_item(mq_tree_sub, hf_mq_fcno_msgid    , tvb, nofs, 152, p_mq_parm->mq_str_enc));
-										proto_tree_add_item(mq_tree_sub, hf_mq_fcno_mqmid    , tvb, nofs, 48, p_mq_parm->mq_int_enc);
-									}
-								}
-							}
+                            nofs = offset;
+                            if (tree)
+                            {
+                                ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSizeCONN, MQ_TEXT_CONN);
+                                mq_tree = proto_item_add_subtree(ti, ett_mq_conn);
+
+                                do_proto_add_item(48, proto_tree_add_item(mq_tree, hf_mq_conn_QMgr    , tvb, nofs, 48, p_mq_parm->mq_str_enc));
+                                do_proto_add_item(28, proto_tree_add_item(mq_tree, hf_mq_conn_appname , tvb, nofs, 28, p_mq_parm->mq_str_enc));
+                                do_proto_add_item( 4, proto_tree_add_item(mq_tree, hf_mq_conn_apptype , tvb, nofs,  4, p_mq_parm->mq_int_enc));
+                                do_proto_add_item(32, proto_tree_add_item(mq_tree, hf_mq_conn_acttoken, tvb, nofs, 32, ENC_NA));
+
+                                if (iSizeCONN >= 120)
+                                {
+                                    do_proto_add_item(4, proto_tree_add_item(mq_tree, hf_mq_conn_version, tvb, nofs, 4, p_mq_parm->mq_int_enc));
+                                    do_proto_add_item(4, proto_tree_add_item(mq_tree, hf_mq_conn_options, tvb, nofs, 4, p_mq_parm->mq_int_enc));
+                                }
+                                if (iSizeCONN >= 260)
+                                {
+                                    proto_tree  *mq_tree_sub;
+
+                                    ti =  proto_tree_add_text(mq_tree, tvb, nofs, iSizeCONN - nofs, MQ_TEXT_FCNO);
+                                    mq_tree_sub = proto_item_add_subtree(ti, ett_mq_fcno);
+
+                                    do_proto_add_item(  4, proto_tree_add_item(mq_tree_sub, hf_mq_fcno_StructID , tvb, nofs, 4, p_mq_parm->mq_str_enc));
+                                    do_proto_add_item(  4, proto_tree_add_item(mq_tree_sub, hf_mq_fcno_unknown00, tvb, nofs, 4, p_mq_parm->mq_int_enc));
+                                    do_proto_add_item(  4, proto_tree_add_item(mq_tree_sub, hf_mq_fcno_unknown01, tvb, nofs, 4, p_mq_parm->mq_int_enc));
+
+                                    if (iSizeCONN == 260)
+                                    {
+                                        do_proto_add_item( 12, proto_tree_add_item(mq_tree_sub, hf_mq_fcno_msgid    , tvb, nofs, 12, p_mq_parm->mq_str_enc));
+                                        do_proto_add_item( 48, proto_tree_add_item(mq_tree_sub, hf_mq_fcno_mqmid    , tvb, nofs, 48, p_mq_parm->mq_str_enc));
+                                        do_proto_add_item( 68, proto_tree_add_item(mq_tree_sub, hf_mq_fcno_unknown02, tvb, nofs, 68, ENC_NA));
+                                    }
+                                    if (iSizeCONN >= 332)
+                                    {
+                                        do_proto_add_item(152, proto_tree_add_item(mq_tree_sub, hf_mq_fcno_msgid    , tvb, nofs, 152, p_mq_parm->mq_str_enc));
+                                        proto_tree_add_item(mq_tree_sub, hf_mq_fcno_mqmid    , tvb, nofs, 48, p_mq_parm->mq_int_enc);
+                                    }
+                                }
+                            }
 #undef do_proto_add_item
-							offset += iSizeCONN;
-						}
-					}
-					else if ((p_mq_parm->mq_opcode == MQ_TST_MQINQ || p_mq_parm->mq_opcode == MQ_TST_MQINQ_REPLY || p_mq_parm->mq_opcode == MQ_TST_MQSET) && tvb_length_remaining(tvb, offset) >= 12)
-					{
-						/* The MQINQ/MQSET structure is special because it does not start with a structid */
-						gint iNbSelectors;
-						gint iNbIntegers;
-						gint iCharLen;
-						gint iOffsetINQ;
-						gint iSelector;
-
-						iNbSelectors = tvb_get_guint32_endian(tvb, offset    , p_mq_parm->mq_int_enc);
-						iNbIntegers  = tvb_get_guint32_endian(tvb, offset + 4, p_mq_parm->mq_int_enc);
-						iCharLen     = tvb_get_guint32_endian(tvb, offset + 8, p_mq_parm->mq_int_enc);
-
-						if (tree)
-						{
-							ti = proto_tree_add_text(mqroot_tree, tvb, offset, -1, MQ_TEXT_INQ);
-							mq_tree = proto_item_add_subtree(ti, ett_mq_inq);
-
-							proto_tree_add_item(mq_tree, hf_mq_inq_nbsel,	tvb, offset,     4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_inq_nbint,	tvb, offset + 4, 4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_inq_charlen, tvb, offset + 8, 4, p_mq_parm->mq_int_enc);
-						}
-						iOffsetINQ = 12;
-						if (tvb_length_remaining(tvb, offset + iOffsetINQ) >= iNbSelectors * 4)
-						{
-							if (tree)
-							{
-								for (iSelector = 0; iSelector < iNbSelectors; iSelector++)
-								{
-									proto_tree_add_item(mq_tree, hf_mq_inq_sel, tvb, offset + iOffsetINQ + iSelector * 4, 4, p_mq_parm->mq_int_enc);
-								}
-							}
-							iOffsetINQ += iNbSelectors * 4;
-							if (p_mq_parm->mq_opcode == MQ_TST_MQINQ_REPLY || p_mq_parm->mq_opcode == MQ_TST_MQSET)
-							{
-								gint iSizeINQValues;
-								iSizeINQValues = iNbIntegers * 4 + iCharLen;
-								if (tvb_length_remaining(tvb, offset + iOffsetINQ) >= iSizeINQValues)
-								{
-									gint iInteger;
-									if (tree)
-									{
-										for (iInteger = 0; iInteger < iNbIntegers; iInteger++)
-										{
-											proto_tree_add_item(mq_tree, hf_mq_inq_intvalue, tvb, offset + iOffsetINQ + iInteger * 4, 4, p_mq_parm->mq_int_enc);
-										}
-									}
-									iOffsetINQ += iNbIntegers * 4;
-									if (iCharLen != 0)
-									{
-										if (tree)
-										{
-											proto_tree_add_item(mq_tree, hf_mq_inq_charvalues, tvb, offset + iOffsetINQ, iCharLen, p_mq_parm->mq_str_enc);
-										}
-									}
-								}
-							}
-						}
-						offset += tvb_length(tvb);
-					}
-					else if (p_mq_parm->mq_opcode == MQ_TST_NOTIFICATION)
-					{
-						gint iHdl;
-
-						iHdl = tvb_get_guint32_endian(tvb, offset+4, p_mq_parm->mq_int_enc);
-
-						col_append_fstr(pinfo->cinfo, COL_INFO, " Hdl=0x%08x", iHdl);
-
-						if (tree)
-						{
-							ti = proto_tree_add_text(mqroot_tree, tvb, offset, -1, MQ_TEXT_NOTIFICATION);
-							mq_tree = proto_item_add_subtree(ti, ett_mq_notif);
-
-							proto_tree_add_item(mq_tree, hf_mq_notif_vers,	 tvb, offset,      4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_notif_handle, tvb, offset +  4, 4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_notif_code,	 tvb, offset +  8, 4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_notif_value,	 tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
-						}
-						offset+=16;
-						p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
-					}
-					else if (p_mq_parm->mq_opcode == MQ_TST_REQUEST_MSGS)
-					{
-						gint iHdl;
-						gint iFlags;
-						gint iGlbMsgIdx;
-						gint iMaxMsgLen;
-						gint xOfs;
-						gint iOpt;
-
-						xOfs       = 0;
-						iHdl       = tvb_get_guint32_endian(tvb, offset +  4, p_mq_parm->mq_int_enc);
-						iMaxMsgLen = tvb_get_guint32_endian(tvb, offset + 16, p_mq_parm->mq_int_enc);
-						iFlags     = tvb_get_guint32_endian(tvb, offset + 32, p_mq_parm->mq_int_enc);
-						iGlbMsgIdx = tvb_get_guint32_endian(tvb, offset + 36, p_mq_parm->mq_int_enc);
-						if (iFlags & 0x00000010)
-						{
-							p_mq_parm->mq_msgreq_ccsid.encod = tvb_get_guint32_endian(tvb, offset + 44, p_mq_parm->mq_int_enc);
-							p_mq_parm->mq_msgreq_ccsid.ccsid = tvb_get_guint32_endian(tvb, offset + 48, p_mq_parm->mq_int_enc);
-						}
-						col_append_fstr(pinfo->cinfo, COL_INFO, " Hdl=0x%08x GlbMsgIdx=%d, MaxLen=%d",
-							iHdl, iGlbMsgIdx, iMaxMsgLen);
-
-						if (tree)
-						{
-							ti = proto_tree_add_text(mqroot_tree, tvb, offset, -1, MQ_TEXT_REQMSG);
-							mq_tree = proto_item_add_subtree(ti, ett_mq_msg);
-
-							proto_tree_add_item(mq_tree, hf_mq_msgreq_version,	 tvb, offset     ,  4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_msgreq_handle,	 tvb, offset +  4,  4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_msgreq_RecvBytes, tvb, offset +  8,  4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_msgreq_RqstBytes, tvb, offset + 12,  4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_msgreq_MaxMsgLen, tvb, offset + 16,  4, p_mq_parm->mq_int_enc);
-							dissect_mq_MQGMO(tvb, mq_tree, offset + 20, ett_mq_gmo_option, p_mq_parm);
-
-							proto_tree_add_item(mq_tree, hf_mq_msgreq_WaitIntrv, tvb, offset + 24,  4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_msgreq_QueStatus, tvb, offset + 28,  4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_msgreq_RqstFlags, tvb, offset + 32,  4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_msgreq_GlbMsgIdx, tvb, offset + 36,  4, p_mq_parm->mq_int_enc);
-
-							if (iFlags & 0x00000010)
-							{
-								proto_tree_add_item(mq_tree, hf_mq_msgreq_SelectIdx, tvb, offset + 40,  2, p_mq_parm->mq_int_enc);
-								proto_tree_add_item(mq_tree, hf_mq_msgreq_MQMDVers,  tvb, offset + 42,  2, p_mq_parm->mq_int_enc);
-								proto_tree_add_item(mq_tree, hf_mq_msgreq_ccsid,	 tvb, offset + 44,  4, p_mq_parm->mq_int_enc);
-								dissect_mq_encoding(mq_tree, hf_mq_msgreq_encoding,	 tvb, offset + 48,  4, p_mq_parm->mq_int_enc);
-								proto_tree_add_item(mq_tree, hf_mq_msgreq_MsgSeqNum, tvb, offset + 52,  4, p_mq_parm->mq_int_enc);
-								proto_tree_add_item(mq_tree, hf_mq_msgreq_offset,	 tvb, offset + 56,  4, p_mq_parm->mq_int_enc);
-								dissect_mq_MQMO(tvb, mq_tree, offset + 60, ett_mq_gmo_matchoption, p_mq_parm);
-								iOpt = tvb_get_guint32_endian(tvb, offset + 60, p_mq_parm->mq_int_enc);
-
-								if (iOpt & MQ_MQMO_MATCH_MSG_ID)
-								{
-									proto_tree_add_item(mq_tree, hf_mq_msgreq_mtchMsgId, tvb, offset + 64 + xOfs, 24, p_mq_parm->mq_str_enc);
-									xOfs += 24;
-								}
-								if (iOpt & MQ_MQMO_MATCH_CORREL_ID)
-								{
-									proto_tree_add_item(mq_tree, hf_mq_msgreq_mtchCorId, tvb, offset + 64 + xOfs, 24, p_mq_parm->mq_str_enc);
-									xOfs += 24;
-								}
-								if (iOpt & MQ_MQMO_MATCH_GROUP_ID)
-								{
-									proto_tree_add_item(mq_tree, hf_mq_msgreq_mtchGrpid, tvb, offset + 64 + xOfs, 24, p_mq_parm->mq_str_enc);
-									xOfs += 24;
-								}
-								if (iOpt & MQ_MQMO_MATCH_MSG_TOKEN)
-								{
-									proto_tree_add_item(mq_tree, hf_mq_msgreq_mtchMsgTk, tvb, offset + 64 + xOfs, 16, p_mq_parm->mq_str_enc);
-									xOfs += 16;
-								}
-							}
-						}
-						offset += (iFlags & 0x00000010) ? (64+xOfs) : 40;
-						p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
-					}
-					else if (p_mq_parm->mq_opcode == MQ_TST_ASYNC_MESSAGE)
-					{
-						gint  iSegmIndex;
-						gint  iGlbMsgIdx;
-						gint  iPadLen;
-						gint  iSegLength;
-						gint8 iStrLen;
-						gint  iHdl;
-						gint  iHdrL;
-
-						iHdl       = tvb_get_guint32_endian(tvb, offset +  4, p_mq_parm->mq_int_enc);
-						iGlbMsgIdx = tvb_get_guint32_endian(tvb, offset + 12, p_mq_parm->mq_int_enc);
-						iSegLength = tvb_get_guint32_endian(tvb, offset + 16, p_mq_parm->mq_int_enc);
-						iSegmIndex = tvb_get_guint16_endian(tvb, offset + 20, p_mq_parm->mq_int_enc);
-
-						if (iSegmIndex == 0)
-						{
-							iStrLen = tvb_get_guint8(tvb, offset + 54);
-							iPadLen = (2+1+iStrLen) % 4;
-							iPadLen = (iPadLen) ? 4-iPadLen : 0;
-						}
-						else
-						{
-							iPadLen = 0;
-							iStrLen = 0;
-						}
-
-						iHdrL = (iSegmIndex == 0) ? (54+1+iStrLen+iPadLen) : 24;
-
-						if (!mq_in_reassembly)
-						{
-							col_append_fstr(pinfo->cinfo, COL_INFO, " Hdl=0x%08x GlbMsgIdx=%d, SegIdx=%d, SegLen=%d",
-								iHdl, iGlbMsgIdx, iSegmIndex, iSegLength);
-						}
-
-						if (tree)
-						{
-							ti = proto_tree_add_text(mqroot_tree, tvb, offset, iHdrL, MQ_TEXT_ASYMSG);
-							mq_tree = proto_item_add_subtree(ti, ett_mq_msg);
-
-							proto_tree_add_item(mq_tree, hf_mq_msgasy_version  , tvb, offset     , 4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_msgasy_handle   , tvb, offset +  4, 4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_msgasy_MsgIndex , tvb, offset +  8, 4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_msgasy_GlbMsgIdx, tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_msgasy_SegLength, tvb, offset + 16, 4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_msgasy_SegmIndex, tvb, offset + 20, 2, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_msgasy_SeleIndex, tvb, offset + 22, 2, p_mq_parm->mq_int_enc);
-							if (p_mq_parm->mq_ctlf1 & MQ_TCF_FIRST)
-							{
-								proto_tree_add_item(mq_tree, hf_mq_msgasy_ReasonCod , tvb, offset + 24,  4, p_mq_parm->mq_int_enc);
-								proto_tree_add_item(mq_tree, hf_mq_msgasy_ActMsgLen , tvb, offset + 28,  4, p_mq_parm->mq_int_enc);
-								proto_tree_add_item(mq_tree, hf_mq_msgasy_TotMsgLen , tvb, offset + 32,  4, p_mq_parm->mq_int_enc);
-								proto_tree_add_item(mq_tree, hf_mq_msgasy_MsgToken  , tvb, offset + 36, 16, p_mq_parm->mq_int_enc);
-								proto_tree_add_item(mq_tree, hf_mq_msgasy_Status    , tvb, offset + 52,  2, p_mq_parm->mq_int_enc);
-								proto_tree_add_item(mq_tree, hf_mq_msgasy_resolQNLn , tvb, offset + 54,  1, ENC_NA);
-								proto_tree_add_item(mq_tree, hf_mq_msgasy_resolQNme , tvb, offset + 55, iStrLen, p_mq_parm->mq_str_enc);
-								if (iPadLen)
-									proto_tree_add_item(mq_tree, hf_mq_msgasy_padding  , tvb, offset + 55 + iStrLen, iPadLen, p_mq_parm->mq_str_enc);
-							}
-						}
-						offset+=iHdrL;
-						p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
-
-						iSizePayload = tvb_length_remaining(tvb, offset);
-						bPayload = (iSizePayload>0);
-					}
-					else if ((p_mq_parm->mq_opcode == MQ_TST_SPI || p_mq_parm->mq_opcode == MQ_TST_SPI_REPLY) && tvb_length_remaining(tvb, offset) >= 12)
-					{
-						gint	iOffsetSPI = 0;
-						guint32 iSpiVerb   = 0;
-
-						p_mq_parm->iOfsEnc = offset + 12;
-						p_mq_parm->iOfsCcs = offset + 16;
-						p_mq_parm->iOfsFmt = offset + 20;
-
-						iSpiVerb = tvb_get_guint32_endian(tvb, offset, p_mq_parm->mq_int_enc);
-						col_append_fstr(pinfo->cinfo, COL_INFO, " (%s)", val_to_str(iSpiVerb, mq_spi_verbs_vals, "Unknown (0x%08x)"));
-
-						if (tree)
-						{
-							ti = proto_tree_add_text(mqroot_tree, tvb, offset, 12, MQ_TEXT_SPI);
-							mq_tree = proto_item_add_subtree(ti, ett_mq_spi);
-
-							proto_tree_add_item(mq_tree, hf_mq_spi_verb,	tvb, offset,     4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_spi_version, tvb, offset + 4, 4, p_mq_parm->mq_int_enc);
-							proto_tree_add_item(mq_tree, hf_mq_spi_length,	tvb, offset + 8, 4, p_mq_parm->mq_int_enc);
-						}
-
-						offset += 12;
-						p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
-						if (((p_mq_parm->mq_strucID & MQ_MASK_SPxZ) == MQ_STRUCTID_SPxU ||
-							(p_mq_parm->mq_strucID & MQ_MASK_SPxZ) == MQ_STRUCTID_SPxU_EBCDIC)
-							&& tvb_length_remaining(tvb, offset) >= 12)
-						{
-							gint iSizeSPIMD = 0;
-							if (tree)
-							{
-								guint8 *sStructId;
-								sStructId = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 4, ((p_mq_parm->mq_strucID & MQ_MASK_SPxx) == MQ_STRUCTID_SPxx) ? ENC_ASCII : ENC_EBCDIC);
-								ti = proto_tree_add_text(mqroot_tree, tvb, offset, 12, "%s", sStructId);
-								mq_tree = proto_item_add_subtree(ti, ett_mq_spi_base);
-
-								proto_tree_add_item(mq_tree, hf_mq_spi_base_StructID, tvb, offset,     4, p_mq_parm->mq_str_enc);
-								proto_tree_add_item(mq_tree, hf_mq_spi_base_version,  tvb, offset + 4, 4, p_mq_parm->mq_int_enc);
-								proto_tree_add_item(mq_tree, hf_mq_spi_base_length,	  tvb, offset + 8, 4, p_mq_parm->mq_int_enc);
-							}
-							offset += 12;
-							p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
-
-							if ((iSizeSPIMD = dissect_mq_md(tvb, mqroot_tree, offset, p_mq_parm, TRUE)) != 0)
-							{
-								offset += iSizeSPIMD;
-								offset += dissect_mq_gmo(tvb, pinfo, mqroot_tree, offset, p_mq_parm);
-								offset += dissect_mq_pmo(tvb, pinfo, mqroot_tree, offset, p_mq_parm, &iDistributionListSize);
-								p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
-							}
-
-							offset += dissect_mq_od(tvb, pinfo, mqroot_tree, offset, p_mq_parm, &iDistributionListSize);
-
-							if (((p_mq_parm->mq_strucID & MQ_MASK_SPxZ) == MQ_STRUCTID_SPxO ||
-								(p_mq_parm->mq_strucID & MQ_MASK_SPxZ) == MQ_STRUCTID_SPxO_EBCDIC ||
-								(p_mq_parm->mq_strucID & MQ_MASK_SPxZ) == MQ_STRUCTID_SPxI ||
-								(p_mq_parm->mq_strucID & MQ_MASK_SPxZ) == MQ_STRUCTID_SPxI_EBCDIC)
-								&& tvb_length_remaining(tvb, offset) >= 12)
-							{
-								if (tree)
-								{
-									/* Dissect the common part of these structures */
-									guint8 *sStructId;
-									sStructId = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 4, ((p_mq_parm->mq_strucID & MQ_MASK_SPxx) == MQ_STRUCTID_SPxx) ? ENC_ASCII : ENC_EBCDIC);
-									ti = proto_tree_add_text(mqroot_tree, tvb, offset, -1, "%s", sStructId);
-									mq_tree = proto_item_add_subtree(ti, ett_mq_spi_base);
-
-									proto_tree_add_item(mq_tree, hf_mq_spi_base_StructID, tvb, offset, 4, p_mq_parm->mq_str_enc);
-									proto_tree_add_item(mq_tree, hf_mq_spi_base_version,  tvb, offset + 4, 4, p_mq_parm->mq_int_enc);
-									proto_tree_add_item(mq_tree, hf_mq_spi_base_length,	  tvb, offset + 8, 4, p_mq_parm->mq_int_enc);
-								}
-
-								if ((p_mq_parm->mq_strucID == MQ_STRUCTID_SPQO || p_mq_parm->mq_strucID == MQ_STRUCTID_SPQO_EBCDIC)
-									&& tvb_length_remaining(tvb, offset) >= 16)
-								{
-									if (tree)
-									{
-										gint iVerbNumber = 0;
-										proto_tree_add_item(mq_tree, hf_mq_spi_spqo_nbverb, tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
-										iVerbNumber = tvb_get_guint32_endian(tvb, offset + 12, p_mq_parm->mq_int_enc);
-
-										if (tvb_length_remaining(tvb, offset) >= iVerbNumber * 20 + 16)
-										{
-											gint iVerb = 0;
-											iOffsetSPI = offset + 16;
-											for (iVerb = 0; iVerb < iVerbNumber; iVerb++)
-											{
-												proto_tree_add_item(mq_tree, hf_mq_spi_spqo_verbid,	  tvb, iOffsetSPI,      4, p_mq_parm->mq_int_enc);
-												proto_tree_add_item(mq_tree, hf_mq_spi_spqo_maxiover, tvb, iOffsetSPI +  4, 4, p_mq_parm->mq_int_enc);
-												proto_tree_add_item(mq_tree, hf_mq_spi_spqo_maxinver, tvb, iOffsetSPI +  8, 4, p_mq_parm->mq_int_enc);
-												proto_tree_add_item(mq_tree, hf_mq_spi_spqo_maxouver, tvb, iOffsetSPI + 12, 4, p_mq_parm->mq_int_enc);
-												proto_tree_add_item(mq_tree, hf_mq_spi_spqo_flags,	  tvb, iOffsetSPI + 16, 4, p_mq_parm->mq_int_enc);
-												iOffsetSPI += 20;
-											}
-											offset += iVerbNumber * 20 + 16;
-										}
-									}
-								}
-								else if ((p_mq_parm->mq_strucID == MQ_STRUCTID_SPAI || p_mq_parm->mq_strucID == MQ_STRUCTID_SPAI_EBCDIC)
-									&& tvb_length_remaining(tvb, offset) >= 136)
-								{
-									if (tree)
-									{
-										proto_tree_add_item(mq_tree, hf_mq_spi_spai_mode,	  tvb, offset +  12,  4, p_mq_parm->mq_int_enc);
-										proto_tree_add_item(mq_tree, hf_mq_spi_spai_unknown1, tvb, offset +  16, 48, p_mq_parm->mq_str_enc);
-										proto_tree_add_item(mq_tree, hf_mq_spi_spai_unknown2, tvb, offset +  64, 48, p_mq_parm->mq_str_enc);
-										proto_tree_add_item(mq_tree, hf_mq_spi_spai_msgid,	  tvb, offset + 112, 24, p_mq_parm->mq_str_enc);
-									}
-									offset += 136;
-								}
-								else if ((p_mq_parm->mq_strucID == MQ_STRUCTID_SPGI || p_mq_parm->mq_strucID == MQ_STRUCTID_SPGI_EBCDIC)
-									&& tvb_length_remaining(tvb, offset) >= 24)
-								{
-									if (tree)
-									{
-										proto_tree_add_item(mq_tree, hf_mq_spi_spgi_batchsz,  tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
-										proto_tree_add_item(mq_tree, hf_mq_spi_spgi_batchint, tvb, offset + 16, 4, p_mq_parm->mq_int_enc);
-										proto_tree_add_item(mq_tree, hf_mq_spi_spgi_maxmsgsz, tvb, offset + 20, 4, p_mq_parm->mq_int_enc);
-									}
-									offset += 24;
-								}
-								else if ((p_mq_parm->mq_strucID == MQ_STRUCTID_SPGO || p_mq_parm->mq_strucID == MQ_STRUCTID_SPPI ||
-									p_mq_parm->mq_strucID == MQ_STRUCTID_SPGO_EBCDIC || p_mq_parm->mq_strucID == MQ_STRUCTID_SPPI_EBCDIC)
-									&& tvb_length_remaining(tvb, offset) >= 20)
-								{
-									if (tree)
-									{
-										proto_tree_add_bitmask(mq_tree, tvb, offset + 12, hf_mq_spi_spgo_options, ett_mq_spi_options, pf_flds_spiopt, ENC_BIG_ENDIAN);
-										proto_tree_add_item(mq_tree, hf_mq_spi_spgo_size, tvb, offset + 16, 4, p_mq_parm->mq_int_enc);
-									}
-									iSizePayload = tvb_get_guint32_endian(tvb, offset + 16, p_mq_parm->mq_int_enc);
-									offset += 20;
-									bPayload = TRUE;
-								}
-								else
-								{
-									offset += 12;
-								}
-								p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
-							}
-						}
-					}
-					else if ((p_mq_parm->mq_opcode >= 0xA0 && p_mq_parm->mq_opcode <= 0xB9) && tvb_length_remaining(tvb, offset) >= 16)
-					{
-						/* The XA structures are special because they do not start with a structid */
-						if (tree)
-						{
-							ti = proto_tree_add_text(mqroot_tree, tvb, offset, 16, "%s (%s)", MQ_TEXT_XA,
-								val_to_str(p_mq_parm->mq_opcode, mq_opcode_vals, "Unknown (0x%02x)"));
-							mq_tree = proto_item_add_subtree(ti, ett_mq_xa);
-
-							proto_tree_add_item(mq_tree, hf_mq_xa_length,      tvb, offset,     4, ENC_BIG_ENDIAN);
-							proto_tree_add_item(mq_tree, hf_mq_xa_returnvalue, tvb, offset + 4, 4, p_mq_parm->mq_int_enc);
-
-							proto_tree_add_bitmask(mq_tree, tvb, offset + 8, hf_mq_xa_tmflags, ett_mq_xa_tmflags, pf_flds_tmflags, ENC_BIG_ENDIAN);
-
-							proto_tree_add_item(mq_tree, hf_mq_xa_rmid, tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
-						}
-						offset += 16;
-						if (p_mq_parm->mq_opcode == MQ_TST_XA_START || p_mq_parm->mq_opcode == MQ_TST_XA_END || p_mq_parm->mq_opcode == MQ_TST_XA_PREPARE
-							|| p_mq_parm->mq_opcode == MQ_TST_XA_COMMIT || p_mq_parm->mq_opcode == MQ_TST_XA_ROLLBACK || p_mq_parm->mq_opcode == MQ_TST_XA_FORGET
-							|| p_mq_parm->mq_opcode == MQ_TST_XA_COMPLETE)
-						{
-							gint iSizeXid = 0;
-							if ((iSizeXid = dissect_mq_xid(tvb, mqroot_tree, p_mq_parm, offset)) != 0)
-								offset += iSizeXid;
-						}
-						else if ((p_mq_parm->mq_opcode == MQ_TST_XA_OPEN || p_mq_parm->mq_opcode == MQ_TST_XA_CLOSE)
-							&& tvb_length_remaining(tvb, offset) >= 1)
-						{
-							guint8 iXAInfoLength = 0;
-							iXAInfoLength = tvb_get_guint8(tvb, offset);
-							if (tvb_length_remaining(tvb, offset) >= iXAInfoLength + 1)
-							{
-								if (tree)
-								{
-									ti = proto_tree_add_text(mqroot_tree, tvb, offset, iXAInfoLength + 1, MQ_TEXT_XINF);
-									mq_tree = proto_item_add_subtree(ti, ett_mq_xa_info);
-
-									proto_tree_add_item(mq_tree, hf_mq_xa_xainfo_length, tvb, offset,     1, ENC_BIG_ENDIAN);
-									proto_tree_add_item(mq_tree, hf_mq_xa_xainfo_value,  tvb, offset + 1, iXAInfoLength, p_mq_parm->mq_str_enc);
-								}
-							}
-							offset += 1 + iXAInfoLength;
-						}
-						else if ((p_mq_parm->mq_opcode == MQ_TST_XA_RECOVER || p_mq_parm->mq_opcode == MQ_TST_XA_RECOVER_REPLY)
-							&& tvb_length_remaining(tvb, offset) >= 4)
-						{
-							gint iNbXid = 0;
-							iNbXid = tvb_get_guint32_endian(tvb, offset, p_mq_parm->mq_int_enc);
-							if (tree)
-							{
-								proto_tree_add_item(mq_tree, hf_mq_xa_count, tvb, offset, 4, p_mq_parm->mq_int_enc);
-							}
-							offset += 4;
-							if (p_mq_parm->mq_opcode == MQ_TST_XA_RECOVER_REPLY)
-							{
-								gint iXid = 0;
-								for (iXid = 0; iXid < iNbXid; iXid++)
-								{
-									gint iSizeXid = 0;
-									if ((iSizeXid = dissect_mq_xid(tvb, mqroot_tree, p_mq_parm, offset)) != 0)
-										offset += iSizeXid;
-									else
-										break;
-								}
-							}
-						}
-					}
-					if ((p_mq_parm->mq_strucID == MQ_STRUCTID_LPOO || p_mq_parm->mq_strucID == MQ_STRUCTID_LPOO_EBCDIC) && tvb_length_remaining(tvb, offset) >= 32)
-					{
-						guint iVersion;
-						guint iXtraData = 0;
-						gint  iSize		= 32;
-						iVersion = tvb_get_guint32_endian(tvb, offset+4, p_mq_parm->mq_int_enc);
-						if (iVersion >= 3)
-						{
-							iSize += 56;
-							iXtraData = tvb_get_guint32_endian(tvb, offset + 84, p_mq_parm->mq_int_enc);
-						}
-
-						if (iSize != 0 && tvb_length_remaining(tvb, offset) >= iSize)
-						{
-							if (tree)
-							{
-								ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSize, MQ_TEXT_LPOO);
-								mq_tree = proto_item_add_subtree(ti, ett_mq_lpoo);
-
-								proto_tree_add_item(mq_tree, hf_mq_lpoo_StructID, tvb, offset,     4, p_mq_parm->mq_str_enc);
-								proto_tree_add_item(mq_tree, hf_mq_lpoo_version,  tvb, offset + 4, 4, p_mq_parm->mq_int_enc);
-
-								dissect_mq_MQOO(tvb, mq_tree, offset+8, ett_mq_lpoo_options, hf_mq_lpoo_options, p_mq_parm);
-
-								dissect_mq_LPOO_LPIOPTS(tvb, mq_tree, offset+16, ett_mq_lpoo_lpiopts, p_mq_parm);
-								proto_tree_add_item(mq_tree, hf_mq_lpoo_defpersist,		tvb, offset + 20, 4, p_mq_parm->mq_int_enc);
-								proto_tree_add_item(mq_tree, hf_mq_lpoo_defputresptype, tvb, offset + 24, 4, p_mq_parm->mq_int_enc);
-								proto_tree_add_item(mq_tree, hf_mq_lpoo_defreadahead,	tvb, offset + 28, 4, p_mq_parm->mq_int_enc);
-								if (iVersion >= 3)
-								{
-									proto_tree_add_item(mq_tree, hf_mq_lpoo_qprotect,   tvb, offset + 32, 48, p_mq_parm->mq_int_enc);
-									proto_tree_add_item(mq_tree, hf_mq_lpoo_unknown6,   tvb, offset + 80,  4, p_mq_parm->mq_int_enc);
-									/*proto_tree_add_item(mq_tree, hf_mq_lpoo_unknown7,   tvb, offset + 84,  2, p_mq_parm->mq_int_enc);*/
-									proto_tree_add_item(mq_tree, hf_mq_lpoo_xtradata,   tvb, offset + 84,  4, p_mq_parm->mq_int_enc);
-								}
-							}
-							offset += iSize;
-							p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
-							if (iXtraData>0)
-							{
-								if (p_mq_parm->mq_opcode == MQ_TST_SPI_REPLY)
-								{
-									bPayload		   = TRUE;
-									iSizePayload	   = iXtraData;
-									p_mq_parm->iOfsFmt = (offset-iSize);
-								}
-							}
-						}
-					}
-					if ((p_mq_parm->mq_strucID == MQ_STRUCTID_ID || p_mq_parm->mq_strucID == MQ_STRUCTID_ID_EBCDIC) && tvb_length_remaining(tvb, offset) >= 5)
-					{
-						offset += dissect_mq_id(tvb, pinfo, mqroot_tree, offset, p_mq_parm);
-						p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
-					}
-					if ((p_mq_parm->mq_strucID == MQ_STRUCTID_UID || p_mq_parm->mq_strucID == MQ_STRUCTID_UID_EBCDIC) && tvb_length_remaining(tvb, offset) > 0)
-					{
-						gint iSizeUID;
-						/* iSizeUID = (iVersionID < 5 ? 28 : 132);  guess */
-						/* The iVersionID is available in the previous ID segment, we should keep a state *
-						 * Instead we rely on the segment length announced in the TSH */
-						iSizeUID = iSegmentLength - iSizeTSH;
-						if (iSizeUID != 28 && iSizeUID != 132)
-							iSizeUID = 0;
-
-						if (iSizeUID != 0 && tvb_length_remaining(tvb, offset) >= iSizeUID)
-						{
-							guint8 *sUserId;
-							sUserId = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 4, 12, p_mq_parm->mq_str_enc);
-							if (strip_trailing_blanks(sUserId, 12) > 0)
-							{
-								col_append_fstr(pinfo->cinfo, COL_INFO, " User=%s", sUserId);
-							}
-
-							if (tree)
-							{
-								ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSizeUID, MQ_TEXT_UID);
-								mq_tree = proto_item_add_subtree(ti, ett_mq_uid);
-
-								proto_tree_add_item(mq_tree, hf_mq_uid_StructID, tvb, offset,       4, p_mq_parm->mq_str_enc);
-								proto_tree_add_item(mq_tree, hf_mq_uid_userid,   tvb, offset +  4, 12, p_mq_parm->mq_str_enc);
-								proto_tree_add_item(mq_tree, hf_mq_uid_password, tvb, offset + 16, 12, p_mq_parm->mq_str_enc);
-							}
-
-							if (iSizeUID == 132)
-							{
-								if (tree)
-								{
-									proto_tree_add_item(mq_tree, hf_mq_uid_longuserid, tvb, offset + 28, 64, p_mq_parm->mq_str_enc);
-									dissect_mq_sid(tvb, mq_tree, p_mq_parm, offset + 92);
-								}
-							}
-						}
-						offset += iSizeUID;
-						p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
-					}
-
-					offset += dissect_mq_od(tvb, pinfo, mqroot_tree, offset, p_mq_parm, &iDistributionListSize);
-
-					if ((iSizeMD = dissect_mq_md(tvb, mqroot_tree, offset, p_mq_parm, TRUE)) != 0)
-					{
-						gint iSizeGMO = 0;
-						gint iSizePMO = 0;
-						offset += iSizeMD;
-
-						if ((iSizeGMO = dissect_mq_gmo(tvb, pinfo, mqroot_tree, offset, p_mq_parm)) != 0)
-						{
-							offset   += iSizeGMO;
-							bPayload  = TRUE;
-						}
-						else if ((iSizePMO = dissect_mq_pmo(tvb, pinfo, mqroot_tree, offset, p_mq_parm, &iDistributionListSize)) != 0)
-						{
-							offset   += iSizePMO;
-							bPayload  = TRUE;
-						}
-						if (tvb_length_remaining(tvb, offset) >= 4)
-						{
-							if (bPayload == TRUE && (p_mq_parm->mq_opcode != MQ_TST_ASYNC_MESSAGE))
-							{
-								iSizePayload = tvb_get_guint32_endian(tvb, offset, p_mq_parm->mq_int_enc);
-								if (tree)
-								{
-									ti = proto_tree_add_text(mqroot_tree, tvb, offset, 4, MQ_TEXT_PUT);
-									mq_tree = proto_item_add_subtree(ti, ett_mq_put);
-									proto_tree_add_item(mq_tree, hf_mq_put_length, tvb, offset, 4, p_mq_parm->mq_int_enc);
-								}
-								offset += 4;
-							}
-						}
-					}
-					if (iDistributionListSize > 0)
-					{
-						col_append_fstr(pinfo->cinfo, COL_INFO, " (Distribution List, Size=%d)", iDistributionListSize);
-					}
-					if (bPayload == TRUE)
-					{
-						if (iSizePayload != 0 && tvb_length_remaining(tvb, offset) > 0)
-						{
-							/* For the following header structures, each structure has a "format" field
-							which announces the type of the following structure.  For dissection we
-							do not use it and rely on the structid instead. */
-							guint32 iHeadersLength = 0;
-							if (tvb_length_remaining(tvb, offset) >= 4)
-							{
-								gint iSizeMD2 = 0;
-								p_mq_parm->mq_strucID = tvb_get_ntohl(tvb, offset);
-
-								if ((p_mq_parm->mq_strucID == MQ_STRUCTID_XQH || p_mq_parm->mq_strucID == MQ_STRUCTID_XQH_EBCDIC) && tvb_length_remaining(tvb, offset) >= 104)
-								{
-									/* if MD.format == MQXMIT */
-									gint iSizeXQH = 104;
-									if (tree)
-									{
-										ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSizeXQH, MQ_TEXT_XQH);
-										mq_tree = proto_item_add_subtree(ti, ett_mq_xqh);
-
-										proto_tree_add_item(mq_tree, hf_mq_xqh_StructID,   tvb, offset,       4, p_mq_parm->mq_str_enc);
-										proto_tree_add_item(mq_tree, hf_mq_xqh_version,	   tvb, offset +  4,  4, p_mq_parm->mq_int_enc);
-										proto_tree_add_item(mq_tree, hf_mq_xqh_remoteq,	   tvb, offset +  8, 48, p_mq_parm->mq_str_enc);
-										proto_tree_add_item(mq_tree, hf_mq_xqh_remoteqmgr, tvb, offset + 56, 48, p_mq_parm->mq_str_enc);
-									}
-									offset += iSizeXQH;
-									iHeadersLength += iSizeXQH;
-
-									if ((iSizeMD2 = dissect_mq_md(tvb, mqroot_tree, offset, p_mq_parm, TRUE)) != 0)
-									{
-										offset += iSizeMD2;
-										iHeadersLength += iSizeMD2;
-									}
-
-									p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
-								}
-								if ((p_mq_parm->mq_strucID == MQ_STRUCTID_DH || p_mq_parm->mq_strucID == MQ_STRUCTID_DH_EBCDIC) && tvb_length_remaining(tvb, offset) >= 48)
-								{
-									/* if MD.format == MQHDIST */
-									gint	iSizeDH		= 48;
-									gint	iNbrRecords = 0;
-									guint32 iRecFlags	= 0;
-
-									iNbrRecords = tvb_get_guint32_endian(tvb, offset + 36, p_mq_parm->mq_int_enc);
-									iRecFlags = tvb_get_guint32_endian(tvb, offset + 32, p_mq_parm->mq_int_enc);
-									p_mq_parm->iOfsEnc = offset + 12;
-									p_mq_parm->iOfsCcs = offset + 16;
-									p_mq_parm->iOfsFmt = offset + 20;
-
-									p_mq_parm->mq_head_ccsid.encod = tvb_get_guint32_endian(tvb, offset + 12, p_mq_parm->mq_int_enc);
-									p_mq_parm->mq_head_ccsid.ccsid = tvb_get_guint32_endian(tvb, offset + 16, p_mq_parm->mq_int_enc);
-
-									if (tree)
-									{
-										ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSizeDH, MQ_TEXT_DH);
-										mq_tree = proto_item_add_subtree(ti, ett_mq_dh);
-
-										proto_tree_add_item(mq_tree, hf_mq_head_StructID,	tvb, offset,      4, p_mq_parm->mq_str_enc);
-										proto_tree_add_item(mq_tree, hf_mq_head_version,	tvb, offset +  4, 4, p_mq_parm->mq_int_enc);
-										proto_tree_add_item(mq_tree, hf_mq_head_length,		tvb, offset +  8, 4, p_mq_parm->mq_int_enc);
-										dissect_mq_encoding(mq_tree, hf_mq_head_encoding,	tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
-										proto_tree_add_item(mq_tree, hf_mq_head_ccsid,		tvb, offset + 16, 4, p_mq_parm->mq_int_enc);
-										proto_tree_add_item(mq_tree, hf_mq_head_format,		tvb, offset + 20, 8, p_mq_parm->mq_str_enc);
-										proto_tree_add_item(mq_tree, hf_mq_head_flags,		tvb, offset + 28, 4, p_mq_parm->mq_int_enc);
-										proto_tree_add_item(mq_tree, hf_mq_dh_putmsgrecfld, tvb, offset + 32, 4, p_mq_parm->mq_int_enc);
-										proto_tree_add_item(mq_tree, hf_mq_dh_recspresent,	tvb, offset + 36, 4, p_mq_parm->mq_int_enc);
-										proto_tree_add_item(mq_tree, hf_mq_dh_objrecofs ,	tvb, offset + 40, 4, p_mq_parm->mq_int_enc);
-										proto_tree_add_item(mq_tree, hf_mq_dh_putmsgrecofs, tvb, offset + 44, 4, p_mq_parm->mq_int_enc);
-									}
-									offset += iSizeDH;
-									iHeadersLength += iSizeDH;
-
-									if (iNbrRecords > 0)
-									{
-										gint iOffsetOR	= 0;
-										gint iOffsetPMR = 0;
-										gint iSizeORPMR = 0;
-
-										iOffsetOR =	 tvb_get_guint32_endian(tvb, offset - iSizeDH + 40, p_mq_parm->mq_int_enc);
-										iOffsetPMR = tvb_get_guint32_endian(tvb, offset - iSizeDH + 44, p_mq_parm->mq_int_enc);
-										if ((iSizeORPMR = dissect_mq_or(tvb, mqroot_tree, offset, iNbrRecords, iOffsetOR, p_mq_parm)) != 0)
-										{
-											offset += iSizeORPMR;
-											iHeadersLength += iSizeORPMR;
-										}
-										if ((iSizeORPMR = dissect_mq_pmr(tvb, mqroot_tree, offset, iNbrRecords, iOffsetPMR, iRecFlags, p_mq_parm)) != 0)
-										{
-											offset += iSizeORPMR;
-											iHeadersLength += iSizeORPMR;
-										}
-									}
-
-									p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
-								}
-								if ((p_mq_parm->mq_strucID == MQ_STRUCTID_DLH || p_mq_parm->mq_strucID == MQ_STRUCTID_DLH_EBCDIC) && tvb_length_remaining(tvb, offset) >= 172)
-								{
-									/* if MD.format == MQDEAD */
-									gint iSizeDLH = 172;
-									p_mq_parm->iOfsEnc = offset + 108;
-									p_mq_parm->iOfsCcs = offset + 112;
-									p_mq_parm->iOfsFmt = offset + 116;
-
-									p_mq_parm->mq_dlh_ccsid.encod = tvb_get_guint32_endian(tvb, offset + 108, p_mq_parm->mq_int_enc);
-									p_mq_parm->mq_dlh_ccsid.ccsid = tvb_get_guint32_endian(tvb, offset + 112, p_mq_parm->mq_int_enc);
-
-									if (tree)
-									{
-										ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSizeDLH, MQ_TEXT_DLH);
-										mq_tree = proto_item_add_subtree(ti, ett_mq_dlh);
-
-										proto_tree_add_item(mq_tree, hf_mq_dlh_StructID,	tvb, offset,        4, p_mq_parm->mq_str_enc);
-										proto_tree_add_item(mq_tree, hf_mq_dlh_version,		tvb, offset +   4,  4, p_mq_parm->mq_int_enc);
-										proto_tree_add_item(mq_tree, hf_mq_dlh_reason,		tvb, offset +   8,  4, p_mq_parm->mq_int_enc);
-										proto_tree_add_item(mq_tree, hf_mq_dlh_destq,		tvb, offset +  12, 48, p_mq_parm->mq_str_enc);
-										proto_tree_add_item(mq_tree, hf_mq_dlh_destqmgr,	tvb, offset +  60, 48, p_mq_parm->mq_str_enc);
-										dissect_mq_encoding(mq_tree, hf_mq_dlh_encoding,	tvb, offset + 108,  4, p_mq_parm->mq_int_enc);
-										proto_tree_add_item(mq_tree, hf_mq_dlh_ccsid,		tvb, offset + 112,  4, p_mq_parm->mq_int_enc);
-										proto_tree_add_item(mq_tree, hf_mq_dlh_format,		tvb, offset + 116,  8, p_mq_parm->mq_str_enc);
-										proto_tree_add_item(mq_tree, hf_mq_dlh_putappltype, tvb, offset + 124,  4, p_mq_parm->mq_int_enc);
-										proto_tree_add_item(mq_tree, hf_mq_dlh_putapplname, tvb, offset + 128, 28, p_mq_parm->mq_str_enc);
-										proto_tree_add_item(mq_tree, hf_mq_dlh_putdate,		tvb, offset + 156,  8, p_mq_parm->mq_str_enc);
-										proto_tree_add_item(mq_tree, hf_mq_dlh_puttime,		tvb, offset + 164,  8, p_mq_parm->mq_str_enc);
-									}
-									offset += iSizeDLH;
-									iHeadersLength += iSizeDLH;
-									p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
-								}
-								if ((p_mq_parm->mq_strucID == MQ_STRUCTID_MDE || p_mq_parm->mq_strucID == MQ_STRUCTID_MDE_EBCDIC) && tvb_length_remaining(tvb, offset) >= 72)
-								{
-									/* if MD.format == MQHMDE */
-									gint iSizeMDE = 72;
-									p_mq_parm->iOfsEnc = offset + 12;
-									p_mq_parm->iOfsCcs = offset + 16;
-									p_mq_parm->iOfsFmt = offset + 20;
-									if (tree)
-									{
-										ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSizeMDE, MQ_TEXT_MDE);
-										mq_tree = proto_item_add_subtree(ti, ett_mq_mde);
-
-										proto_tree_add_item(mq_tree, hf_mq_head_StructID,	tvb, offset,       4, p_mq_parm->mq_str_enc);
-										proto_tree_add_item(mq_tree, hf_mq_head_version,	tvb, offset +  4,  4, p_mq_parm->mq_int_enc);
-										proto_tree_add_item(mq_tree, hf_mq_head_length,		tvb, offset +  8,  4, p_mq_parm->mq_int_enc);
-										dissect_mq_encoding(mq_tree, hf_mq_head_encoding,	tvb, offset + 12,  4, p_mq_parm->mq_int_enc);
-										proto_tree_add_item(mq_tree, hf_mq_head_ccsid,		tvb, offset + 16,  4, p_mq_parm->mq_int_enc);
-										proto_tree_add_item(mq_tree, hf_mq_head_format,		tvb, offset + 20,  8, p_mq_parm->mq_str_enc);
-										proto_tree_add_item(mq_tree, hf_mq_head_flags,		tvb, offset + 28,  4, p_mq_parm->mq_int_enc);
-										proto_tree_add_item(mq_tree, hf_mq_md_groupid,		tvb, offset + 32, 24, ENC_NA);
-										proto_tree_add_item(mq_tree, hf_mq_md_msgseqnumber, tvb, offset + 56,  4, p_mq_parm->mq_int_enc);
-										proto_tree_add_item(mq_tree, hf_mq_md_offset,		tvb, offset + 60,  4, p_mq_parm->mq_int_enc);
-										proto_tree_add_item(mq_tree, hf_mq_md_msgflags,		tvb, offset + 64,  4, p_mq_parm->mq_int_enc);
-										proto_tree_add_item(mq_tree, hf_mq_md_origlen,		tvb, offset + 68,  4, p_mq_parm->mq_int_enc);
-									}
-									offset += iSizeMDE;
-									iHeadersLength += iSizeMDE;
-									p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
-								}
-								if ((p_mq_parm->mq_strucID == MQ_STRUCTID_CIH || p_mq_parm->mq_strucID == MQ_STRUCTID_CIH_EBCDIC
-									|| p_mq_parm->mq_strucID == MQ_STRUCTID_IIH || p_mq_parm->mq_strucID == MQ_STRUCTID_IIH_EBCDIC
-									|| p_mq_parm->mq_strucID == MQ_STRUCTID_RFH || p_mq_parm->mq_strucID == MQ_STRUCTID_RFH_EBCDIC
-									|| p_mq_parm->mq_strucID == MQ_STRUCTID_RMH || p_mq_parm->mq_strucID == MQ_STRUCTID_RMH_EBCDIC
-									|| p_mq_parm->mq_strucID == MQ_STRUCTID_WIH || p_mq_parm->mq_strucID == MQ_STRUCTID_WIH_EBCDIC)
-									&& tvb_length_remaining(tvb, offset) >= 12)
-								{
-									/* Dissect the generic part of the other pre-defined headers */
-									/* We assume that only one such header is present */
-									gint iSizeHeader = 0;
-									iSizeHeader = (gint) tvb_get_guint32_endian(tvb, offset + 8, p_mq_parm->mq_int_enc);
-									/* XXX - 32 is inferred from the code below.  What's the
-									* correct minimum? */
-									if (iSizeHeader <= 32)
-										THROW(ReportedBoundsError);
-
-									if (tvb_length_remaining(tvb, offset) >= iSizeHeader)
-									{
-										p_mq_parm->iOfsEnc = offset + 12;
-										p_mq_parm->iOfsCcs = offset + 16;
-										p_mq_parm->iOfsFmt = offset + 20;
-										if (tree)
-										{
-											ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSizeHeader, "%s", val_to_str(p_mq_parm->mq_strucID, mq_StructID_vals, "Unknown (0x%08x)"));
-											mq_tree = proto_item_add_subtree(ti, ett_mq_head);
-
-											proto_tree_add_item(mq_tree, hf_mq_head_StructID, tvb, offset,      4, p_mq_parm->mq_str_enc);
-											proto_tree_add_item(mq_tree, hf_mq_head_version,  tvb, offset +  4, 4, p_mq_parm->mq_int_enc);
-											proto_tree_add_item(mq_tree, hf_mq_head_length,	  tvb, offset +  8, 4, p_mq_parm->mq_int_enc);
-											dissect_mq_encoding(mq_tree, hf_mq_head_encoding, tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
-											proto_tree_add_item(mq_tree, hf_mq_head_ccsid,	  tvb, offset + 16, 4, p_mq_parm->mq_int_enc);
-											proto_tree_add_item(mq_tree, hf_mq_head_format,	  tvb, offset + 20, 8, p_mq_parm->mq_str_enc);
-											proto_tree_add_item(mq_tree, hf_mq_head_flags,	  tvb, offset + 28, 4, p_mq_parm->mq_int_enc);
-											proto_tree_add_item(mq_tree, hf_mq_head_struct,	  tvb, offset + 32, iSizeHeader - 32, ENC_NA);
-
-										}
-										offset += iSizeHeader;
-										iHeadersLength += iSizeHeader;
-										p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
-									}
-								}
-							}
-
-							col_append_fstr(pinfo->cinfo, COL_INFO, " (%d bytes)", iSizePayload - iHeadersLength);
-
-							if (!mq_in_reassembly)
-							{
-								/* Call subdissector for the payload */
-								tvbuff_t *next_tvb;
+                            offset += iSizeCONN;
+                        }
+                    }
+                    else if ((p_mq_parm->mq_opcode == MQ_TST_MQINQ || p_mq_parm->mq_opcode == MQ_TST_MQINQ_REPLY || p_mq_parm->mq_opcode == MQ_TST_MQSET) && tvb_length_remaining(tvb, offset) >= 12)
+                    {
+                        /* The MQINQ/MQSET structure is special because it does not start with a structid */
+                        gint iNbSelectors;
+                        gint iNbIntegers;
+                        gint iCharLen;
+                        gint iOffsetINQ;
+                        gint iSelector;
+
+                        iNbSelectors = tvb_get_guint32_endian(tvb, offset    , p_mq_parm->mq_int_enc);
+                        iNbIntegers  = tvb_get_guint32_endian(tvb, offset + 4, p_mq_parm->mq_int_enc);
+                        iCharLen     = tvb_get_guint32_endian(tvb, offset + 8, p_mq_parm->mq_int_enc);
+
+                        if (tree)
+                        {
+                            ti = proto_tree_add_text(mqroot_tree, tvb, offset, -1, MQ_TEXT_INQ);
+                            mq_tree = proto_item_add_subtree(ti, ett_mq_inq);
+
+                            proto_tree_add_item(mq_tree, hf_mq_inq_nbsel,   tvb, offset,     4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_inq_nbint,   tvb, offset + 4, 4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_inq_charlen, tvb, offset + 8, 4, p_mq_parm->mq_int_enc);
+                        }
+                        iOffsetINQ = 12;
+                        if (tvb_length_remaining(tvb, offset + iOffsetINQ) >= iNbSelectors * 4)
+                        {
+                            if (tree)
+                            {
+                                for (iSelector = 0; iSelector < iNbSelectors; iSelector++)
+                                {
+                                    proto_tree_add_item(mq_tree, hf_mq_inq_sel, tvb, offset + iOffsetINQ + iSelector * 4, 4, p_mq_parm->mq_int_enc);
+                                }
+                            }
+                            iOffsetINQ += iNbSelectors * 4;
+                            if (p_mq_parm->mq_opcode == MQ_TST_MQINQ_REPLY || p_mq_parm->mq_opcode == MQ_TST_MQSET)
+                            {
+                                gint iSizeINQValues;
+                                iSizeINQValues = iNbIntegers * 4 + iCharLen;
+                                if (tvb_length_remaining(tvb, offset + iOffsetINQ) >= iSizeINQValues)
+                                {
+                                    gint iInteger;
+                                    if (tree)
+                                    {
+                                        for (iInteger = 0; iInteger < iNbIntegers; iInteger++)
+                                        {
+                                            proto_tree_add_item(mq_tree, hf_mq_inq_intvalue, tvb, offset + iOffsetINQ + iInteger * 4, 4, p_mq_parm->mq_int_enc);
+                                        }
+                                    }
+                                    iOffsetINQ += iNbIntegers * 4;
+                                    if (iCharLen != 0)
+                                    {
+                                        if (tree)
+                                        {
+                                            proto_tree_add_item(mq_tree, hf_mq_inq_charvalues, tvb, offset + iOffsetINQ, iCharLen, p_mq_parm->mq_str_enc);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        offset += tvb_length(tvb);
+                    }
+                    else if (p_mq_parm->mq_opcode == MQ_TST_NOTIFICATION)
+                    {
+                        gint iHdl;
+
+                        iHdl = tvb_get_guint32_endian(tvb, offset+4, p_mq_parm->mq_int_enc);
+
+                        col_append_fstr(pinfo->cinfo, COL_INFO, " Hdl=0x%08x", iHdl);
+
+                        if (tree)
+                        {
+                            ti = proto_tree_add_text(mqroot_tree, tvb, offset, -1, MQ_TEXT_NOTIFICATION);
+                            mq_tree = proto_item_add_subtree(ti, ett_mq_notif);
+
+                            proto_tree_add_item(mq_tree, hf_mq_notif_vers,   tvb, offset,      4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_notif_handle, tvb, offset +  4, 4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_notif_code,   tvb, offset +  8, 4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_notif_value,  tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
+                        }
+                        offset+=16;
+                        p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
+                    }
+                    else if (p_mq_parm->mq_opcode == MQ_TST_REQUEST_MSGS)
+                    {
+                        gint iHdl;
+                        gint iFlags;
+                        gint iGlbMsgIdx;
+                        gint iMaxMsgLen;
+                        gint xOfs;
+                        gint iOpt;
+
+                        xOfs       = 0;
+                        iHdl       = tvb_get_guint32_endian(tvb, offset +  4, p_mq_parm->mq_int_enc);
+                        iMaxMsgLen = tvb_get_guint32_endian(tvb, offset + 16, p_mq_parm->mq_int_enc);
+                        iFlags     = tvb_get_guint32_endian(tvb, offset + 32, p_mq_parm->mq_int_enc);
+                        iGlbMsgIdx = tvb_get_guint32_endian(tvb, offset + 36, p_mq_parm->mq_int_enc);
+                        if (iFlags & 0x00000010)
+                        {
+                            p_mq_parm->mq_msgreq_ccsid.encod = tvb_get_guint32_endian(tvb, offset + 44, p_mq_parm->mq_int_enc);
+                            p_mq_parm->mq_msgreq_ccsid.ccsid = tvb_get_guint32_endian(tvb, offset + 48, p_mq_parm->mq_int_enc);
+                        }
+                        col_append_fstr(pinfo->cinfo, COL_INFO, " Hdl=0x%08x GlbMsgIdx=%d, MaxLen=%d",
+                            iHdl, iGlbMsgIdx, iMaxMsgLen);
+
+                        if (tree)
+                        {
+                            ti = proto_tree_add_text(mqroot_tree, tvb, offset, -1, MQ_TEXT_REQMSG);
+                            mq_tree = proto_item_add_subtree(ti, ett_mq_msg);
+
+                            proto_tree_add_item(mq_tree, hf_mq_msgreq_version,   tvb, offset     ,  4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_msgreq_handle,    tvb, offset +  4,  4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_msgreq_RecvBytes, tvb, offset +  8,  4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_msgreq_RqstBytes, tvb, offset + 12,  4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_msgreq_MaxMsgLen, tvb, offset + 16,  4, p_mq_parm->mq_int_enc);
+                            dissect_mq_MQGMO(tvb, mq_tree, offset + 20, ett_mq_gmo_option, p_mq_parm);
+
+                            proto_tree_add_item(mq_tree, hf_mq_msgreq_WaitIntrv, tvb, offset + 24,  4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_msgreq_QueStatus, tvb, offset + 28,  4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_msgreq_RqstFlags, tvb, offset + 32,  4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_msgreq_GlbMsgIdx, tvb, offset + 36,  4, p_mq_parm->mq_int_enc);
+
+                            if (iFlags & 0x00000010)
+                            {
+                                proto_tree_add_item(mq_tree, hf_mq_msgreq_SelectIdx, tvb, offset + 40,  2, p_mq_parm->mq_int_enc);
+                                proto_tree_add_item(mq_tree, hf_mq_msgreq_MQMDVers,  tvb, offset + 42,  2, p_mq_parm->mq_int_enc);
+                                proto_tree_add_item(mq_tree, hf_mq_msgreq_ccsid,     tvb, offset + 44,  4, p_mq_parm->mq_int_enc);
+                                dissect_mq_encoding(mq_tree, hf_mq_msgreq_encoding,  tvb, offset + 48,  4, p_mq_parm->mq_int_enc);
+                                proto_tree_add_item(mq_tree, hf_mq_msgreq_MsgSeqNum, tvb, offset + 52,  4, p_mq_parm->mq_int_enc);
+                                proto_tree_add_item(mq_tree, hf_mq_msgreq_offset,    tvb, offset + 56,  4, p_mq_parm->mq_int_enc);
+                                dissect_mq_MQMO(tvb, mq_tree, offset + 60, ett_mq_gmo_matchoption, p_mq_parm);
+                                iOpt = tvb_get_guint32_endian(tvb, offset + 60, p_mq_parm->mq_int_enc);
+
+                                if (iOpt & MQ_MQMO_MATCH_MSG_ID)
+                                {
+                                    proto_tree_add_item(mq_tree, hf_mq_msgreq_mtchMsgId, tvb, offset + 64 + xOfs, 24, p_mq_parm->mq_str_enc);
+                                    xOfs += 24;
+                                }
+                                if (iOpt & MQ_MQMO_MATCH_CORREL_ID)
+                                {
+                                    proto_tree_add_item(mq_tree, hf_mq_msgreq_mtchCorId, tvb, offset + 64 + xOfs, 24, p_mq_parm->mq_str_enc);
+                                    xOfs += 24;
+                                }
+                                if (iOpt & MQ_MQMO_MATCH_GROUP_ID)
+                                {
+                                    proto_tree_add_item(mq_tree, hf_mq_msgreq_mtchGrpid, tvb, offset + 64 + xOfs, 24, p_mq_parm->mq_str_enc);
+                                    xOfs += 24;
+                                }
+                                if (iOpt & MQ_MQMO_MATCH_MSG_TOKEN)
+                                {
+                                    proto_tree_add_item(mq_tree, hf_mq_msgreq_mtchMsgTk, tvb, offset + 64 + xOfs, 16, p_mq_parm->mq_str_enc);
+                                    xOfs += 16;
+                                }
+                            }
+                        }
+                        offset += (iFlags & 0x00000010) ? (64+xOfs) : 40;
+                        p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
+                    }
+                    else if (p_mq_parm->mq_opcode == MQ_TST_ASYNC_MESSAGE)
+                    {
+                        gint  iSegmIndex;
+                        gint  iGlbMsgIdx;
+                        gint  iPadLen;
+                        gint  iSegLength;
+                        gint8 iStrLen;
+                        gint  iHdl;
+                        gint  iHdrL;
+
+                        iHdl       = tvb_get_guint32_endian(tvb, offset +  4, p_mq_parm->mq_int_enc);
+                        iGlbMsgIdx = tvb_get_guint32_endian(tvb, offset + 12, p_mq_parm->mq_int_enc);
+                        iSegLength = tvb_get_guint32_endian(tvb, offset + 16, p_mq_parm->mq_int_enc);
+                        iSegmIndex = tvb_get_guint16_endian(tvb, offset + 20, p_mq_parm->mq_int_enc);
+
+                        if (iSegmIndex == 0)
+                        {
+                            iStrLen = tvb_get_guint8(tvb, offset + 54);
+                            iPadLen = (2+1+iStrLen) % 4;
+                            iPadLen = (iPadLen) ? 4-iPadLen : 0;
+                        }
+                        else
+                        {
+                            iPadLen = 0;
+                            iStrLen = 0;
+                        }
+
+                        iHdrL = (iSegmIndex == 0) ? (54+1+iStrLen+iPadLen) : 24;
+
+                        if (!mq_in_reassembly)
+                        {
+                            col_append_fstr(pinfo->cinfo, COL_INFO, " Hdl=0x%08x GlbMsgIdx=%d, SegIdx=%d, SegLen=%d",
+                                iHdl, iGlbMsgIdx, iSegmIndex, iSegLength);
+                        }
+
+                        if (tree)
+                        {
+                            ti = proto_tree_add_text(mqroot_tree, tvb, offset, iHdrL, MQ_TEXT_ASYMSG);
+                            mq_tree = proto_item_add_subtree(ti, ett_mq_msg);
+
+                            proto_tree_add_item(mq_tree, hf_mq_msgasy_version  , tvb, offset     , 4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_msgasy_handle   , tvb, offset +  4, 4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_msgasy_MsgIndex , tvb, offset +  8, 4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_msgasy_GlbMsgIdx, tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_msgasy_SegLength, tvb, offset + 16, 4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_msgasy_SegmIndex, tvb, offset + 20, 2, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_msgasy_SeleIndex, tvb, offset + 22, 2, p_mq_parm->mq_int_enc);
+                            if (p_mq_parm->mq_ctlf1 & MQ_TCF_FIRST)
+                            {
+                                proto_tree_add_item(mq_tree, hf_mq_msgasy_ReasonCod , tvb, offset + 24,  4, p_mq_parm->mq_int_enc);
+                                proto_tree_add_item(mq_tree, hf_mq_msgasy_ActMsgLen , tvb, offset + 28,  4, p_mq_parm->mq_int_enc);
+                                proto_tree_add_item(mq_tree, hf_mq_msgasy_TotMsgLen , tvb, offset + 32,  4, p_mq_parm->mq_int_enc);
+                                proto_tree_add_item(mq_tree, hf_mq_msgasy_MsgToken  , tvb, offset + 36, 16, p_mq_parm->mq_int_enc);
+                                proto_tree_add_item(mq_tree, hf_mq_msgasy_Status    , tvb, offset + 52,  2, p_mq_parm->mq_int_enc);
+                                proto_tree_add_item(mq_tree, hf_mq_msgasy_resolQNLn , tvb, offset + 54,  1, ENC_NA);
+                                proto_tree_add_item(mq_tree, hf_mq_msgasy_resolQNme , tvb, offset + 55, iStrLen, p_mq_parm->mq_str_enc);
+                                if (iPadLen)
+                                    proto_tree_add_item(mq_tree, hf_mq_msgasy_padding  , tvb, offset + 55 + iStrLen, iPadLen, p_mq_parm->mq_str_enc);
+                            }
+                        }
+                        offset+=iHdrL;
+                        p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
+
+                        iSizePayload = tvb_length_remaining(tvb, offset);
+                        bPayload = (iSizePayload>0);
+                    }
+                    else if ((p_mq_parm->mq_opcode == MQ_TST_SPI || p_mq_parm->mq_opcode == MQ_TST_SPI_REPLY) && tvb_length_remaining(tvb, offset) >= 12)
+                    {
+                        gint    iOffsetSPI = 0;
+                        guint32 iSpiVerb   = 0;
+
+                        p_mq_parm->iOfsEnc = offset + 12;
+                        p_mq_parm->iOfsCcs = offset + 16;
+                        p_mq_parm->iOfsFmt = offset + 20;
+
+                        iSpiVerb = tvb_get_guint32_endian(tvb, offset, p_mq_parm->mq_int_enc);
+                        col_append_fstr(pinfo->cinfo, COL_INFO, " (%s)", val_to_str(iSpiVerb, mq_spi_verbs_vals, "Unknown (0x%08x)"));
+
+                        if (tree)
+                        {
+                            ti = proto_tree_add_text(mqroot_tree, tvb, offset, 12, MQ_TEXT_SPI);
+                            mq_tree = proto_item_add_subtree(ti, ett_mq_spi);
+
+                            proto_tree_add_item(mq_tree, hf_mq_spi_verb,    tvb, offset,     4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_spi_version, tvb, offset + 4, 4, p_mq_parm->mq_int_enc);
+                            proto_tree_add_item(mq_tree, hf_mq_spi_length,  tvb, offset + 8, 4, p_mq_parm->mq_int_enc);
+                        }
+
+                        offset += 12;
+                        p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
+                        if (((p_mq_parm->mq_strucID & MQ_MASK_SPxZ) == MQ_STRUCTID_SPxU ||
+                            (p_mq_parm->mq_strucID & MQ_MASK_SPxZ) == MQ_STRUCTID_SPxU_EBCDIC)
+                            && tvb_length_remaining(tvb, offset) >= 12)
+                        {
+                            gint iSizeSPIMD = 0;
+                            if (tree)
+                            {
+                                guint8 *sStructId;
+                                sStructId = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 4, ((p_mq_parm->mq_strucID & MQ_MASK_SPxx) == MQ_STRUCTID_SPxx) ? ENC_ASCII : ENC_EBCDIC);
+                                ti = proto_tree_add_text(mqroot_tree, tvb, offset, 12, "%s", sStructId);
+                                mq_tree = proto_item_add_subtree(ti, ett_mq_spi_base);
+
+                                proto_tree_add_item(mq_tree, hf_mq_spi_base_StructID, tvb, offset,     4, p_mq_parm->mq_str_enc);
+                                proto_tree_add_item(mq_tree, hf_mq_spi_base_version,  tvb, offset + 4, 4, p_mq_parm->mq_int_enc);
+                                proto_tree_add_item(mq_tree, hf_mq_spi_base_length,   tvb, offset + 8, 4, p_mq_parm->mq_int_enc);
+                            }
+                            offset += 12;
+                            p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
+
+                            if ((iSizeSPIMD = dissect_mq_md(tvb, mqroot_tree, offset, p_mq_parm, TRUE)) != 0)
+                            {
+                                offset += iSizeSPIMD;
+                                offset += dissect_mq_gmo(tvb, pinfo, mqroot_tree, offset, p_mq_parm);
+                                offset += dissect_mq_pmo(tvb, pinfo, mqroot_tree, offset, p_mq_parm, &iDistributionListSize);
+                                p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
+                            }
+
+                            offset += dissect_mq_od(tvb, pinfo, mqroot_tree, offset, p_mq_parm, &iDistributionListSize);
+
+                            if (((p_mq_parm->mq_strucID & MQ_MASK_SPxZ) == MQ_STRUCTID_SPxO ||
+                                (p_mq_parm->mq_strucID & MQ_MASK_SPxZ) == MQ_STRUCTID_SPxO_EBCDIC ||
+                                (p_mq_parm->mq_strucID & MQ_MASK_SPxZ) == MQ_STRUCTID_SPxI ||
+                                (p_mq_parm->mq_strucID & MQ_MASK_SPxZ) == MQ_STRUCTID_SPxI_EBCDIC)
+                                && tvb_length_remaining(tvb, offset) >= 12)
+                            {
+                                if (tree)
+                                {
+                                    /* Dissect the common part of these structures */
+                                    guint8 *sStructId;
+                                    sStructId = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, 4, ((p_mq_parm->mq_strucID & MQ_MASK_SPxx) == MQ_STRUCTID_SPxx) ? ENC_ASCII : ENC_EBCDIC);
+                                    ti = proto_tree_add_text(mqroot_tree, tvb, offset, -1, "%s", sStructId);
+                                    mq_tree = proto_item_add_subtree(ti, ett_mq_spi_base);
+
+                                    proto_tree_add_item(mq_tree, hf_mq_spi_base_StructID, tvb, offset, 4, p_mq_parm->mq_str_enc);
+                                    proto_tree_add_item(mq_tree, hf_mq_spi_base_version,  tvb, offset + 4, 4, p_mq_parm->mq_int_enc);
+                                    proto_tree_add_item(mq_tree, hf_mq_spi_base_length,   tvb, offset + 8, 4, p_mq_parm->mq_int_enc);
+                                }
+
+                                if ((p_mq_parm->mq_strucID == MQ_STRUCTID_SPQO || p_mq_parm->mq_strucID == MQ_STRUCTID_SPQO_EBCDIC)
+                                    && tvb_length_remaining(tvb, offset) >= 16)
+                                {
+                                    if (tree)
+                                    {
+                                        gint iVerbNumber = 0;
+                                        proto_tree_add_item(mq_tree, hf_mq_spi_spqo_nbverb, tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
+                                        iVerbNumber = tvb_get_guint32_endian(tvb, offset + 12, p_mq_parm->mq_int_enc);
+
+                                        if (tvb_length_remaining(tvb, offset) >= iVerbNumber * 20 + 16)
+                                        {
+                                            gint iVerb = 0;
+                                            iOffsetSPI = offset + 16;
+                                            for (iVerb = 0; iVerb < iVerbNumber; iVerb++)
+                                            {
+                                                proto_tree_add_item(mq_tree, hf_mq_spi_spqo_verbid,   tvb, iOffsetSPI,      4, p_mq_parm->mq_int_enc);
+                                                proto_tree_add_item(mq_tree, hf_mq_spi_spqo_maxiover, tvb, iOffsetSPI +  4, 4, p_mq_parm->mq_int_enc);
+                                                proto_tree_add_item(mq_tree, hf_mq_spi_spqo_maxinver, tvb, iOffsetSPI +  8, 4, p_mq_parm->mq_int_enc);
+                                                proto_tree_add_item(mq_tree, hf_mq_spi_spqo_maxouver, tvb, iOffsetSPI + 12, 4, p_mq_parm->mq_int_enc);
+                                                proto_tree_add_item(mq_tree, hf_mq_spi_spqo_flags,    tvb, iOffsetSPI + 16, 4, p_mq_parm->mq_int_enc);
+                                                iOffsetSPI += 20;
+                                            }
+                                            offset += iVerbNumber * 20 + 16;
+                                        }
+                                    }
+                                }
+                                else if ((p_mq_parm->mq_strucID == MQ_STRUCTID_SPAI || p_mq_parm->mq_strucID == MQ_STRUCTID_SPAI_EBCDIC)
+                                    && tvb_length_remaining(tvb, offset) >= 136)
+                                {
+                                    if (tree)
+                                    {
+                                        proto_tree_add_item(mq_tree, hf_mq_spi_spai_mode,     tvb, offset +  12,  4, p_mq_parm->mq_int_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_spi_spai_unknown1, tvb, offset +  16, 48, p_mq_parm->mq_str_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_spi_spai_unknown2, tvb, offset +  64, 48, p_mq_parm->mq_str_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_spi_spai_msgid,    tvb, offset + 112, 24, p_mq_parm->mq_str_enc);
+                                    }
+                                    offset += 136;
+                                }
+                                else if ((p_mq_parm->mq_strucID == MQ_STRUCTID_SPGI || p_mq_parm->mq_strucID == MQ_STRUCTID_SPGI_EBCDIC)
+                                    && tvb_length_remaining(tvb, offset) >= 24)
+                                {
+                                    if (tree)
+                                    {
+                                        proto_tree_add_item(mq_tree, hf_mq_spi_spgi_batchsz,  tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_spi_spgi_batchint, tvb, offset + 16, 4, p_mq_parm->mq_int_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_spi_spgi_maxmsgsz, tvb, offset + 20, 4, p_mq_parm->mq_int_enc);
+                                    }
+                                    offset += 24;
+                                }
+                                else if ((p_mq_parm->mq_strucID == MQ_STRUCTID_SPGO || p_mq_parm->mq_strucID == MQ_STRUCTID_SPPI ||
+                                    p_mq_parm->mq_strucID == MQ_STRUCTID_SPGO_EBCDIC || p_mq_parm->mq_strucID == MQ_STRUCTID_SPPI_EBCDIC)
+                                    && tvb_length_remaining(tvb, offset) >= 20)
+                                {
+                                    if (tree)
+                                    {
+                                        proto_tree_add_bitmask(mq_tree, tvb, offset + 12, hf_mq_spi_spgo_options, ett_mq_spi_options, pf_flds_spiopt, ENC_BIG_ENDIAN);
+                                        proto_tree_add_item(mq_tree, hf_mq_spi_spgo_size, tvb, offset + 16, 4, p_mq_parm->mq_int_enc);
+                                    }
+                                    iSizePayload = tvb_get_guint32_endian(tvb, offset + 16, p_mq_parm->mq_int_enc);
+                                    offset += 20;
+                                    bPayload = TRUE;
+                                }
+                                else
+                                {
+                                    offset += 12;
+                                }
+                                p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
+                            }
+                        }
+                    }
+                    else if ((p_mq_parm->mq_opcode >= 0xA0 && p_mq_parm->mq_opcode <= 0xB9) && tvb_length_remaining(tvb, offset) >= 16)
+                    {
+                        /* The XA structures are special because they do not start with a structid */
+                        if (tree)
+                        {
+                            ti = proto_tree_add_text(mqroot_tree, tvb, offset, 16, "%s (%s)", MQ_TEXT_XA,
+                                val_to_str(p_mq_parm->mq_opcode, mq_opcode_vals, "Unknown (0x%02x)"));
+                            mq_tree = proto_item_add_subtree(ti, ett_mq_xa);
+
+                            proto_tree_add_item(mq_tree, hf_mq_xa_length,      tvb, offset,     4, ENC_BIG_ENDIAN);
+                            proto_tree_add_item(mq_tree, hf_mq_xa_returnvalue, tvb, offset + 4, 4, p_mq_parm->mq_int_enc);
+
+                            proto_tree_add_bitmask(mq_tree, tvb, offset + 8, hf_mq_xa_tmflags, ett_mq_xa_tmflags, pf_flds_tmflags, ENC_BIG_ENDIAN);
+
+                            proto_tree_add_item(mq_tree, hf_mq_xa_rmid, tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
+                        }
+                        offset += 16;
+                        if (p_mq_parm->mq_opcode == MQ_TST_XA_START || p_mq_parm->mq_opcode == MQ_TST_XA_END || p_mq_parm->mq_opcode == MQ_TST_XA_PREPARE
+                            || p_mq_parm->mq_opcode == MQ_TST_XA_COMMIT || p_mq_parm->mq_opcode == MQ_TST_XA_ROLLBACK || p_mq_parm->mq_opcode == MQ_TST_XA_FORGET
+                            || p_mq_parm->mq_opcode == MQ_TST_XA_COMPLETE)
+                        {
+                            gint iSizeXid = 0;
+                            if ((iSizeXid = dissect_mq_xid(tvb, mqroot_tree, p_mq_parm, offset)) != 0)
+                                offset += iSizeXid;
+                        }
+                        else if ((p_mq_parm->mq_opcode == MQ_TST_XA_OPEN || p_mq_parm->mq_opcode == MQ_TST_XA_CLOSE)
+                            && tvb_length_remaining(tvb, offset) >= 1)
+                        {
+                            guint8 iXAInfoLength = 0;
+                            iXAInfoLength = tvb_get_guint8(tvb, offset);
+                            if (tvb_length_remaining(tvb, offset) >= iXAInfoLength + 1)
+                            {
+                                if (tree)
+                                {
+                                    ti = proto_tree_add_text(mqroot_tree, tvb, offset, iXAInfoLength + 1, MQ_TEXT_XINF);
+                                    mq_tree = proto_item_add_subtree(ti, ett_mq_xa_info);
+
+                                    proto_tree_add_item(mq_tree, hf_mq_xa_xainfo_length, tvb, offset,     1, ENC_BIG_ENDIAN);
+                                    proto_tree_add_item(mq_tree, hf_mq_xa_xainfo_value,  tvb, offset + 1, iXAInfoLength, p_mq_parm->mq_str_enc);
+                                }
+                            }
+                            offset += 1 + iXAInfoLength;
+                        }
+                        else if ((p_mq_parm->mq_opcode == MQ_TST_XA_RECOVER || p_mq_parm->mq_opcode == MQ_TST_XA_RECOVER_REPLY)
+                            && tvb_length_remaining(tvb, offset) >= 4)
+                        {
+                            gint iNbXid = 0;
+                            iNbXid = tvb_get_guint32_endian(tvb, offset, p_mq_parm->mq_int_enc);
+                            if (tree)
+                            {
+                                proto_tree_add_item(mq_tree, hf_mq_xa_count, tvb, offset, 4, p_mq_parm->mq_int_enc);
+                            }
+                            offset += 4;
+                            if (p_mq_parm->mq_opcode == MQ_TST_XA_RECOVER_REPLY)
+                            {
+                                gint iXid = 0;
+                                for (iXid = 0; iXid < iNbXid; iXid++)
+                                {
+                                    gint iSizeXid = 0;
+                                    if ((iSizeXid = dissect_mq_xid(tvb, mqroot_tree, p_mq_parm, offset)) != 0)
+                                        offset += iSizeXid;
+                                    else
+                                        break;
+                                }
+                            }
+                        }
+                    }
+                    if ((p_mq_parm->mq_strucID == MQ_STRUCTID_LPOO || p_mq_parm->mq_strucID == MQ_STRUCTID_LPOO_EBCDIC) && tvb_length_remaining(tvb, offset) >= 32)
+                    {
+                        guint iVersion;
+                        guint iXtraData = 0;
+                        gint  iSize     = 32;
+                        iVersion = tvb_get_guint32_endian(tvb, offset+4, p_mq_parm->mq_int_enc);
+                        if (iVersion >= 3)
+                        {
+                            iSize += 56;
+                            iXtraData = tvb_get_guint32_endian(tvb, offset + 84, p_mq_parm->mq_int_enc);
+                        }
+
+                        if (iSize != 0 && tvb_length_remaining(tvb, offset) >= iSize)
+                        {
+                            if (tree)
+                            {
+                                ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSize, MQ_TEXT_LPOO);
+                                mq_tree = proto_item_add_subtree(ti, ett_mq_lpoo);
+
+                                proto_tree_add_item(mq_tree, hf_mq_lpoo_StructID, tvb, offset,     4, p_mq_parm->mq_str_enc);
+                                proto_tree_add_item(mq_tree, hf_mq_lpoo_version,  tvb, offset + 4, 4, p_mq_parm->mq_int_enc);
+
+                                dissect_mq_MQOO(tvb, mq_tree, offset+8, ett_mq_lpoo_options, hf_mq_lpoo_options, p_mq_parm);
+
+                                dissect_mq_LPOO_LPIOPTS(tvb, mq_tree, offset+16, ett_mq_lpoo_lpiopts, p_mq_parm);
+                                proto_tree_add_item(mq_tree, hf_mq_lpoo_defpersist,     tvb, offset + 20, 4, p_mq_parm->mq_int_enc);
+                                proto_tree_add_item(mq_tree, hf_mq_lpoo_defputresptype, tvb, offset + 24, 4, p_mq_parm->mq_int_enc);
+                                proto_tree_add_item(mq_tree, hf_mq_lpoo_defreadahead,   tvb, offset + 28, 4, p_mq_parm->mq_int_enc);
+                                if (iVersion >= 3)
+                                {
+                                    proto_tree_add_item(mq_tree, hf_mq_lpoo_qprotect,   tvb, offset + 32, 48, p_mq_parm->mq_int_enc);
+                                    proto_tree_add_item(mq_tree, hf_mq_lpoo_unknown6,   tvb, offset + 80,  4, p_mq_parm->mq_int_enc);
+                                    /*proto_tree_add_item(mq_tree, hf_mq_lpoo_unknown7,   tvb, offset + 84,  2, p_mq_parm->mq_int_enc);*/
+                                    proto_tree_add_item(mq_tree, hf_mq_lpoo_xtradata,   tvb, offset + 84,  4, p_mq_parm->mq_int_enc);
+                                }
+                            }
+                            offset += iSize;
+                            p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
+                            if (iXtraData>0)
+                            {
+                                if (p_mq_parm->mq_opcode == MQ_TST_SPI_REPLY)
+                                {
+                                    bPayload           = TRUE;
+                                    iSizePayload       = iXtraData;
+                                    p_mq_parm->iOfsFmt = (offset-iSize);
+                                }
+                            }
+                        }
+                    }
+                    if ((p_mq_parm->mq_strucID == MQ_STRUCTID_ID || p_mq_parm->mq_strucID == MQ_STRUCTID_ID_EBCDIC) && tvb_length_remaining(tvb, offset) >= 5)
+                    {
+                        offset += dissect_mq_id(tvb, pinfo, mqroot_tree, offset, p_mq_parm);
+                        p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
+                    }
+                    if ((p_mq_parm->mq_strucID == MQ_STRUCTID_UID || p_mq_parm->mq_strucID == MQ_STRUCTID_UID_EBCDIC) && tvb_length_remaining(tvb, offset) > 0)
+                    {
+                        gint iSizeUID;
+                        /* iSizeUID = (iVersionID < 5 ? 28 : 132);  guess */
+                        /* The iVersionID is available in the previous ID segment, we should keep a state *
+                         * Instead we rely on the segment length announced in the TSH */
+                        iSizeUID = iSegmentLength - iSizeTSH;
+                        if (iSizeUID != 28 && iSizeUID != 132)
+                            iSizeUID = 0;
+
+                        if (iSizeUID != 0 && tvb_length_remaining(tvb, offset) >= iSizeUID)
+                        {
+                            guint8 *sUserId;
+                            sUserId = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 4, 12, p_mq_parm->mq_str_enc);
+                            if (strip_trailing_blanks(sUserId, 12) > 0)
+                            {
+                                col_append_fstr(pinfo->cinfo, COL_INFO, " User=%s", sUserId);
+                            }
+
+                            if (tree)
+                            {
+                                ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSizeUID, MQ_TEXT_UID);
+                                mq_tree = proto_item_add_subtree(ti, ett_mq_uid);
+
+                                proto_tree_add_item(mq_tree, hf_mq_uid_StructID, tvb, offset,       4, p_mq_parm->mq_str_enc);
+                                proto_tree_add_item(mq_tree, hf_mq_uid_userid,   tvb, offset +  4, 12, p_mq_parm->mq_str_enc);
+                                proto_tree_add_item(mq_tree, hf_mq_uid_password, tvb, offset + 16, 12, p_mq_parm->mq_str_enc);
+                            }
+
+                            if (iSizeUID == 132)
+                            {
+                                if (tree)
+                                {
+                                    proto_tree_add_item(mq_tree, hf_mq_uid_longuserid, tvb, offset + 28, 64, p_mq_parm->mq_str_enc);
+                                    dissect_mq_sid(tvb, mq_tree, p_mq_parm, offset + 92);
+                                }
+                            }
+                        }
+                        offset += iSizeUID;
+                        p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
+                    }
+
+                    offset += dissect_mq_od(tvb, pinfo, mqroot_tree, offset, p_mq_parm, &iDistributionListSize);
+
+                    if ((iSizeMD = dissect_mq_md(tvb, mqroot_tree, offset, p_mq_parm, TRUE)) != 0)
+                    {
+                        gint iSizeGMO = 0;
+                        gint iSizePMO = 0;
+                        offset += iSizeMD;
+
+                        if ((iSizeGMO = dissect_mq_gmo(tvb, pinfo, mqroot_tree, offset, p_mq_parm)) != 0)
+                        {
+                            offset   += iSizeGMO;
+                            bPayload  = TRUE;
+                        }
+                        else if ((iSizePMO = dissect_mq_pmo(tvb, pinfo, mqroot_tree, offset, p_mq_parm, &iDistributionListSize)) != 0)
+                        {
+                            offset   += iSizePMO;
+                            bPayload  = TRUE;
+                        }
+                        if (tvb_length_remaining(tvb, offset) >= 4)
+                        {
+                            if (bPayload == TRUE && (p_mq_parm->mq_opcode != MQ_TST_ASYNC_MESSAGE))
+                            {
+                                iSizePayload = tvb_get_guint32_endian(tvb, offset, p_mq_parm->mq_int_enc);
+                                if (tree)
+                                {
+                                    ti = proto_tree_add_text(mqroot_tree, tvb, offset, 4, MQ_TEXT_PUT);
+                                    mq_tree = proto_item_add_subtree(ti, ett_mq_put);
+                                    proto_tree_add_item(mq_tree, hf_mq_put_length, tvb, offset, 4, p_mq_parm->mq_int_enc);
+                                }
+                                offset += 4;
+                            }
+                        }
+                    }
+                    if (iDistributionListSize > 0)
+                    {
+                        col_append_fstr(pinfo->cinfo, COL_INFO, " (Distribution List, Size=%d)", iDistributionListSize);
+                    }
+                    if (bPayload == TRUE)
+                    {
+                        if (iSizePayload != 0 && tvb_length_remaining(tvb, offset) > 0)
+                        {
+                            /* For the following header structures, each structure has a "format" field
+                            which announces the type of the following structure.  For dissection we
+                            do not use it and rely on the structid instead. */
+                            guint32 iHeadersLength = 0;
+                            if (tvb_length_remaining(tvb, offset) >= 4)
+                            {
+                                gint iSizeMD2 = 0;
+                                p_mq_parm->mq_strucID = tvb_get_ntohl(tvb, offset);
+
+                                if ((p_mq_parm->mq_strucID == MQ_STRUCTID_XQH || p_mq_parm->mq_strucID == MQ_STRUCTID_XQH_EBCDIC) && tvb_length_remaining(tvb, offset) >= 104)
+                                {
+                                    /* if MD.format == MQXMIT */
+                                    gint iSizeXQH = 104;
+                                    if (tree)
+                                    {
+                                        ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSizeXQH, MQ_TEXT_XQH);
+                                        mq_tree = proto_item_add_subtree(ti, ett_mq_xqh);
+
+                                        proto_tree_add_item(mq_tree, hf_mq_xqh_StructID,   tvb, offset,       4, p_mq_parm->mq_str_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_xqh_version,    tvb, offset +  4,  4, p_mq_parm->mq_int_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_xqh_remoteq,    tvb, offset +  8, 48, p_mq_parm->mq_str_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_xqh_remoteqmgr, tvb, offset + 56, 48, p_mq_parm->mq_str_enc);
+                                    }
+                                    offset += iSizeXQH;
+                                    iHeadersLength += iSizeXQH;
+
+                                    if ((iSizeMD2 = dissect_mq_md(tvb, mqroot_tree, offset, p_mq_parm, TRUE)) != 0)
+                                    {
+                                        offset += iSizeMD2;
+                                        iHeadersLength += iSizeMD2;
+                                    }
+
+                                    p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
+                                }
+                                if ((p_mq_parm->mq_strucID == MQ_STRUCTID_DH || p_mq_parm->mq_strucID == MQ_STRUCTID_DH_EBCDIC) && tvb_length_remaining(tvb, offset) >= 48)
+                                {
+                                    /* if MD.format == MQHDIST */
+                                    gint    iSizeDH     = 48;
+                                    gint    iNbrRecords = 0;
+                                    guint32 iRecFlags   = 0;
+
+                                    iNbrRecords = tvb_get_guint32_endian(tvb, offset + 36, p_mq_parm->mq_int_enc);
+                                    iRecFlags = tvb_get_guint32_endian(tvb, offset + 32, p_mq_parm->mq_int_enc);
+                                    p_mq_parm->iOfsEnc = offset + 12;
+                                    p_mq_parm->iOfsCcs = offset + 16;
+                                    p_mq_parm->iOfsFmt = offset + 20;
+
+                                    p_mq_parm->mq_head_ccsid.encod = tvb_get_guint32_endian(tvb, offset + 12, p_mq_parm->mq_int_enc);
+                                    p_mq_parm->mq_head_ccsid.ccsid = tvb_get_guint32_endian(tvb, offset + 16, p_mq_parm->mq_int_enc);
+
+                                    if (tree)
+                                    {
+                                        ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSizeDH, MQ_TEXT_DH);
+                                        mq_tree = proto_item_add_subtree(ti, ett_mq_dh);
+
+                                        proto_tree_add_item(mq_tree, hf_mq_head_StructID,   tvb, offset,      4, p_mq_parm->mq_str_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_head_version,    tvb, offset +  4, 4, p_mq_parm->mq_int_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_head_length,     tvb, offset +  8, 4, p_mq_parm->mq_int_enc);
+                                        dissect_mq_encoding(mq_tree, hf_mq_head_encoding,   tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_head_ccsid,      tvb, offset + 16, 4, p_mq_parm->mq_int_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_head_format,     tvb, offset + 20, 8, p_mq_parm->mq_str_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_head_flags,      tvb, offset + 28, 4, p_mq_parm->mq_int_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_dh_putmsgrecfld, tvb, offset + 32, 4, p_mq_parm->mq_int_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_dh_recspresent,  tvb, offset + 36, 4, p_mq_parm->mq_int_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_dh_objrecofs ,   tvb, offset + 40, 4, p_mq_parm->mq_int_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_dh_putmsgrecofs, tvb, offset + 44, 4, p_mq_parm->mq_int_enc);
+                                    }
+                                    offset += iSizeDH;
+                                    iHeadersLength += iSizeDH;
+
+                                    if (iNbrRecords > 0)
+                                    {
+                                        gint iOffsetOR  = 0;
+                                        gint iOffsetPMR = 0;
+                                        gint iSizeORPMR = 0;
+
+                                        iOffsetOR =  tvb_get_guint32_endian(tvb, offset - iSizeDH + 40, p_mq_parm->mq_int_enc);
+                                        iOffsetPMR = tvb_get_guint32_endian(tvb, offset - iSizeDH + 44, p_mq_parm->mq_int_enc);
+                                        if ((iSizeORPMR = dissect_mq_or(tvb, mqroot_tree, offset, iNbrRecords, iOffsetOR, p_mq_parm)) != 0)
+                                        {
+                                            offset += iSizeORPMR;
+                                            iHeadersLength += iSizeORPMR;
+                                        }
+                                        if ((iSizeORPMR = dissect_mq_pmr(tvb, mqroot_tree, offset, iNbrRecords, iOffsetPMR, iRecFlags, p_mq_parm)) != 0)
+                                        {
+                                            offset += iSizeORPMR;
+                                            iHeadersLength += iSizeORPMR;
+                                        }
+                                    }
+
+                                    p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
+                                }
+                                if ((p_mq_parm->mq_strucID == MQ_STRUCTID_DLH || p_mq_parm->mq_strucID == MQ_STRUCTID_DLH_EBCDIC) && tvb_length_remaining(tvb, offset) >= 172)
+                                {
+                                    /* if MD.format == MQDEAD */
+                                    gint iSizeDLH = 172;
+                                    p_mq_parm->iOfsEnc = offset + 108;
+                                    p_mq_parm->iOfsCcs = offset + 112;
+                                    p_mq_parm->iOfsFmt = offset + 116;
+
+                                    p_mq_parm->mq_dlh_ccsid.encod = tvb_get_guint32_endian(tvb, offset + 108, p_mq_parm->mq_int_enc);
+                                    p_mq_parm->mq_dlh_ccsid.ccsid = tvb_get_guint32_endian(tvb, offset + 112, p_mq_parm->mq_int_enc);
+
+                                    if (tree)
+                                    {
+                                        ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSizeDLH, MQ_TEXT_DLH);
+                                        mq_tree = proto_item_add_subtree(ti, ett_mq_dlh);
+
+                                        proto_tree_add_item(mq_tree, hf_mq_dlh_StructID,    tvb, offset,        4, p_mq_parm->mq_str_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_dlh_version,     tvb, offset +   4,  4, p_mq_parm->mq_int_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_dlh_reason,      tvb, offset +   8,  4, p_mq_parm->mq_int_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_dlh_destq,       tvb, offset +  12, 48, p_mq_parm->mq_str_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_dlh_destqmgr,    tvb, offset +  60, 48, p_mq_parm->mq_str_enc);
+                                        dissect_mq_encoding(mq_tree, hf_mq_dlh_encoding,    tvb, offset + 108,  4, p_mq_parm->mq_int_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_dlh_ccsid,       tvb, offset + 112,  4, p_mq_parm->mq_int_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_dlh_format,      tvb, offset + 116,  8, p_mq_parm->mq_str_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_dlh_putappltype, tvb, offset + 124,  4, p_mq_parm->mq_int_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_dlh_putapplname, tvb, offset + 128, 28, p_mq_parm->mq_str_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_dlh_putdate,     tvb, offset + 156,  8, p_mq_parm->mq_str_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_dlh_puttime,     tvb, offset + 164,  8, p_mq_parm->mq_str_enc);
+                                    }
+                                    offset += iSizeDLH;
+                                    iHeadersLength += iSizeDLH;
+                                    p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
+                                }
+                                if ((p_mq_parm->mq_strucID == MQ_STRUCTID_MDE || p_mq_parm->mq_strucID == MQ_STRUCTID_MDE_EBCDIC) && tvb_length_remaining(tvb, offset) >= 72)
+                                {
+                                    /* if MD.format == MQHMDE */
+                                    gint iSizeMDE = 72;
+                                    p_mq_parm->iOfsEnc = offset + 12;
+                                    p_mq_parm->iOfsCcs = offset + 16;
+                                    p_mq_parm->iOfsFmt = offset + 20;
+                                    if (tree)
+                                    {
+                                        ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSizeMDE, MQ_TEXT_MDE);
+                                        mq_tree = proto_item_add_subtree(ti, ett_mq_mde);
+
+                                        proto_tree_add_item(mq_tree, hf_mq_head_StructID,   tvb, offset,       4, p_mq_parm->mq_str_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_head_version,    tvb, offset +  4,  4, p_mq_parm->mq_int_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_head_length,     tvb, offset +  8,  4, p_mq_parm->mq_int_enc);
+                                        dissect_mq_encoding(mq_tree, hf_mq_head_encoding,   tvb, offset + 12,  4, p_mq_parm->mq_int_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_head_ccsid,      tvb, offset + 16,  4, p_mq_parm->mq_int_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_head_format,     tvb, offset + 20,  8, p_mq_parm->mq_str_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_head_flags,      tvb, offset + 28,  4, p_mq_parm->mq_int_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_md_groupid,      tvb, offset + 32, 24, ENC_NA);
+                                        proto_tree_add_item(mq_tree, hf_mq_md_msgseqnumber, tvb, offset + 56,  4, p_mq_parm->mq_int_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_md_offset,       tvb, offset + 60,  4, p_mq_parm->mq_int_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_md_msgflags,     tvb, offset + 64,  4, p_mq_parm->mq_int_enc);
+                                        proto_tree_add_item(mq_tree, hf_mq_md_origlen,      tvb, offset + 68,  4, p_mq_parm->mq_int_enc);
+                                    }
+                                    offset += iSizeMDE;
+                                    iHeadersLength += iSizeMDE;
+                                    p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
+                                }
+                                if ((p_mq_parm->mq_strucID == MQ_STRUCTID_CIH || p_mq_parm->mq_strucID == MQ_STRUCTID_CIH_EBCDIC
+                                    || p_mq_parm->mq_strucID == MQ_STRUCTID_IIH || p_mq_parm->mq_strucID == MQ_STRUCTID_IIH_EBCDIC
+                                    || p_mq_parm->mq_strucID == MQ_STRUCTID_RFH || p_mq_parm->mq_strucID == MQ_STRUCTID_RFH_EBCDIC
+                                    || p_mq_parm->mq_strucID == MQ_STRUCTID_RMH || p_mq_parm->mq_strucID == MQ_STRUCTID_RMH_EBCDIC
+                                    || p_mq_parm->mq_strucID == MQ_STRUCTID_WIH || p_mq_parm->mq_strucID == MQ_STRUCTID_WIH_EBCDIC)
+                                    && tvb_length_remaining(tvb, offset) >= 12)
+                                {
+                                    /* Dissect the generic part of the other pre-defined headers */
+                                    /* We assume that only one such header is present */
+                                    gint iSizeHeader = 0;
+                                    iSizeHeader = (gint) tvb_get_guint32_endian(tvb, offset + 8, p_mq_parm->mq_int_enc);
+                                    /* XXX - 32 is inferred from the code below.  What's the
+                                    * correct minimum? */
+                                    if (iSizeHeader <= 32)
+                                        THROW(ReportedBoundsError);
+
+                                    if (tvb_length_remaining(tvb, offset) >= iSizeHeader)
+                                    {
+                                        p_mq_parm->iOfsEnc = offset + 12;
+                                        p_mq_parm->iOfsCcs = offset + 16;
+                                        p_mq_parm->iOfsFmt = offset + 20;
+                                        if (tree)
+                                        {
+                                            ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSizeHeader, "%s", val_to_str(p_mq_parm->mq_strucID, mq_StructID_vals, "Unknown (0x%08x)"));
+                                            mq_tree = proto_item_add_subtree(ti, ett_mq_head);
+
+                                            proto_tree_add_item(mq_tree, hf_mq_head_StructID, tvb, offset,      4, p_mq_parm->mq_str_enc);
+                                            proto_tree_add_item(mq_tree, hf_mq_head_version,  tvb, offset +  4, 4, p_mq_parm->mq_int_enc);
+                                            proto_tree_add_item(mq_tree, hf_mq_head_length,   tvb, offset +  8, 4, p_mq_parm->mq_int_enc);
+                                            dissect_mq_encoding(mq_tree, hf_mq_head_encoding, tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
+                                            proto_tree_add_item(mq_tree, hf_mq_head_ccsid,    tvb, offset + 16, 4, p_mq_parm->mq_int_enc);
+                                            proto_tree_add_item(mq_tree, hf_mq_head_format,   tvb, offset + 20, 8, p_mq_parm->mq_str_enc);
+                                            proto_tree_add_item(mq_tree, hf_mq_head_flags,    tvb, offset + 28, 4, p_mq_parm->mq_int_enc);
+                                            proto_tree_add_item(mq_tree, hf_mq_head_struct,   tvb, offset + 32, iSizeHeader - 32, ENC_NA);
+
+                                        }
+                                        offset += iSizeHeader;
+                                        iHeadersLength += iSizeHeader;
+                                        p_mq_parm->mq_strucID = (tvb_length_remaining(tvb, offset) >= 4) ? tvb_get_ntohl(tvb, offset) : MQ_STRUCTID_NULL;
+                                    }
+                                }
+                            }
+
+                            col_append_fstr(pinfo->cinfo, COL_INFO, " (%d bytes)", iSizePayload - iHeadersLength);
+
+                            if (!mq_in_reassembly)
+                            {
+                                /* Call subdissector for the payload */
+                                tvbuff_t *next_tvb;
 #if 0
-								struct mqinfo *mqinfo;
-								mqinfo = wmem_new0(wmem_packet_scope(), struct mqinfo);
-								/* Format, encoding and character set are "data type" information, not subprotocol information */
-								mqinfo->encoding = tvb_get_guint32_endian(tvb, p_mq_parm->iOfsEnc, p_mq_parm->mq_int_enc);
-								mqinfo->ccsid    = tvb_get_guint32_endian(tvb, p_mq_parm->iOfsCcs, p_mq_parm->mq_int_enc);
-								memcpy(mqinfo->format,
-									tvb_get_string_enc(wmem_packet_scope(), tvb, p_mq_parm->iOfsFmt, sizeof(mqinfo->format), p_mq_parm->mq_str_enc),
-									sizeof(mqinfo->format));
+                                struct mqinfo *mqinfo;
+                                mqinfo = wmem_new0(wmem_packet_scope(), struct mqinfo);
+                                /* Format, encoding and character set are "data type" information, not subprotocol information */
+                                mqinfo->encoding = tvb_get_guint32_endian(tvb, p_mq_parm->iOfsEnc, p_mq_parm->mq_int_enc);
+                                mqinfo->ccsid    = tvb_get_guint32_endian(tvb, p_mq_parm->iOfsCcs, p_mq_parm->mq_int_enc);
+                                memcpy(mqinfo->format,
+                                    tvb_get_string_enc(wmem_packet_scope(), tvb, p_mq_parm->iOfsFmt, sizeof(mqinfo->format), p_mq_parm->mq_str_enc),
+                                    sizeof(mqinfo->format));
 #endif
-								p_mq_parm->mq_cur_ccsid.encod = tvb_get_guint32_endian(tvb, p_mq_parm->iOfsEnc, p_mq_parm->mq_int_enc);
-								p_mq_parm->mq_cur_ccsid.ccsid = tvb_get_guint32_endian(tvb, p_mq_parm->iOfsCcs, p_mq_parm->mq_int_enc);
-								memcpy(p_mq_parm->mq_format,
-									tvb_get_string_enc(wmem_packet_scope(), tvb, p_mq_parm->iOfsFmt, sizeof(p_mq_parm->mq_format), p_mq_parm->mq_str_enc),
-									sizeof(p_mq_parm->mq_format));
-
-								next_tvb = tvb_new_subset_remaining(tvb, offset);
-								if (!dissector_try_heuristic(mq_heur_subdissector_list, next_tvb, pinfo, mqroot_tree, p_mq_parm))
-									call_dissector(data_handle, next_tvb, pinfo, mqroot_tree);
-							}
-							else
-							{
-								tvbuff_t *next_tvb;
-								next_tvb = tvb_new_subset_remaining(tvb, offset);
-								call_dissector(data_handle, next_tvb, pinfo, mqroot_tree);
-							}
-						}
-						offset = tvb_length(tvb);
-					}
-					/* After all recognised structures have been dissected, process remaining structure*/
-					if (tvb_length_remaining(tvb, offset) >= 4)
-					{
-						p_mq_parm->mq_strucID = tvb_get_ntohl(tvb, offset);
-						if (tree)
-						{
-							proto_tree_add_text(mqroot_tree, tvb, offset, -1, "%s", val_to_str(p_mq_parm->mq_strucID, mq_StructID_vals, "Unknown (0x%08x)"));
-						}
-					}
-				}
-				else
-				{
-					/* This is a MQ segment continuation (if MQ reassembly is not enabled) */
-					col_append_str(pinfo->cinfo, COL_INFO, " [Unreassembled MQ]");
-					call_dissector(data_handle, tvb_new_subset_remaining(tvb, offset), pinfo, tree);
-				}
-			}
-		}
-		else
-		{
-			/* This packet is a TCP continuation of a segment (if desegmentation is not enabled) */
-			col_append_str(pinfo->cinfo, COL_INFO, " [Undesegmented]");
-			if (tree)
-			{
-				proto_tree_add_item(tree, proto_mq, tvb, offset, -1, ENC_NA);
-			}
-			call_dissector(data_handle, tvb_new_subset_remaining(tvb, offset), pinfo, tree);
-		}
-	}
+                                p_mq_parm->mq_cur_ccsid.encod = tvb_get_guint32_endian(tvb, p_mq_parm->iOfsEnc, p_mq_parm->mq_int_enc);
+                                p_mq_parm->mq_cur_ccsid.ccsid = tvb_get_guint32_endian(tvb, p_mq_parm->iOfsCcs, p_mq_parm->mq_int_enc);
+                                memcpy(p_mq_parm->mq_format,
+                                    tvb_get_string_enc(wmem_packet_scope(), tvb, p_mq_parm->iOfsFmt, sizeof(p_mq_parm->mq_format), p_mq_parm->mq_str_enc),
+                                    sizeof(p_mq_parm->mq_format));
+
+                                next_tvb = tvb_new_subset_remaining(tvb, offset);
+                                if (!dissector_try_heuristic(mq_heur_subdissector_list, next_tvb, pinfo, mqroot_tree, p_mq_parm))
+                                    call_dissector(data_handle, next_tvb, pinfo, mqroot_tree);
+                            }
+                            else
+                            {
+                                tvbuff_t *next_tvb;
+                                next_tvb = tvb_new_subset_remaining(tvb, offset);
+                                call_dissector(data_handle, next_tvb, pinfo, mqroot_tree);
+                            }
+                        }
+                        offset = tvb_length(tvb);
+                    }
+                    /* After all recognised structures have been dissected, process remaining structure*/
+                    if (tvb_length_remaining(tvb, offset) >= 4)
+                    {
+                        p_mq_parm->mq_strucID = tvb_get_ntohl(tvb, offset);
+                        if (tree)
+                        {
+                            proto_tree_add_text(mqroot_tree, tvb, offset, -1, "%s", val_to_str(p_mq_parm->mq_strucID, mq_StructID_vals, "Unknown (0x%08x)"));
+                        }
+                    }
+                }
+                else
+                {
+                    /* This is a MQ segment continuation (if MQ reassembly is not enabled) */
+                    col_append_str(pinfo->cinfo, COL_INFO, " [Unreassembled MQ]");
+                    call_dissector(data_handle, tvb_new_subset_remaining(tvb, offset), pinfo, tree);
+                }
+            }
+        }
+        else
+        {
+            /* This packet is a TCP continuation of a segment (if desegmentation is not enabled) */
+            col_append_str(pinfo->cinfo, COL_INFO, " [Undesegmented]");
+            if (tree)
+            {
+                proto_tree_add_item(tree, proto_mq, tvb, offset, -1, ENC_NA);
+            }
+            call_dissector(data_handle, tvb_new_subset_remaining(tvb, offset), pinfo, tree);
+        }
+    }
 }
 
 static int reassemble_mq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
-	mq_parm_t mq_parm;
+    mq_parm_t mq_parm;
 
-	/* Reassembly of the MQ messages that span several PDU (several TSH) */
-	/* Typically a TCP PDU is 1460 bytes and a MQ PDU is 32766 bytes */
-	if (tvb_length(tvb) < 28)
+    /* Reassembly of the MQ messages that span several PDU (several TSH) */
+    /* Typically a TCP PDU is 1460 bytes and a MQ PDU is 32766 bytes */
+    if (tvb_length(tvb) < 28)
         return 0;
 
-	memset(&mq_parm, 0, sizeof(mq_parm_t));
-	mq_parm.mq_strucID = tvb_get_ntohl(tvb, 0);
-
-	if ( (mq_parm.mq_strucID & MQ_MASK_TSHx) == MQ_STRUCTID_TSHx || (mq_parm.mq_strucID & MQ_MASK_TSHx) == MQ_STRUCTID_TSHx_EBCDIC )
-	{
-		guint8   iCtlF		= 0;
-		gint32   iSegL		= 0;
-		gint32   iBegL		= 0;
-		gint32   iEnco		= 0;
-		gint32   iMulS		= 0;
-		gint32   iHdrL		= 0;
-		gint32   iNxtP		= 0;
-		guint8   iOpcd		= 0;
-		gboolean bSeg1st	= FALSE;
-		gboolean bSegLst	= FALSE;
-		gboolean bMore		= FALSE;
-
-		gint32	 iHdl       = 0;
-		gint32	 iGlbMsgIdx = 0;
-		gint32	 iSegLength = 0;
-		gint16	 iSegmIndex = 0;
-
-		guint32	 uStrL		= 0;
-		guint32	 uPadL		= 0;
-
-		/* TSHM structure as 8 bytes more after the length (convid/requestid) */
-		if (mq_parm.mq_strucID == MQ_STRUCTID_TSHM || mq_parm.mq_strucID == MQ_STRUCTID_TSHM_EBCDIC)
-			iMulS = 8;
-
-		/* Get the Encoding scheme */
-		iEnco	= (tvb_get_guint8(tvb,  8 + iMulS) == MQ_LITTLE_ENDIAN ? ENC_LITTLE_ENDIAN : ENC_BIG_ENDIAN);
-		/* Get the Operation Code */
-		iOpcd	= tvb_get_guint8( tvb,  9 + iMulS);
-		/* Get the Control Flag */
-		iCtlF	= tvb_get_guint8( tvb, 10 + iMulS);
-		/* Get the Semgnet Length */
-		iSegL	= tvb_get_ntohl ( tvb, 4);
-		/* First Segment ? */
-		bSeg1st = ((iCtlF & MQ_TCF_FIRST) != 0);
-		/* Last Segment */
-		bSegLst = ((iCtlF & MQ_TCF_LAST) != 0);
-
-		mq_in_reassembly = FALSE;
-
-		if ((iOpcd > 0x80 && !(bSeg1st && bSegLst)) || iOpcd == MQ_TST_ASYNC_MESSAGE)
-		{
-			proto_tree *mq_tree = NULL;
-
-			/* Optimisation : only fragmented segments go through the reassembly process */
-			/*
-			  It seems that after a PUT on a Queue, when doing a GET, MQ first get
-			  a small part of the response (4096 bytes)
-			  The response contain the number of bytes returned for this request (ActMsgLen)
-			  and the total number of bytes of this reply	(TotMsgLen)
-
-			  this mean the flow seems to be :
-
-			  PUT
-			  REQUEST_MSG (MaxLen=4096)
-			  ASYNC_MSG (1st/Lst Segment, ActMsgLen=4096, TotMsgLen=279420)
-			  as ActMsgLen!=TotMsgLen, this mean the MSG is not complete, we only receive some of 279420 bytes
-			  REQUEST_MSG (MaxLen=279420)
-			  ASYNC_MSG (1st Segment, SegIndex=0 ActMsgLen=279420, TotMsgLen=279420)
-			  ASYNC_MSG (Mid Segment, SegIndex=1)
-			  ASYNC_MSG (Mid Segment, SegIndex=2)
-			  .
-			  ASYNC_MSG (Lst Segment, SegIndex=n)
-			  End of reassembling (we have 279420 bytes to decode)
-			*/
-
-			if (mq_reassembly)
-			{
-				fragment_head *fd_head;
-				guint32 iConnectionId = (pinfo->srcport + pinfo->destport);
-				iHdrL = 28 + iMulS;
-
-				/* Get the MQ Handle of the Object */
-				iHdl = tvb_get_guint32_endian(tvb, iHdrL + 4, iEnco);
-				/* Get the Global Message Index */
-				iGlbMsgIdx = tvb_get_guint32_endian(tvb, iHdrL + 12, iEnco);
-				/* Get the Segment Length */
-				iSegLength = tvb_get_guint32_endian(tvb, iHdrL + 16, iEnco);
-				/* Get the Segment Index */
-				iSegmIndex = tvb_get_guint16_endian(tvb, iHdrL +20, iEnco);
-
-				/*
-				  if SegmIndex == 0, it has 54 bytes + the length and padding
-				  of a variable string at the end of the Header
-				*/
-
-				if (iSegmIndex == 0)
-				{
-					uStrL = tvb_get_guint8(tvb, iHdrL + 54);
-					uPadL = ((((2+1+uStrL)/4)+1)*4)-(2+1+uStrL);
-				}
-				bMore = !bSegLst;
-				/*
-				  First segment has a longer header
-				*/
-				iNxtP  = iHdrL + ((bSeg1st) ? (54 + 1 + uStrL + uPadL) : (24));
-				iNxtP += dissect_mq_md(tvb, NULL, iNxtP, &mq_parm, FALSE);
-
-				/*
-				  if it is the 1st Segment, it means we are
-				  of the beginning of a reassembling. We must take the whole segment (with tSHM, and headers)
-				*/
-				iBegL = (bSeg1st) ? 0 : iNxtP;
-
-				fd_head = fragment_add_seq_next(&mq_reassembly_table,
-					tvb, iBegL,
-					pinfo, iConnectionId, NULL,
-					iSegL - iBegL, bMore);
-
-				if (tree)
-				{
-					proto_item *ti = proto_tree_add_item(tree, proto_mq, tvb, 0, -1, ENC_NA);
-					if (bMore)
-					{
-						proto_item_append_text(ti, " [%s of a Reassembled MQ Segment] Hdl=0x%08x GlbMsgIdx=%d, SegIdx=%d, SegLen=%d",
-							val_to_str(iOpcd, mq_opcode_vals, "Unknown (0x%02x)"),
-							iHdl, iGlbMsgIdx, iSegmIndex, iSegLength);
-					}
-					else
-					{
-						proto_item_append_text(ti, " %s Hdl=0x%08x GlbMsgIdx=%d, SegIdx=%d, SegLen=%d",
-							val_to_str(iOpcd, mq_opcode_vals, "Unknown (0x%02x)"),
-							iHdl, iGlbMsgIdx, iSegmIndex, iSegLength);
-					}
-					mq_tree = proto_item_add_subtree(ti, ett_mq_reaasemb);
-				}
-				else
-				{
-					mq_tree = tree;
-				}
-
-				if (fd_head != NULL && pinfo->fd->num == fd_head->reassembled_in)
-				{
-					tvbuff_t *next_tvb;
-
-					/* Reassembly finished */
-					if (fd_head->next != NULL)
-					{
-						/* 2 or more fragments */
-						next_tvb = tvb_new_chain(tvb, fd_head->tvb_data);
-						add_new_data_source(pinfo, next_tvb, "Reassembled MQ");
-					}
-					else
-					{
-						/* Only 1 fragment */
-						next_tvb = tvb;
-					}
-					dissect_mq_pdu(next_tvb, pinfo, mq_tree);
-					return tvb_length(tvb);
-				}
-				else
-				{
-					mq_in_reassembly = TRUE;
-					/* Reassembly in progress */
-					col_set_str(pinfo->cinfo, COL_PROTOCOL, "MQ");
-					col_add_fstr(pinfo->cinfo, COL_INFO, "[%s of a Reassembled MQ Segment] Hdl=0x%08x GlbMsgIdx=%d, SegIdx=%d, SegLen=%d",
-						val_to_str(iOpcd, mq_opcode_vals, "Unknown (0x%02x)"),
-						iHdl, iGlbMsgIdx, iSegmIndex, iSegLength);
-					dissect_mq_pdu(tvb, pinfo, mq_tree);
-					return tvb_length(tvb);
-				}
-			}
-			else
-			{
-				dissect_mq_pdu(tvb, pinfo, mq_tree);   /* XXX: mq_tree always NULL ?? */
-				if (bSeg1st)
-				{
-					/* MQ segment is the first of a unreassembled series */
-					col_append_str(pinfo->cinfo, COL_INFO, " [Unreassembled MQ]");
-				}
-				return tvb_length(tvb);
-			}
-		}
-		/* Reassembly not enabled or non-fragmented message */
-		dissect_mq_pdu(tvb, pinfo, tree);
-	}
-
-	return tvb_length(tvb);
+    memset(&mq_parm, 0, sizeof(mq_parm_t));
+    mq_parm.mq_strucID = tvb_get_ntohl(tvb, 0);
+
+    if ( (mq_parm.mq_strucID & MQ_MASK_TSHx) == MQ_STRUCTID_TSHx || (mq_parm.mq_strucID & MQ_MASK_TSHx) == MQ_STRUCTID_TSHx_EBCDIC )
+    {
+        guint8   iCtlF      = 0;
+        gint32   iSegL      = 0;
+        gint32   iBegL      = 0;
+        gint32   iEnco      = 0;
+        gint32   iMulS      = 0;
+        gint32   iHdrL      = 0;
+        gint32   iNxtP      = 0;
+        guint8   iOpcd      = 0;
+        gboolean bSeg1st    = FALSE;
+        gboolean bSegLst    = FALSE;
+        gboolean bMore      = FALSE;
+
+        gint32   iHdl       = 0;
+        gint32   iGlbMsgIdx = 0;
+        gint32   iSegLength = 0;
+        gint16   iSegmIndex = 0;
+
+        guint32  uStrL      = 0;
+        guint32  uPadL      = 0;
+
+        /* TSHM structure as 8 bytes more after the length (convid/requestid) */
+        if (mq_parm.mq_strucID == MQ_STRUCTID_TSHM || mq_parm.mq_strucID == MQ_STRUCTID_TSHM_EBCDIC)
+            iMulS = 8;
+
+        /* Get the Encoding scheme */
+        iEnco   = (tvb_get_guint8(tvb,  8 + iMulS) == MQ_LITTLE_ENDIAN ? ENC_LITTLE_ENDIAN : ENC_BIG_ENDIAN);
+        /* Get the Operation Code */
+        iOpcd   = tvb_get_guint8( tvb,  9 + iMulS);
+        /* Get the Control Flag */
+        iCtlF   = tvb_get_guint8( tvb, 10 + iMulS);
+        /* Get the Semgnet Length */
+        iSegL   = tvb_get_ntohl ( tvb, 4);
+        /* First Segment ? */
+        bSeg1st = ((iCtlF & MQ_TCF_FIRST) != 0);
+        /* Last Segment */
+        bSegLst = ((iCtlF & MQ_TCF_LAST) != 0);
+
+        mq_in_reassembly = FALSE;
+
+        if ((iOpcd > 0x80 && !(bSeg1st && bSegLst)) || iOpcd == MQ_TST_ASYNC_MESSAGE)
+        {
+            proto_tree *mq_tree = NULL;
+
+            /* Optimisation : only fragmented segments go through the reassembly process */
+            /*
+              It seems that after a PUT on a Queue, when doing a GET, MQ first get
+              a small part of the response (4096 bytes)
+              The response contain the number of bytes returned for this request (ActMsgLen)
+              and the total number of bytes of this reply   (TotMsgLen)
+
+              this mean the flow seems to be :
+
+              PUT
+              REQUEST_MSG (MaxLen=4096)
+              ASYNC_MSG (1st/Lst Segment, ActMsgLen=4096, TotMsgLen=279420)
+              as ActMsgLen!=TotMsgLen, this mean the MSG is not complete, we only receive some of 279420 bytes
+              REQUEST_MSG (MaxLen=279420)
+              ASYNC_MSG (1st Segment, SegIndex=0 ActMsgLen=279420, TotMsgLen=279420)
+              ASYNC_MSG (Mid Segment, SegIndex=1)
+              ASYNC_MSG (Mid Segment, SegIndex=2)
+              .
+              ASYNC_MSG (Lst Segment, SegIndex=n)
+              End of reassembling (we have 279420 bytes to decode)
+            */
+
+            if (mq_reassembly)
+            {
+                fragment_head *fd_head;
+                guint32 iConnectionId = (pinfo->srcport + pinfo->destport);
+                iHdrL = 28 + iMulS;
+
+                /* Get the MQ Handle of the Object */
+                iHdl = tvb_get_guint32_endian(tvb, iHdrL + 4, iEnco);
+                /* Get the Global Message Index */
+                iGlbMsgIdx = tvb_get_guint32_endian(tvb, iHdrL + 12, iEnco);
+                /* Get the Segment Length */
+                iSegLength = tvb_get_guint32_endian(tvb, iHdrL + 16, iEnco);
+                /* Get the Segment Index */
+                iSegmIndex = tvb_get_guint16_endian(tvb, iHdrL +20, iEnco);
+
+                /*
+                  if SegmIndex == 0, it has 54 bytes + the length and padding
+                  of a variable string at the end of the Header
+                */
+
+                if (iSegmIndex == 0)
+                {
+                    uStrL = tvb_get_guint8(tvb, iHdrL + 54);
+                    uPadL = ((((2+1+uStrL)/4)+1)*4)-(2+1+uStrL);
+                }
+                bMore = !bSegLst;
+                /*
+                  First segment has a longer header
+                */
+                iNxtP  = iHdrL + ((bSeg1st) ? (54 + 1 + uStrL + uPadL) : (24));
+                iNxtP += dissect_mq_md(tvb, NULL, iNxtP, &mq_parm, FALSE);
+
+                /*
+                  if it is the 1st Segment, it means we are
+                  of the beginning of a reassembling. We must take the whole segment (with tSHM, and headers)
+                */
+                iBegL = (bSeg1st) ? 0 : iNxtP;
+
+                fd_head = fragment_add_seq_next(&mq_reassembly_table,
+                    tvb, iBegL,
+                    pinfo, iConnectionId, NULL,
+                    iSegL - iBegL, bMore);
+
+                if (tree)
+                {
+                    proto_item *ti = proto_tree_add_item(tree, proto_mq, tvb, 0, -1, ENC_NA);
+                    if (bMore)
+                    {
+                        proto_item_append_text(ti, " [%s of a Reassembled MQ Segment] Hdl=0x%08x GlbMsgIdx=%d, SegIdx=%d, SegLen=%d",
+                            val_to_str(iOpcd, mq_opcode_vals, "Unknown (0x%02x)"),
+                            iHdl, iGlbMsgIdx, iSegmIndex, iSegLength);
+                    }
+                    else
+                    {
+                        proto_item_append_text(ti, " %s Hdl=0x%08x GlbMsgIdx=%d, SegIdx=%d, SegLen=%d",
+                            val_to_str(iOpcd, mq_opcode_vals, "Unknown (0x%02x)"),
+                            iHdl, iGlbMsgIdx, iSegmIndex, iSegLength);
+                    }
+                    mq_tree = proto_item_add_subtree(ti, ett_mq_reaasemb);
+                }
+                else
+                {
+                    mq_tree = tree;
+                }
+
+                if (fd_head != NULL && pinfo->fd->num == fd_head->reassembled_in)
+                {
+                    tvbuff_t *next_tvb;
+
+                    /* Reassembly finished */
+                    if (fd_head->next != NULL)
+                    {
+                        /* 2 or more fragments */
+                        next_tvb = tvb_new_chain(tvb, fd_head->tvb_data);
+                        add_new_data_source(pinfo, next_tvb, "Reassembled MQ");
+                    }
+                    else
+                    {
+                        /* Only 1 fragment */
+                        next_tvb = tvb;
+                    }
+                    dissect_mq_pdu(next_tvb, pinfo, mq_tree);
+                    return tvb_length(tvb);
+                }
+                else
+                {
+                    mq_in_reassembly = TRUE;
+                    /* Reassembly in progress */
+                    col_set_str(pinfo->cinfo, COL_PROTOCOL, "MQ");
+                    col_add_fstr(pinfo->cinfo, COL_INFO, "[%s of a Reassembled MQ Segment] Hdl=0x%08x GlbMsgIdx=%d, SegIdx=%d, SegLen=%d",
+                        val_to_str(iOpcd, mq_opcode_vals, "Unknown (0x%02x)"),
+                        iHdl, iGlbMsgIdx, iSegmIndex, iSegLength);
+                    dissect_mq_pdu(tvb, pinfo, mq_tree);
+                    return tvb_length(tvb);
+                }
+            }
+            else
+            {
+                dissect_mq_pdu(tvb, pinfo, mq_tree);   /* XXX: mq_tree always NULL ?? */
+                if (bSeg1st)
+                {
+                    /* MQ segment is the first of a unreassembled series */
+                    col_append_str(pinfo->cinfo, COL_INFO, " [Unreassembled MQ]");
+                }
+                return tvb_length(tvb);
+            }
+        }
+        /* Reassembly not enabled or non-fragmented message */
+        dissect_mq_pdu(tvb, pinfo, tree);
+    }
+
+    return tvb_length(tvb);
 }
 
 static guint get_mq_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset)
 {
-	if (tvb_length_remaining(tvb, offset) >= 8)
-	{
-		guint32 mq_strucID = tvb_get_ntohl(tvb, 0);
-		if ( (mq_strucID & MQ_MASK_TSHx) == MQ_STRUCTID_TSHx || (mq_strucID & MQ_MASK_TSHx) == MQ_STRUCTID_TSHx_EBCDIC )
-		{
-			return tvb_get_ntohl(tvb, offset + 4);
-		}
-	}
-	return 0;
+    if (tvb_length_remaining(tvb, offset) >= 8)
+    {
+        guint32 mq_strucID = tvb_get_ntohl(tvb, 0);
+        if ( (mq_strucID & MQ_MASK_TSHx) == MQ_STRUCTID_TSHx || (mq_strucID & MQ_MASK_TSHx) == MQ_STRUCTID_TSHx_EBCDIC )
+        {
+            return tvb_get_ntohl(tvb, offset + 4);
+        }
+    }
+    return 0;
 }
 
 static int dissect_mq_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
 {
-	tcp_dissect_pdus(tvb, pinfo, tree, mq_desegment, 28, get_mq_pdu_len, reassemble_mq, data);
-	return tvb_length(tvb);
+    tcp_dissect_pdus(tvb, pinfo, tree, mq_desegment, 28, get_mq_pdu_len, reassemble_mq, data);
+    return tvb_length(tvb);
 }
 
 static void dissect_mq_spx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-	/* Since SPX has no standard desegmentation, MQ cannot be performed as well */
-	dissect_mq_pdu(tvb, pinfo, tree);
+    /* Since SPX has no standard desegmentation, MQ cannot be performed as well */
+    dissect_mq_pdu(tvb, pinfo, tree);
 }
 
 static gboolean dissect_mq_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint iProto, void *data)
 {
-	if (tvb_length(tvb) >= 28)
-	{
-		guint32 mq_strucID = tvb_get_ntohl(tvb, 0);
-		if ( (mq_strucID & MQ_MASK_TSHx) == MQ_STRUCTID_TSHx || (mq_strucID & MQ_MASK_TSHx) == MQ_STRUCTID_TSHx_EBCDIC )
-		{
-			/* Register this dissector for this conversation */
-			conversation_t  *conversation;
-
-			conversation = find_or_create_conversation(pinfo);
-			if (iProto == MQ_XPT_TCP)
-				conversation_set_dissector(conversation, mq_tcp_handle);
-
-			/* Dissect the packet */
-			reassemble_mq(tvb, pinfo, tree, data);
-			return TRUE;
-		}
-	}
-	return FALSE;
+    if (tvb_length(tvb) >= 28)
+    {
+        guint32 mq_strucID = tvb_get_ntohl(tvb, 0);
+        if ( (mq_strucID & MQ_MASK_TSHx) == MQ_STRUCTID_TSHx || (mq_strucID & MQ_MASK_TSHx) == MQ_STRUCTID_TSHx_EBCDIC )
+        {
+            /* Register this dissector for this conversation */
+            conversation_t  *conversation;
+
+            conversation = find_or_create_conversation(pinfo);
+            if (iProto == MQ_XPT_TCP)
+                conversation_set_dissector(conversation, mq_tcp_handle);
+
+            /* Dissect the packet */
+            reassemble_mq(tvb, pinfo, tree, data);
+            return TRUE;
+        }
+    }
+    return FALSE;
 }
 
-static gboolean	dissect_mq_heur_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
+static gboolean dissect_mq_heur_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
-	return dissect_mq_heur(tvb, pinfo, tree, MQ_XPT_TCP, NULL);
+    return dissect_mq_heur(tvb, pinfo, tree, MQ_XPT_TCP, NULL);
 }
 
-static gboolean	dissect_mq_heur_netbios(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
+static gboolean dissect_mq_heur_netbios(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
-	return dissect_mq_heur(tvb, pinfo, tree, MQ_XPT_NETBIOS, NULL);
+    return dissect_mq_heur(tvb, pinfo, tree, MQ_XPT_NETBIOS, NULL);
 }
 
-static gboolean	dissect_mq_heur_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
+static gboolean dissect_mq_heur_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
-	return dissect_mq_heur(tvb, pinfo, tree, MQ_XPT_HTTP, NULL);
+    return dissect_mq_heur(tvb, pinfo, tree, MQ_XPT_HTTP, NULL);
 }
 
 static void mq_init(void)
 {
-	reassembly_table_init(&mq_reassembly_table,
-		&addresses_reassembly_table_functions);
+    reassembly_table_init(&mq_reassembly_table,
+        &addresses_reassembly_table_functions);
 }
 
 void proto_register_mq(void)
 {
-	static hf_register_info hf[] =
-	{
-		{ &hf_mq_tsh_StructID , {"StructID..", "mq.tsh.structid", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-		{ &hf_mq_tsh_mqseglen , {"MQSegmLen.", "mq.tsh.seglength", FT_UINT32, BASE_DEC, NULL, 0x0, "TSH MQ Segment length", HFILL }},
-		{ &hf_mq_tsh_convid   , {"Convers ID", "mq.tsh.convid", FT_UINT32, BASE_DEC, NULL, 0x0, "TSH Conversation ID", HFILL }},
-		{ &hf_mq_tsh_requestid, {"Request ID", "mq.tsh.requestid", FT_UINT32, BASE_DEC, NULL, 0x0, "TSH Request ID", HFILL }},
-		{ &hf_mq_tsh_byteorder, {"Byte order", "mq.tsh.byteorder", FT_UINT8, BASE_HEX, VALS(GET_VALSV(byteorder)), 0x0, "TSH Byte order", HFILL }},
-		{ &hf_mq_tsh_opcode   , {"SegmType..", "mq.tsh.type", FT_UINT8, BASE_HEX, VALS(GET_VALSV(opcode)), 0x0, "TSH MQ segment type", HFILL }},
-		{ &hf_mq_tsh_ctlflgs1 , {"Ctl Flag 1", "mq.tsh.cflags1", FT_UINT8, BASE_HEX, NULL, 0x0, "TSH Control flags 1", HFILL }},
-		{ &hf_mq_tsh_ctlflgs2 , {"Ctl Flag 2", "mq.tsh.cflags2", FT_UINT8, BASE_HEX, NULL, 0x0, "TSH Control flags 2", HFILL }},
-		{ &hf_mq_tsh_luwid    , {"LUW Ident.", "mq.tsh.luwid", FT_BYTES, BASE_NONE, NULL, 0x0, "TSH logical unit of work identifier", HFILL }},
-		{ &hf_mq_tsh_encoding , {"Encoding..", "mq.tsh.encoding", FT_UINT32, BASE_DEC, NULL, 0x0, "TSH Encoding", HFILL }},
-		{ &hf_mq_tsh_ccsid    , {"CCSID.....", "mq.tsh.ccsid", FT_INT16, BASE_DEC | BASE_RANGE_STRING, RVALS(&GET_VALRV(ccsid)), 0x0, "TSH CCSID", HFILL }},
-		{ &hf_mq_tsh_reserved , {"Reserved..", "mq.tsh.reserved", FT_UINT16, BASE_HEX, NULL, 0x0, "TSH Reserved", HFILL }},
-
-		{ &hf_mq_tsh_tcf_confirmreq, {"Confirm Req", "mq.tsh.tcf.confirmreq", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_TCF_CONFIRM_REQUEST, "TSH TCF Confirm request", HFILL }},
-		{ &hf_mq_tsh_tcf_error     , {"Error", "mq.tsh.tcf.error", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_TCF_ERROR, "TSH TCF Error", HFILL }},
-		{ &hf_mq_tsh_tcf_reqclose  , {"Req close", "mq.tsh.tcf.reqclose", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_TCF_REQUEST_CLOSE, "TSH TCF Request close", HFILL }},
-		{ &hf_mq_tsh_tcf_closechann, {"Close Chnl", "mq.tsh.tcf.closechann", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_TCF_CLOSE_CHANNEL, "TSH TCF Close channel", HFILL }},
-		{ &hf_mq_tsh_tcf_first     , {"First Seg", "mq.tsh.tcf.first", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_TCF_FIRST, "TSH TCF First", HFILL }},
-		{ &hf_mq_tsh_tcf_last      , {"Last Seg", "mq.tsh.tcf.last", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_TCF_LAST, "TSH TCF Last", HFILL }},
-		{ &hf_mq_tsh_tcf_reqacc    , {"Req accept", "mq.tsh.tcf.reqacc", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_TCF_REQUEST_ACCEPTED, "TSH TCF Request accepted", HFILL }},
-		{ &hf_mq_tsh_tcf_dlq       , {"DLQ used", "mq.tsh.tcf.dlq", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_TCF_DLQ_USED, "TSH TCF DLQ used", HFILL }},
-
-		{ &hf_mq_tsh_tcf2_HdrComp  , {"HDR Comp", "mq.tsh.tcf2.hdrcomp", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_TCF2_HDRCOMP      , "TSH TCF2 Header Compressed", HFILL }},
-		{ &hf_mq_tsh_tcf2_MsgComp  , {"MSG Comp", "mq.tsh.tcf2.msgcomp", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_TCF2_MSGCOMP      , "TSH TCF2 Message Compressed", HFILL }},
-		{ &hf_mq_tsh_tcf2_CSH      , {"CSH", "mq.tsh.tcf2.csh"    , FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_TCF2_CSH          , "TSH TCF2 CSH", HFILL }},
-		{ &hf_mq_tsh_tcf2_CmitIntv , {"ComitIntvl", "mq.tsh.tcf.cmitintv", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_TCF2_CMIT_INTERVAL, "TSH TCF2 Commit Interval", HFILL }},
-
-		{ &hf_mq_api_replylen , {"Reply len..", "mq.api.replylength", FT_UINT32, BASE_DEC, NULL, 0x0, "API Reply length", HFILL }},
-		{ &hf_mq_api_compcode , {"Compl Code.", "mq.api.completioncode", FT_UINT32, BASE_DEC, VALS(GET_VALSV(mqcc)), 0x0, "API Completion code", HFILL }},
-		{ &hf_mq_api_reascode , {"Reason Code", "mq.api.reasoncode", FT_UINT32, BASE_DEC, VALS(GET_VALSV(mqrc)), 0x0, "API Reason code", HFILL }},
-		{ &hf_mq_api_objecthdl, {"Object Hdl.", "mq.api.hobj", FT_UINT32, BASE_HEX, NULL, 0x0, "API Object handle", HFILL }},
-
-		{ &hf_mq_socket_conversid, {"ConversId", "mq.socket.conversid", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "Socket Conversation Id", HFILL }},
-		{ &hf_mq_socket_requestid, {"RequestId", "mq.socket.requestid", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "Socket Request Id", HFILL }},
-		{ &hf_mq_socket_type     , {"Type.....", "mq.socket.type", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "Socket Type", HFILL }},
-		{ &hf_mq_socket_parm1    , {"Parm1....", "mq.socket.parm1", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "Socket Parameter 1", HFILL }},
-		{ &hf_mq_socket_parm2    , {"Parm2....", "mq.socket.parm2", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "Socket Parameter 2", HFILL }},
-
-		{ &hf_mq_caut_StructID , {"StructID." , "mq.caut.structid" , FT_STRINGZ, BASE_NONE   , NULL, 0x0, NULL, HFILL }},
-		{ &hf_mq_caut_AuthType , {"AuthType." , "mq.caut.authtype" , FT_UINT32 , BASE_HEX_DEC, NULL, 0x0, "CAUT Authority Type", HFILL }},
-		{ &hf_mq_caut_UsrMaxLen, {"UsrMaxLen", "mq.caut.usrmaxlen", FT_UINT32 , BASE_HEX_DEC, NULL, 0x0, "CAUT userid Maximum length", HFILL }},
-		{ &hf_mq_caut_PwdMaxLen, {"PwdMaxLen", "mq.caut.pwdmaxlen", FT_UINT32 , BASE_HEX_DEC, NULL, 0x0, "CAUT password Maximum length", HFILL }},
-		{ &hf_mq_caut_UsrLength, {"UsrLength", "mq.caut.usrlength", FT_UINT32 , BASE_HEX_DEC, NULL, 0x0, "CAUT userid length", HFILL }},
-		{ &hf_mq_caut_PwdLength, {"PwdLength", "mq.caut.pswlength", FT_UINT32 , BASE_HEX_DEC, NULL, 0x0, "CAUT password length", HFILL }},
-		{ &hf_mq_caut_usr      , {"userid...", "mq.msh.userid"    , FT_STRINGZ, BASE_NONE   , NULL, 0x0, "CAUT UserId", HFILL }},
-		{ &hf_mq_caut_psw      , {"password.", "mq.msh.password"  , FT_STRINGZ, BASE_NONE   , NULL, 0x0, "CAUT Password", HFILL }},
-
-		{ &hf_mq_msh_StructID  , {"StructID", "mq.msh.structid", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-		{ &hf_mq_msh_seqnum    , {"Seq Numb", "mq.msh.seqnum", FT_UINT32, BASE_DEC, NULL, 0x0, "MSH sequence number", HFILL }},
-		{ &hf_mq_msh_datalength, {"Buf len.", "mq.msh.buflength", FT_UINT32, BASE_DEC, NULL, 0x0, "MSH buffer length", HFILL }},
-		{ &hf_mq_msh_unknown1  , {"Unknown1", "mq.msh.unknown1", FT_UINT32, BASE_HEX, NULL, 0x0, "MSH unknown1", HFILL }},
-		{ &hf_mq_msh_msglength , {"Msg len.", "mq.msh.msglength", FT_UINT32, BASE_DEC, NULL, 0x0, "MSH message length", HFILL }},
-
-		{ &hf_mq_xqh_StructID  , {"StructID", "mq.xqh.structid", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-		{ &hf_mq_xqh_version   , {"Version.", "mq.xqh.version", FT_UINT32, BASE_DEC, NULL, 0x0, "XQH version", HFILL }},
-		{ &hf_mq_xqh_remoteq   , {"Remote Q", "mq.xqh.remoteq", FT_STRINGZ, BASE_NONE, NULL, 0x0, "XQH remote queue", HFILL }},
-		{ &hf_mq_xqh_remoteqmgr, {"Rmt QMgr", "mq.xqh.remoteqmgr", FT_STRINGZ, BASE_NONE, NULL, 0x0, "XQH remote queue manager", HFILL }},
-
-		{ &hf_mq_id_StructID   , {"Structid..", "mq.id.structid", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-		{ &hf_mq_id_FapLevel   , {"FAP level.", "mq.id.level", FT_UINT8, BASE_DEC, NULL, 0x0, "ID Formats And Protocols level", HFILL }},
-		{ &hf_mq_id_icf1       , {"CapFlag1..", "mq.id.idflags", FT_UINT8, BASE_HEX, NULL, 0x0, "ID Capability Flags 1", HFILL }},
-		{ &hf_mq_id_Eicf1      , {"ECapFlag1.", "mq.id.ideflags", FT_UINT8, BASE_HEX, NULL, 0x0, "ID E Capability Flags 1", HFILL }},
-		{ &hf_mq_id_ief1       , {"IniErrFlg1", "mq.id.ief", FT_UINT8, BASE_HEX, NULL, 0x0, "ID Initial Error Flags 1", HFILL }},
-		{ &hf_mq_id_Reserved   , {"Reserved..", "mq.id.unknown04", FT_UINT16, BASE_HEX, NULL, 0x0, "ID Reserved", HFILL }},
-		{ &hf_mq_id_MaxMsgBatch, {"MaxMsgBtch", "mq.id.MaxMsgBatch", FT_UINT16, BASE_DEC, NULL, 0x0, "ID max msg per batch", HFILL }},
-		{ &hf_mq_id_MaxTrSize  , {"MaxTrSize.", "mq.id.MaxTrSize", FT_UINT32, BASE_DEC, NULL, 0x0, "ID max trans size", HFILL }},
-		{ &hf_mq_id_MaxMsgSize , {"MaxMsgSize", "mq.id.maxmsgsize", FT_UINT32, BASE_DEC, NULL, 0x0, "ID max msg size", HFILL }},
-		{ &hf_mq_id_SeqWrapVal , {"SeqWrapVal", "mq.id.seqwrap", FT_UINT32, BASE_DEC, NULL, 0x0, "ID seq wrap value", HFILL }},
-		{ &hf_mq_id_channel    , {"ChannelNme", "mq.id.channelname", FT_STRINGZ, BASE_NONE, NULL, 0x0, "ID channel name", HFILL }},
-		{ &hf_mq_id_icf2       , {"CapFlag2..", "mq.id.idflags2", FT_UINT8, BASE_HEX, NULL, 0x0, "ID Capability flags 2", HFILL }},
-		{ &hf_mq_id_Eicf2      , {"ECapFlag2.", "mq.id.ideflags2", FT_UINT8, BASE_HEX, NULL, 0x0, "ID E Capabitlity flags 2", HFILL }},
-		{ &hf_mq_id_ccsid      , {"ccsid.....", "mq.id.ccsid", FT_INT16, BASE_DEC | BASE_RANGE_STRING, RVALS(&GET_VALRV(ccsid)), 0x0, "ID Coded Character Set ID", HFILL }},
-		{ &hf_mq_id_qmgrname   , {"QMgrName..", "mq.id.qm", FT_STRINGZ, BASE_NONE, NULL, 0x0, "ID Queue Manager Name", HFILL }},
-		{ &hf_mq_id_HBInterval , {"HBInterval", "mq.id.hbint", FT_UINT32, BASE_DEC, NULL, 0x0, "ID Heartbeat interval", HFILL }},
-		{ &hf_mq_id_EFLLength  , {"EFLLength.", "mq.id.efllength", FT_UINT16, BASE_HEX_DEC, NULL, 0x0, "ID EFL Length", HFILL }},
-		{ &hf_mq_id_ief2       , {"IniErrFlg2", "mq.id.inierrflg2", FT_UINT8, BASE_HEX_DEC, NULL, 0x0, "ID Initial Error Flags 2", HFILL }},
-		{ &hf_mq_id_Reserved1  , {"Reserved1.", "mq.id.reserved1", FT_UINT8, BASE_HEX_DEC, NULL, 0x0, "ID Reserved 1", HFILL }},
-		{ &hf_mq_id_HdrCprsLst , {"HdrCprsLst", "mq.id.hdrcprslst", FT_BYTES, BASE_NONE, NULL, 0x0, "ID Hdr Cprs Lst", HFILL }},
-		{ &hf_mq_id_MsgCprsLst , {"MsgCprsLst", "mq.id.msgcprslst", FT_BYTES, BASE_NONE, NULL, 0x0, "ID Msg Cprs Lst", HFILL }},
-		{ &hf_mq_id_Reserved2  , {"Reserved2.", "mq.id.reserved2", FT_UINT16, BASE_HEX_DEC, NULL, 0x0, "ID Reserved 2", HFILL }},
-		{ &hf_mq_id_SSLKeyRst  , {"SSLKeyRst.", "mq.id.sslkeyrst", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "ID SSL Key Reset", HFILL }},
-		{ &hf_mq_id_ConvBySkt  , {"ConvBySkt.", "mq.id.convbyskt", FT_INT32, BASE_DEC, NULL, 0x0, "ID Conv Per Socket", HFILL }},
-		{ &hf_mq_id_icf3       , {"CapFlag3..", "mq.id.idflags3", FT_UINT8, BASE_HEX_DEC, NULL, 0x0, "ID Capability flags 3", HFILL }},
-		{ &hf_mq_id_Eicf3      , {"ECapFlag3.", "mq.id.ideflags3", FT_UINT8, BASE_HEX_DEC, NULL, 0x0, "ID E Capability flags 3", HFILL }},
-		{ &hf_mq_id_Reserved3  , {"Reserved3.", "mq.id.reserved3", FT_UINT16, BASE_HEX_DEC, NULL, 0x0, "ID Reserved 3", HFILL }},
-		{ &hf_mq_id_ProcessId  , {"ProcessId.", "mq.id.processid", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "ID Process Identifier", HFILL }},
-		{ &hf_mq_id_ThreadId   , {"ThreadId..", "mq.id.threadid", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "ID Thread Identifier", HFILL }},
-		{ &hf_mq_id_TraceId    , {"TraceId...", "mq.id.traceid", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "ID Trace Identifier", HFILL }},
-		{ &hf_mq_id_ProdId     , {"ProdId....", "mq.id.prodid", FT_STRINGZ, BASE_NONE, NULL, 0x0, "ID Product Identifier", HFILL }},
-		{ &hf_mq_id_mqmid      , {"MQM ID....", "mq.id.mqmid", FT_STRINGZ, BASE_NONE, NULL, 0x0, "ID MQM ID", HFILL }},
-
-		{ &hf_mq_id_icf1_msgseq  , {"Message sequence", "mq.id.icf.msgseq"  , FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF1_MSG_SEQ, "ID ICF Message sequence", HFILL }},
-		{ &hf_mq_id_icf1_convcap , {"Conversion capable", "mq.id.icf.convcap" , FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF1_CONVERSION_CAPABLE, "ID ICF Conversion capable", HFILL }},
-		{ &hf_mq_id_icf1_splitmsg, {"Split messages", "mq.id.icf.splitmsg", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF1_SPLIT_MESSAGE, "ID ICF Split message", HFILL }},
-		{ &hf_mq_id_icf1_RqstInit, {"Request Initiation", "mq.id.icf.rqstinit", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF1_REQUEST_INITIATION, "ID ICF Request Initiation", HFILL }},
-		{ &hf_mq_id_icf1_RqstSecu, {"Request Security", "mq.id.icf.rqstsecu", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF1_REQUEST_SECURITY, "ID ICF Request Security", HFILL }},
-		{ &hf_mq_id_icf1_mqreq   , {"MQ request", "mq.id.icf.mqreq"   , FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF1_MQREQUEST, "ID ICF MQ request", HFILL }},
-		{ &hf_mq_id_icf1_svrsec  , {"Srvr Con security", "mq.id.icf.svrsec"  , FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF1_SVRCONN_SECURITY, "ID ICF Server connection security", HFILL }},
-		{ &hf_mq_id_icf1_runtime , {"Runtime applic", "mq.id.icf.runtime" , FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF1_RUNTIME, "ID ICF Runtime application", HFILL }},
-
-		{ &hf_mq_id_icf2_CanDstLst, {"DistListCapable", "mq.id.icf2.distlistcap"   , FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF2_DIST_LIST_CAPABLE, "ID ICF2 Distribution List Capable", HFILL }},
-		{ &hf_mq_id_icf2_FstMsgReq, {"Fast Msg Reqrd", "mq.id.icf2.fastmsgrqrd"   , FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF2_FAST_MESSAGES_REQUIRED, "ID ICF2 Fast Message Required", HFILL }},
-		{ &hf_mq_id_icf2_RespConv , {"RspndrConversion", "mq.id.icf2.respndrconvers", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF2_RESPONDER_CONVERSION, "ID ICF2 Responder Conversion", HFILL }},
-		{ &hf_mq_id_icf2_XARequest, {"XARequest", "mq.id.icf2.xarequest"     , FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF2_XAREQUEST, "ID ICF2 XA Request", HFILL }},
-		{ &hf_mq_id_icf2_XARunTApp, {"XARunTypApp", "mq.id.icf2.xaruntypapp"   , FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF2_XARUNTIME_APP, "ID ICF2 XA Runtime App", HFILL }},
-		{ &hf_mq_id_icf2_SPIRqst  , {"SPIRequest", "mq.id.icf2.spirequest"    , FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF2_SPIREQUEST, "ID ICF2 SPI Request", HFILL }},
-		{ &hf_mq_id_icf2_DualUOW  , {"DualUOW", "mq.id.icf2.dualuow"       , FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF2_DUAL_UOW, "ID ICF2 Dual UOW", HFILL }},
-		{ &hf_mq_id_icf2_CanTrcRte, {"Trace Rte Capab", "mq.id.icf2.cantraceroute" , FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF2_TRACE_ROUTE_CAPABLE, "ID ICF2 Trace Route Capable", HFILL }},
-
-		{ &hf_mq_id_icf3_CanMsgPrp, {"Msg Property Cap", "mq.id.icf.msgprpcap", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF3_MSG_PROP_CAPABLE, "ID ICF3 Message PropertyCapable", HFILL }},
-		{ &hf_mq_id_icf3_Unknown02, {"Unknownx02", "mq.id.icf.unknown02", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF3_UNKNOWNX02, "ID ICF3 Unknown Falg x02", HFILL }},
-
-		{ &hf_mq_id_ief1_ccsid  , {"Invalid CCSID", "mq.id.ief1.ccsid", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_IEF1_CCSID, "ID invalid CCSID", HFILL }},
-		{ &hf_mq_id_ief1_enc    , {"Invalid encoding", "mq.id.ief1.enc", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_IEF1_ENCODING, "ID invalid encoding", HFILL }},
-		{ &hf_mq_id_ief1_mxtrsz , {"Invalid Max Trans Size", "mq.id.ief1.mxtrsz", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_IEF1_MAX_TRANSMISSION_SIZE, "ID invalid maximum transmission size", HFILL }},
-		{ &hf_mq_id_ief1_fap    , {"Invalid FAP level", "mq.id.ief1.fap", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_IEF1_FAP_LEVEL, "ID invalid FAP level", HFILL }},
-		{ &hf_mq_id_ief1_mxmsgsz, {"Invalid message size", "mq.id.ief1.mxmsgsz", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_IEF1_MAX_MSG_SIZE, "ID invalid message size", HFILL }},
-		{ &hf_mq_id_ief1_mxmsgpb, {"Invalid Max Msg batch", "mq.id.ief1.mxmsgpb", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_IEF1_MAX_MSG_PER_BATCH, "ID maximum message per batch", HFILL }},
-		{ &hf_mq_id_ief1_seqwrap, {"Invalid Seq Wrap Value", "mq.id.ief1.seqwrap", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_IEF1_SEQ_WRAP_VALUE, "ID invalid sequence wrap value", HFILL }},
-		{ &hf_mq_id_ief1_hbint  , {"Invalid HB interval", "mq.id.ief1.hbint", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_IEF1_HEARTBEAT_INTERVAL, "ID invalid heartbeat interval", HFILL }},
-
-		{ &hf_mq_id_ief2_HdrCmpLst, {"Invalid HDR CompLst", "mq.id.ief2.hdrcomplst", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_IEF2_HDRCOMPLIST, "ID invalid Header Compression List", HFILL }},
-		{ &hf_mq_id_ief2_MsgCmpLst, {"Invalid Msg CompLst", "mq.id.ief2.msgcomplst", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_IEF2_MSGCOMPLIST, "ID invalid Message Compression List", HFILL }},
-		{ &hf_mq_id_ief2_SSLReset , {"Invalid SSL Reset", "mq.id.ief2.sslreset"  , FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_IEF2_SSL_RESET  , "ID invalid SSL Reset", HFILL }},
-
-		{ &hf_mq_uid_StructID  , {"Structid", "mq.uid.structid", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-		{ &hf_mq_uid_userid    , {"User ID.", "mq.uid.userid", FT_STRINGZ, BASE_NONE, NULL, 0x0, "UID structid", HFILL }},
-		{ &hf_mq_uid_password  , {"Password", "mq.uid.password", FT_STRINGZ, BASE_NONE, NULL, 0x0, "UID password", HFILL }},
-		{ &hf_mq_uid_longuserid, {"Long UID", "mq.uid.longuserid", FT_STRINGZ, BASE_NONE, NULL, 0x0, "UID long user id", HFILL }},
-
-		{ &hf_mq_sidlen        , {"SID Len.", "mq.uid.sidlen", FT_UINT8, BASE_DEC, NULL, 0x0, "Sid Len", HFILL }},
-		{ &hf_mq_sidtyp        , {"SIDType.", "mq.uid.sidtyp", FT_UINT8, BASE_DEC, VALS(GET_VALSV(sidtype)), 0x0, "Sid Typ", HFILL }},
-		{ &hf_mq_securityid    , {"SecurID.", "mq.uid.securityid", FT_BYTES, BASE_NONE, NULL, 0x0, "Security ID", HFILL }},
-
-		{ &hf_mq_conn_QMgr     , {"QMgr....", "mq.conn.qm", FT_STRINGZ, BASE_NONE, NULL, 0x0, "CONN queue manager", HFILL }},
-		{ &hf_mq_conn_appname  , {"ApplName", "mq.conn.appname", FT_STRINGZ, BASE_NONE, NULL, 0x0, "CONN application name", HFILL }},
-		{ &hf_mq_conn_apptype  , {"ApplType", "mq.conn.apptype", FT_INT32, BASE_DEC, VALS(GET_VALSV(mqat)), 0x0, "CONN application type", HFILL }},
-		{ &hf_mq_conn_acttoken , {"AccntTok", "mq.conn.acttoken", FT_BYTES, BASE_NONE, NULL, 0x0, "CONN accounting token", HFILL }},
-		{ &hf_mq_conn_version  , {"Version.", "mq.conn.version", FT_UINT32, BASE_DEC, VALS(mq_conn_version_vals), 0x0, "CONN version", HFILL }},
-		{ &hf_mq_conn_options  , {"Options.", "mq.conn.options", FT_UINT32, BASE_HEX, NULL, 0x0, "CONN options", HFILL }},
-
-		{ &hf_mq_fcno_StructID , {"StructId.", "mq.fcno.structid", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-		{ &hf_mq_fcno_unknown00, {"unknown00", "mq.fcno.unknown00", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "FCNO unknown00", HFILL }},
-		{ &hf_mq_fcno_unknown01, {"unknown01", "mq.fcno.unknown01", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "FCNO unknown01", HFILL }},
-		{ &hf_mq_fcno_unknown02, {"unknown02", "mq.fcno.unknown02", FT_BYTES, BASE_NONE, NULL, 0x0, "FCNO unknown02", HFILL }},
-		{ &hf_mq_fcno_msgid    , {"msgid....", "mq.fcno.msgid", FT_STRINGZ, BASE_NONE, NULL, 0x0, "FCNO Msg ID", HFILL }},
-		{ &hf_mq_fcno_mqmid    , {"MqmId....", "mq.fcno.mqmid", FT_STRINGZ, BASE_NONE, NULL, 0x0, "FCNO Mqm ID", HFILL }},
-
-		{ &hf_mq_inq_nbsel     , {"Selector count..", "mq.inq.nbsel", FT_UINT32, BASE_DEC, NULL, 0x0, "INQ Selector count", HFILL }},
-		{ &hf_mq_inq_nbint     , {"Integer count...", "mq.inq.nbint", FT_UINT32, BASE_DEC, NULL, 0x0, "INQ Integer count", HFILL }},
-		{ &hf_mq_inq_charlen   , {"Character length", "mq.inq.charlen", FT_UINT32, BASE_DEC, NULL, 0x0, "INQ Character length", HFILL }},
-		{ &hf_mq_inq_sel       , {"Selector........", "mq.inq.sel", FT_UINT32, BASE_DEC, VALS(GET_VALSV(selector)), 0x0, "INQ Selector", HFILL }},
-		{ &hf_mq_inq_intvalue  , {"Integer value...", "mq.inq.intvalue", FT_UINT32, BASE_DEC, NULL, 0x0, "INQ Integer value", HFILL }},
-		{ &hf_mq_inq_charvalues, {"Char values.....", "mq.inq.charvalues", FT_STRINGZ, BASE_NONE, NULL, 0x0, "INQ Character values", HFILL }},
-
-		{ &hf_mq_spi_verb      , {"SPI Verb", "mq.spi.verb", FT_UINT32, BASE_DEC, VALS(GET_VALSV(spi_verbs)), 0x0, NULL, HFILL }},
-		{ &hf_mq_spi_version   , {"Version", "mq.spi.version", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Version", HFILL }},
-		{ &hf_mq_spi_length    , {"Max reply size", "mq.spi.replength", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Max reply size", HFILL }},
-
-		{ &hf_mq_spi_base_StructID, {"SPI Structid", "mq.spib.structid", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-		{ &hf_mq_spi_base_version , {"Version", "mq.spib.version", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Base Version", HFILL }},
-		{ &hf_mq_spi_base_length  , {"Length", "mq.spib.length", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Base Length", HFILL }},
-
-		{ &hf_mq_spi_spqo_nbverb  , {"Number of verbs", "mq.spqo.nbverb", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Query Output Number of verbs", HFILL }},
-		{ &hf_mq_spi_spqo_verbid  , {"Verb", "mq.spqo.verb", FT_UINT32, BASE_DEC, VALS(GET_VALSV(spi_verbs)), 0x0, "SPI Query Output VerbId", HFILL }},
-		{ &hf_mq_spi_spqo_maxiover, {"Max InOut Version", "mq.spqo.maxiov", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Query Output Max InOut Version", HFILL }},
-		{ &hf_mq_spi_spqo_maxinver, {"Max In Version", "mq.spqo.maxiv", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Query Output Max In Version", HFILL }},
-		{ &hf_mq_spi_spqo_maxouver, {"Max Out Version", "mq.spqo.maxov", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Query Output Max Out Version", HFILL }},
-		{ &hf_mq_spi_spqo_flags   , {"Flags", "mq.spqo.flags", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Query Output flags", HFILL }},
-
-		{ &hf_mq_spi_spai_mode    , {"Mode", "mq.spai.mode", FT_UINT32, BASE_DEC, VALS(GET_VALSV(spi_activate)), 0x0, "SPI Activate Input mode", HFILL }},
-		{ &hf_mq_spi_spai_unknown1, {"Unknown1", "mq.spai.unknown1", FT_STRINGZ, BASE_NONE, NULL, 0x0, "SPI Activate Input unknown1", HFILL }},
-		{ &hf_mq_spi_spai_unknown2, {"Unknown2", "mq.spai.unknown2", FT_STRINGZ, BASE_NONE, NULL, 0x0, "SPI Activate Input unknown2", HFILL }},
-		{ &hf_mq_spi_spai_msgid   , {"Message Id", "mq.spai.msgid", FT_STRINGZ, BASE_NONE, NULL, 0x0, "SPI Activate Input message id", HFILL }},
-		{ &hf_mq_spi_spgi_batchsz , {"Batch size", "mq.spgi.batchsize", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Get Input batch size", HFILL }},
-		{ &hf_mq_spi_spgi_batchint, {"Batch interval", "mq.spgi.batchint", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Get Input batch interval", HFILL }},
-		{ &hf_mq_spi_spgi_maxmsgsz, {"Max message size", "mq.spgi.maxmsgsize", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Get Input max message size", HFILL }},
-
-		{ &hf_mq_spi_spgo_options , {"Options", "mq.spgo.options", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Get Output options", HFILL }},
-		{ &hf_mq_spi_spgo_size    , {"Size", "mq.spgo.size", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Get Output size", HFILL }},
-		{ &hf_mq_spi_opt_blank    , {"Blank padded", "mq.spi.options.blank", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_SPI_OPTIONS_BLANK_PADDED, "SPI Options blank padded", HFILL }},
-		{ &hf_mq_spi_opt_syncp    , {"Syncpoint", "mq.spi.options.sync", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_SPI_OPTIONS_SYNCPOINT, "SPI Options syncpoint", HFILL }},
-		{ &hf_mq_spi_opt_deferred , {"Deferred", "mq.spi.options.deferred", FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_SPI_OPTIONS_DEFERRED, "SPI Options deferred", HFILL }},
-
-		{ &hf_mq_put_length       , {"Data length", "mq.put.length", FT_UINT32, BASE_DEC, NULL, 0x0, "PUT Data length", HFILL }},
-
-		{ &hf_mq_close_options    , {"Options", "mq.close.options", FT_UINT32, BASE_HEX, NULL, 0x0, "CLOSE options", HFILL }},
-		{ &hf_mq_close_options_DELETE      , {"DELETE", "mq.close.options.Delete", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQCO_DELETE, "CLOSE options DELETE", HFILL }},
-		{ &hf_mq_close_options_DELETE_PURGE, {"DELETE_PURGE", "mq.close.options.DeletePurge", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQCO_DELETE_PURGE, "CLOSE options DELETE_PURGE", HFILL }},
-		{ &hf_mq_close_options_KEEP_SUB    , {"KEEPSUB", "mq.close.options.KeepSub", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQCO_KEEP_SUB, "CLOSE options KEEP_SUB", HFILL }},
-		{ &hf_mq_close_options_REMOVE_SUB  , {"REMOVE_SUB", "mq.close.options.RemoveSub", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQCO_REMOVE_SUB, "CLOSE options REMOVE_SUB", HFILL }},
-		{ &hf_mq_close_options_QUIESCE     , {"QUIESCE", "mq.close.options.Quiesce", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQCO_QUIESCE, "CLOSE options QUIESCE", HFILL }},
-
-		{ &hf_mq_open_options     , {"Options", "mq.open.options", FT_UINT32, BASE_HEX, NULL, 0x0, "OPEN options", HFILL }},
-		{ &hf_mq_open_options_INPUT_AS_Q_DEF , {"INPUT_AS_Q_DEF", "mq.open.options.InputAsQDef", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_INPUT_AS_Q_DEF, "OPEN options INPUT_AS_Q_DEF", HFILL }},
-		{ &hf_mq_open_options_INPUT_SHARED   , {"INPUT_SHARED", "mq.open.options.InputShared", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_INPUT_SHARED, "OPEN options INPUT_SHARED", HFILL }},
-		{ &hf_mq_open_options_INPUT_EXCLUSIVE, {"INPUT_EXCLUSIVE", "mq.open.options.InputExclusive", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_INPUT_EXCLUSIVE, "OPEN options INPUT_EXCLUSIVE", HFILL }},
-		{ &hf_mq_open_options_BROWSE         , {"BROWSE", "mq.open.options.Browse", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_BROWSE, "OPEN options BROWSE", HFILL }},
-		{ &hf_mq_open_options_OUTPUT         , {"OUTPUT", "mq.open.options.Output", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_OUTPUT, "OPEN options OUTPUT", HFILL }},
-		{ &hf_mq_open_options_INQUIRE        , {"INQUIRE", "mq.open.options.Inquire", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_INQUIRE, "OPEN options INQUIRE", HFILL }},
-		{ &hf_mq_open_options_SET            , {"SET", "mq.open.options.Set", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_SET, "OPEN options SET", HFILL }},
-		{ &hf_mq_open_options_SAVE_ALL_CTX   , {"SAVE_ALL_CONTEXT", "mq.open.options.SaveAllContext", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_SAVE_ALL_CONTEXT, "OPEN options SAVE_ALL_CONTEXT", HFILL }},
-		{ &hf_mq_open_options_PASS_IDENT_CTX , {"PASS_IDENTITY_CONTEXT", "mq.open.options.PassIdentityContext", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_PASS_IDENTITY_CONTEXT, "OPEN options PASS_IDENTITY_CONTEXT", HFILL }},
-		{ &hf_mq_open_options_PASS_ALL_CTX   , {"PASS_ALL_CONTEXT", "mq.open.options.PassAllContext", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_PASS_ALL_CONTEXT, "OPEN options PASS_ALL_CONTEXT", HFILL }},
-		{ &hf_mq_open_options_SET_IDENT_CTX  , {"SET_IDENTITY_CONTEXT", "mq.open.options.SetIdentityContext", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_SET_IDENTITY_CONTEXT, "OPEN options SET_IDENTITY_CONTEXT", HFILL }},
-		{ &hf_mq_open_options_SET_ALL_CONTEXT, {"SET_ALL_CONTEXT", "mq.open.options.SetAllContext", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_SET_ALL_CONTEXT, "OPEN options SET_ALL_CONTEXT", HFILL }},
-		{ &hf_mq_open_options_ALT_USER_AUTH  , {"ALTERNATE_USER_AUTHORITY", "mq.open.options.AlternateUserAuthority", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_ALTERNATE_USER_AUTHORITY, "OPEN options ALTERNATE_USER_AUTHORITY", HFILL }},
-		{ &hf_mq_open_options_FAIL_IF_QUIESC , {"FAIL_IF_QUIESCING", "mq.open.options.FailIfQuiescing", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_FAIL_IF_QUIESCING, "OPEN options FAIL_IF_QUIESCING", HFILL }},
-		{ &hf_mq_open_options_BIND_ON_OPEN   , {"BIND_ON_OPEN", "mq.open.options.BindOnOpen", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_BIND_ON_OPEN, "OPEN options BIND_ON_OPEN", HFILL }},
-		{ &hf_mq_open_options_BIND_NOT_FIXED , {"BIND_NOT_FIXED", "mq.open.options.BindNotFixed", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_BIND_NOT_FIXED, "OPEN options BIND_NOT_FIXED", HFILL }},
-		{ &hf_mq_open_options_RESOLVE_NAMES  , {"RESOLVE_NAMES", "mq.open.options.ResolveNames", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_RESOLVE_NAMES, "OPEN options RESOLVE_NAMES", HFILL }},
-		{ &hf_mq_open_options_CO_OP          , {"CO_OP", "mq.open.options.CoOp", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_CO_OP, "OPEN options CO_OP", HFILL }},
-		{ &hf_mq_open_options_RESOLVE_LOCAL_Q, {"RESOLVE_LOCAL_Q", "mq.open.options.ResolveLocalQueueOrTopic", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_RESOLVE_LOCAL_Q, "OPEN options RESOLVE_LOCAL_Q", HFILL }},
-		{ &hf_mq_open_options_NO_READ_AHEAD  , {"NO_READ_AHEAD", "mq.open.options.NoReadAhead", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_NO_READ_AHEAD, "OPEN options NO_READ_AHEAD", HFILL }},
-		{ &hf_mq_open_options_READ_AHEAD     , {"READ_AHEAD", "mq.open.options.ReadAhead", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_READ_AHEAD, "OPEN options READ_AHEAD", HFILL }},
-		{ &hf_mq_open_options_NO_MULTICAST   , {"NO_MULTICAST", "mq.open.options.NoMulticast", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_NO_MULTICAST, "OPEN options NO_MULTICAST", HFILL }},
-		{ &hf_mq_open_options_BIND_ON_GROUP  , {"BIND_ON_GROUP", "mq.open.options.BindOnGroup", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_BIND_ON_GROUP, "OPEN options BIND_ON_GROUP", HFILL }},
-
-		{ &hf_mq_fopa_StructID, {"StructId", "mq.fopa.structid", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-		{ &hf_mq_fopa_version , {"Version.", "mq.fopa.version", FT_UINT32, BASE_DEC, NULL, 0x0, "FOPA Version", HFILL }},
-		{ &hf_mq_fopa_length  , {"Length..", "mq.fopa.length", FT_UINT32, BASE_DEC, NULL, 0x0, "FOPA Length", HFILL }},
-		{ &hf_mq_fopa_unknown1, {"Unknown1", "mq.fopa.unknown1", FT_UINT32, BASE_HEX, NULL, 0x0, "FOPA unknown1", HFILL }},
-		{ &hf_mq_fopa_unknown2, {"Unknown2", "mq.fopa.unknown2", FT_UINT32, BASE_HEX, NULL, 0x0, "FOPA unknown2", HFILL }},
-		{ &hf_mq_fopa_unknown3, {"Unknown3", "mq.fopa.unknown3", FT_STRINGZ, BASE_NONE, NULL, 0x0, "FOPA unknown3", HFILL }},
-		{ &hf_mq_fopa_qprotect, {"qprotect", "mq.fopa.qprotect", FT_STRINGZ, BASE_NONE, NULL, 0x0, "FOPA queue protection", HFILL }},
-		{ &hf_mq_fopa_unknown4, {"Unknown4", "mq.fopa.unknown4", FT_UINT32, BASE_HEX, NULL, 0x0, "FOPA unknown4", HFILL }},
-		{ &hf_mq_fopa_unknown5, {"Unknown5", "mq.fopa.unknown5", FT_UINT32, BASE_HEX, NULL, 0x0, "FOPA unknown5", HFILL }},
-
-		{ &hf_mq_msgreq_version  , {"version..", "mq.msgreq.version"  , FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "MSGREQ version", HFILL }},
-		{ &hf_mq_msgreq_handle   , {"handle...", "mq.msgreq.handle"   , FT_UINT32, BASE_HEX, NULL, 0x0, "MSGREQ handle", HFILL }},
-		{ &hf_mq_msgreq_RecvBytes, {"RecvBytes", "mq.msgreq.unknown1" , FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "MSGREQ Received Bytes", HFILL }},
-		{ &hf_mq_msgreq_RqstBytes, {"RqstBytes", "mq.msgreq.rqstbytes", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "MSGREQ Requesed Bytes", HFILL }},
-		{ &hf_mq_msgreq_MaxMsgLen, {"MaxMsgLen", "mq.msgreq.maxmsglen", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "MSGREQ Maximum Msg Length", HFILL }},
-		{ &hf_mq_msgreq_WaitIntrv, {"WaitIntrv", "mq.msgreq.waitintrv", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "MSGREQ Wait Interval", HFILL }},
-		{ &hf_mq_msgreq_QueStatus, {"QueStatus", "mq.msgreq.questatus", FT_UINT32, BASE_HEX    , NULL, 0x0, "MSGREQ Queue Status", HFILL }},
-		{ &hf_mq_msgreq_RqstFlags, {"RqstFlags", "mq.msgreq.rqstflags", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "MSGREQ Request Flags", HFILL }},
-		{ &hf_mq_msgreq_GlbMsgIdx, {"GlbMsgIdx", "mq.msgreq.glbmsgidx", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "MSGREQ Global Message Index", HFILL }},
-		{ &hf_mq_msgreq_SelectIdx, {"SelectIdx", "mq.msgreq.selectIdx", FT_UINT16, BASE_HEX_DEC, NULL, 0x0, "MSGREQ Selection Index", HFILL }},
-		{ &hf_mq_msgreq_MQMDVers , {"MQMDVers.", "mq.msgreq.mqmdvers" , FT_UINT16, BASE_HEX_DEC, NULL, 0x0, "MSGREQ MQMD Version", HFILL }},
-		{ &hf_mq_msgreq_ccsid    , {"CCSID....", "mq.msgreq.ccsid"    , FT_INT32 , BASE_DEC | BASE_RANGE_STRING, RVALS(&GET_VALRV(ccsid)), 0x0, "MSGREQ ccsid", HFILL }},
-		{ &hf_mq_msgreq_encoding , {"Encoding.", "mq.msgreq.encoding" , FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "MSGREQ encoding", HFILL }},
-		{ &hf_mq_msgreq_MsgSeqNum, {"MsgSeqNum", "mq.msgreq.msgseqnum", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "MSGREQ Message Sequence Number", HFILL }},
-		{ &hf_mq_msgreq_offset   , {"Offset...", "mq.msgreq.offset"   , FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "MSGREQ Offset", HFILL }},
-		{ &hf_mq_msgreq_mtchMsgId, {"mtchMsgId", "mq.msgreq.mtchMsgId", FT_BYTES , BASE_NONE   , NULL, 0x0, "MSGREQ match MsgID", HFILL }},
-		{ &hf_mq_msgreq_mtchCorId, {"mtchCorID", "mq.msgreq.mtchcorid", FT_BYTES , BASE_NONE   , NULL, 0x0, "MSGREQ match Correlation Id", HFILL }},
-		{ &hf_mq_msgreq_mtchGrpid, {"mtchGrpID", "mq.msgreq.mtchgrpid", FT_BYTES , BASE_NONE   , NULL, 0x0, "MSGREQ match Group ID", HFILL }},
-		{ &hf_mq_msgreq_mtchMsgTk, {"mtchMsgTk", "mq.msgreq.mtchmsgtk", FT_BYTES , BASE_NONE   , NULL, 0x0, "MSGREQ match Message Token", HFILL }},
-
-		{ &hf_mq_msgasy_version  , {"version..", "mq.msgasy.version"  , FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "MSGASYNC version", HFILL }},
-		{ &hf_mq_msgasy_handle   , {"handle...", "mq.msgasy.handle"   , FT_UINT32, BASE_HEX, NULL, 0x0, "MSGASYNC handle", HFILL }},
-		{ &hf_mq_msgasy_MsgIndex , {"MsgIndex.", "mq.msgasy.msgindex" , FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "MSGASYNC Message Index", HFILL }},
-		{ &hf_mq_msgasy_GlbMsgIdx, {"GlbMsgIdx", "mq.msgasy.glbmsgidx", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "MSGASYNC Global Message Index", HFILL }},
-		{ &hf_mq_msgasy_SegLength, {"SegLength", "mq.msgasy.seglength", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "MSGASYNC Segment Length", HFILL }},
-		{ &hf_mq_msgasy_SegmIndex, {"SegmIndex", "mq.msgasy.segmindex", FT_UINT16, BASE_HEX_DEC, NULL, 0x0, "MSGASYNC Segment Index", HFILL }},
-		{ &hf_mq_msgasy_SeleIndex, {"SeleIndex", "mq.msgasy.seleindex", FT_UINT16, BASE_HEX_DEC, NULL, 0x0, "MSGASYNC Selection Index", HFILL }},
-		{ &hf_mq_msgasy_ReasonCod, {"ReasonCod", "mq.msgasy.reasoncod", FT_UINT32, BASE_HEX    , NULL, 0x0, "MSGASYNC Reason Code", HFILL }},
-		{ &hf_mq_msgasy_ActMsgLen, {"ActMsgLen", "mq.msgasy.actmsglen", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "MSGASYNC Actual Message Length", HFILL }},
-		{ &hf_mq_msgasy_TotMsgLen, {"TotMsgLen", "mq.msgasy.totmsglen", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "MSGASYNC Total Message Length", HFILL }},
-		{ &hf_mq_msgasy_MsgToken , {"MsgToken.", "mq.msgasy.msgtoken" , FT_BYTES , BASE_NONE   , NULL, 0x0, "MSGASYNC Mesasage Token", HFILL }},
-		{ &hf_mq_msgasy_Status   , {"status...", "mq.msgasy.status"   , FT_UINT16, BASE_HEX    , NULL, 0x0, "MSGASYNC Status", HFILL }},
-		{ &hf_mq_msgasy_resolQNLn, {"resolQNLn", "mq.msgasy.resolqnln", FT_UINT8 , BASE_DEC    , NULL, 0x0, "MSGASYNC Resolved Queue Name Length", HFILL }},
-		{ &hf_mq_msgasy_resolQNme, {"resolQNme", "mq.msgasy.resolqnme", FT_STRINGZ, BASE_NONE  , NULL, 0x0, "MSGASYNC Resolved Queue Name", HFILL }},
-		{ &hf_mq_msgasy_padding  , {"Padding..", "mq.msgasy.padding"  , FT_BYTES , BASE_NONE   , NULL, 0x0, "MSGASYNC Padding", HFILL }},
-
-		{ &hf_mq_notif_vers     , {"version.", "mq.notif.vers"  , FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "NOTIFICATION version", HFILL }},
-		{ &hf_mq_notif_handle   , {"handle..", "mq.notif.handle", FT_UINT32, BASE_HEX    , NULL, 0x0, "NOTIFICATION handle", HFILL }},
-		{ &hf_mq_notif_code     , {"code....", "mq.notif.code"  , FT_UINT32, BASE_HEX_DEC, VALS(GET_VALSV(notifcode)), 0x0, "NOTIFICATION code", HFILL }},
-		{ &hf_mq_notif_value    , {"value...", "mq.notif.value" , FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "NOTIFICATION MQRC", HFILL }},
-
-		{ &hf_mq_ping_length    , {"Length", "mq.ping.length", FT_UINT32, BASE_DEC, NULL, 0x0, "PING length", HFILL }},
-		{ &hf_mq_ping_buffer    , {"Buffer", "mq.ping.buffer", FT_BYTES, BASE_NONE, NULL, 0x0, "PING buffer", HFILL }},
-
-		{ &hf_mq_reset_length   , {"Length", "mq.reset.length", FT_UINT32, BASE_DEC, NULL, 0x0, "RESET length", HFILL }},
-		{ &hf_mq_reset_seqnum   , {"SeqNum", "mq.reset.seqnum", FT_UINT32, BASE_DEC, NULL, 0x0, "RESET sequence number", HFILL }},
-
-		{ &hf_mq_status_length  , {"Length", "mq.status.length", FT_UINT32, BASE_DEC, NULL, 0x0, "STATUS length", HFILL }},
-		{ &hf_mq_status_code    , {"Code..", "mq.status.code"  , FT_UINT32, BASE_DEC, VALS(GET_VALSV(status)), 0x0, "STATUS code", HFILL }},
-		{ &hf_mq_status_value   , {"Value.", "mq.status.value" , FT_UINT32, BASE_DEC, NULL, 0x0, "STATUS value", HFILL }},
-
-		{ &hf_mq_od_StructID    , {"StructID.........", "mq.od.structid", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-		{ &hf_mq_od_version     , {"version..........", "mq.od.version", FT_UINT32, BASE_DEC, NULL, 0x0, "OD version", HFILL }},
-		{ &hf_mq_od_objecttype  , {"ObjType..........", "mq.od.objtype", FT_UINT32, BASE_DEC, VALS(GET_VALSV(objtype)), 0x0, "OD object type", HFILL }},
-		{ &hf_mq_od_objectname  , {"ObjName..........", "mq.od.objname", FT_STRINGZ, BASE_NONE, NULL, 0x0, "OD object name", HFILL }},
-		{ &hf_mq_od_objqmgrname , {"ObjQMgr..........", "mq.od.objqmgrname", FT_STRINGZ, BASE_NONE, NULL, 0x0, "OD object queue manager name", HFILL }},
-		{ &hf_mq_od_dynqname    , {"DynQName.........", "mq.od.dynqname", FT_STRINGZ, BASE_NONE, NULL, 0x0, "OD dynamic queue name", HFILL }},
-		{ &hf_mq_od_altuserid   , {"AltUserID........", "mq.od.altuserid", FT_STRINGZ, BASE_NONE, NULL, 0x0, "OD alternate userid", HFILL }},
-		{ &hf_mq_od_recspresent , {"NbrRecord........", "mq.od.nbrrec", FT_UINT32, BASE_DEC, NULL, 0x0, "OD number of records", HFILL }},
-		{ &hf_mq_od_knowndstcnt , {"Known Dest Count.", "mq.od.kdestcount", FT_UINT32, BASE_DEC, NULL, 0x0, "OD known destination count", HFILL }},
-		{ &hf_mq_od_unknowdstcnt, {"Unknown Dest Cnt.", "mq.od.udestcount", FT_UINT32, BASE_DEC, NULL, 0x0, "OD unknown destination count", HFILL }},
-		{ &hf_mq_od_invaldstcnt , {"Invalid Dest Cnt.", "mq.od.idestcount", FT_UINT32, BASE_DEC, NULL, 0x0, "OD invalid destination count", HFILL }},
-		{ &hf_mq_od_objrecofs   , {"Offset of 1st OR.", "mq.od.offsetor", FT_UINT32, BASE_DEC, NULL, 0x0, "OD offset of first OR", HFILL }},
-		{ &hf_mq_od_resprecofs  , {"Offset of 1st RR.", "mq.od.offsetrr", FT_UINT32, BASE_DEC, NULL, 0x0, "OD offset of first RR", HFILL }},
-		{ &hf_mq_od_objrecptr   , {"Addr   of 1st OR.", "mq.od.addror", FT_UINT32, BASE_HEX, NULL, 0x0, "OD address of first OR", HFILL }},
-		{ &hf_mq_od_resprecptr  , {"Addr   of 1st RR.", "mq.od.addrrr", FT_UINT32, BASE_HEX, NULL, 0x0, "OD address of first RR", HFILL }},
-		{ &hf_mq_od_altsecurid  , {"Alt security id..", "mq.od.altsecid", FT_STRINGZ, BASE_NONE, NULL, 0x0, "OD alternate security id", HFILL }},
-		{ &hf_mq_od_resolvqname , {"Resolved Q Name..", "mq.od.resolvq", FT_STRINGZ, BASE_NONE, NULL, 0x0, "OD resolved queue name", HFILL }},
-		{ &hf_mq_od_resolvqmgrnm, {"Resolved QMgrName", "mq.od.resolvqmgr", FT_STRINGZ, BASE_NONE, NULL, 0x0, "OD resolved queue manager name", HFILL }},
-		{ &hf_mq_od_resolvobjtyp, {"Resolv Obj Type..", "mq.od.resolvedobjtype", FT_UINT32, BASE_DEC, VALS(GET_VALSV(objtype)), 0x0, "OD resolved object type", HFILL }},
-
-		{ &hf_mq_or_objname     , {"Object name...", "mq.or.objname", FT_STRINGZ, BASE_NONE, NULL, 0x0, "OR object name", HFILL }},
-		{ &hf_mq_or_objqmgrname , {"Object QMgr Nm", "mq.or.objqmgrname", FT_STRINGZ, BASE_NONE, NULL, 0x0, "OR object queue manager name", HFILL }},
-
-		{ &hf_mq_rr_compcode    , {"Comp Code", "mq.rr.completioncode", FT_UINT32, BASE_DEC, NULL, 0x0, "OR completion code", HFILL }},
-		{ &hf_mq_rr_reascode    , {"Reas Code", "mq.rr.reasoncode", FT_UINT32, BASE_DEC, NULL, 0x0, "OR reason code", HFILL }},
-
-		{ &hf_mq_pmr_msgid      , {"Message Id", "mq.pmr.msgid", FT_BYTES, BASE_NONE, NULL, 0x0, "PMR Message Id", HFILL }},
-		{ &hf_mq_pmr_correlid   , {"Correlation Id", "mq.pmr.correlid", FT_BYTES, BASE_NONE, NULL, 0x0, "PMR Correlation Id", HFILL }},
-		{ &hf_mq_pmr_groupid    , {"GroupId", "mq.pmr.groupid", FT_BYTES, BASE_NONE, NULL, 0x0, "PMR GroupId", HFILL }},
-		{ &hf_mq_pmr_feedback   , {"Feedback", "mq.pmr.feedback", FT_UINT32, BASE_DEC, NULL, 0x0, "PMR Feedback", HFILL }},
-		{ &hf_mq_pmr_acttoken   , {"Accounting token", "mq.pmr.acttoken", FT_BYTES, BASE_NONE, NULL, 0x0, "PMR accounting token", HFILL }},
-
-		{ &hf_mq_md_StructID    , {"StructID.", "mq.md.structid", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-		{ &hf_mq_md_version     , {"Version..", "mq.md.version", FT_UINT32, BASE_DEC, NULL, 0x0, "MD version", HFILL }},
-		{ &hf_mq_md_report      , {"Report...", "mq.md.report", FT_UINT32, BASE_DEC, NULL, 0x0, "MD report", HFILL }},
-		{ &hf_mq_md_msgtype     , {"Msg Type.", "mq.md.msgtype", FT_UINT32, BASE_DEC, NULL, 0x0, "MD message type", HFILL }},
-		{ &hf_mq_md_expiry      , {"Expiry  .", "mq.md.expiry", FT_INT32, BASE_DEC, NULL, 0x0, "MD expiry", HFILL }},
-		{ &hf_mq_md_feedback    , {"Feedback.", "mq.md.feedback", FT_UINT32, BASE_DEC, NULL, 0x0, "MD feedback", HFILL }},
-		{ &hf_mq_md_encoding    , {"Encoding.", "mq.md.encoding", FT_UINT32, BASE_DEC, NULL, 0x0, "MD encoding", HFILL }},
-		{ &hf_mq_md_ccsid       , {"CCSID....", "mq.md.ccsid", FT_INT32, BASE_DEC | BASE_RANGE_STRING, RVALS(&GET_VALRV(ccsid)), 0x0, "MD character set", HFILL }},
-		{ &hf_mq_md_format      , {"Format...", "mq.md.format", FT_STRINGZ, BASE_NONE, NULL, 0x0, "MD format", HFILL }},
-		{ &hf_mq_md_priority    , {"Priority.", "mq.md.priority", FT_INT32, BASE_DEC, NULL, 0x0, "MD priority", HFILL }},
-		{ &hf_mq_md_persistence , {"Persist..", "mq.md.persistence", FT_UINT32, BASE_DEC, NULL, 0x0, "MD persistence", HFILL }},
-		{ &hf_mq_md_msgid       , {"Msg ID...", "mq.md.msgid", FT_BYTES, BASE_NONE, NULL, 0x0, "MD Message Id", HFILL }},
-		{ &hf_mq_md_correlid    , {"CorrelID.", "mq.md.correlid", FT_BYTES, BASE_NONE, NULL, 0x0, "MD Correlation Id", HFILL }},
-		{ &hf_mq_md_backoutcnt  , {"BackoCnt.", "mq.md.backount", FT_UINT32, BASE_DEC, NULL, 0x0, "MD Backout count", HFILL }},
-		{ &hf_mq_md_replytoq    , {"ReplyToQ.", "mq.md.replytoq", FT_STRINGZ, BASE_NONE, NULL, 0x0, "MD ReplyTo queue", HFILL }},
-		{ &hf_mq_md_replytoqmgr , {"RepToQMgr", "mq.md.replytoqmgr", FT_STRINGZ, BASE_NONE, NULL, 0x0, "MD ReplyTo queue manager", HFILL }},
-		{ &hf_mq_md_userid      , {"UserId...", "mq.md.userid", FT_STRINGZ, BASE_NONE, NULL, 0x0, "MD UserId", HFILL }},
-		{ &hf_mq_md_acttoken    , {"AccntTok.", "mq.md.acttoken", FT_BYTES, BASE_NONE, NULL, 0x0, "MD accounting token", HFILL }},
-		{ &hf_mq_md_appliddata  , {"AppIdData", "mq.md.appldata", FT_STRINGZ, BASE_NONE, NULL, 0x0, "MD Put applicationId data", HFILL }},
-		{ &hf_mq_md_putappltype , {"PutAppTyp", "mq.md.appltype", FT_INT32, BASE_DEC, VALS(GET_VALSV(mqat)), 0x0, "MD Put application type", HFILL }},
-		{ &hf_mq_md_putapplname , {"PutAppNme", "mq.md.applname", FT_STRINGZ, BASE_NONE, NULL, 0x0, "MD Put application name", HFILL }},
-		{ &hf_mq_md_putdate     , {"PutDatGMT", "mq.md.date", FT_STRINGZ, BASE_NONE, NULL, 0x0, "MD Put date", HFILL }},
-		{ &hf_mq_md_puttime     , {"PutTimGMT", "mq.md.time", FT_STRINGZ, BASE_NONE, NULL, 0x0, "MD Put time", HFILL }},
-		{ &hf_mq_md_apporigdata , {"AppOriDat", "mq.md.origdata", FT_STRINGZ, BASE_NONE, NULL, 0x0, "MD Application original data", HFILL }},
-		{ &hf_mq_md_groupid     , {"GroupId..", "mq.md.groupid", FT_BYTES, BASE_NONE, NULL, 0x0, "MD GroupId", HFILL }},
-		{ &hf_mq_md_msgseqnumber, {"MsgSeqNum", "mq.md.msgseqnumber", FT_UINT32, BASE_DEC, NULL, 0x0, "MD Message sequence number", HFILL }},
-		{ &hf_mq_md_offset      , {"Offset...", "mq.md.offset", FT_UINT32, BASE_DEC, NULL, 0x0, "MD Offset", HFILL }},
-		{ &hf_mq_md_msgflags    , {"Msg flags", "mq.md.msgflags", FT_UINT32, BASE_HEX, NULL, 0x0, "MD Message flags", HFILL }},
-		{ &hf_mq_md_origlen     , {"Orig len.", "mq.md.origlength", FT_INT32, BASE_DEC, NULL, 0x0, "MD Original length", HFILL }},
-
-		{ &hf_mq_dlh_StructID   , {"StructID.", "mq.dlh.structid", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-		{ &hf_mq_dlh_version    , {"Version..", "mq.dlh.version", FT_UINT32, BASE_DEC, NULL, 0x0, "DLH version", HFILL }},
-		{ &hf_mq_dlh_reason     , {"Reason...", "mq.dlh.reason", FT_UINT32, BASE_DEC, NULL, 0x0, "DLH reason", HFILL }},
-		{ &hf_mq_dlh_destq      , {"Dest Q...", "mq.dlh.destq", FT_STRINGZ, BASE_NONE, NULL, 0x0, "DLH destination queue", HFILL }},
-		{ &hf_mq_dlh_destqmgr   , {"DestQMgr.", "mq.dlh.destqmgr", FT_STRINGZ, BASE_NONE, NULL, 0x0, "DLH destination queue manager", HFILL }},
-		{ &hf_mq_dlh_encoding   , {"Encoding.", "mq.dlh.encoding", FT_UINT32, BASE_DEC, NULL, 0x0, "DLH encoding", HFILL }},
-		{ &hf_mq_dlh_ccsid      , {"CCSID....", "mq.dlh.ccsid", FT_INT32, BASE_DEC | BASE_RANGE_STRING, RVALS(&GET_VALRV(ccsid)), 0x0, "DLH character set", HFILL }},
-		{ &hf_mq_dlh_format     , {"Format...", "mq.dlh.format", FT_STRINGZ, BASE_NONE, NULL, 0x0, "DLH format", HFILL }},
-		{ &hf_mq_dlh_putappltype, {"PutAppTyp", "mq.dlh.putappltype", FT_INT32, BASE_DEC, VALS(GET_VALSV(mqat)), 0x0, "DLH put application type", HFILL }},
-		{ &hf_mq_dlh_putapplname, {"PutAppNme", "mq.dlh.putapplname", FT_STRINGZ, BASE_NONE, NULL, 0x0, "DLH put application name", HFILL }},
-		{ &hf_mq_dlh_putdate    , {"PutDatGMT", "mq.dlh.putdate", FT_STRINGZ, BASE_NONE, NULL, 0x0, "DLH put date", HFILL }},
-		{ &hf_mq_dlh_puttime    , {"PutTimGMT", "mq.dlh.puttime", FT_STRINGZ, BASE_NONE, NULL, 0x0, "DLH put time", HFILL }},
-		{ &hf_mq_dh_putmsgrecfld, {"Flags PMR", "mq.dh.flagspmr", FT_UINT32, BASE_DEC, NULL, 0x0, "DH flags PMR", HFILL }},
-		{ &hf_mq_dh_recspresent , {"NumOfRecs", "mq.dh.nbrrec", FT_UINT32, BASE_DEC, NULL, 0x0, "DH number of records", HFILL }},
-		{ &hf_mq_dh_objrecofs   , {"Ofs1stOR.", "mq.dh.offsetor", FT_UINT32, BASE_DEC, NULL, 0x0, "DH offset of first OR", HFILL }},
-		{ &hf_mq_dh_putmsgrecofs, {"Ofs1stPMR", "mq.dh.offsetpmr", FT_UINT32, BASE_DEC, NULL, 0x0, "DH offset of first PMR", HFILL }},
-
-		{ &hf_mq_gmo_StructID   , {"StructID.", "mq.gmo.structid", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-		{ &hf_mq_gmo_version    , {"Version..", "mq.gmo.version", FT_UINT32, BASE_DEC, NULL, 0x0, "GMO version", HFILL }},
-		{ &hf_mq_gmo_options    , {"GetMsgOpt", "mq.gmo.getmsgopt", FT_UINT32, BASE_HEX, NULL, 0x0, "GMO Get Message Options", HFILL }},
-
-		{ &hf_mq_gmo_options_PROPERTIES_COMPATIBILITY, {"PROPERTIES_COMPATIBILITY", "mq.gmo.options.PROPERTIES_COMPATIBILITY", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_PROPERTIES_COMPATIBILITY, "GMO options PROPERTIES_COMPATIBILITY", HFILL }},
-		{ &hf_mq_gmo_options_PROPERTIES_IN_HANDLE    , {"PROPERTIES_IN_HANDLE", "mq.gmo.options.PROPERTIES_IN_HANDLE", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_PROPERTIES_IN_HANDLE , "GMO options PROPERTIES_IN_HANDLE", HFILL }},
-		{ &hf_mq_gmo_options_NO_PROPERTIES           , {"NO_PROPERTIES", "mq.gmo.options.NO_PROPERTIES", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_NO_PROPERTIES , "GMO options NO_PROPERTIES", HFILL }},
-		{ &hf_mq_gmo_options_PROPERTIES_FORCE_MQRFH2 , {"PROPERTIES_FORCE_MQRFH2", "mq.gmo.options.PROPERTIES_FORCE_MQRFH2", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_PROPERTIES_FORCE_MQRFH2 , "GMO options PROPERTIES_FORCE_MQRFH2", HFILL }},
-		{ &hf_mq_gmo_options_UNMARKED_BROWSE_MSG     , {"UNMARKED_BROWSE_MSG", "mq.gmo.options.UNMARKED_BROWSE_MSG", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_UNMARKED_BROWSE_MSG , "GMO options UNMARKED_BROWSE_MSG", HFILL }},
-		{ &hf_mq_gmo_options_UNMARK_BROWSE_HANDLE    , {"UNMARK_BROWSE_HANDLE", "mq.gmo.options.UNMARK_BROWSE_HANDLE", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_UNMARK_BROWSE_HANDLE , "GMO options UNMARK_BROWSE_HANDLE", HFILL }},
-		{ &hf_mq_gmo_options_UNMARK_BROWSE_CO_OP     , {"UNMARK_BROWSE_CO_OP", "mq.gmo.options.UNMARK_BROWSE_CO_OP", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_UNMARK_BROWSE_CO_OP , "GMO options UNMARK_BROWSE_CO_OP", HFILL }},
-		{ &hf_mq_gmo_options_MARK_BROWSE_CO_OP       , {"MARK_BROWSE_CO_OP", "mq.gmo.options.MARK_BROWSE_CO_OP", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_MARK_BROWSE_CO_OP , "GMO options MARK_BROWSE_CO_OP", HFILL }},
-		{ &hf_mq_gmo_options_MARK_BROWSE_HANDLE      , {"MARK_BROWSE_HANDLE", "mq.gmo.options.MARK_BROWSE_HANDLE", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_MARK_BROWSE_HANDLE , "GMO options MARK_BROWSE_HANDLE", HFILL }},
-		{ &hf_mq_gmo_options_ALL_SEGMENTS_AVAILABLE  , {"ALL_SEGMENTS_AVAILABLE", "mq.gmo.options.ALL_SEGMENTS_AVAILABLE", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_ALL_SEGMENTS_AVAILABLE , "GMO options ALL_SEGMENTS_AVAILABLE", HFILL }},
-		{ &hf_mq_gmo_options_ALL_MSGS_AVAILABLE      , {"ALL_MSGS_AVAILABLE", "mq.gmo.options.ALL_MSGS_AVAILABLE", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_ALL_MSGS_AVAILABLE , "GMO options ALL_MSGS_AVAILABLE", HFILL }},
-		{ &hf_mq_gmo_options_COMPLETE_MSG            , {"COMPLETE_MSG", "mq.gmo.options.COMPLETE_MSG", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_COMPLETE_MSG , "GMO options COMPLETE_MSG", HFILL }},
-		{ &hf_mq_gmo_options_LOGICAL_ORDER           , {"LOGICAL_ORDER", "mq.gmo.options.LOGICAL_ORDER", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_LOGICAL_ORDER , "GMO options LOGICAL_ORDER", HFILL }},
-		{ &hf_mq_gmo_options_CONVERT                 , {"CONVERT", "mq.gmo.options.CONVERT", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_CONVERT , "GMO options CONVERT", HFILL }},
-		{ &hf_mq_gmo_options_FAIL_IF_QUIESCING       , {"FAIL_IF_QUIESCING", "mq.gmo.options.FAIL_IF_QUIESCING", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_FAIL_IF_QUIESCING , "GMO options FAIL_IF_QUIESCING", HFILL }},
-		{ &hf_mq_gmo_options_SYNCPOINT_IF_PERSISTENT , {"SYNCPOINT_IF_PERSISTENT", "mq.gmo.options.SYNCPOINT_IF_PERSISTENT", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_SYNCPOINT_IF_PERSISTENT , "GMO options SYNCPOINT_IF_PERSISTENT", HFILL }},
-		{ &hf_mq_gmo_options_BROWSE_MSG_UNDER_CURSOR , {"BROWSE_MSG_UNDER_CURSOR", "mq.gmo.options.BROWSE_MSG_UNDER_CURSOR", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_BROWSE_MSG_UNDER_CURSOR , "GMO options BROWSE_MSG_UNDER_CURSOR", HFILL }},
-		{ &hf_mq_gmo_options_UNLOCK                  , {"UNLOCK", "mq.gmo.options.UNLOCK", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_UNLOCK , "GMO options UNLOCK", HFILL }},
-		{ &hf_mq_gmo_options_LOCK                    , {"LOCK", "mq.gmo.options.LOCK", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_LOCK , "GMO options LOCK", HFILL }},
-		{ &hf_mq_gmo_options_MSG_UNDER_CURSOR        , {"MSG_UNDER_CURSOR", "mq.gmo.options.MSG_UNDER_CURSOR", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_MSG_UNDER_CURSOR , "GMO options MSG_UNDER_CURSOR", HFILL }},
-		{ &hf_mq_gmo_options_MARK_SKIP_BACKOUT       , {"MARK_SKIP_BACKOUT", "mq.gmo.options.MARK_SKIP_BACKOUT", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_MARK_SKIP_BACKOUT , "GMO options MARK_SKIP_BACKOUT", HFILL }},
-		{ &hf_mq_gmo_options_ACCEPT_TRUNCATED_MSG    , {"ACCEPT_TRUNCATED_MSG", "mq.gmo.options.ACCEPT_TRUNCATED_MSG", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_ACCEPT_TRUNCATED_MSG , "GMO options ACCEPT_TRUNCATED_MSG", HFILL }},
-		{ &hf_mq_gmo_options_BROWSE_NEXT             , {"BROWSE_NEXT", "mq.gmo.options.BROWSE_NEXT", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_BROWSE_NEXT , "GMO options BROWSE_NEXT", HFILL }},
-		{ &hf_mq_gmo_options_BROWSE_FIRST            , {"BROWSE_FIRST", "mq.gmo.options.BROWSE_FIRST", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_BROWSE_FIRST , "GMO options BROWSE_FIRST", HFILL }},
-		{ &hf_mq_gmo_options_SET_SIGNAL              , {"SET_SIGNAL", "mq.gmo.options.SET_SIGNAL", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_SET_SIGNAL , "GMO options SET_SIGNAL", HFILL }},
-		{ &hf_mq_gmo_options_NO_SYNCPOINT            , {"NO_SYNCPOINT", "mq.gmo.options.NO_SYNCPOINT", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_NO_SYNCPOINT , "GMO options NO_SYNCPOINT", HFILL }},
-		{ &hf_mq_gmo_options_SYNCPOINT               , {"SYNCPOINT", "mq.gmo.options.SYNCPOINT", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_SYNCPOINT , "GMO options SYNCPOINT", HFILL }},
-		{ &hf_mq_gmo_options_WAIT                    , {"WAIT", "mq.gmo.options.WAIT", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_WAIT , "GMO options WAIT", HFILL }},
-
-		{ &hf_mq_gmo_waitinterval, {"WaitIntv.", "mq.gmo.waitint", FT_INT32, BASE_DEC, NULL, 0x0, "GMO wait interval", HFILL }},
-		{ &hf_mq_gmo_signal1     , {"Signal 1.", "mq.gmo.signal1", FT_UINT32, BASE_HEX, NULL, 0x0, "GMO signal 1", HFILL }},
-		{ &hf_mq_gmo_signal2     , {"Signal 2.", "mq.gmo.signal2", FT_UINT32, BASE_HEX, NULL, 0x0, "GMO signal 2", HFILL }},
-		{ &hf_mq_gmo_resolvqname , {"ResQName.", "mq.gmo.resolvq", FT_STRINGZ, BASE_NONE, NULL, 0x0, "GMO resolved queue name", HFILL }},
-		{ &hf_mq_gmo_matchoptions, {"MatchOpt.", "mq.gmo.matchopt", FT_UINT32, BASE_HEX, NULL, 0x0, "GMO match options", HFILL }},
-
-		{ &hf_mq_gmo_matchoptions_MATCH_MSG_TOKEN     , {"MATCH_MSG_TOKEN", "mq.gmo.matchoptions.MATCH_MSG_TOKEN", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQMO_MATCH_MSG_TOKEN , "GMO matchoptions MATCH_MSG_TOKEN", HFILL }},
-		{ &hf_mq_gmo_matchoptions_MATCH_OFFSET        , {"MATCH_OFFSET", "mq.gmo.matchoptions.MATCH_OFFSET", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQMO_MATCH_OFFSET , "GMO matchoptions MATCH_OFFSET", HFILL }},
-		{ &hf_mq_gmo_matchoptions_MATCH_MSG_SEQ_NUMBER, {"MATCH_MSG_SEQ_NUMBER", "mq.gmo.matchoptions.MATCH_MSG_SEQ_NUMBER", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQMO_MATCH_MSG_SEQ_NUMBER, "GMO matchoptions MATCH_MSG_SEQ_NUMBER", HFILL }},
-		{ &hf_mq_gmo_matchoptions_MATCH_GROUP_ID      , {"MATCH_GROUP_ID", "mq.gmo.matchoptions.MATCH_GROUP_ID", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQMO_MATCH_GROUP_ID , "GMO matchoptions MATCH_GROUP_ID", HFILL }},
-		{ &hf_mq_gmo_matchoptions_MATCH_CORREL_ID     , {"MATCH_CORREL_ID", "mq.gmo.matchoptions.MATCH_CORREL_ID", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQMO_MATCH_CORREL_ID , "GMO matchoptions MATCH_CORREL_ID", HFILL }},
-		{ &hf_mq_gmo_matchoptions_MATCH_MSG_ID        , {"MATCH_MSG_ID", "mq.gmo.matchoptions.MATCH_MSG_ID", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQMO_MATCH_MSG_ID , "GMO matchoptions MATCH_MSG_ID", HFILL }},
-
-		{ &hf_mq_gmo_groupstatus , {"GrpStatus", "mq.gmo.grpstat", FT_UINT8, BASE_HEX, NULL, 0x0, "GMO group status", HFILL }},
-		{ &hf_mq_gmo_segmstatus  , {"SegStatus", "mq.gmo.sgmtstat", FT_UINT8, BASE_HEX, NULL, 0x0, "GMO segment status", HFILL }},
-		{ &hf_mq_gmo_segmentation, {"Segmentat", "mq.gmo.segmentation", FT_UINT8, BASE_HEX, NULL, 0x0, "GMO segmentation", HFILL }},
-		{ &hf_mq_gmo_reserved    , {"Reserved.", "mq.gmo.reserved", FT_UINT8, BASE_HEX, NULL, 0x0, "GMO reserved", HFILL }},
-		{ &hf_mq_gmo_msgtoken    , {"MsgToken.", "mq.gmo.msgtoken", FT_BYTES, BASE_NONE, NULL, 0x0, "GMO message token", HFILL }},
-		{ &hf_mq_gmo_returnedlen , {"RtnLength", "mq.gmo.retlen", FT_INT32, BASE_DEC, NULL, 0x0, "GMO returned length", HFILL }},
-
-		{ &hf_mq_lpoo_StructID      , {"StructID......", "mq.lpoo.structid", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-		{ &hf_mq_lpoo_version       , {"Version.......", "mq.lpoo.version", FT_UINT32, BASE_DEC, NULL, 0x0, "LPOO version", HFILL }},
-		{ &hf_mq_lpoo_options       , {"Options.......", "mq.lpoo.options", FT_UINT32, BASE_HEX, NULL, 0x0, "LPOO options", HFILL }},
-		{ &hf_mq_lpoo_lpiopts       , {"LpiOpts.......", "mq.lpoo.lpioopts", FT_UINT32, BASE_HEX, NULL, 0x0, "LPOO Lpi Options", HFILL }},
-
-		{ &hf_mq_lpoo_lpiopts_SAVE_USER_CTXT    , {"SAVE_USER_CTXT", "mq.lpoo.opts.SAVE_USER_CTXT", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_LPOO_SAVE_USER_CTXT, "LPOO options SAVE_USER_CTXT", HFILL }},
-		{ &hf_mq_lpoo_lpiopts_SAVE_ORIGIN_CTXT  , {"SAVE_ORIGIN_CTXT", "mq.lpoo.opts.SAVE_ORIGIN_CTXT", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_LPOO_SAVE_ORIGIN_CTXT, "LPOO options SAVE_ORIGIN_CTXT", HFILL }},
-		{ &hf_mq_lpoo_lpiopts_SAVE_IDENTITY_CTXT, {"SAVE_IDENTITY_CTXT", "mq.lpoo.opts.SAVE_IDENTITY_CTXT", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_LPOO_SAVE_IDENTITY_CTXT, "LPOO options SAVE_IDENTITY_CTXT", HFILL }},
-
-		{ &hf_mq_lpoo_defpersist    , {"DefPersitence.", "mq.lpoo.defpersist", FT_UINT32, BASE_HEX, NULL, 0x0, "LPOO Default Persitence", HFILL }},
-		{ &hf_mq_lpoo_defputresptype, {"DefPutRespType", "mq.lpoo.defputresptype", FT_UINT32, BASE_HEX, NULL, 0x0, "LPOO Default Put Response Type", HFILL }},
-		{ &hf_mq_lpoo_defreadahead  , {"DefReadAHead..", "mq.lpoo.defreadahead", FT_UINT32, BASE_HEX, NULL, 0x0, "LPOO Default Read AHead", HFILL }},
-
-		{ &hf_mq_lpoo_qprotect      , {"qprotect......", "mq.lpoo.qprotect", FT_STRINGZ, BASE_NONE, NULL, 0x0, "LPOO queue protection", HFILL }},
-		{ &hf_mq_lpoo_unknown6      , {"Unknown6......", "mq.lpoo.unknown6", FT_UINT32, BASE_HEX, NULL, 0x0, "LPOO unknown6", HFILL }},
-		/*{ &hf_mq_lpoo_unknown7      , {"Unknown7......", "mq.lpoo.unknown7", FT_UINT16, BASE_HEX, NULL, 0x0, "LPOO unknown7", HFILL }},*/
-		{ &hf_mq_lpoo_xtradata      , {"ExtraData.....", "mq.lpoo.extradata", FT_UINT32, BASE_DEC, NULL, 0x0, "LPOO Extra Data", HFILL }},
-
-		{ &hf_mq_pmo_StructID    , {"StructID.", "mq.pmo.structid", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-		{ &hf_mq_pmo_version     , {"Version..", "mq.pmo.version", FT_UINT32, BASE_DEC, NULL, 0x0, "PMO version", HFILL }},
-		{ &hf_mq_pmo_options     , {"Options..", "mq.pmo.options", FT_UINT32, BASE_HEX, NULL, 0x0, "PMO options", HFILL }},
-		{ &hf_mq_pmo_options_NOT_OWN_SUBS            , {"NOT_OWN_SUBS", "mq.pmo.options.NOT_OWN_SUBS", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_NOT_OWN_SUBS , "PMO options NOT_OWN_SUBS", HFILL }},
-		{ &hf_mq_pmo_options_SUPPRESS_REPLYTO        , {"SUPPRESS_REPLYTO", "mq.pmo.options.SUPPRESS_REPLYTO", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_SUPPRESS_REPLYTO , "PMO options SUPPRESS_REPLYTO", HFILL }},
-		{ &hf_mq_pmo_options_SCOPE_QMGR              , {"SCOPE_QMGR", "mq.pmo.options.SCOPE_QMGR", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_SCOPE_QMGR , "PMO options SCOPE_QMGR", HFILL }},
-		{ &hf_mq_pmo_options_MD_FOR_OUTPUT_ONLY      , {"MD_FOR_OUTPUT_ONLY", "mq.pmo.options.MD_FOR_OUTPUT_ONLY", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_MD_FOR_OUTPUT_ONLY , "PMO options MD_FOR_OUTPUT_ONLY", HFILL }},
-		{ &hf_mq_pmo_options_RETAIN                  , {"RETAIN", "mq.pmo.options.RETAIN", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_RETAIN , "PMO options RETAIN", HFILL }},
-		{ &hf_mq_pmo_options_WARN_IF_NO_SUBS_MATCHED , {"WARN_IF_NO_SUBS_MATCHED", "mq.pmo.options.WARN_IF_NO_SUBS_MATCHED", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_WARN_IF_NO_SUBS_MATCHED , "PMO options WARN_IF_NO_SUBS_MATCHED", HFILL }},
-		{ &hf_mq_pmo_options_RESOLVE_LOCAL_Q         , {"RESOLVE_LOCAL_Q", "mq.pmo.options.RESOLVE_LOCAL_Q", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_RESOLVE_LOCAL_Q , "PMO options RESOLVE_LOCAL_Q", HFILL }},
-		{ &hf_mq_pmo_options_SYNC_RESPONSE           , {"SYNC_RESPONSE", "mq.pmo.options.SYNC_RESPONSE", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_SYNC_RESPONSE , "PMO options SYNC_RESPONSE", HFILL }},
-		{ &hf_mq_pmo_options_ASYNC_RESPONSE          , {"ASYNC_RESPONSE", "mq.pmo.options.ASYNC_RESPONSE", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_ASYNC_RESPONSE , "PMO options ASYNC_RESPONSE", HFILL }},
-		{ &hf_mq_pmo_options_LOGICAL_ORDER           , {"LOGICAL_ORDER", "mq.pmo.options.LOGICAL_ORDER", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_LOGICAL_ORDER , "PMO options LOGICAL_ORDER", HFILL }},
-		{ &hf_mq_pmo_options_NO_CONTEXT              , {"NO_CONTEXT", "mq.pmo.options.NO_CONTEXT", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_NO_CONTEXT , "PMO options NO_CONTEXT", HFILL }},
-		{ &hf_mq_pmo_options_FAIL_IF_QUIESCING       , {"FAIL_IF_QUIESCING", "mq.pmo.options.FAIL_IF_QUIESCING", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_FAIL_IF_QUIESCING , "PMO options FAIL_IF_QUIESCING", HFILL }},
-		{ &hf_mq_pmo_options_ALTERNATE_USER_AUTHORITY, {"ALTERNATE_USER_AUTHORITY", "mq.pmo.options.ALTERNATE_USER_AUTHORITY", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_ALTERNATE_USER_AUTHORITY , "PMO options ALTERNATE_USER_AUTHORITY", HFILL }},
-		{ &hf_mq_pmo_options_SET_ALL_CONTEXT         , {"SET_ALL_CONTEXT", "mq.pmo.options.SET_ALL_CONTEXT", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_SET_ALL_CONTEXT , "PMO options SET_ALL_CONTEXT", HFILL }},
-		{ &hf_mq_pmo_options_SET_IDENTITY_CONTEXT    , {"SET_IDENTITY_CONTEXT", "mq.pmo.options.SET_IDENTITY_CONTEXT", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_SET_IDENTITY_CONTEXT , "PMO options SET_IDENTITY_CONTEXT", HFILL }},
-		{ &hf_mq_pmo_options_PASS_ALL_CONTEXT        , {"PASS_ALL_CONTEXT", "mq.pmo.options.PASS_ALL_CONTEXT", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_PASS_ALL_CONTEXT , "PMO options PASS_ALL_CONTEXT", HFILL }},
-		{ &hf_mq_pmo_options_PASS_IDENTITY_CONTEXT   , {"PASS_IDENTITY_CONTEXT", "mq.pmo.options.PASS_IDENTITY_CONTEXT", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_PASS_IDENTITY_CONTEXT , "PMO options PASS_IDENTITY_CONTEXT", HFILL }},
-		{ &hf_mq_pmo_options_NEW_CORREL_ID           , {"NEW_CORREL_ID", "mq.pmo.options.NEW_CORREL_ID", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_NEW_CORREL_ID , "PMO options NEW_CORREL_ID", HFILL }},
-		{ &hf_mq_pmo_options_NEW_MSG_ID              , {"NEW_MSG_ID", "mq.pmo.options.NEW_MSG_ID", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_NEW_MSG_ID , "PMO options NEW_MSG_ID", HFILL }},
-		{ &hf_mq_pmo_options_DEFAULT_CONTEXT         , {"DEFAULT_CONTEXT", "mq.pmo.options.DEFAULT_CONTEXT", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_DEFAULT_CONTEXT , "PMO options DEFAULT_CONTEXT", HFILL }},
-		{ &hf_mq_pmo_options_NO_SYNCPOINT            , {"NO_SYNCPOINT", "mq.pmo.options.NO_SYNCPOINT", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_NO_SYNCPOINT , "PMO options NO_SYNCPOINT", HFILL }},
-		{ &hf_mq_pmo_options_SYNCPOINT               , {"SYNCPOINT", "mq.pmo.options.SYNCPOINT", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_SYNCPOINT , "PMO options SYNCPOINT", HFILL }},
-
-		{ &hf_mq_pmo_timeout     , {"Timeout..", "mq.pmo.timeout", FT_INT32, BASE_DEC, NULL, 0x0, "PMO time out", HFILL }},
-		{ &hf_mq_pmo_context     , {"Context..", "mq.pmo.context", FT_UINT32, BASE_HEX, NULL, 0x0, "PMO context", HFILL }},
-		{ &hf_mq_pmo_knowndstcnt , {"KnDstCnt.", "mq.pmo.kdstcount", FT_UINT32, BASE_DEC, NULL, 0x0, "PMO known destination count", HFILL }},
-		{ &hf_mq_pmo_unkndstcnt  , {"UkDstCnt.", "mq.pmo.udestcount", FT_UINT32, BASE_DEC, NULL, 0x0, "PMO unknown destination count", HFILL }},
-		{ &hf_mq_pmo_invaldstcnt , {"InDstCnt.", "mq.pmo.idestcount", FT_UINT32, BASE_DEC, NULL, 0x0, "PMO invalid destination count", HFILL }},
-		{ &hf_mq_pmo_resolvqname , {"ResQName.", "mq.pmo.resolvq", FT_STRINGZ, BASE_NONE, NULL, 0x0, "PMO resolved queue name", HFILL }},
-		{ &hf_mq_pmo_resolvqmgr  , {"ResQMgr..", "mq.pmo.resolvqmgr", FT_STRINGZ, BASE_NONE, NULL, 0x0, "PMO resolved queue manager name", HFILL }},
-		{ &hf_mq_pmo_recspresent , {"NumRecs..", "mq.pmo.nbrrec", FT_UINT32, BASE_DEC, NULL, 0x0, "PMO number of records", HFILL }},
-		{ &hf_mq_pmo_putmsgrecfld, {"PMR Flag.", "mq.pmo.flagspmr", FT_UINT32, BASE_HEX, NULL, 0x0, "PMO flags PMR fields", HFILL }},
-		{ &hf_mq_pmo_putmsgrecofs, {"Ofs1stPMR", "mq.pmo.offsetpmr", FT_UINT32, BASE_DEC, NULL, 0x0, "PMO offset of first PMR", HFILL }},
-		{ &hf_mq_pmo_resprecofs  , {"Off1stRR.", "mq.pmo.offsetrr", FT_UINT32, BASE_DEC, NULL, 0x0, "PMO offset of first RR", HFILL }},
-		{ &hf_mq_pmo_putmsgrecptr, {"Adr1stPMR", "mq.pmo.addrrec", FT_UINT32, BASE_HEX, NULL, 0x0, "PMO address of first record", HFILL }},
-		{ &hf_mq_pmo_resprecptr  , {"Adr1stRR.", "mq.pmo.addrres", FT_UINT32, BASE_HEX, NULL, 0x0, "PMO address of first response record", HFILL }},
-
-		{ &hf_mq_head_StructID   , {"Structid", "mq.head.structid", FT_STRINGZ, BASE_NONE, NULL, 0x0, "Header structid", HFILL }},
-		{ &hf_mq_head_version    , {"version.", "mq.head.version", FT_UINT32, BASE_DEC, NULL, 0x0, "Header version", HFILL }},
-		{ &hf_mq_head_length     , {"Length..", "mq.head.length", FT_UINT32, BASE_DEC, NULL, 0x0, "Header length", HFILL }},
-		{ &hf_mq_head_encoding   , {"Encoding", "mq.head.encoding", FT_UINT32, BASE_DEC, NULL, 0x0, "Header encoding", HFILL }},
-		{ &hf_mq_head_ccsid      , {"CCSID...", "mq.head.ccsid", FT_INT32, BASE_DEC | BASE_RANGE_STRING, RVALS(&GET_VALRV(ccsid)), 0x0, "Header character set", HFILL }},
-		{ &hf_mq_head_format     , {"Format..", "mq.head.format", FT_STRINGZ, BASE_NONE, NULL, 0x0, "Header format", HFILL }},
-		{ &hf_mq_head_flags      , {"Flags...", "mq.head.flags", FT_UINT32, BASE_DEC, NULL, 0x0, "Header flags", HFILL }},
-		{ &hf_mq_head_struct     , {"Struct..", "mq.head.struct", FT_BYTES, BASE_NONE, NULL, 0x0, "Header struct", HFILL }},
-
-		{ &hf_mq_xa_length        , {"Length.......", "mq.xa.length", FT_UINT32, BASE_DEC, NULL, 0x0, "XA Length", HFILL }},
-		{ &hf_mq_xa_returnvalue   , {"Return value.", "mq.xa.returnvalue", FT_INT32, BASE_DEC, VALS(mq_xaer_vals), 0x0, "XA Return Value", HFILL }},
-		{ &hf_mq_xa_tmflags       , {"TransMgrFlags", "mq.xa.tmflags", FT_UINT32, BASE_HEX, NULL, 0x0, "XA Transaction Manager Flags", HFILL }},
-		{ &hf_mq_xa_rmid          , {"ResourceMgrID", "mq.xa.rmid", FT_UINT32, BASE_DEC, NULL, 0x0, "XA Resource Manager ID", HFILL }},
-		{ &hf_mq_xa_count         , {"Number of Xid", "mq.xa.nbxid", FT_UINT32, BASE_DEC, NULL, 0x0, "XA Number of Xid", HFILL }},
-		{ &hf_mq_xa_tmflags_join      , {"JOIN", "mq.xa.tmflags.join", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_XA_TMJOIN, "XA TM Flags JOIN", HFILL }},
-		{ &hf_mq_xa_tmflags_endrscan  , {"ENDRSCAN", "mq.xa.tmflags.endrscan", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_XA_TMENDRSCAN, "XA TM Flags ENDRSCAN", HFILL }},
-		{ &hf_mq_xa_tmflags_startrscan, {"STARTRSCAN", "mq.xa.tmflags.startrscan", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_XA_TMSTARTRSCAN, "XA TM Flags STARTRSCAN", HFILL }},
-		{ &hf_mq_xa_tmflags_suspend   , {"SUSPEND", "mq.xa.tmflags.suspend", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_XA_TMSUSPEND, "XA TM Flags SUSPEND", HFILL }},
-		{ &hf_mq_xa_tmflags_success   , {"SUCCESS", "mq.xa.tmflags.success", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_XA_TMSUCCESS, "XA TM Flags SUCCESS", HFILL }},
-		{ &hf_mq_xa_tmflags_resume    , {"RESUME", "mq.xa.tmflags.resume", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_XA_TMRESUME, "XA TM Flags RESUME", HFILL }},
-		{ &hf_mq_xa_tmflags_fail      , {"FAIL", "mq.xa.tmflags.fail", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_XA_TMFAIL, "XA TM Flags FAIL", HFILL }},
-		{ &hf_mq_xa_tmflags_onephase  , {"ONEPHASE", "mq.xa.tmflags.onephase", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_XA_TMONEPHASE, "XA TM Flags ONEPHASE", HFILL }},
-
-		{ &hf_mq_xa_xid_formatid  , {"Format ID....", "mq.xa.xid.formatid", FT_INT32, BASE_DEC, NULL, 0x0, "XA Xid Format ID", HFILL }},
-		{ &hf_mq_xa_xid_glbxid_len, {"GlbTransIDLen", "mq.xa.xid.gxidl", FT_UINT8, BASE_DEC, NULL, 0x0, "XA Xid Global TransactionId Length", HFILL }},
-		{ &hf_mq_xa_xid_brq_length, {"BranchQualLen", "mq.xa.xid.bql", FT_UINT8, BASE_DEC, NULL, 0x0, "XA Xid Branch Qualifier Length", HFILL }},
-		{ &hf_mq_xa_xid_globalxid , {"GlbTransactID", "mq.xa.xid.gxid", FT_BYTES, BASE_NONE, NULL, 0x0, "XA Xid Global TransactionId", HFILL }},
-		{ &hf_mq_xa_xid_brq       , {"BranchQualif.", "mq.xa.xid.bq", FT_BYTES, BASE_NONE, NULL, 0x0, "XA Xid Branch Qualifier", HFILL }},
-		{ &hf_mq_xa_xainfo_length , {"Length.......", "mq.xa.xainfo.length", FT_UINT8, BASE_DEC, NULL, 0x0, "XA XA_info Length", HFILL }},
-		{ &hf_mq_xa_xainfo_value  , {"Value........", "mq.xa.xainfo.value", FT_STRINGZ, BASE_NONE, NULL, 0x0, "XA XA_info Value", HFILL }},
-
-		{ &hf_mq_charv_vsptr      , {"VLStr Addr.", "mq.charv.vsptr", FT_UINT32, BASE_HEX, NULL, 0x0, "VS Address", HFILL }},
-		{ &hf_mq_charv_vsoffset   , {"VLStr Offs.", "mq.charv.vsoffset", FT_UINT32, BASE_DEC, NULL, 0x0, "VS Offset", HFILL }},
-		{ &hf_mq_charv_vsbufsize  , {"VLStr BufSz", "mq.charv.vsbufsize", FT_UINT32, BASE_DEC, NULL, 0x0, "VS BufSize", HFILL }},
-		{ &hf_mq_charv_vslength   , {"VLStr Len..", "mq.charv.vslength", FT_UINT32, BASE_DEC, NULL, 0x0, "VS Length", HFILL }},
-		{ &hf_mq_charv_vsccsid    , {"VLStr Ccsid", "mq.charv.vsccsid", FT_INT32, BASE_DEC, NULL, 0x0, "VS CCSID", HFILL }},
-		{ &hf_mq_charv_vsvalue    , {"VLStr Value", "mq.charv.vsvalue", FT_STRINGZ, BASE_NONE, NULL, 0x0, "VS value", HFILL }}
-
-	};
-	static gint *ett[] =
-	{
-		&ett_mq,
-		&ett_mq_tsh,
-		&ett_mq_tsh_tcf,
-		&ett_mq_tsh_tcf2,
-		&ett_mq_api,
-		&ett_mq_socket,
-		&ett_mq_msh,
-		&ett_mq_caut,
-		&ett_mq_xqh,
-		&ett_mq_id,
-		&ett_mq_id_icf1,
-		&ett_mq_id_icf2,
-		&ett_mq_id_icf3,
-		&ett_mq_id_ief1,
-		&ett_mq_id_ief2,
-		&ett_mq_uid,
-		&ett_mq_conn,
-		&ett_mq_msg,
-		&ett_mq_notif,
-		&ett_mq_inq,
-		&ett_mq_spi,
-		&ett_mq_spi_base,
-		&ett_mq_spi_options,
-		&ett_mq_put,
-		&ett_mq_open,
-		&ett_mq_open_option,
-		&ett_mq_close_option,
-		&ett_mq_ping,
-		&ett_mq_reset,
-		&ett_mq_status,
-		&ett_mq_od,
-		&ett_mq_od_objstr,
-		&ett_mq_od_selstr,
-		&ett_mq_od_resobjstr,
-		&ett_mq_or,
-		&ett_mq_rr,
-		&ett_mq_pmr,
-		&ett_mq_md,
-		&ett_mq_mde,
-		&ett_mq_dlh,
-		&ett_mq_dh,
-		&ett_mq_gmo,
-		&ett_mq_gmo_option,
-		&ett_mq_gmo_matchoption,
-		&ett_mq_pmo,
-		&ett_mq_pmo_option,
-		&ett_mq_fcno,
-		&ett_mq_fopa,
-		&ett_mq_lpoo,
-		&ett_mq_lpoo_options,
-		&ett_mq_lpoo_lpiopts,
-		&ett_mq_head,
-		&ett_mq_xa,
-		&ett_mq_xa_tmflags,
-		&ett_mq_xa_xid,
-		&ett_mq_xa_info,
-		&ett_mq_charv,
-		&ett_mq_reaasemb
-	};
-
-	module_t *mq_module;
-
-	proto_mq = proto_register_protocol("WebSphere MQ", "MQ", "mq");
-	proto_register_field_array(proto_mq, hf, array_length(hf));
-	proto_register_subtree_array(ett, array_length(ett));
-
-	register_heur_dissector_list("mq", &mq_heur_subdissector_list);
-	register_init_routine(mq_init);
-
-	mq_module = prefs_register_protocol(proto_mq, NULL);
-	prefs_register_bool_preference(mq_module, "desegment",
-		"Reassemble MQ messages spanning multiple TCP segments",
-		"Whether the MQ dissector should reassemble messages spanning multiple TCP segments."
-		" To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.",
-		&mq_desegment);
-	prefs_register_bool_preference(mq_module, "reassembly",
-		"Reassemble segmented MQ messages",
-		"Whether the MQ dissector should reassemble MQ messages spanning multiple TSH segments",
-		&mq_reassembly);
+    static hf_register_info hf[] =
+    {
+        { &hf_mq_tsh_StructID ,
+          {"StructID..", "mq.tsh.structid",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           NULL, HFILL }
+        },
+        { &hf_mq_tsh_mqseglen ,
+          {"MQSegmLen.", "mq.tsh.seglength",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "TSH MQ Segment length", HFILL }
+        },
+        { &hf_mq_tsh_convid   ,
+          {"Convers ID", "mq.tsh.convid",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "TSH Conversation ID", HFILL }
+        },
+        { &hf_mq_tsh_requestid,
+          {"Request ID", "mq.tsh.requestid",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "TSH Request ID", HFILL }
+        },
+        { &hf_mq_tsh_byteorder,
+          {"Byte order", "mq.tsh.byteorder",
+           FT_UINT8, BASE_HEX, VALS(GET_VALSV(byteorder)), 0x0,
+           "TSH Byte order", HFILL }
+        },
+        { &hf_mq_tsh_opcode   ,
+          {"SegmType..", "mq.tsh.type",
+           FT_UINT8, BASE_HEX, VALS(GET_VALSV(opcode)), 0x0,
+           "TSH MQ segment type", HFILL }
+        },
+        { &hf_mq_tsh_ctlflgs1 ,
+          {"Ctl Flag 1", "mq.tsh.cflags1",
+           FT_UINT8, BASE_HEX, NULL, 0x0,
+           "TSH Control flags 1", HFILL }
+        },
+        { &hf_mq_tsh_ctlflgs2 ,
+          {"Ctl Flag 2", "mq.tsh.cflags2",
+           FT_UINT8, BASE_HEX, NULL, 0x0,
+           "TSH Control flags 2", HFILL }
+        },
+        { &hf_mq_tsh_luwid    ,
+          {"LUW Ident.", "mq.tsh.luwid",
+           FT_BYTES, BASE_NONE, NULL, 0x0,
+           "TSH logical unit of work identifier", HFILL }
+        },
+        { &hf_mq_tsh_encoding ,
+          {"Encoding..", "mq.tsh.encoding",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "TSH Encoding", HFILL }
+        },
+        { &hf_mq_tsh_ccsid    ,
+          {"CCSID.....", "mq.tsh.ccsid",
+           FT_INT16, BASE_DEC | BASE_RANGE_STRING, RVALS(&GET_VALRV(ccsid)), 0x0,
+           "TSH CCSID", HFILL }
+        },
+        { &hf_mq_tsh_reserved ,
+          {"Reserved..", "mq.tsh.reserved",
+           FT_UINT16, BASE_HEX, NULL, 0x0,
+           "TSH Reserved", HFILL }
+        },
+
+        { &hf_mq_tsh_tcf_confirmreq,
+          {"Confirm Req", "mq.tsh.tcf.confirmreq",
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_TCF_CONFIRM_REQUEST,
+           "TSH TCF Confirm request", HFILL }
+        },
+        { &hf_mq_tsh_tcf_error     ,
+          {"Error", "mq.tsh.tcf.error",
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_TCF_ERROR,
+           "TSH TCF Error", HFILL }
+        },
+        { &hf_mq_tsh_tcf_reqclose  ,
+          {"Req close", "mq.tsh.tcf.reqclose",
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_TCF_REQUEST_CLOSE,
+           "TSH TCF Request close", HFILL }
+        },
+        { &hf_mq_tsh_tcf_closechann,
+          {"Close Chnl", "mq.tsh.tcf.closechann",
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_TCF_CLOSE_CHANNEL,
+           "TSH TCF Close channel", HFILL }
+        },
+        { &hf_mq_tsh_tcf_first     ,
+          {"First Seg", "mq.tsh.tcf.first",
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_TCF_FIRST,
+           "TSH TCF First", HFILL }
+        },
+        { &hf_mq_tsh_tcf_last      ,
+          {"Last Seg", "mq.tsh.tcf.last",
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_TCF_LAST,
+           "TSH TCF Last", HFILL }
+        },
+        { &hf_mq_tsh_tcf_reqacc    ,
+          {"Req accept", "mq.tsh.tcf.reqacc",
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_TCF_REQUEST_ACCEPTED,
+           "TSH TCF Request accepted", HFILL }
+        },
+        { &hf_mq_tsh_tcf_dlq       ,
+          {"DLQ used", "mq.tsh.tcf.dlq",
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_TCF_DLQ_USED,
+           "TSH TCF DLQ used", HFILL }
+        },
+
+        { &hf_mq_tsh_tcf2_HdrComp  ,
+          {"HDR Comp", "mq.tsh.tcf2.hdrcomp",
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_TCF2_HDRCOMP      ,
+           "TSH TCF2 Header Compressed", HFILL }
+        },
+        { &hf_mq_tsh_tcf2_MsgComp  ,
+          {"MSG Comp", "mq.tsh.tcf2.msgcomp",
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_TCF2_MSGCOMP      ,
+           "TSH TCF2 Message Compressed", HFILL }
+        },
+        { &hf_mq_tsh_tcf2_CSH      ,
+          {"CSH", "mq.tsh.tcf2.csh"    ,
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_TCF2_CSH          ,
+           "TSH TCF2 CSH", HFILL }
+        },
+        { &hf_mq_tsh_tcf2_CmitIntv ,
+          {"ComitIntvl", "mq.tsh.tcf.cmitintv",
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_TCF2_CMIT_INTERVAL,
+           "TSH TCF2 Commit Interval", HFILL }
+        },
+
+        { &hf_mq_api_replylen ,
+          {"Reply len..", "mq.api.replylength",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "API Reply length", HFILL }
+        },
+        { &hf_mq_api_compcode ,
+          {"Compl Code.", "mq.api.completioncode",
+           FT_UINT32, BASE_DEC, VALS(GET_VALSV(mqcc)), 0x0,
+           "API Completion code", HFILL }
+        },
+        { &hf_mq_api_reascode ,
+          {"Reason Code", "mq.api.reasoncode",
+           FT_UINT32, BASE_DEC, VALS(GET_VALSV(mqrc)), 0x0,
+           "API Reason code", HFILL }
+        },
+        { &hf_mq_api_objecthdl,
+          {"Object Hdl.", "mq.api.hobj",
+           FT_UINT32, BASE_HEX, NULL, 0x0,
+           "API Object handle", HFILL }
+        },
+
+        { &hf_mq_socket_conversid,
+          {"ConversId", "mq.socket.conversid",
+           FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+           "Socket Conversation Id", HFILL }
+        },
+        { &hf_mq_socket_requestid,
+          {"RequestId", "mq.socket.requestid",
+           FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+           "Socket Request Id", HFILL }
+        },
+        { &hf_mq_socket_type     ,
+          {"Type.....", "mq.socket.type",
+           FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+           "Socket Type", HFILL }
+        },
+        { &hf_mq_socket_parm1    ,
+          {"Parm1....", "mq.socket.parm1",
+           FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+           "Socket Parameter 1", HFILL }
+        },
+        { &hf_mq_socket_parm2    ,
+          {"Parm2....", "mq.socket.parm2",
+           FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+           "Socket Parameter 2", HFILL }
+        },
+
+        { &hf_mq_caut_StructID ,
+          {"StructID." , "mq.caut.structid" ,
+           FT_STRINGZ, BASE_NONE   , NULL, 0x0,
+           NULL, HFILL }
+        },
+        { &hf_mq_caut_AuthType ,
+          {"AuthType." , "mq.caut.authtype" ,
+           FT_UINT32 , BASE_HEX_DEC, NULL, 0x0,
+           "CAUT Authority Type", HFILL }
+        },
+        { &hf_mq_caut_UsrMaxLen,
+          {"UsrMaxLen", "mq.caut.usrmaxlen",
+           FT_UINT32 , BASE_HEX_DEC, NULL, 0x0,
+           "CAUT userid Maximum length", HFILL }
+        },
+        { &hf_mq_caut_PwdMaxLen,
+          {"PwdMaxLen", "mq.caut.pwdmaxlen",
+           FT_UINT32 , BASE_HEX_DEC, NULL, 0x0,
+           "CAUT password Maximum length", HFILL }
+        },
+        { &hf_mq_caut_UsrLength,
+          {"UsrLength", "mq.caut.usrlength",
+           FT_UINT32 , BASE_HEX_DEC, NULL, 0x0,
+           "CAUT userid length", HFILL }
+        },
+        { &hf_mq_caut_PwdLength,
+          {"PwdLength", "mq.caut.pswlength",
+           FT_UINT32 , BASE_HEX_DEC, NULL, 0x0,
+           "CAUT password length", HFILL }
+        },
+        { &hf_mq_caut_usr      ,
+          {"userid...", "mq.msh.userid"    ,
+           FT_STRINGZ, BASE_NONE   , NULL, 0x0,
+           "CAUT UserId", HFILL }
+        },
+        { &hf_mq_caut_psw      ,
+          {"password.", "mq.msh.password"  ,
+           FT_STRINGZ, BASE_NONE   , NULL, 0x0,
+           "CAUT Password", HFILL }
+        },
+
+        { &hf_mq_msh_StructID  ,
+          {"StructID", "mq.msh.structid",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           NULL, HFILL }
+        },
+        { &hf_mq_msh_seqnum    ,
+          {"Seq Numb", "mq.msh.seqnum",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "MSH sequence number", HFILL }
+        },
+        { &hf_mq_msh_datalength,
+          {"Buf len.", "mq.msh.buflength",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "MSH buffer length", HFILL }
+        },
+        { &hf_mq_msh_unknown1  ,
+          {"Unknown1", "mq.msh.unknown1",
+           FT_UINT32, BASE_HEX, NULL, 0x0,
+           "MSH unknown1", HFILL }
+        },
+        { &hf_mq_msh_msglength ,
+          {"Msg len.", "mq.msh.msglength",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "MSH message length", HFILL }
+        },
+
+        { &hf_mq_xqh_StructID  ,
+          {"StructID", "mq.xqh.structid",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           NULL, HFILL }
+        },
+        { &hf_mq_xqh_version   ,
+          {"Version.", "mq.xqh.version",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "XQH version", HFILL }
+        },
+        { &hf_mq_xqh_remoteq   ,
+          {"Remote Q", "mq.xqh.remoteq",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "XQH remote queue", HFILL }
+        },
+        { &hf_mq_xqh_remoteqmgr,
+          {"Rmt QMgr", "mq.xqh.remoteqmgr",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "XQH remote queue manager", HFILL }
+        },
+
+        { &hf_mq_id_StructID   ,
+          {"Structid..", "mq.id.structid",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           NULL, HFILL }
+        },
+        { &hf_mq_id_FapLevel   ,
+          {"FAP level.", "mq.id.level",
+           FT_UINT8, BASE_DEC, NULL, 0x0,
+           "ID Formats And Protocols level", HFILL }
+        },
+        { &hf_mq_id_icf1       ,
+          {"CapFlag1..", "mq.id.idflags",
+           FT_UINT8, BASE_HEX, NULL, 0x0,
+           "ID Capability Flags 1", HFILL }
+        },
+        { &hf_mq_id_Eicf1      ,
+          {"ECapFlag1.", "mq.id.ideflags",
+           FT_UINT8, BASE_HEX, NULL, 0x0,
+           "ID E Capability Flags 1", HFILL }
+        },
+        { &hf_mq_id_ief1       ,
+          {"IniErrFlg1", "mq.id.ief",
+           FT_UINT8, BASE_HEX, NULL, 0x0,
+           "ID Initial Error Flags 1", HFILL }
+        },
+        { &hf_mq_id_Reserved   ,
+          {"Reserved..", "mq.id.unknown04",
+           FT_UINT16, BASE_HEX, NULL, 0x0,
+           "ID Reserved", HFILL }
+        },
+        { &hf_mq_id_MaxMsgBatch,
+          {"MaxMsgBtch", "mq.id.MaxMsgBatch",
+           FT_UINT16, BASE_DEC, NULL, 0x0,
+           "ID max msg per batch", HFILL }
+        },
+        { &hf_mq_id_MaxTrSize  ,
+          {"MaxTrSize.", "mq.id.MaxTrSize",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "ID max trans size", HFILL }
+        },
+        { &hf_mq_id_MaxMsgSize ,
+          {"MaxMsgSize", "mq.id.maxmsgsize",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "ID max msg size", HFILL }
+        },
+        { &hf_mq_id_SeqWrapVal ,
+          {"SeqWrapVal", "mq.id.seqwrap",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "ID seq wrap value", HFILL }
+        },
+        { &hf_mq_id_channel    ,
+          {"ChannelNme", "mq.id.channelname",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "ID channel name", HFILL }
+        },
+        { &hf_mq_id_icf2       ,
+          {"CapFlag2..", "mq.id.idflags2",
+           FT_UINT8, BASE_HEX, NULL, 0x0,
+           "ID Capability flags 2", HFILL }
+        },
+        { &hf_mq_id_Eicf2      ,
+          {"ECapFlag2.", "mq.id.ideflags2",
+           FT_UINT8, BASE_HEX, NULL, 0x0,
+           "ID E Capabitlity flags 2", HFILL }
+        },
+        { &hf_mq_id_ccsid      ,
+          {"ccsid.....", "mq.id.ccsid",
+           FT_INT16, BASE_DEC | BASE_RANGE_STRING, RVALS(&GET_VALRV(ccsid)), 0x0,
+           "ID Coded Character Set ID", HFILL }
+        },
+        { &hf_mq_id_qmgrname   ,
+          {"QMgrName..", "mq.id.qm",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "ID Queue Manager Name", HFILL }
+        },
+        { &hf_mq_id_HBInterval ,
+          {"HBInterval", "mq.id.hbint",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "ID Heartbeat interval", HFILL }
+        },
+        { &hf_mq_id_EFLLength  ,
+          {"EFLLength.", "mq.id.efllength",
+           FT_UINT16, BASE_HEX_DEC, NULL, 0x0,
+           "ID EFL Length", HFILL }
+        },
+        { &hf_mq_id_ief2       ,
+          {"IniErrFlg2", "mq.id.inierrflg2",
+           FT_UINT8, BASE_HEX_DEC, NULL, 0x0,
+           "ID Initial Error Flags 2", HFILL }
+        },
+        { &hf_mq_id_Reserved1  ,
+          {"Reserved1.", "mq.id.reserved1",
+           FT_UINT8, BASE_HEX_DEC, NULL, 0x0,
+           "ID Reserved 1", HFILL }
+        },
+        { &hf_mq_id_HdrCprsLst ,
+          {"HdrCprsLst", "mq.id.hdrcprslst",
+           FT_BYTES, BASE_NONE, NULL, 0x0,
+           "ID Hdr Cprs Lst", HFILL }
+        },
+        { &hf_mq_id_MsgCprsLst ,
+          {"MsgCprsLst", "mq.id.msgcprslst",
+           FT_BYTES, BASE_NONE, NULL, 0x0,
+           "ID Msg Cprs Lst", HFILL }
+        },
+        { &hf_mq_id_Reserved2  ,
+          {"Reserved2.", "mq.id.reserved2",
+           FT_UINT16, BASE_HEX_DEC, NULL, 0x0,
+           "ID Reserved 2", HFILL }
+        },
+        { &hf_mq_id_SSLKeyRst  ,
+          {"SSLKeyRst.", "mq.id.sslkeyrst",
+           FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+           "ID SSL Key Reset", HFILL }
+        },
+        { &hf_mq_id_ConvBySkt  ,
+          {"ConvBySkt.", "mq.id.convbyskt",
+           FT_INT32, BASE_DEC, NULL, 0x0,
+           "ID Conv Per Socket", HFILL }
+        },
+        { &hf_mq_id_icf3       ,
+          {"CapFlag3..", "mq.id.idflags3",
+           FT_UINT8, BASE_HEX_DEC, NULL, 0x0,
+           "ID Capability flags 3", HFILL }
+        },
+        { &hf_mq_id_Eicf3      ,
+          {"ECapFlag3.", "mq.id.ideflags3",
+           FT_UINT8, BASE_HEX_DEC, NULL, 0x0,
+           "ID E Capability flags 3", HFILL }
+        },
+        { &hf_mq_id_Reserved3  ,
+          {"Reserved3.", "mq.id.reserved3",
+           FT_UINT16, BASE_HEX_DEC, NULL, 0x0,
+           "ID Reserved 3", HFILL }
+        },
+        { &hf_mq_id_ProcessId  ,
+          {"ProcessId.", "mq.id.processid",
+           FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+           "ID Process Identifier", HFILL }
+        },
+        { &hf_mq_id_ThreadId   ,
+          {"ThreadId..", "mq.id.threadid",
+           FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+           "ID Thread Identifier", HFILL }
+        },
+        { &hf_mq_id_TraceId    ,
+          {"TraceId...", "mq.id.traceid",
+           FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+           "ID Trace Identifier", HFILL }
+        },
+        { &hf_mq_id_ProdId     ,
+          {"ProdId....", "mq.id.prodid",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "ID Product Identifier", HFILL }
+        },
+        { &hf_mq_id_mqmid      ,
+          {"MQM ID....", "mq.id.mqmid",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "ID MQM ID", HFILL }
+        },
+
+        { &hf_mq_id_icf1_msgseq  ,
+          {"Message sequence", "mq.id.icf.msgseq"  ,
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF1_MSG_SEQ,
+           "ID ICF Message sequence", HFILL }
+        },
+        { &hf_mq_id_icf1_convcap ,
+          {"Conversion capable", "mq.id.icf.convcap" ,
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF1_CONVERSION_CAPABLE,
+           "ID ICF Conversion capable", HFILL }
+        },
+        { &hf_mq_id_icf1_splitmsg,
+          {"Split messages", "mq.id.icf.splitmsg",
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF1_SPLIT_MESSAGE,
+           "ID ICF Split message", HFILL }
+        },
+        { &hf_mq_id_icf1_RqstInit,
+          {"Request Initiation", "mq.id.icf.rqstinit",
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF1_REQUEST_INITIATION,
+           "ID ICF Request Initiation", HFILL }
+        },
+        { &hf_mq_id_icf1_RqstSecu,
+          {"Request Security", "mq.id.icf.rqstsecu",
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF1_REQUEST_SECURITY,
+           "ID ICF Request Security", HFILL }
+        },
+        { &hf_mq_id_icf1_mqreq   ,
+          {"MQ request", "mq.id.icf.mqreq"   ,
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF1_MQREQUEST,
+           "ID ICF MQ request", HFILL }
+        },
+        { &hf_mq_id_icf1_svrsec  ,
+          {"Srvr Con security", "mq.id.icf.svrsec"  ,
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF1_SVRCONN_SECURITY,
+           "ID ICF Server connection security", HFILL }
+        },
+        { &hf_mq_id_icf1_runtime ,
+          {"Runtime applic", "mq.id.icf.runtime" ,
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF1_RUNTIME,
+           "ID ICF Runtime application", HFILL }
+        },
+
+        { &hf_mq_id_icf2_CanDstLst,
+          {"DistListCapable", "mq.id.icf2.distlistcap"   ,
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF2_DIST_LIST_CAPABLE,
+           "ID ICF2 Distribution List Capable", HFILL }
+        },
+        { &hf_mq_id_icf2_FstMsgReq,
+          {"Fast Msg Reqrd", "mq.id.icf2.fastmsgrqrd"   ,
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF2_FAST_MESSAGES_REQUIRED,
+           "ID ICF2 Fast Message Required", HFILL }
+        },
+        { &hf_mq_id_icf2_RespConv ,
+          {"RspndrConversion", "mq.id.icf2.respndrconvers",
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF2_RESPONDER_CONVERSION,
+           "ID ICF2 Responder Conversion", HFILL }
+        },
+        { &hf_mq_id_icf2_XARequest,
+          {"XARequest", "mq.id.icf2.xarequest"     ,
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF2_XAREQUEST,
+           "ID ICF2 XA Request", HFILL }
+        },
+        { &hf_mq_id_icf2_XARunTApp,
+          {"XARunTypApp", "mq.id.icf2.xaruntypapp"   ,
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF2_XARUNTIME_APP,
+           "ID ICF2 XA Runtime App", HFILL }
+        },
+        { &hf_mq_id_icf2_SPIRqst  ,
+          {"SPIRequest", "mq.id.icf2.spirequest"    ,
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF2_SPIREQUEST,
+           "ID ICF2 SPI Request", HFILL }
+        },
+        { &hf_mq_id_icf2_DualUOW  ,
+          {"DualUOW", "mq.id.icf2.dualuow"       ,
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF2_DUAL_UOW,
+           "ID ICF2 Dual UOW", HFILL }
+        },
+        { &hf_mq_id_icf2_CanTrcRte,
+          {"Trace Rte Capab", "mq.id.icf2.cantraceroute" ,
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF2_TRACE_ROUTE_CAPABLE,
+           "ID ICF2 Trace Route Capable", HFILL }
+        },
+
+        { &hf_mq_id_icf3_CanMsgPrp,
+          {"Msg Property Cap", "mq.id.icf.msgprpcap",
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF3_MSG_PROP_CAPABLE,
+           "ID ICF3 Message PropertyCapable", HFILL }
+        },
+        { &hf_mq_id_icf3_Unknown02,
+          {"Unknownx02", "mq.id.icf.unknown02",
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_ICF3_UNKNOWNX02,
+           "ID ICF3 Unknown Falg x02", HFILL }
+        },
+
+        { &hf_mq_id_ief1_ccsid  ,
+          {"Invalid CCSID", "mq.id.ief1.ccsid",
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_IEF1_CCSID,
+           "ID invalid CCSID", HFILL }
+        },
+        { &hf_mq_id_ief1_enc    ,
+          {"Invalid encoding", "mq.id.ief1.enc",
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_IEF1_ENCODING,
+           "ID invalid encoding", HFILL }
+        },
+        { &hf_mq_id_ief1_mxtrsz ,
+          {"Invalid Max Trans Size", "mq.id.ief1.mxtrsz",
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_IEF1_MAX_TRANSMISSION_SIZE,
+           "ID invalid maximum transmission size", HFILL }
+        },
+        { &hf_mq_id_ief1_fap    ,
+          {"Invalid FAP level", "mq.id.ief1.fap",
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_IEF1_FAP_LEVEL,
+           "ID invalid FAP level", HFILL }
+        },
+        { &hf_mq_id_ief1_mxmsgsz,
+          {"Invalid message size", "mq.id.ief1.mxmsgsz",
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_IEF1_MAX_MSG_SIZE,
+           "ID invalid message size", HFILL }
+        },
+        { &hf_mq_id_ief1_mxmsgpb,
+          {"Invalid Max Msg batch", "mq.id.ief1.mxmsgpb",
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_IEF1_MAX_MSG_PER_BATCH,
+           "ID maximum message per batch", HFILL }
+        },
+        { &hf_mq_id_ief1_seqwrap,
+          {"Invalid Seq Wrap Value", "mq.id.ief1.seqwrap",
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_IEF1_SEQ_WRAP_VALUE,
+           "ID invalid sequence wrap value", HFILL }
+        },
+        { &hf_mq_id_ief1_hbint  ,
+          {"Invalid HB interval", "mq.id.ief1.hbint",
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_IEF1_HEARTBEAT_INTERVAL,
+           "ID invalid heartbeat interval", HFILL }
+        },
+
+        { &hf_mq_id_ief2_HdrCmpLst,
+          {"Invalid HDR CompLst", "mq.id.ief2.hdrcomplst",
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_IEF2_HDRCOMPLIST,
+           "ID invalid Header Compression List", HFILL }
+        },
+        { &hf_mq_id_ief2_MsgCmpLst,
+          {"Invalid Msg CompLst", "mq.id.ief2.msgcomplst",
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_IEF2_MSGCOMPLIST,
+           "ID invalid Message Compression List", HFILL }
+        },
+        { &hf_mq_id_ief2_SSLReset ,
+          {"Invalid SSL Reset", "mq.id.ief2.sslreset"  ,
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_IEF2_SSL_RESET  ,
+           "ID invalid SSL Reset", HFILL }
+        },
+
+        { &hf_mq_uid_StructID  ,
+          {"Structid", "mq.uid.structid",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           NULL, HFILL }
+        },
+        { &hf_mq_uid_userid    ,
+          {"User ID.", "mq.uid.userid",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "UID structid", HFILL }
+        },
+        { &hf_mq_uid_password  ,
+          {"Password", "mq.uid.password",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "UID password", HFILL }
+        },
+        { &hf_mq_uid_longuserid,
+          {"Long UID", "mq.uid.longuserid",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "UID long user id", HFILL }
+        },
+
+        { &hf_mq_sidlen        ,
+          {"SID Len.", "mq.uid.sidlen",
+           FT_UINT8, BASE_DEC, NULL, 0x0,
+           "Sid Len", HFILL }
+        },
+        { &hf_mq_sidtyp        ,
+          {"SIDType.", "mq.uid.sidtyp",
+           FT_UINT8, BASE_DEC, VALS(GET_VALSV(sidtype)), 0x0,
+           "Sid Typ", HFILL }
+        },
+        { &hf_mq_securityid    ,
+          {"SecurID.", "mq.uid.securityid",
+           FT_BYTES, BASE_NONE, NULL, 0x0,
+           "Security ID", HFILL }
+        },
+
+        { &hf_mq_conn_QMgr     ,
+          {"QMgr....", "mq.conn.qm",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "CONN queue manager", HFILL }
+        },
+        { &hf_mq_conn_appname  ,
+          {"ApplName", "mq.conn.appname",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "CONN application name", HFILL }
+        },
+        { &hf_mq_conn_apptype  ,
+          {"ApplType", "mq.conn.apptype",
+           FT_INT32, BASE_DEC, VALS(GET_VALSV(mqat)), 0x0,
+           "CONN application type", HFILL }
+        },
+        { &hf_mq_conn_acttoken ,
+          {"AccntTok", "mq.conn.acttoken",
+           FT_BYTES, BASE_NONE, NULL, 0x0,
+           "CONN accounting token", HFILL }
+        },
+        { &hf_mq_conn_version  ,
+          {"Version.", "mq.conn.version",
+           FT_UINT32, BASE_DEC, VALS(mq_conn_version_vals), 0x0,
+           "CONN version", HFILL }
+        },
+        { &hf_mq_conn_options  ,
+          {"Options.", "mq.conn.options",
+           FT_UINT32, BASE_HEX, NULL, 0x0,
+           "CONN options", HFILL }
+        },
+
+        { &hf_mq_fcno_StructID ,
+          {"StructId.", "mq.fcno.structid",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           NULL, HFILL }
+        },
+        { &hf_mq_fcno_unknown00,
+          {"unknown00", "mq.fcno.unknown00",
+           FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+           "FCNO unknown00", HFILL }
+        },
+        { &hf_mq_fcno_unknown01,
+          {"unknown01", "mq.fcno.unknown01",
+           FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+           "FCNO unknown01", HFILL }
+        },
+        { &hf_mq_fcno_unknown02,
+          {"unknown02", "mq.fcno.unknown02",
+           FT_BYTES, BASE_NONE, NULL, 0x0,
+           "FCNO unknown02", HFILL }
+        },
+        { &hf_mq_fcno_msgid    ,
+          {"msgid....", "mq.fcno.msgid",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "FCNO Msg ID", HFILL }
+        },
+        { &hf_mq_fcno_mqmid    ,
+          {"MqmId....", "mq.fcno.mqmid",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "FCNO Mqm ID", HFILL }
+        },
+
+        { &hf_mq_inq_nbsel     ,
+          {"Selector count..", "mq.inq.nbsel",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "INQ Selector count", HFILL }
+        },
+        { &hf_mq_inq_nbint     ,
+          {"Integer count...", "mq.inq.nbint",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "INQ Integer count", HFILL }
+        },
+        { &hf_mq_inq_charlen   ,
+          {"Character length", "mq.inq.charlen",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "INQ Character length", HFILL }
+        },
+        { &hf_mq_inq_sel       ,
+          {"Selector........", "mq.inq.sel",
+           FT_UINT32, BASE_DEC, VALS(GET_VALSV(selector)), 0x0,
+           "INQ Selector", HFILL }
+        },
+        { &hf_mq_inq_intvalue  ,
+          {"Integer value...", "mq.inq.intvalue",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "INQ Integer value", HFILL }
+        },
+        { &hf_mq_inq_charvalues,
+          {"Char values.....", "mq.inq.charvalues",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "INQ Character values", HFILL }
+        },
+
+        { &hf_mq_spi_verb      ,
+          {"SPI Verb", "mq.spi.verb",
+           FT_UINT32, BASE_DEC, VALS(GET_VALSV(spi_verbs)), 0x0,
+           NULL, HFILL }
+        },
+        { &hf_mq_spi_version   ,
+          {"Version", "mq.spi.version",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "SPI Version", HFILL }
+        },
+        { &hf_mq_spi_length    ,
+          {"Max reply size", "mq.spi.replength",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "SPI Max reply size", HFILL }
+        },
+
+        { &hf_mq_spi_base_StructID,
+          {"SPI Structid", "mq.spib.structid",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           NULL, HFILL }
+        },
+        { &hf_mq_spi_base_version ,
+          {"Version", "mq.spib.version",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "SPI Base Version", HFILL }
+        },
+        { &hf_mq_spi_base_length  ,
+          {"Length", "mq.spib.length",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "SPI Base Length", HFILL }
+        },
+
+        { &hf_mq_spi_spqo_nbverb  ,
+          {"Number of verbs", "mq.spqo.nbverb",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "SPI Query Output Number of verbs", HFILL }
+        },
+        { &hf_mq_spi_spqo_verbid  ,
+          {"Verb", "mq.spqo.verb",
+           FT_UINT32, BASE_DEC, VALS(GET_VALSV(spi_verbs)), 0x0,
+           "SPI Query Output VerbId", HFILL }
+        },
+        { &hf_mq_spi_spqo_maxiover,
+          {"Max InOut Version", "mq.spqo.maxiov",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "SPI Query Output Max InOut Version", HFILL }
+        },
+        { &hf_mq_spi_spqo_maxinver,
+          {"Max In Version", "mq.spqo.maxiv",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "SPI Query Output Max In Version", HFILL }
+        },
+        { &hf_mq_spi_spqo_maxouver,
+          {"Max Out Version", "mq.spqo.maxov",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "SPI Query Output Max Out Version", HFILL }
+        },
+        { &hf_mq_spi_spqo_flags   ,
+          {"Flags", "mq.spqo.flags",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "SPI Query Output flags", HFILL }
+        },
+
+        { &hf_mq_spi_spai_mode    ,
+          {"Mode", "mq.spai.mode",
+           FT_UINT32, BASE_DEC, VALS(GET_VALSV(spi_activate)), 0x0,
+           "SPI Activate Input mode", HFILL }
+        },
+        { &hf_mq_spi_spai_unknown1,
+          {"Unknown1", "mq.spai.unknown1",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "SPI Activate Input unknown1", HFILL }
+        },
+        { &hf_mq_spi_spai_unknown2,
+          {"Unknown2", "mq.spai.unknown2",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "SPI Activate Input unknown2", HFILL }
+        },
+        { &hf_mq_spi_spai_msgid   ,
+          {"Message Id", "mq.spai.msgid",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "SPI Activate Input message id", HFILL }
+        },
+        { &hf_mq_spi_spgi_batchsz ,
+          {"Batch size", "mq.spgi.batchsize",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "SPI Get Input batch size", HFILL }
+        },
+        { &hf_mq_spi_spgi_batchint,
+          {"Batch interval", "mq.spgi.batchint",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "SPI Get Input batch interval", HFILL }
+        },
+        { &hf_mq_spi_spgi_maxmsgsz,
+          {"Max message size", "mq.spgi.maxmsgsize",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "SPI Get Input max message size", HFILL }
+        },
+
+        { &hf_mq_spi_spgo_options ,
+          {"Options", "mq.spgo.options",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "SPI Get Output options", HFILL }
+        },
+        { &hf_mq_spi_spgo_size    ,
+          {"Size", "mq.spgo.size",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "SPI Get Output size", HFILL }
+        },
+        { &hf_mq_spi_opt_blank    ,
+          {"Blank padded", "mq.spi.options.blank",
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_SPI_OPTIONS_BLANK_PADDED,
+           "SPI Options blank padded", HFILL }
+        },
+        { &hf_mq_spi_opt_syncp    ,
+          {"Syncpoint", "mq.spi.options.sync",
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_SPI_OPTIONS_SYNCPOINT,
+           "SPI Options syncpoint", HFILL }
+        },
+        { &hf_mq_spi_opt_deferred ,
+          {"Deferred", "mq.spi.options.deferred",
+           FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_SPI_OPTIONS_DEFERRED,
+           "SPI Options deferred", HFILL }
+        },
+
+        { &hf_mq_put_length       ,
+          {"Data length", "mq.put.length",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "PUT Data length", HFILL }
+        },
+
+        { &hf_mq_close_options    ,
+          {"Options", "mq.close.options",
+           FT_UINT32, BASE_HEX, NULL, 0x0,
+           "CLOSE options", HFILL }
+        },
+        { &hf_mq_close_options_DELETE      ,
+          {"DELETE", "mq.close.options.Delete",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQCO_DELETE,
+           "CLOSE options DELETE", HFILL }
+        },
+        { &hf_mq_close_options_DELETE_PURGE,
+          {"DELETE_PURGE", "mq.close.options.DeletePurge",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQCO_DELETE_PURGE,
+           "CLOSE options DELETE_PURGE", HFILL }
+        },
+        { &hf_mq_close_options_KEEP_SUB    ,
+          {"KEEPSUB", "mq.close.options.KeepSub",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQCO_KEEP_SUB,
+           "CLOSE options KEEP_SUB", HFILL }
+        },
+        { &hf_mq_close_options_REMOVE_SUB  ,
+          {"REMOVE_SUB", "mq.close.options.RemoveSub",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQCO_REMOVE_SUB,
+           "CLOSE options REMOVE_SUB", HFILL }
+        },
+        { &hf_mq_close_options_QUIESCE     ,
+          {"QUIESCE", "mq.close.options.Quiesce",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQCO_QUIESCE,
+           "CLOSE options QUIESCE", HFILL }
+        },
+
+        { &hf_mq_open_options     ,
+          {"Options", "mq.open.options",
+           FT_UINT32, BASE_HEX, NULL, 0x0,
+           "OPEN options", HFILL }
+        },
+        { &hf_mq_open_options_INPUT_AS_Q_DEF ,
+          {"INPUT_AS_Q_DEF", "mq.open.options.InputAsQDef",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_INPUT_AS_Q_DEF,
+           "OPEN options INPUT_AS_Q_DEF", HFILL }
+        },
+        { &hf_mq_open_options_INPUT_SHARED   ,
+          {"INPUT_SHARED", "mq.open.options.InputShared",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_INPUT_SHARED,
+           "OPEN options INPUT_SHARED", HFILL }
+        },
+        { &hf_mq_open_options_INPUT_EXCLUSIVE,
+          {"INPUT_EXCLUSIVE", "mq.open.options.InputExclusive",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_INPUT_EXCLUSIVE,
+           "OPEN options INPUT_EXCLUSIVE", HFILL }
+        },
+        { &hf_mq_open_options_BROWSE         ,
+          {"BROWSE", "mq.open.options.Browse",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_BROWSE,
+           "OPEN options BROWSE", HFILL }
+        },
+        { &hf_mq_open_options_OUTPUT         ,
+          {"OUTPUT", "mq.open.options.Output",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_OUTPUT,
+           "OPEN options OUTPUT", HFILL }
+        },
+        { &hf_mq_open_options_INQUIRE        ,
+          {"INQUIRE", "mq.open.options.Inquire",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_INQUIRE,
+           "OPEN options INQUIRE", HFILL }
+        },
+        { &hf_mq_open_options_SET            ,
+          {"SET", "mq.open.options.Set",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_SET,
+           "OPEN options SET", HFILL }
+        },
+        { &hf_mq_open_options_SAVE_ALL_CTX   ,
+          {"SAVE_ALL_CONTEXT", "mq.open.options.SaveAllContext",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_SAVE_ALL_CONTEXT,
+           "OPEN options SAVE_ALL_CONTEXT", HFILL }
+        },
+        { &hf_mq_open_options_PASS_IDENT_CTX ,
+          {"PASS_IDENTITY_CONTEXT", "mq.open.options.PassIdentityContext",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_PASS_IDENTITY_CONTEXT,
+           "OPEN options PASS_IDENTITY_CONTEXT", HFILL }
+        },
+        { &hf_mq_open_options_PASS_ALL_CTX   ,
+          {"PASS_ALL_CONTEXT", "mq.open.options.PassAllContext",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_PASS_ALL_CONTEXT,
+           "OPEN options PASS_ALL_CONTEXT", HFILL }
+        },
+        { &hf_mq_open_options_SET_IDENT_CTX  ,
+          {"SET_IDENTITY_CONTEXT", "mq.open.options.SetIdentityContext",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_SET_IDENTITY_CONTEXT,
+           "OPEN options SET_IDENTITY_CONTEXT", HFILL }
+        },
+        { &hf_mq_open_options_SET_ALL_CONTEXT,
+          {"SET_ALL_CONTEXT", "mq.open.options.SetAllContext",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_SET_ALL_CONTEXT,
+           "OPEN options SET_ALL_CONTEXT", HFILL }
+        },
+        { &hf_mq_open_options_ALT_USER_AUTH  ,
+          {"ALTERNATE_USER_AUTHORITY", "mq.open.options.AlternateUserAuthority",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_ALTERNATE_USER_AUTHORITY,
+           "OPEN options ALTERNATE_USER_AUTHORITY", HFILL }
+        },
+        { &hf_mq_open_options_FAIL_IF_QUIESC ,
+          {"FAIL_IF_QUIESCING", "mq.open.options.FailIfQuiescing",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_FAIL_IF_QUIESCING,
+           "OPEN options FAIL_IF_QUIESCING", HFILL }
+        },
+        { &hf_mq_open_options_BIND_ON_OPEN   ,
+          {"BIND_ON_OPEN", "mq.open.options.BindOnOpen",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_BIND_ON_OPEN,
+           "OPEN options BIND_ON_OPEN", HFILL }
+        },
+        { &hf_mq_open_options_BIND_NOT_FIXED ,
+          {"BIND_NOT_FIXED", "mq.open.options.BindNotFixed",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_BIND_NOT_FIXED,
+           "OPEN options BIND_NOT_FIXED", HFILL }
+        },
+        { &hf_mq_open_options_RESOLVE_NAMES  ,
+          {"RESOLVE_NAMES", "mq.open.options.ResolveNames",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_RESOLVE_NAMES,
+           "OPEN options RESOLVE_NAMES", HFILL }
+        },
+        { &hf_mq_open_options_CO_OP          ,
+          {"CO_OP", "mq.open.options.CoOp",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_CO_OP,
+           "OPEN options CO_OP", HFILL }
+        },
+        { &hf_mq_open_options_RESOLVE_LOCAL_Q,
+          {"RESOLVE_LOCAL_Q", "mq.open.options.ResolveLocalQueueOrTopic",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_RESOLVE_LOCAL_Q,
+           "OPEN options RESOLVE_LOCAL_Q", HFILL }
+        },
+        { &hf_mq_open_options_NO_READ_AHEAD  ,
+          {"NO_READ_AHEAD", "mq.open.options.NoReadAhead",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_NO_READ_AHEAD,
+           "OPEN options NO_READ_AHEAD", HFILL }
+        },
+        { &hf_mq_open_options_READ_AHEAD     ,
+          {"READ_AHEAD", "mq.open.options.ReadAhead",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_READ_AHEAD,
+           "OPEN options READ_AHEAD", HFILL }
+        },
+        { &hf_mq_open_options_NO_MULTICAST   ,
+          {"NO_MULTICAST", "mq.open.options.NoMulticast",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_NO_MULTICAST,
+           "OPEN options NO_MULTICAST", HFILL }
+        },
+        { &hf_mq_open_options_BIND_ON_GROUP  ,
+          {"BIND_ON_GROUP", "mq.open.options.BindOnGroup",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_BIND_ON_GROUP,
+           "OPEN options BIND_ON_GROUP", HFILL }
+        },
+
+        { &hf_mq_fopa_StructID,
+          {"StructId", "mq.fopa.structid",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           NULL, HFILL }
+        },
+        { &hf_mq_fopa_version ,
+          {"Version.", "mq.fopa.version",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "FOPA Version", HFILL }
+        },
+        { &hf_mq_fopa_length  ,
+          {"Length..", "mq.fopa.length",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "FOPA Length", HFILL }
+        },
+        { &hf_mq_fopa_unknown1,
+          {"Unknown1", "mq.fopa.unknown1",
+           FT_UINT32, BASE_HEX, NULL, 0x0,
+           "FOPA unknown1", HFILL }
+        },
+        { &hf_mq_fopa_unknown2,
+          {"Unknown2", "mq.fopa.unknown2",
+           FT_UINT32, BASE_HEX, NULL, 0x0,
+           "FOPA unknown2", HFILL }
+        },
+        { &hf_mq_fopa_unknown3,
+          {"Unknown3", "mq.fopa.unknown3",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "FOPA unknown3", HFILL }
+        },
+        { &hf_mq_fopa_qprotect,
+          {"qprotect", "mq.fopa.qprotect",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "FOPA queue protection", HFILL }
+        },
+        { &hf_mq_fopa_unknown4,
+          {"Unknown4", "mq.fopa.unknown4",
+           FT_UINT32, BASE_HEX, NULL, 0x0,
+           "FOPA unknown4", HFILL }
+        },
+        { &hf_mq_fopa_unknown5,
+          {"Unknown5", "mq.fopa.unknown5",
+           FT_UINT32, BASE_HEX, NULL, 0x0,
+           "FOPA unknown5", HFILL }
+        },
+
+        { &hf_mq_msgreq_version  ,
+          {"version..", "mq.msgreq.version"  ,
+           FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+           "MSGREQ version", HFILL }
+        },
+        { &hf_mq_msgreq_handle   ,
+          {"handle...", "mq.msgreq.handle"   ,
+           FT_UINT32, BASE_HEX, NULL, 0x0,
+           "MSGREQ handle", HFILL }
+        },
+        { &hf_mq_msgreq_RecvBytes,
+          {"RecvBytes", "mq.msgreq.unknown1" ,
+           FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+           "MSGREQ Received Bytes", HFILL }
+        },
+        { &hf_mq_msgreq_RqstBytes,
+          {"RqstBytes", "mq.msgreq.rqstbytes",
+           FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+           "MSGREQ Requesed Bytes", HFILL }
+        },
+        { &hf_mq_msgreq_MaxMsgLen,
+          {"MaxMsgLen", "mq.msgreq.maxmsglen",
+           FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+           "MSGREQ Maximum Msg Length", HFILL }
+        },
+        { &hf_mq_msgreq_WaitIntrv,
+          {"WaitIntrv", "mq.msgreq.waitintrv",
+           FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+           "MSGREQ Wait Interval", HFILL }
+        },
+        { &hf_mq_msgreq_QueStatus,
+          {"QueStatus", "mq.msgreq.questatus",
+           FT_UINT32, BASE_HEX    , NULL, 0x0,
+           "MSGREQ Queue Status", HFILL }
+        },
+        { &hf_mq_msgreq_RqstFlags,
+          {"RqstFlags", "mq.msgreq.rqstflags",
+           FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+           "MSGREQ Request Flags", HFILL }
+        },
+        { &hf_mq_msgreq_GlbMsgIdx,
+          {"GlbMsgIdx", "mq.msgreq.glbmsgidx",
+           FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+           "MSGREQ Global Message Index", HFILL }
+        },
+        { &hf_mq_msgreq_SelectIdx,
+          {"SelectIdx", "mq.msgreq.selectIdx",
+           FT_UINT16, BASE_HEX_DEC, NULL, 0x0,
+           "MSGREQ Selection Index", HFILL }
+        },
+        { &hf_mq_msgreq_MQMDVers ,
+          {"MQMDVers.", "mq.msgreq.mqmdvers" ,
+           FT_UINT16, BASE_HEX_DEC, NULL, 0x0,
+           "MSGREQ MQMD Version", HFILL }
+        },
+        { &hf_mq_msgreq_ccsid    ,
+          {"CCSID....", "mq.msgreq.ccsid"    ,
+           FT_INT32 , BASE_DEC | BASE_RANGE_STRING, RVALS(&GET_VALRV(ccsid)), 0x0,
+           "MSGREQ ccsid", HFILL }
+        },
+        { &hf_mq_msgreq_encoding ,
+          {"Encoding.", "mq.msgreq.encoding" ,
+           FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+           "MSGREQ encoding", HFILL }
+        },
+        { &hf_mq_msgreq_MsgSeqNum,
+          {"MsgSeqNum", "mq.msgreq.msgseqnum",
+           FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+           "MSGREQ Message Sequence Number", HFILL }
+        },
+        { &hf_mq_msgreq_offset   ,
+          {"Offset...", "mq.msgreq.offset"   ,
+           FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+           "MSGREQ Offset", HFILL }
+        },
+        { &hf_mq_msgreq_mtchMsgId,
+          {"mtchMsgId", "mq.msgreq.mtchMsgId",
+           FT_BYTES , BASE_NONE   , NULL, 0x0,
+           "MSGREQ match MsgID", HFILL }
+        },
+        { &hf_mq_msgreq_mtchCorId,
+          {"mtchCorID", "mq.msgreq.mtchcorid",
+           FT_BYTES , BASE_NONE   , NULL, 0x0,
+           "MSGREQ match Correlation Id", HFILL }
+        },
+        { &hf_mq_msgreq_mtchGrpid,
+          {"mtchGrpID", "mq.msgreq.mtchgrpid",
+           FT_BYTES , BASE_NONE   , NULL, 0x0,
+           "MSGREQ match Group ID", HFILL }
+        },
+        { &hf_mq_msgreq_mtchMsgTk,
+          {"mtchMsgTk", "mq.msgreq.mtchmsgtk",
+           FT_BYTES , BASE_NONE   , NULL, 0x0,
+           "MSGREQ match Message Token", HFILL }
+        },
+
+        { &hf_mq_msgasy_version  ,
+          {"version..", "mq.msgasy.version"  ,
+           FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+           "MSGASYNC version", HFILL }
+        },
+        { &hf_mq_msgasy_handle   ,
+          {"handle...", "mq.msgasy.handle"   ,
+           FT_UINT32, BASE_HEX, NULL, 0x0,
+           "MSGASYNC handle", HFILL }
+        },
+        { &hf_mq_msgasy_MsgIndex ,
+          {"MsgIndex.", "mq.msgasy.msgindex" ,
+           FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+           "MSGASYNC Message Index", HFILL }
+        },
+        { &hf_mq_msgasy_GlbMsgIdx,
+          {"GlbMsgIdx", "mq.msgasy.glbmsgidx",
+           FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+           "MSGASYNC Global Message Index", HFILL }
+        },
+        { &hf_mq_msgasy_SegLength,
+          {"SegLength", "mq.msgasy.seglength",
+           FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+           "MSGASYNC Segment Length", HFILL }
+        },
+        { &hf_mq_msgasy_SegmIndex,
+          {"SegmIndex", "mq.msgasy.segmindex",
+           FT_UINT16, BASE_HEX_DEC, NULL, 0x0,
+           "MSGASYNC Segment Index", HFILL }
+        },
+        { &hf_mq_msgasy_SeleIndex,
+          {"SeleIndex", "mq.msgasy.seleindex",
+           FT_UINT16, BASE_HEX_DEC, NULL, 0x0,
+           "MSGASYNC Selection Index", HFILL }
+        },
+        { &hf_mq_msgasy_ReasonCod,
+          {"ReasonCod", "mq.msgasy.reasoncod",
+           FT_UINT32, BASE_HEX    , NULL, 0x0,
+           "MSGASYNC Reason Code", HFILL }
+        },
+        { &hf_mq_msgasy_ActMsgLen,
+          {"ActMsgLen", "mq.msgasy.actmsglen",
+           FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+           "MSGASYNC Actual Message Length", HFILL }
+        },
+        { &hf_mq_msgasy_TotMsgLen,
+          {"TotMsgLen", "mq.msgasy.totmsglen",
+           FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+           "MSGASYNC Total Message Length", HFILL }
+        },
+        { &hf_mq_msgasy_MsgToken ,
+          {"MsgToken.", "mq.msgasy.msgtoken" ,
+           FT_BYTES , BASE_NONE   , NULL, 0x0,
+           "MSGASYNC Mesasage Token", HFILL }
+        },
+        { &hf_mq_msgasy_Status   ,
+          {"status...", "mq.msgasy.status"   ,
+           FT_UINT16, BASE_HEX    , NULL, 0x0,
+           "MSGASYNC Status", HFILL }
+        },
+        { &hf_mq_msgasy_resolQNLn,
+          {"resolQNLn", "mq.msgasy.resolqnln",
+           FT_UINT8 , BASE_DEC    , NULL, 0x0,
+           "MSGASYNC Resolved Queue Name Length", HFILL }
+        },
+        { &hf_mq_msgasy_resolQNme,
+          {"resolQNme", "mq.msgasy.resolqnme",
+           FT_STRINGZ, BASE_NONE  , NULL, 0x0,
+           "MSGASYNC Resolved Queue Name", HFILL }
+        },
+        { &hf_mq_msgasy_padding  ,
+          {"Padding..", "mq.msgasy.padding"  ,
+           FT_BYTES , BASE_NONE   , NULL, 0x0,
+           "MSGASYNC Padding", HFILL }
+        },
+
+        { &hf_mq_notif_vers     ,
+          {"version.", "mq.notif.vers"  ,
+           FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+           "NOTIFICATION version", HFILL }
+        },
+        { &hf_mq_notif_handle   ,
+          {"handle..", "mq.notif.handle",
+           FT_UINT32, BASE_HEX    , NULL, 0x0,
+           "NOTIFICATION handle", HFILL }
+        },
+        { &hf_mq_notif_code     ,
+          {"code....", "mq.notif.code"  ,
+           FT_UINT32, BASE_HEX_DEC, VALS(GET_VALSV(notifcode)), 0x0,
+           "NOTIFICATION code", HFILL }
+        },
+        { &hf_mq_notif_value    ,
+          {"value...", "mq.notif.value" ,
+           FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
+           "NOTIFICATION MQRC", HFILL }
+        },
+
+        { &hf_mq_ping_length    ,
+          {"Length", "mq.ping.length",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "PING length", HFILL }
+        },
+        { &hf_mq_ping_buffer    ,
+          {"Buffer", "mq.ping.buffer",
+           FT_BYTES, BASE_NONE, NULL, 0x0,
+           "PING buffer", HFILL }
+        },
+
+        { &hf_mq_reset_length   ,
+          {"Length", "mq.reset.length",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "RESET length", HFILL }
+        },
+        { &hf_mq_reset_seqnum   ,
+          {"SeqNum", "mq.reset.seqnum",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "RESET sequence number", HFILL }
+        },
+
+        { &hf_mq_status_length  ,
+          {"Length", "mq.status.length",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "STATUS length", HFILL }
+        },
+        { &hf_mq_status_code    ,
+          {"Code..", "mq.status.code"  ,
+           FT_UINT32, BASE_DEC, VALS(GET_VALSV(status)), 0x0,
+           "STATUS code", HFILL }
+        },
+        { &hf_mq_status_value   ,
+          {"Value.", "mq.status.value" ,
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "STATUS value", HFILL }
+        },
+
+        { &hf_mq_od_StructID    ,
+          {"StructID.........", "mq.od.structid",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           NULL, HFILL }
+        },
+        { &hf_mq_od_version     ,
+          {"version..........", "mq.od.version",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "OD version", HFILL }
+        },
+        { &hf_mq_od_objecttype  ,
+          {"ObjType..........", "mq.od.objtype",
+           FT_UINT32, BASE_DEC, VALS(GET_VALSV(objtype)), 0x0,
+           "OD object type", HFILL }
+        },
+        { &hf_mq_od_objectname  ,
+          {"ObjName..........", "mq.od.objname",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "OD object name", HFILL }
+        },
+        { &hf_mq_od_objqmgrname ,
+          {"ObjQMgr..........", "mq.od.objqmgrname",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "OD object queue manager name", HFILL }
+        },
+        { &hf_mq_od_dynqname    ,
+          {"DynQName.........", "mq.od.dynqname",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "OD dynamic queue name", HFILL }
+        },
+        { &hf_mq_od_altuserid   ,
+          {"AltUserID........", "mq.od.altuserid",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "OD alternate userid", HFILL }
+        },
+        { &hf_mq_od_recspresent ,
+          {"NbrRecord........", "mq.od.nbrrec",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "OD number of records", HFILL }
+        },
+        { &hf_mq_od_knowndstcnt ,
+          {"Known Dest Count.", "mq.od.kdestcount",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "OD known destination count", HFILL }
+        },
+        { &hf_mq_od_unknowdstcnt,
+          {"Unknown Dest Cnt.", "mq.od.udestcount",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "OD unknown destination count", HFILL }
+        },
+        { &hf_mq_od_invaldstcnt ,
+          {"Invalid Dest Cnt.", "mq.od.idestcount",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "OD invalid destination count", HFILL }
+        },
+        { &hf_mq_od_objrecofs   ,
+          {"Offset of 1st OR.", "mq.od.offsetor",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "OD offset of first OR", HFILL }
+        },
+        { &hf_mq_od_resprecofs  ,
+          {"Offset of 1st RR.", "mq.od.offsetrr",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "OD offset of first RR", HFILL }
+        },
+        { &hf_mq_od_objrecptr   ,
+          {"Addr   of 1st OR.", "mq.od.addror",
+           FT_UINT32, BASE_HEX, NULL, 0x0,
+           "OD address of first OR", HFILL }
+        },
+        { &hf_mq_od_resprecptr  ,
+          {"Addr   of 1st RR.", "mq.od.addrrr",
+           FT_UINT32, BASE_HEX, NULL, 0x0,
+           "OD address of first RR", HFILL }
+        },
+        { &hf_mq_od_altsecurid  ,
+          {"Alt security id..", "mq.od.altsecid",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "OD alternate security id", HFILL }
+        },
+        { &hf_mq_od_resolvqname ,
+          {"Resolved Q Name..", "mq.od.resolvq",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "OD resolved queue name", HFILL }
+        },
+        { &hf_mq_od_resolvqmgrnm,
+          {"Resolved QMgrName", "mq.od.resolvqmgr",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "OD resolved queue manager name", HFILL }
+        },
+        { &hf_mq_od_resolvobjtyp,
+          {"Resolv Obj Type..", "mq.od.resolvedobjtype",
+           FT_UINT32, BASE_DEC, VALS(GET_VALSV(objtype)), 0x0,
+           "OD resolved object type", HFILL }
+        },
+
+        { &hf_mq_or_objname     ,
+          {"Object name...", "mq.or.objname",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "OR object name", HFILL }
+        },
+        { &hf_mq_or_objqmgrname ,
+          {"Object QMgr Nm", "mq.or.objqmgrname",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "OR object queue manager name", HFILL }
+        },
+
+        { &hf_mq_rr_compcode    ,
+          {"Comp Code", "mq.rr.completioncode",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "OR completion code", HFILL }
+        },
+        { &hf_mq_rr_reascode    ,
+          {"Reas Code", "mq.rr.reasoncode",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "OR reason code", HFILL }
+        },
+
+        { &hf_mq_pmr_msgid      ,
+          {"Message Id", "mq.pmr.msgid",
+           FT_BYTES, BASE_NONE, NULL, 0x0,
+           "PMR Message Id", HFILL }
+        },
+        { &hf_mq_pmr_correlid   ,
+          {"Correlation Id", "mq.pmr.correlid",
+           FT_BYTES, BASE_NONE, NULL, 0x0,
+           "PMR Correlation Id", HFILL }
+        },
+        { &hf_mq_pmr_groupid    ,
+          {"GroupId", "mq.pmr.groupid",
+           FT_BYTES, BASE_NONE, NULL, 0x0,
+           "PMR GroupId", HFILL }
+        },
+        { &hf_mq_pmr_feedback   ,
+          {"Feedback", "mq.pmr.feedback",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "PMR Feedback", HFILL }
+        },
+        { &hf_mq_pmr_acttoken   ,
+          {"Accounting token", "mq.pmr.acttoken",
+           FT_BYTES, BASE_NONE, NULL, 0x0,
+           "PMR accounting token", HFILL }
+        },
+
+        { &hf_mq_md_StructID    ,
+          {"StructID.", "mq.md.structid",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           NULL, HFILL }
+        },
+        { &hf_mq_md_version     ,
+          {"Version..", "mq.md.version",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "MD version", HFILL }
+        },
+        { &hf_mq_md_report      ,
+          {"Report...", "mq.md.report",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "MD report", HFILL }
+        },
+        { &hf_mq_md_msgtype     ,
+          {"Msg Type.", "mq.md.msgtype",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "MD message type", HFILL }
+        },
+        { &hf_mq_md_expiry      ,
+          {"Expiry  .", "mq.md.expiry",
+           FT_INT32, BASE_DEC, NULL, 0x0,
+           "MD expiry", HFILL }
+        },
+        { &hf_mq_md_feedback    ,
+          {"Feedback.", "mq.md.feedback",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "MD feedback", HFILL }
+        },
+        { &hf_mq_md_encoding    ,
+          {"Encoding.", "mq.md.encoding",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "MD encoding", HFILL }
+        },
+        { &hf_mq_md_ccsid       ,
+          {"CCSID....", "mq.md.ccsid",
+           FT_INT32, BASE_DEC | BASE_RANGE_STRING, RVALS(&GET_VALRV(ccsid)), 0x0,
+           "MD character set", HFILL }
+        },
+        { &hf_mq_md_format      ,
+          {"Format...", "mq.md.format",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "MD format", HFILL }
+        },
+        { &hf_mq_md_priority    ,
+          {"Priority.", "mq.md.priority",
+           FT_INT32, BASE_DEC, NULL, 0x0,
+           "MD priority", HFILL }
+        },
+        { &hf_mq_md_persistence ,
+          {"Persist..", "mq.md.persistence",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "MD persistence", HFILL }
+        },
+        { &hf_mq_md_msgid       ,
+          {"Msg ID...", "mq.md.msgid",
+           FT_BYTES, BASE_NONE, NULL, 0x0,
+           "MD Message Id", HFILL }
+        },
+        { &hf_mq_md_correlid    ,
+          {"CorrelID.", "mq.md.correlid",
+           FT_BYTES, BASE_NONE, NULL, 0x0,
+           "MD Correlation Id", HFILL }
+        },
+        { &hf_mq_md_backoutcnt  ,
+          {"BackoCnt.", "mq.md.backount",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "MD Backout count", HFILL }
+        },
+        { &hf_mq_md_replytoq    ,
+          {"ReplyToQ.", "mq.md.replytoq",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "MD ReplyTo queue", HFILL }
+        },
+        { &hf_mq_md_replytoqmgr ,
+          {"RepToQMgr", "mq.md.replytoqmgr",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "MD ReplyTo queue manager", HFILL }
+        },
+        { &hf_mq_md_userid      ,
+          {"UserId...", "mq.md.userid",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "MD UserId", HFILL }
+        },
+        { &hf_mq_md_acttoken    ,
+          {"AccntTok.", "mq.md.acttoken",
+           FT_BYTES, BASE_NONE, NULL, 0x0,
+           "MD accounting token", HFILL }
+        },
+        { &hf_mq_md_appliddata  ,
+          {"AppIdData", "mq.md.appldata",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "MD Put applicationId data", HFILL }
+        },
+        { &hf_mq_md_putappltype ,
+          {"PutAppTyp", "mq.md.appltype",
+           FT_INT32, BASE_DEC, VALS(GET_VALSV(mqat)), 0x0,
+           "MD Put application type", HFILL }
+        },
+        { &hf_mq_md_putapplname ,
+          {"PutAppNme", "mq.md.applname",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "MD Put application name", HFILL }
+        },
+        { &hf_mq_md_putdate     ,
+          {"PutDatGMT", "mq.md.date",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "MD Put date", HFILL }
+        },
+        { &hf_mq_md_puttime     ,
+          {"PutTimGMT", "mq.md.time",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "MD Put time", HFILL }
+        },
+        { &hf_mq_md_apporigdata ,
+          {"AppOriDat", "mq.md.origdata",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "MD Application original data", HFILL }
+        },
+        { &hf_mq_md_groupid     ,
+          {"GroupId..", "mq.md.groupid",
+           FT_BYTES, BASE_NONE, NULL, 0x0,
+           "MD GroupId", HFILL }
+        },
+        { &hf_mq_md_msgseqnumber,
+          {"MsgSeqNum", "mq.md.msgseqnumber",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "MD Message sequence number", HFILL }
+        },
+        { &hf_mq_md_offset      ,
+          {"Offset...", "mq.md.offset",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "MD Offset", HFILL }
+        },
+        { &hf_mq_md_msgflags    ,
+          {"Msg flags", "mq.md.msgflags",
+           FT_UINT32, BASE_HEX, NULL, 0x0,
+           "MD Message flags", HFILL }
+        },
+        { &hf_mq_md_origlen     ,
+          {"Orig len.", "mq.md.origlength",
+           FT_INT32, BASE_DEC, NULL, 0x0,
+           "MD Original length", HFILL }
+        },
+
+        { &hf_mq_dlh_StructID   ,
+          {"StructID.", "mq.dlh.structid",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           NULL, HFILL }
+        },
+        { &hf_mq_dlh_version    ,
+          {"Version..", "mq.dlh.version",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "DLH version", HFILL }
+        },
+        { &hf_mq_dlh_reason     ,
+          {"Reason...", "mq.dlh.reason",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "DLH reason", HFILL }
+        },
+        { &hf_mq_dlh_destq      ,
+          {"Dest Q...", "mq.dlh.destq",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "DLH destination queue", HFILL }
+        },
+        { &hf_mq_dlh_destqmgr   ,
+          {"DestQMgr.", "mq.dlh.destqmgr",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "DLH destination queue manager", HFILL }
+        },
+        { &hf_mq_dlh_encoding   ,
+          {"Encoding.", "mq.dlh.encoding",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "DLH encoding", HFILL }
+        },
+        { &hf_mq_dlh_ccsid      ,
+          {"CCSID....", "mq.dlh.ccsid",
+           FT_INT32, BASE_DEC | BASE_RANGE_STRING, RVALS(&GET_VALRV(ccsid)), 0x0,
+           "DLH character set", HFILL }
+        },
+        { &hf_mq_dlh_format     ,
+          {"Format...", "mq.dlh.format",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "DLH format", HFILL }
+        },
+        { &hf_mq_dlh_putappltype,
+          {"PutAppTyp", "mq.dlh.putappltype",
+           FT_INT32, BASE_DEC, VALS(GET_VALSV(mqat)), 0x0,
+           "DLH put application type", HFILL }
+        },
+        { &hf_mq_dlh_putapplname,
+          {"PutAppNme", "mq.dlh.putapplname",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "DLH put application name", HFILL }
+        },
+        { &hf_mq_dlh_putdate    ,
+          {"PutDatGMT", "mq.dlh.putdate",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "DLH put date", HFILL }
+        },
+        { &hf_mq_dlh_puttime    ,
+          {"PutTimGMT", "mq.dlh.puttime",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "DLH put time", HFILL }
+        },
+        { &hf_mq_dh_putmsgrecfld,
+          {"Flags PMR", "mq.dh.flagspmr",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "DH flags PMR", HFILL }
+        },
+        { &hf_mq_dh_recspresent ,
+          {"NumOfRecs", "mq.dh.nbrrec",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "DH number of records", HFILL }
+        },
+        { &hf_mq_dh_objrecofs   ,
+          {"Ofs1stOR.", "mq.dh.offsetor",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "DH offset of first OR", HFILL }
+        },
+        { &hf_mq_dh_putmsgrecofs,
+          {"Ofs1stPMR", "mq.dh.offsetpmr",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "DH offset of first PMR", HFILL }
+        },
+
+        { &hf_mq_gmo_StructID   ,
+          {"StructID.", "mq.gmo.structid",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           NULL, HFILL }
+        },
+        { &hf_mq_gmo_version    ,
+          {"Version..", "mq.gmo.version",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "GMO version", HFILL }
+        },
+        { &hf_mq_gmo_options    ,
+          {"GetMsgOpt", "mq.gmo.getmsgopt",
+           FT_UINT32, BASE_HEX, NULL, 0x0,
+           "GMO Get Message Options", HFILL }
+        },
+
+        { &hf_mq_gmo_options_PROPERTIES_COMPATIBILITY,
+          {"PROPERTIES_COMPATIBILITY", "mq.gmo.options.PROPERTIES_COMPATIBILITY",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_PROPERTIES_COMPATIBILITY,
+           "GMO options PROPERTIES_COMPATIBILITY", HFILL }
+        },
+        { &hf_mq_gmo_options_PROPERTIES_IN_HANDLE    ,
+          {"PROPERTIES_IN_HANDLE", "mq.gmo.options.PROPERTIES_IN_HANDLE",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_PROPERTIES_IN_HANDLE ,
+           "GMO options PROPERTIES_IN_HANDLE", HFILL }
+        },
+        { &hf_mq_gmo_options_NO_PROPERTIES           ,
+          {"NO_PROPERTIES", "mq.gmo.options.NO_PROPERTIES",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_NO_PROPERTIES ,
+           "GMO options NO_PROPERTIES", HFILL }
+        },
+        { &hf_mq_gmo_options_PROPERTIES_FORCE_MQRFH2 ,
+          {"PROPERTIES_FORCE_MQRFH2", "mq.gmo.options.PROPERTIES_FORCE_MQRFH2",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_PROPERTIES_FORCE_MQRFH2 ,
+           "GMO options PROPERTIES_FORCE_MQRFH2", HFILL }
+        },
+        { &hf_mq_gmo_options_UNMARKED_BROWSE_MSG     ,
+          {"UNMARKED_BROWSE_MSG", "mq.gmo.options.UNMARKED_BROWSE_MSG",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_UNMARKED_BROWSE_MSG ,
+           "GMO options UNMARKED_BROWSE_MSG", HFILL }
+        },
+        { &hf_mq_gmo_options_UNMARK_BROWSE_HANDLE    ,
+          {"UNMARK_BROWSE_HANDLE", "mq.gmo.options.UNMARK_BROWSE_HANDLE",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_UNMARK_BROWSE_HANDLE ,
+           "GMO options UNMARK_BROWSE_HANDLE", HFILL }
+        },
+        { &hf_mq_gmo_options_UNMARK_BROWSE_CO_OP     ,
+          {"UNMARK_BROWSE_CO_OP", "mq.gmo.options.UNMARK_BROWSE_CO_OP",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_UNMARK_BROWSE_CO_OP ,
+           "GMO options UNMARK_BROWSE_CO_OP", HFILL }
+        },
+        { &hf_mq_gmo_options_MARK_BROWSE_CO_OP       ,
+          {"MARK_BROWSE_CO_OP", "mq.gmo.options.MARK_BROWSE_CO_OP",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_MARK_BROWSE_CO_OP ,
+           "GMO options MARK_BROWSE_CO_OP", HFILL }
+        },
+        { &hf_mq_gmo_options_MARK_BROWSE_HANDLE      ,
+          {"MARK_BROWSE_HANDLE", "mq.gmo.options.MARK_BROWSE_HANDLE",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_MARK_BROWSE_HANDLE ,
+           "GMO options MARK_BROWSE_HANDLE", HFILL }
+        },
+        { &hf_mq_gmo_options_ALL_SEGMENTS_AVAILABLE  ,
+          {"ALL_SEGMENTS_AVAILABLE", "mq.gmo.options.ALL_SEGMENTS_AVAILABLE",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_ALL_SEGMENTS_AVAILABLE ,
+           "GMO options ALL_SEGMENTS_AVAILABLE", HFILL }
+        },
+        { &hf_mq_gmo_options_ALL_MSGS_AVAILABLE      ,
+          {"ALL_MSGS_AVAILABLE", "mq.gmo.options.ALL_MSGS_AVAILABLE",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_ALL_MSGS_AVAILABLE ,
+           "GMO options ALL_MSGS_AVAILABLE", HFILL }
+        },
+        { &hf_mq_gmo_options_COMPLETE_MSG            ,
+          {"COMPLETE_MSG", "mq.gmo.options.COMPLETE_MSG",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_COMPLETE_MSG ,
+           "GMO options COMPLETE_MSG", HFILL }
+        },
+        { &hf_mq_gmo_options_LOGICAL_ORDER           ,
+          {"LOGICAL_ORDER", "mq.gmo.options.LOGICAL_ORDER",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_LOGICAL_ORDER ,
+           "GMO options LOGICAL_ORDER", HFILL }
+        },
+        { &hf_mq_gmo_options_CONVERT                 ,
+          {"CONVERT", "mq.gmo.options.CONVERT",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_CONVERT ,
+           "GMO options CONVERT", HFILL }
+        },
+        { &hf_mq_gmo_options_FAIL_IF_QUIESCING       ,
+          {"FAIL_IF_QUIESCING", "mq.gmo.options.FAIL_IF_QUIESCING",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_FAIL_IF_QUIESCING ,
+           "GMO options FAIL_IF_QUIESCING", HFILL }
+        },
+        { &hf_mq_gmo_options_SYNCPOINT_IF_PERSISTENT ,
+          {"SYNCPOINT_IF_PERSISTENT", "mq.gmo.options.SYNCPOINT_IF_PERSISTENT",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_SYNCPOINT_IF_PERSISTENT ,
+           "GMO options SYNCPOINT_IF_PERSISTENT", HFILL }
+        },
+        { &hf_mq_gmo_options_BROWSE_MSG_UNDER_CURSOR ,
+          {"BROWSE_MSG_UNDER_CURSOR", "mq.gmo.options.BROWSE_MSG_UNDER_CURSOR",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_BROWSE_MSG_UNDER_CURSOR ,
+           "GMO options BROWSE_MSG_UNDER_CURSOR", HFILL }
+        },
+        { &hf_mq_gmo_options_UNLOCK                  ,
+          {"UNLOCK", "mq.gmo.options.UNLOCK",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_UNLOCK ,
+           "GMO options UNLOCK", HFILL }
+        },
+        { &hf_mq_gmo_options_LOCK                    ,
+          {"LOCK", "mq.gmo.options.LOCK",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_LOCK ,
+           "GMO options LOCK", HFILL }
+        },
+        { &hf_mq_gmo_options_MSG_UNDER_CURSOR        ,
+          {"MSG_UNDER_CURSOR", "mq.gmo.options.MSG_UNDER_CURSOR",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_MSG_UNDER_CURSOR ,
+           "GMO options MSG_UNDER_CURSOR", HFILL }
+        },
+        { &hf_mq_gmo_options_MARK_SKIP_BACKOUT       ,
+          {"MARK_SKIP_BACKOUT", "mq.gmo.options.MARK_SKIP_BACKOUT",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_MARK_SKIP_BACKOUT ,
+           "GMO options MARK_SKIP_BACKOUT", HFILL }
+        },
+        { &hf_mq_gmo_options_ACCEPT_TRUNCATED_MSG    ,
+          {"ACCEPT_TRUNCATED_MSG", "mq.gmo.options.ACCEPT_TRUNCATED_MSG",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_ACCEPT_TRUNCATED_MSG ,
+           "GMO options ACCEPT_TRUNCATED_MSG", HFILL }
+        },
+        { &hf_mq_gmo_options_BROWSE_NEXT             ,
+          {"BROWSE_NEXT", "mq.gmo.options.BROWSE_NEXT",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_BROWSE_NEXT ,
+           "GMO options BROWSE_NEXT", HFILL }
+        },
+        { &hf_mq_gmo_options_BROWSE_FIRST            ,
+          {"BROWSE_FIRST", "mq.gmo.options.BROWSE_FIRST",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_BROWSE_FIRST ,
+           "GMO options BROWSE_FIRST", HFILL }
+        },
+        { &hf_mq_gmo_options_SET_SIGNAL              ,
+          {"SET_SIGNAL", "mq.gmo.options.SET_SIGNAL",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_SET_SIGNAL ,
+           "GMO options SET_SIGNAL", HFILL }
+        },
+        { &hf_mq_gmo_options_NO_SYNCPOINT            ,
+          {"NO_SYNCPOINT", "mq.gmo.options.NO_SYNCPOINT",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_NO_SYNCPOINT ,
+           "GMO options NO_SYNCPOINT", HFILL }
+        },
+        { &hf_mq_gmo_options_SYNCPOINT               ,
+          {"SYNCPOINT", "mq.gmo.options.SYNCPOINT",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_SYNCPOINT ,
+           "GMO options SYNCPOINT", HFILL }
+        },
+        { &hf_mq_gmo_options_WAIT                    ,
+          {"WAIT", "mq.gmo.options.WAIT",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQGMO_WAIT ,
+           "GMO options WAIT", HFILL }
+        },
+
+        { &hf_mq_gmo_waitinterval,
+          {"WaitIntv.", "mq.gmo.waitint",
+           FT_INT32, BASE_DEC, NULL, 0x0,
+           "GMO wait interval", HFILL }
+        },
+        { &hf_mq_gmo_signal1     ,
+          {"Signal 1.", "mq.gmo.signal1",
+           FT_UINT32, BASE_HEX, NULL, 0x0,
+           "GMO signal 1", HFILL }
+        },
+        { &hf_mq_gmo_signal2     ,
+          {"Signal 2.", "mq.gmo.signal2",
+           FT_UINT32, BASE_HEX, NULL, 0x0,
+           "GMO signal 2", HFILL }
+        },
+        { &hf_mq_gmo_resolvqname ,
+          {"ResQName.", "mq.gmo.resolvq",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "GMO resolved queue name", HFILL }
+        },
+        { &hf_mq_gmo_matchoptions,
+          {"MatchOpt.", "mq.gmo.matchopt",
+           FT_UINT32, BASE_HEX, NULL, 0x0,
+           "GMO match options", HFILL }
+        },
+
+        { &hf_mq_gmo_matchoptions_MATCH_MSG_TOKEN     ,
+          {"MATCH_MSG_TOKEN", "mq.gmo.matchoptions.MATCH_MSG_TOKEN",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQMO_MATCH_MSG_TOKEN ,
+           "GMO matchoptions MATCH_MSG_TOKEN", HFILL }
+        },
+        { &hf_mq_gmo_matchoptions_MATCH_OFFSET        ,
+          {"MATCH_OFFSET", "mq.gmo.matchoptions.MATCH_OFFSET",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQMO_MATCH_OFFSET ,
+           "GMO matchoptions MATCH_OFFSET", HFILL }
+        },
+        { &hf_mq_gmo_matchoptions_MATCH_MSG_SEQ_NUMBER,
+          {"MATCH_MSG_SEQ_NUMBER", "mq.gmo.matchoptions.MATCH_MSG_SEQ_NUMBER",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQMO_MATCH_MSG_SEQ_NUMBER,
+           "GMO matchoptions MATCH_MSG_SEQ_NUMBER", HFILL }
+        },
+        { &hf_mq_gmo_matchoptions_MATCH_GROUP_ID      ,
+          {"MATCH_GROUP_ID", "mq.gmo.matchoptions.MATCH_GROUP_ID",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQMO_MATCH_GROUP_ID ,
+           "GMO matchoptions MATCH_GROUP_ID", HFILL }
+        },
+        { &hf_mq_gmo_matchoptions_MATCH_CORREL_ID     ,
+          {"MATCH_CORREL_ID", "mq.gmo.matchoptions.MATCH_CORREL_ID",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQMO_MATCH_CORREL_ID ,
+           "GMO matchoptions MATCH_CORREL_ID", HFILL }
+        },
+        { &hf_mq_gmo_matchoptions_MATCH_MSG_ID        ,
+          {"MATCH_MSG_ID", "mq.gmo.matchoptions.MATCH_MSG_ID",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQMO_MATCH_MSG_ID ,
+           "GMO matchoptions MATCH_MSG_ID", HFILL }
+        },
+
+        { &hf_mq_gmo_groupstatus ,
+          {"GrpStatus", "mq.gmo.grpstat",
+           FT_UINT8, BASE_HEX, NULL, 0x0,
+           "GMO group status", HFILL }
+        },
+        { &hf_mq_gmo_segmstatus  ,
+          {"SegStatus", "mq.gmo.sgmtstat",
+           FT_UINT8, BASE_HEX, NULL, 0x0,
+           "GMO segment status", HFILL }
+        },
+        { &hf_mq_gmo_segmentation,
+          {"Segmentat", "mq.gmo.segmentation",
+           FT_UINT8, BASE_HEX, NULL, 0x0,
+           "GMO segmentation", HFILL }
+        },
+        { &hf_mq_gmo_reserved    ,
+          {"Reserved.", "mq.gmo.reserved",
+           FT_UINT8, BASE_HEX, NULL, 0x0,
+           "GMO reserved", HFILL }
+        },
+        { &hf_mq_gmo_msgtoken    ,
+          {"MsgToken.", "mq.gmo.msgtoken",
+           FT_BYTES, BASE_NONE, NULL, 0x0,
+           "GMO message token", HFILL }
+        },
+        { &hf_mq_gmo_returnedlen ,
+          {"RtnLength", "mq.gmo.retlen",
+           FT_INT32, BASE_DEC, NULL, 0x0,
+           "GMO returned length", HFILL }
+        },
+
+        { &hf_mq_lpoo_StructID      ,
+          {"StructID......", "mq.lpoo.structid",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           NULL, HFILL }
+        },
+        { &hf_mq_lpoo_version       ,
+          {"Version.......", "mq.lpoo.version",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "LPOO version", HFILL }
+        },
+        { &hf_mq_lpoo_options       ,
+          {"Options.......", "mq.lpoo.options",
+           FT_UINT32, BASE_HEX, NULL, 0x0,
+           "LPOO options", HFILL }
+        },
+        { &hf_mq_lpoo_lpiopts       ,
+          {"LpiOpts.......", "mq.lpoo.lpioopts",
+           FT_UINT32, BASE_HEX, NULL, 0x0,
+           "LPOO Lpi Options", HFILL }
+        },
+
+        { &hf_mq_lpoo_lpiopts_SAVE_USER_CTXT    ,
+          {"SAVE_USER_CTXT", "mq.lpoo.opts.SAVE_USER_CTXT",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_LPOO_SAVE_USER_CTXT,
+           "LPOO options SAVE_USER_CTXT", HFILL }
+        },
+        { &hf_mq_lpoo_lpiopts_SAVE_ORIGIN_CTXT  ,
+          {"SAVE_ORIGIN_CTXT", "mq.lpoo.opts.SAVE_ORIGIN_CTXT",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_LPOO_SAVE_ORIGIN_CTXT,
+           "LPOO options SAVE_ORIGIN_CTXT", HFILL }
+        },
+        { &hf_mq_lpoo_lpiopts_SAVE_IDENTITY_CTXT,
+          {"SAVE_IDENTITY_CTXT", "mq.lpoo.opts.SAVE_IDENTITY_CTXT",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_LPOO_SAVE_IDENTITY_CTXT,
+           "LPOO options SAVE_IDENTITY_CTXT", HFILL }
+        },
+
+        { &hf_mq_lpoo_defpersist    ,
+          {"DefPersitence.", "mq.lpoo.defpersist",
+           FT_UINT32, BASE_HEX, NULL, 0x0,
+           "LPOO Default Persitence", HFILL }
+        },
+        { &hf_mq_lpoo_defputresptype,
+          {"DefPutRespType", "mq.lpoo.defputresptype",
+           FT_UINT32, BASE_HEX, NULL, 0x0,
+           "LPOO Default Put Response Type", HFILL }
+        },
+        { &hf_mq_lpoo_defreadahead  ,
+          {"DefReadAHead..", "mq.lpoo.defreadahead",
+           FT_UINT32, BASE_HEX, NULL, 0x0,
+           "LPOO Default Read AHead", HFILL }
+        },
+
+        { &hf_mq_lpoo_qprotect      ,
+          {"qprotect......", "mq.lpoo.qprotect",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "LPOO queue protection", HFILL }
+        },
+        { &hf_mq_lpoo_unknown6      ,
+          {"Unknown6......", "mq.lpoo.unknown6",
+           FT_UINT32, BASE_HEX, NULL, 0x0,
+           "LPOO unknown6", HFILL }
+        },
+        /*{ &hf_mq_lpoo_unknown7      ,
+          {"Unknown7......", "mq.lpoo.unknown7",
+          FT_UINT16, BASE_HEX, NULL, 0x0,
+          "LPOO unknown7", HFILL }
+          },*/
+        { &hf_mq_lpoo_xtradata      ,
+          {"ExtraData.....", "mq.lpoo.extradata",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "LPOO Extra Data", HFILL }
+        },
+
+        { &hf_mq_pmo_StructID    ,
+          {"StructID.", "mq.pmo.structid",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           NULL, HFILL }
+        },
+        { &hf_mq_pmo_version     ,
+          {"Version..", "mq.pmo.version",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "PMO version", HFILL }
+        },
+        { &hf_mq_pmo_options     ,
+          {"Options..", "mq.pmo.options",
+           FT_UINT32, BASE_HEX, NULL, 0x0,
+           "PMO options", HFILL }
+        },
+        { &hf_mq_pmo_options_NOT_OWN_SUBS            ,
+          {"NOT_OWN_SUBS", "mq.pmo.options.NOT_OWN_SUBS",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_NOT_OWN_SUBS ,
+           "PMO options NOT_OWN_SUBS", HFILL }
+        },
+        { &hf_mq_pmo_options_SUPPRESS_REPLYTO        ,
+          {"SUPPRESS_REPLYTO", "mq.pmo.options.SUPPRESS_REPLYTO",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_SUPPRESS_REPLYTO ,
+           "PMO options SUPPRESS_REPLYTO", HFILL }
+        },
+        { &hf_mq_pmo_options_SCOPE_QMGR              ,
+          {"SCOPE_QMGR", "mq.pmo.options.SCOPE_QMGR",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_SCOPE_QMGR ,
+           "PMO options SCOPE_QMGR", HFILL }
+        },
+        { &hf_mq_pmo_options_MD_FOR_OUTPUT_ONLY      ,
+          {"MD_FOR_OUTPUT_ONLY", "mq.pmo.options.MD_FOR_OUTPUT_ONLY",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_MD_FOR_OUTPUT_ONLY ,
+           "PMO options MD_FOR_OUTPUT_ONLY", HFILL }
+        },
+        { &hf_mq_pmo_options_RETAIN                  ,
+          {"RETAIN", "mq.pmo.options.RETAIN",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_RETAIN ,
+           "PMO options RETAIN", HFILL }
+        },
+        { &hf_mq_pmo_options_WARN_IF_NO_SUBS_MATCHED ,
+          {"WARN_IF_NO_SUBS_MATCHED", "mq.pmo.options.WARN_IF_NO_SUBS_MATCHED",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_WARN_IF_NO_SUBS_MATCHED ,
+           "PMO options WARN_IF_NO_SUBS_MATCHED", HFILL }
+        },
+        { &hf_mq_pmo_options_RESOLVE_LOCAL_Q         ,
+          {"RESOLVE_LOCAL_Q", "mq.pmo.options.RESOLVE_LOCAL_Q",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_RESOLVE_LOCAL_Q ,
+           "PMO options RESOLVE_LOCAL_Q", HFILL }
+        },
+        { &hf_mq_pmo_options_SYNC_RESPONSE           ,
+          {"SYNC_RESPONSE", "mq.pmo.options.SYNC_RESPONSE",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_SYNC_RESPONSE ,
+           "PMO options SYNC_RESPONSE", HFILL }
+        },
+        { &hf_mq_pmo_options_ASYNC_RESPONSE          ,
+          {"ASYNC_RESPONSE", "mq.pmo.options.ASYNC_RESPONSE",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_ASYNC_RESPONSE ,
+           "PMO options ASYNC_RESPONSE", HFILL }
+        },
+        { &hf_mq_pmo_options_LOGICAL_ORDER           ,
+          {"LOGICAL_ORDER", "mq.pmo.options.LOGICAL_ORDER",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_LOGICAL_ORDER ,
+           "PMO options LOGICAL_ORDER", HFILL }
+        },
+        { &hf_mq_pmo_options_NO_CONTEXT              ,
+          {"NO_CONTEXT", "mq.pmo.options.NO_CONTEXT",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_NO_CONTEXT ,
+           "PMO options NO_CONTEXT", HFILL }
+        },
+        { &hf_mq_pmo_options_FAIL_IF_QUIESCING       ,
+          {"FAIL_IF_QUIESCING", "mq.pmo.options.FAIL_IF_QUIESCING",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_FAIL_IF_QUIESCING ,
+           "PMO options FAIL_IF_QUIESCING", HFILL }
+        },
+        { &hf_mq_pmo_options_ALTERNATE_USER_AUTHORITY,
+          {"ALTERNATE_USER_AUTHORITY", "mq.pmo.options.ALTERNATE_USER_AUTHORITY",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_ALTERNATE_USER_AUTHORITY ,
+           "PMO options ALTERNATE_USER_AUTHORITY", HFILL }
+        },
+        { &hf_mq_pmo_options_SET_ALL_CONTEXT         ,
+          {"SET_ALL_CONTEXT", "mq.pmo.options.SET_ALL_CONTEXT",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_SET_ALL_CONTEXT ,
+           "PMO options SET_ALL_CONTEXT", HFILL }
+        },
+        { &hf_mq_pmo_options_SET_IDENTITY_CONTEXT    ,
+          {"SET_IDENTITY_CONTEXT", "mq.pmo.options.SET_IDENTITY_CONTEXT",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_SET_IDENTITY_CONTEXT ,
+           "PMO options SET_IDENTITY_CONTEXT", HFILL }
+        },
+        { &hf_mq_pmo_options_PASS_ALL_CONTEXT        ,
+          {"PASS_ALL_CONTEXT", "mq.pmo.options.PASS_ALL_CONTEXT",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_PASS_ALL_CONTEXT ,
+           "PMO options PASS_ALL_CONTEXT", HFILL }
+        },
+        { &hf_mq_pmo_options_PASS_IDENTITY_CONTEXT   ,
+          {"PASS_IDENTITY_CONTEXT", "mq.pmo.options.PASS_IDENTITY_CONTEXT",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_PASS_IDENTITY_CONTEXT ,
+           "PMO options PASS_IDENTITY_CONTEXT", HFILL }
+        },
+        { &hf_mq_pmo_options_NEW_CORREL_ID           ,
+          {"NEW_CORREL_ID", "mq.pmo.options.NEW_CORREL_ID",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_NEW_CORREL_ID ,
+           "PMO options NEW_CORREL_ID", HFILL }
+        },
+        { &hf_mq_pmo_options_NEW_MSG_ID              ,
+          {"NEW_MSG_ID", "mq.pmo.options.NEW_MSG_ID",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_NEW_MSG_ID ,
+           "PMO options NEW_MSG_ID", HFILL }
+        },
+        { &hf_mq_pmo_options_DEFAULT_CONTEXT         ,
+          {"DEFAULT_CONTEXT", "mq.pmo.options.DEFAULT_CONTEXT",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_DEFAULT_CONTEXT ,
+           "PMO options DEFAULT_CONTEXT", HFILL }
+        },
+        { &hf_mq_pmo_options_NO_SYNCPOINT            ,
+          {"NO_SYNCPOINT", "mq.pmo.options.NO_SYNCPOINT",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_NO_SYNCPOINT ,
+           "PMO options NO_SYNCPOINT", HFILL }
+        },
+        { &hf_mq_pmo_options_SYNCPOINT               ,
+          {"SYNCPOINT", "mq.pmo.options.SYNCPOINT",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_SYNCPOINT ,
+           "PMO options SYNCPOINT", HFILL }
+        },
+
+        { &hf_mq_pmo_timeout     ,
+          {"Timeout..", "mq.pmo.timeout",
+           FT_INT32, BASE_DEC, NULL, 0x0,
+           "PMO time out", HFILL }
+        },
+        { &hf_mq_pmo_context     ,
+          {"Context..", "mq.pmo.context",
+           FT_UINT32, BASE_HEX, NULL, 0x0,
+           "PMO context", HFILL }
+        },
+        { &hf_mq_pmo_knowndstcnt ,
+          {"KnDstCnt.", "mq.pmo.kdstcount",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "PMO known destination count", HFILL }
+        },
+        { &hf_mq_pmo_unkndstcnt  ,
+          {"UkDstCnt.", "mq.pmo.udestcount",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "PMO unknown destination count", HFILL }
+        },
+        { &hf_mq_pmo_invaldstcnt ,
+          {"InDstCnt.", "mq.pmo.idestcount",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "PMO invalid destination count", HFILL }
+        },
+        { &hf_mq_pmo_resolvqname ,
+          {"ResQName.", "mq.pmo.resolvq",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "PMO resolved queue name", HFILL }
+        },
+        { &hf_mq_pmo_resolvqmgr  ,
+          {"ResQMgr..", "mq.pmo.resolvqmgr",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "PMO resolved queue manager name", HFILL }
+        },
+        { &hf_mq_pmo_recspresent ,
+          {"NumRecs..", "mq.pmo.nbrrec",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "PMO number of records", HFILL }
+        },
+        { &hf_mq_pmo_putmsgrecfld,
+          {"PMR Flag.", "mq.pmo.flagspmr",
+           FT_UINT32, BASE_HEX, NULL, 0x0,
+           "PMO flags PMR fields", HFILL }
+        },
+        { &hf_mq_pmo_putmsgrecofs,
+          {"Ofs1stPMR", "mq.pmo.offsetpmr",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "PMO offset of first PMR", HFILL }
+        },
+        { &hf_mq_pmo_resprecofs  ,
+          {"Off1stRR.", "mq.pmo.offsetrr",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "PMO offset of first RR", HFILL }
+        },
+        { &hf_mq_pmo_putmsgrecptr,
+          {"Adr1stPMR", "mq.pmo.addrrec",
+           FT_UINT32, BASE_HEX, NULL, 0x0,
+           "PMO address of first record", HFILL }
+        },
+        { &hf_mq_pmo_resprecptr  ,
+          {"Adr1stRR.", "mq.pmo.addrres",
+           FT_UINT32, BASE_HEX, NULL, 0x0,
+           "PMO address of first response record", HFILL }
+        },
+
+        { &hf_mq_head_StructID   ,
+          {"Structid", "mq.head.structid",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "Header structid", HFILL }
+        },
+        { &hf_mq_head_version    ,
+          {"version.", "mq.head.version",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "Header version", HFILL }
+        },
+        { &hf_mq_head_length     ,
+          {"Length..", "mq.head.length",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "Header length", HFILL }
+        },
+        { &hf_mq_head_encoding   ,
+          {"Encoding", "mq.head.encoding",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "Header encoding", HFILL }
+        },
+        { &hf_mq_head_ccsid      ,
+          {"CCSID...", "mq.head.ccsid",
+           FT_INT32, BASE_DEC | BASE_RANGE_STRING, RVALS(&GET_VALRV(ccsid)), 0x0,
+           "Header character set", HFILL }
+        },
+        { &hf_mq_head_format     ,
+          {"Format..", "mq.head.format",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "Header format", HFILL }
+        },
+        { &hf_mq_head_flags      ,
+          {"Flags...", "mq.head.flags",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "Header flags", HFILL }
+        },
+        { &hf_mq_head_struct     ,
+          {"Struct..", "mq.head.struct",
+           FT_BYTES, BASE_NONE, NULL, 0x0,
+           "Header struct", HFILL }
+        },
+
+        { &hf_mq_xa_length        ,
+          {"Length.......", "mq.xa.length",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "XA Length", HFILL }
+        },
+        { &hf_mq_xa_returnvalue   ,
+          {"Return value.", "mq.xa.returnvalue",
+           FT_INT32, BASE_DEC, VALS(mq_xaer_vals), 0x0,
+           "XA Return Value", HFILL }
+        },
+        { &hf_mq_xa_tmflags       ,
+          {"TransMgrFlags", "mq.xa.tmflags",
+           FT_UINT32, BASE_HEX, NULL, 0x0,
+           "XA Transaction Manager Flags", HFILL }
+        },
+        { &hf_mq_xa_rmid          ,
+          {"ResourceMgrID", "mq.xa.rmid",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "XA Resource Manager ID", HFILL }
+        },
+        { &hf_mq_xa_count         ,
+          {"Number of Xid", "mq.xa.nbxid",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "XA Number of Xid", HFILL }
+        },
+        { &hf_mq_xa_tmflags_join      ,
+          {"JOIN", "mq.xa.tmflags.join",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_XA_TMJOIN,
+           "XA TM Flags JOIN", HFILL }
+        },
+        { &hf_mq_xa_tmflags_endrscan  ,
+          {"ENDRSCAN", "mq.xa.tmflags.endrscan",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_XA_TMENDRSCAN,
+           "XA TM Flags ENDRSCAN", HFILL }
+        },
+        { &hf_mq_xa_tmflags_startrscan,
+          {"STARTRSCAN", "mq.xa.tmflags.startrscan",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_XA_TMSTARTRSCAN,
+           "XA TM Flags STARTRSCAN", HFILL }
+        },
+        { &hf_mq_xa_tmflags_suspend   ,
+          {"SUSPEND", "mq.xa.tmflags.suspend",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_XA_TMSUSPEND,
+           "XA TM Flags SUSPEND", HFILL }
+        },
+        { &hf_mq_xa_tmflags_success   ,
+          {"SUCCESS", "mq.xa.tmflags.success",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_XA_TMSUCCESS,
+           "XA TM Flags SUCCESS", HFILL }
+        },
+        { &hf_mq_xa_tmflags_resume    ,
+          {"RESUME", "mq.xa.tmflags.resume",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_XA_TMRESUME,
+           "XA TM Flags RESUME", HFILL }
+        },
+        { &hf_mq_xa_tmflags_fail      ,
+          {"FAIL", "mq.xa.tmflags.fail",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_XA_TMFAIL,
+           "XA TM Flags FAIL", HFILL }
+        },
+        { &hf_mq_xa_tmflags_onephase  ,
+          {"ONEPHASE", "mq.xa.tmflags.onephase",
+           FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_XA_TMONEPHASE,
+           "XA TM Flags ONEPHASE", HFILL }
+        },
+
+        { &hf_mq_xa_xid_formatid  ,
+          {"Format ID....", "mq.xa.xid.formatid",
+           FT_INT32, BASE_DEC, NULL, 0x0,
+           "XA Xid Format ID", HFILL }
+        },
+        { &hf_mq_xa_xid_glbxid_len,
+          {"GlbTransIDLen", "mq.xa.xid.gxidl",
+           FT_UINT8, BASE_DEC, NULL, 0x0,
+           "XA Xid Global TransactionId Length", HFILL }
+        },
+        { &hf_mq_xa_xid_brq_length,
+          {"BranchQualLen", "mq.xa.xid.bql",
+           FT_UINT8, BASE_DEC, NULL, 0x0,
+           "XA Xid Branch Qualifier Length", HFILL }
+        },
+        { &hf_mq_xa_xid_globalxid ,
+          {"GlbTransactID", "mq.xa.xid.gxid",
+           FT_BYTES, BASE_NONE, NULL, 0x0,
+           "XA Xid Global TransactionId", HFILL }
+        },
+        { &hf_mq_xa_xid_brq       ,
+          {"BranchQualif.", "mq.xa.xid.bq",
+           FT_BYTES, BASE_NONE, NULL, 0x0,
+           "XA Xid Branch Qualifier", HFILL }
+        },
+        { &hf_mq_xa_xainfo_length ,
+          {"Length.......", "mq.xa.xainfo.length",
+           FT_UINT8, BASE_DEC, NULL, 0x0,
+           "XA XA_info Length", HFILL }
+        },
+        { &hf_mq_xa_xainfo_value  ,
+          {"Value........", "mq.xa.xainfo.value",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "XA XA_info Value", HFILL }
+        },
+
+        { &hf_mq_charv_vsptr      ,
+          {"VLStr Addr.", "mq.charv.vsptr",
+           FT_UINT32, BASE_HEX, NULL, 0x0,
+           "VS Address", HFILL }
+        },
+        { &hf_mq_charv_vsoffset   ,
+          {"VLStr Offs.", "mq.charv.vsoffset",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "VS Offset", HFILL }
+        },
+        { &hf_mq_charv_vsbufsize  ,
+          {"VLStr BufSz", "mq.charv.vsbufsize",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "VS BufSize", HFILL }
+        },
+        { &hf_mq_charv_vslength   ,
+          {"VLStr Len..", "mq.charv.vslength",
+           FT_UINT32, BASE_DEC, NULL, 0x0,
+           "VS Length", HFILL }
+        },
+        { &hf_mq_charv_vsccsid    ,
+          {"VLStr Ccsid", "mq.charv.vsccsid",
+           FT_INT32, BASE_DEC, NULL, 0x0,
+           "VS CCSID", HFILL }
+        },
+        { &hf_mq_charv_vsvalue    ,
+          {"VLStr Value", "mq.charv.vsvalue",
+           FT_STRINGZ, BASE_NONE, NULL, 0x0,
+           "VS value", HFILL }
+        }
+
+    };
+    static gint *ett[] =
+    {
+        &ett_mq,
+        &ett_mq_tsh,
+        &ett_mq_tsh_tcf,
+        &ett_mq_tsh_tcf2,
+        &ett_mq_api,
+        &ett_mq_socket,
+        &ett_mq_msh,
+        &ett_mq_caut,
+        &ett_mq_xqh,
+        &ett_mq_id,
+        &ett_mq_id_icf1,
+        &ett_mq_id_icf2,
+        &ett_mq_id_icf3,
+        &ett_mq_id_ief1,
+        &ett_mq_id_ief2,
+        &ett_mq_uid,
+        &ett_mq_conn,
+        &ett_mq_msg,
+        &ett_mq_notif,
+        &ett_mq_inq,
+        &ett_mq_spi,
+        &ett_mq_spi_base,
+        &ett_mq_spi_options,
+        &ett_mq_put,
+        &ett_mq_open,
+        &ett_mq_open_option,
+        &ett_mq_close_option,
+        &ett_mq_ping,
+        &ett_mq_reset,
+        &ett_mq_status,
+        &ett_mq_od,
+        &ett_mq_od_objstr,
+        &ett_mq_od_selstr,
+        &ett_mq_od_resobjstr,
+        &ett_mq_or,
+        &ett_mq_rr,
+        &ett_mq_pmr,
+        &ett_mq_md,
+        &ett_mq_mde,
+        &ett_mq_dlh,
+        &ett_mq_dh,
+        &ett_mq_gmo,
+        &ett_mq_gmo_option,
+        &ett_mq_gmo_matchoption,
+        &ett_mq_pmo,
+        &ett_mq_pmo_option,
+        &ett_mq_fcno,
+        &ett_mq_fopa,
+        &ett_mq_lpoo,
+        &ett_mq_lpoo_options,
+        &ett_mq_lpoo_lpiopts,
+        &ett_mq_head,
+        &ett_mq_xa,
+        &ett_mq_xa_tmflags,
+        &ett_mq_xa_xid,
+        &ett_mq_xa_info,
+        &ett_mq_charv,
+        &ett_mq_reaasemb
+    };
+
+    module_t *mq_module;
+
+    proto_mq = proto_register_protocol("WebSphere MQ", "MQ", "mq");
+    proto_register_field_array(proto_mq, hf, array_length(hf));
+    proto_register_subtree_array(ett, array_length(ett));
+
+    register_heur_dissector_list("mq", &mq_heur_subdissector_list);
+    register_init_routine(mq_init);
+
+    mq_module = prefs_register_protocol(proto_mq, NULL);
+    prefs_register_bool_preference(mq_module, "desegment",
+        "Reassemble MQ messages spanning multiple TCP segments",
+        "Whether the MQ dissector should reassemble messages spanning multiple TCP segments."
+        " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.",
+        &mq_desegment);
+    prefs_register_bool_preference(mq_module, "reassembly",
+        "Reassemble segmented MQ messages",
+        "Whether the MQ dissector should reassemble MQ messages spanning multiple TSH segments",
+        &mq_reassembly);
 }
 
 void proto_reg_handoff_mq(void)
 {
-	/*  Unlike some protocol (HTTP, POP3, ...) that clearly map to a standard
-	 *  class of applications (web browser, e-mail client, ...) and have a very well
-	 *  known port number, the MQ applications are most often specific to a business application */
-
-	mq_tcp_handle = new_create_dissector_handle(dissect_mq_tcp, proto_mq);
-	mq_spx_handle = create_dissector_handle(dissect_mq_spx, proto_mq);
-
-	dissector_add_handle("tcp.port", mq_tcp_handle);
-	heur_dissector_add("tcp",     dissect_mq_heur_tcp, proto_mq);
-	heur_dissector_add("netbios", dissect_mq_heur_netbios, proto_mq);
-	heur_dissector_add("http",    dissect_mq_heur_http, proto_mq);
-	dissector_add_uint("spx.socket", MQ_SOCKET_SPX, mq_spx_handle);
-	data_handle  = find_dissector("data");
-	mqpcf_handle = find_dissector("mqpcf");
+    /*  Unlike some protocol (HTTP, POP3, ...) that clearly map to a standard
+     *  class of applications (web browser, e-mail client, ...) and have a very well
+     *  known port number, the MQ applications are most often specific to a business application */
+
+    mq_tcp_handle = new_create_dissector_handle(dissect_mq_tcp, proto_mq);
+    mq_spx_handle = create_dissector_handle(dissect_mq_spx, proto_mq);
+
+    dissector_add_handle("tcp.port", mq_tcp_handle);
+    heur_dissector_add("tcp",     dissect_mq_heur_tcp, proto_mq);
+    heur_dissector_add("netbios", dissect_mq_heur_netbios, proto_mq);
+    heur_dissector_add("http",    dissect_mq_heur_http, proto_mq);
+    dissector_add_uint("spx.socket", MQ_SOCKET_SPX, mq_spx_handle);
+    data_handle  = find_dissector("data");
+    mqpcf_handle = find_dissector("mqpcf");
 }
 
+
 /*
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
  *
  * Local variables:
  * c-basic-offset: 4
- * tab-width: 4
- * indent-tabs-mode: t
+ * tab-width: 8
+ * indent-tabs-mode: nil
  * End:
  *
- * vi: set shiftwidth=4 tabstop=4 noexpandtab:
- * :indentSize=4:tabSize=4:noTabs=false:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-ncp-nmas.c b/epan/dissectors/packet-ncp-nmas.c
index fc40346b2a..f3d094ecc5 100644
--- a/epan/dissectors/packet-ncp-nmas.c
+++ b/epan/dissectors/packet-ncp-nmas.c
@@ -768,10 +768,10 @@ proto_register_nmas(void)
  *
  * Local variables:
  * c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
  * indent-tabs-mode: nil
  * End:
  *
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-ncp-sss.c b/epan/dissectors/packet-ncp-sss.c
index d25d194e73..b170b92d40 100644
--- a/epan/dissectors/packet-ncp-sss.c
+++ b/epan/dissectors/packet-ncp-sss.c
@@ -870,11 +870,11 @@ proto_register_sss(void)
  *
  * Local variables:
  * c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
  * indent-tabs-mode: nil
  * End:
  *
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
  */
 
diff --git a/epan/dissectors/packet-nsip.c b/epan/dissectors/packet-nsip.c
index 22b475bb82..63b7b121e8 100644
--- a/epan/dissectors/packet-nsip.c
+++ b/epan/dissectors/packet-nsip.c
@@ -1200,10 +1200,10 @@ proto_reg_handoff_nsip(void) {
  *
  * Local variables:
  * c-basic-offset: 2
- * tab-width: 4
+ * tab-width: 8
  * indent-tabs-mode: nil
  * End:
  *
- * vi: set shiftwidth=2 tabstop=4 expandtab:
- * :indentSize=2:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=2 tabstop=8 expandtab:
+ * :indentSize=2:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-osi-options.c b/epan/dissectors/packet-osi-options.c
index 499156bacf..137499205f 100644
--- a/epan/dissectors/packet-osi-options.c
+++ b/epan/dissectors/packet-osi-options.c
@@ -663,11 +663,11 @@ proto_register_osi_options(void) {
  *
  * Local variables:
  * c-basic-offset: 2
- * tab-width: 2
+ * tab-width: 8
  * indent-tabs-mode: nil
  * End:
  *
- * vi: set shiftwidth=2 tabstop=2 expandtab:
- * :indentSize=2:tabSize=2:noTabs=true:
+ * vi: set shiftwidth=2 tabstop=8 expandtab:
+ * :indentSize=2:tabSize=8:noTabs=true:
  */
 
diff --git a/epan/dissectors/packet-ositp.c b/epan/dissectors/packet-ositp.c
index 0ea9f23053..37d206fcb8 100644
--- a/epan/dissectors/packet-ositp.c
+++ b/epan/dissectors/packet-ositp.c
@@ -338,7 +338,7 @@ static void cotp_frame_end(void)
 static gboolean is_all_printable(const guchar *stringtocheck, int length)
 {
   gboolean allprintable;
-  int i;
+  int      i;
 
   allprintable=TRUE;
   for (i=0;i<length;i++) {
@@ -354,9 +354,9 @@ static gboolean is_all_printable(const guchar *stringtocheck, int length)
 static gchar *print_tsap(const guchar *tsap, int length)
 {
 
-  gchar *cur;
-  gboolean allprintable;
-  gint idx = 0, returned_length;
+  gchar    *cur;
+  gboolean  allprintable;
+  gint      idx = 0, returned_length;
 
   cur=(gchar *)wmem_alloc(wmem_packet_scope(), MAX_TSAP_LEN * 2 + 3);
   cur[0] = '\0';
@@ -389,18 +389,18 @@ static gboolean ositp_decode_var_part(tvbuff_t *tvb, int offset, int vp_length,
                                       int class_option, int tpdu_len,
                                       packet_info *pinfo, proto_tree *tree)
 {
-  guint8  code, length;
-  guint8  c1;
-  guint16 s, s1,s2,s3,s4;
-  guint32 t1, t2, t3, t4;
-  guint32 offset_iso8073_checksum = 0;
-  gint32 i = 0;
-  guint8 tmp_code = 0;
-  guint tmp_len = 0;
-  cksum_status_t cksum_status;
-  gboolean checksum_ok = FALSE;
-  guint32 pref_max_tpdu_size;
-  proto_item *hidden_item;
+  guint8          code, length;
+  guint8          c1;
+  guint16         s, s1,s2,s3,s4;
+  guint32         t1, t2, t3, t4;
+  guint32         offset_iso8073_checksum = 0;
+  gint32          i                       = 0;
+  guint8          tmp_code                = 0;
+  guint           tmp_len                 = 0;
+  cksum_status_t  cksum_status;
+  gboolean        checksum_ok             = FALSE;
+  guint32         pref_max_tpdu_size;
+  proto_item     *hidden_item;
 
   while (vp_length != 0) {
     code = tvb_get_guint8(tvb, offset);
@@ -844,11 +844,11 @@ static int ositp_decode_DR(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu,
                            packet_info *pinfo, proto_tree *tree)
 {
   proto_tree *cotp_tree = NULL;
-  proto_item *ti = NULL;
-  guint16 dst_ref, src_ref;
-  guchar  reason;
+  proto_item *ti        = NULL;
+  guint16     dst_ref, src_ref;
+  guchar      reason;
   const char *str;
-  guint   tpdu_len;
+  guint       tpdu_len;
 
   /* ATN TPDU's tend to be larger than normal OSI,
    * so nothing to do with respect to LI checks */
@@ -934,19 +934,19 @@ static int ositp_decode_DT(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu,
                            gboolean uses_inactive_subset,
                            gboolean *subdissector_found)
 {
-  proto_tree *cotp_tree = NULL;
-  proto_item *ti;
-  gboolean is_extended;
-  gboolean is_class_234;
-  guint32  dst_ref;
-  guint32 *prev_dst_ref;
-  guint    tpdu_nr;
-  gboolean fragment = FALSE;
-  guint32  fragment_length = 0;
-  tvbuff_t *next_tvb;
-  fragment_head *fd_head;
+  proto_tree     *cotp_tree       = NULL;
+  proto_item     *ti;
+  gboolean        is_extended;
+  gboolean        is_class_234;
+  guint32         dst_ref;
+  guint32        *prev_dst_ref;
+  guint           tpdu_nr;
+  gboolean        fragment        = FALSE;
+  guint32         fragment_length = 0;
+  tvbuff_t       *next_tvb;
+  fragment_head  *fd_head;
   conversation_t *conv;
-  guint     tpdu_len;
+  guint           tpdu_len;
 
   /* DT TPDUs have user data, so they run to the end of the containing PDU */
   tpdu_len = tvb_reported_length_remaining(tvb, offset);
@@ -1261,11 +1261,11 @@ static int ositp_decode_ED(tvbuff_t *tvb, int offset, guint8 li, guint8 tpdu,
 {
   proto_tree *cotp_tree = NULL;
   proto_item *ti;
-  gboolean is_extended;
-  guint16  dst_ref;
-  guint    tpdu_nr;
-  tvbuff_t *next_tvb;
-  guint    tpdu_len;
+  gboolean    is_extended;
+  guint16     dst_ref;
+  guint       tpdu_nr;
+  tvbuff_t   *next_tvb;
+  guint       tpdu_len;
 
   /* ED TPDUs have user data, so they run to the end of the containing PDU */
   tpdu_len = tvb_reported_length_remaining(tvb, offset);
@@ -2490,11 +2490,11 @@ proto_reg_handoff_cotp(void)
  *
  * Local variables:
  * c-basic-offset: 2
- * tab-width: 2
+ * tab-width: 8
  * indent-tabs-mode: nil
  * End:
  *
- * vi: set shiftwidth=2 tabstop=2 expandtab:
- * :indentSize=2:tabSize=2:noTabs=true:
+ * vi: set shiftwidth=2 tabstop=8 expandtab:
+ * :indentSize=2:tabSize=8:noTabs=true:
  */
 
diff --git a/epan/dissectors/packet-sasp.c b/epan/dissectors/packet-sasp.c
index 6d61811ed4..9b1a0b6dd7 100644
--- a/epan/dissectors/packet-sasp.c
+++ b/epan/dissectors/packet-sasp.c
@@ -207,1373 +207,1373 @@ static expert_field ei_msg_type_invalid = EI_INIT;
 static gboolean sasp_desegment = TRUE;
 
 static const value_string msg_table[] = {
-	{ 0x1010, "Registration Request" },
-	{ 0x1015, "Registration Reply"},
-	{ 0x1020, "DeRegistration Request"},
-	{ 0x1025, "DeRegistration Reply"},
-	{ 0x1030, "Get Weights Request"},
-	{ 0x1035, "Get Weights Reply" },
-	{ 0x1040, "Send Weights"},
-	{ 0x1050, "Set LB State Request"},
-	{ 0x1055, "Set LB State Reply"},
-	{ 0x1060, "Set Member State Request"},
-	{ 0x1065, "Set Member State Reply"},
-	{ 0x3010, "Member Data Component"},
-	{ 0x3011, "Group Data Component"},
-	{ 0x3012, "Weight Entry Data Component"},
-	{ 0x3013, "Member State Instance"},
-	{ 0x4010, "Group of Member Data"},
-	{ 0x4011, "Group of Weight Entry Data" },
-	{ 0x4012, "Group of Member State Data" },
-	{      0,  NULL }
+    { 0x1010, "Registration Request" },
+    { 0x1015, "Registration Reply"},
+    { 0x1020, "DeRegistration Request"},
+    { 0x1025, "DeRegistration Reply"},
+    { 0x1030, "Get Weights Request"},
+    { 0x1035, "Get Weights Reply" },
+    { 0x1040, "Send Weights"},
+    { 0x1050, "Set LB State Request"},
+    { 0x1055, "Set LB State Reply"},
+    { 0x1060, "Set Member State Request"},
+    { 0x1065, "Set Member State Reply"},
+    { 0x3010, "Member Data Component"},
+    { 0x3011, "Group Data Component"},
+    { 0x3012, "Weight Entry Data Component"},
+    { 0x3013, "Member State Instance"},
+    { 0x4010, "Group of Member Data"},
+    { 0x4011, "Group of Weight Entry Data" },
+    { 0x4012, "Group of Member State Data" },
+    {      0,  NULL }
 };
 static value_string_ext msg_table_ext = VALUE_STRING_EXT_INIT(msg_table);
 
 static const value_string protocol_table[] = {
-	{ 0x06, "TCP" },
-	{ 0x11, "UDP" },
-	{    0,  NULL }
+    { 0x06, "TCP" },
+    { 0x11, "UDP" },
+    {    0,  NULL }
 };
 
 static const value_string lbstate_healthtable[] = {
-	{ 0x00, "Least Healthy" },
-	{ 0x7f, "Most Healthy" },
-	{    0, NULL }
+    { 0x00, "Least Healthy" },
+    { 0x7f, "Most Healthy" },
+    {    0, NULL }
 };
 
 static const value_string reg_reply_response_code[] = {
-	{ 0x00, "Successful" },
-	{ 0x10, "Message not understood" },
-	{ 0x11, "GWM will not accept this message from the sender" },
-	{ 0x40, "Member already registered" },
-	{ 0x44, "Duplicate Member in Request" },
-	{ 0x45, "Invalid Group (determined by the GWM)"},
-	{ 0x50, "Invalid Group Name Size (size == 0)"},
-	{ 0x51, "Invalid LB uid Size (size == 0 or > max)"},
-	{ 0x61, "Member is registering itself, but LB hasn't yet contacted the GWM."
-		"  This registration will not be processed."},
-	{    0, NULL }
+    { 0x00, "Successful" },
+    { 0x10, "Message not understood" },
+    { 0x11, "GWM will not accept this message from the sender" },
+    { 0x40, "Member already registered" },
+    { 0x44, "Duplicate Member in Request" },
+    { 0x45, "Invalid Group (determined by the GWM)"},
+    { 0x50, "Invalid Group Name Size (size == 0)"},
+    { 0x51, "Invalid LB uid Size (size == 0 or > max)"},
+    { 0x61, "Member is registering itself, but LB hasn't yet contacted the GWM."
+        "  This registration will not be processed."},
+    {    0, NULL }
 };
 
 static const value_string dereg_reply_response_code[] = {
-	{ 0x00, "Successful" },
-	{ 0x10, "Message not understood" },
-	{ 0x11, "GWM will not accept this message from the sender" },
-	{ 0x41, "Application or System not registered" },
-	{ 0x42, "Unknown Group Name" },
-	{ 0x43, "Unknown LB uid" },
-	{ 0x44, "Duplicate Member in Request"},
-	{ 0x46, "Duplicate Group in Request (for remove all members/groups requests)"},
-	{ 0x51, "Invalid LB uid Size (size == 0 or > max)"},
-	{ 0x61, "Member is deregistering itself, but LB hasn't yet contacted the GWM."
-		"  This deregistration will not be processed."},
-	{    0, NULL }
+    { 0x00, "Successful" },
+    { 0x10, "Message not understood" },
+    { 0x11, "GWM will not accept this message from the sender" },
+    { 0x41, "Application or System not registered" },
+    { 0x42, "Unknown Group Name" },
+    { 0x43, "Unknown LB uid" },
+    { 0x44, "Duplicate Member in Request"},
+    { 0x46, "Duplicate Group in Request (for remove all members/groups requests)"},
+    { 0x51, "Invalid LB uid Size (size == 0 or > max)"},
+    { 0x61, "Member is deregistering itself, but LB hasn't yet contacted the GWM."
+        "  This deregistration will not be processed."},
+    {    0, NULL }
 };
 
 static const value_string get_weights_reply_response_code[] = {
-	{ 0x00, "Successful" },
-	{ 0x10, "Message not understood" },
-	{ 0x11, "GWM will not accept this message from the sender" },
-	{ 0x42, "Unknown Group Name" },
-	{ 0x43, "Unknown LB uid" },
-	{ 0x46, "Duplicate Group in Request"},
-	{ 0x51, "Invalid LB uid Size (size == 0 or > max)"},
-	{    0, NULL }
+    { 0x00, "Successful" },
+    { 0x10, "Message not understood" },
+    { 0x11, "GWM will not accept this message from the sender" },
+    { 0x42, "Unknown Group Name" },
+    { 0x43, "Unknown LB uid" },
+    { 0x46, "Duplicate Group in Request"},
+    { 0x51, "Invalid LB uid Size (size == 0 or > max)"},
+    {    0, NULL }
 };
 
 static const value_string set_lb_state_reply_response_code[] = {
-	{ 0x00, "Successful" },
-	{ 0x10, "Message not understood" },
-	{ 0x11, "GWM will not accept this message from the sender" },
-	{ 0x51, "Invalid LB uid Size (size == 0 or > max)"},
-	{    0, NULL }
+    { 0x00, "Successful" },
+    { 0x10, "Message not understood" },
+    { 0x11, "GWM will not accept this message from the sender" },
+    { 0x51, "Invalid LB uid Size (size == 0 or > max)"},
+    {    0, NULL }
 };
 
 static const value_string set_mem_state_reply_response_code[] = {
-	{ 0x00, "Successful" },
-	{ 0x10, "Message not understood" },
-	{ 0x11, "GWM will not accept this message from the sender" },
-	{ 0x41, "Application or System not registered" },
-	{ 0x42, "Unknown Group Name" },
-	{ 0x43, "Unknown LB uid" },
-	{ 0x44, "Duplicate Member in Request"},
-	{ 0x46, "Duplicate Group in Request (for remove all members/groups requests)"},
-	{ 0x50, "Invalid Group Name Size (size == 0)"},
-	{ 0x51, "Invalid LB uid Size (size == 0 or > max)"},
-	{    0, NULL }
+    { 0x00, "Successful" },
+    { 0x10, "Message not understood" },
+    { 0x11, "GWM will not accept this message from the sender" },
+    { 0x41, "Application or System not registered" },
+    { 0x42, "Unknown Group Name" },
+    { 0x43, "Unknown LB uid" },
+    { 0x44, "Duplicate Member in Request"},
+    { 0x46, "Duplicate Group in Request (for remove all members/groups requests)"},
+    { 0x50, "Invalid Group Name Size (size == 0)"},
+    { 0x51, "Invalid LB uid Size (size == 0 or > max)"},
+    {    0, NULL }
 };
 
 
-#define SASP_GLOBAL_PORT		3860
-#define SASP_MIN_PACKET_LEN		13
+#define SASP_GLOBAL_PORT        3860
+#define SASP_MIN_PACKET_LEN     13
 
-#define SASP_DEREG_REQ_REASON_LEARNED	0x01
-#define SASP_DEREG_REQ_NOREASON_FLAG	0x00
-#define SASP_HDR_TYPE			0x2010
-#define SASP_WED_CONTACT_SUCCESS_FLAG	0x01
-#define SASP_WED_QUIESCE_FLAG		0x02
-#define SASP_WED_REG_FLAG		0x04
-#define SASP_WED_CONF_FLAG		0x08
-#define SASP_PUSH_FLAG			0x01
-#define SASP_TRUST_FLAG			0x02
-#define SASP_NOCHANGE_FLAG		0x04
-#define SASP_QUIESCE_FLAG		0x01
+#define SASP_DEREG_REQ_REASON_LEARNED   0x01
+#define SASP_DEREG_REQ_NOREASON_FLAG    0x00
+#define SASP_HDR_TYPE           0x2010
+#define SASP_WED_CONTACT_SUCCESS_FLAG   0x01
+#define SASP_WED_QUIESCE_FLAG       0x02
+#define SASP_WED_REG_FLAG       0x04
+#define SASP_WED_CONF_FLAG      0x08
+#define SASP_PUSH_FLAG          0x01
+#define SASP_TRUST_FLAG         0x02
+#define SASP_NOCHANGE_FLAG      0x04
+#define SASP_QUIESCE_FLAG       0x01
 
 
 static guint
 get_sasp_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset)
 {
-	/* Get the length of the SASP packet. */
-	return tvb_get_ntohl(tvb, offset + 5);
+    /* Get the length of the SASP packet. */
+    return tvb_get_ntohl(tvb, offset + 5);
 }
 
 /* Called from tcp_dissect_pdus with a complete SASP pdu */
 static int
 dissect_sasp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
-	/* Set up structures needed to add the protocol subtree and manage it */
-	proto_item *ti;
-	proto_item *hti;
-	proto_item *mti;
-	proto_tree *sasp_tree;
-	proto_tree *msg_tree;
-	proto_tree *pay_load;
-	guint16 msg_type;
-	guint16 hdr_type;
-	guint32 offset = 0;
-
-	/*protocol is being displayed*/
-
-	col_set_str(pinfo->cinfo, COL_PROTOCOL, "SASP");
-	col_clear(pinfo->cinfo, COL_INFO);
-
-	ti = proto_tree_add_item(tree, proto_sasp, tvb, offset, -1, ENC_NA);
-	sasp_tree = proto_item_add_subtree(ti, ett_sasp_header);
-
-	hdr_type = tvb_get_ntohs(tvb, offset);
-	hti = proto_tree_add_uint_format_value(sasp_tree, hf_sasp_type, tvb, offset, 2, hdr_type,
-		"%s", (hdr_type == SASP_HDR_TYPE) ? "SASP" : "[Invalid]");
-	if (hdr_type != SASP_HDR_TYPE)
-	{
-		expert_add_info_format(pinfo, hti, &ei_msg_type_invalid,
-			"Invalid SASP Header Type [0x%04x]", hdr_type);
-		/* XXX: The folowing should actually happen automatically ? */
-		col_set_str(pinfo->cinfo, COL_INFO, "[Malformed: Invalid SASP Header Type]");
-		return tvb_length(tvb);
-	}
-	offset += 2;
-
-	/*length*/
-	proto_tree_add_item(sasp_tree, hf_sasp_length, tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
-
-	/*Header Version */
-	proto_tree_add_item(sasp_tree, hf_sasp_vrsn, tvb, offset, 1, ENC_BIG_ENDIAN);
-	offset += 1;
-
-	/*Message*/
-	msg_tree = proto_item_add_subtree(ti, ett_sasp_msg);
-
-	/*Message Len*/
-	proto_tree_add_item(msg_tree, hf_msg_len, tvb, offset, 4, ENC_BIG_ENDIAN);
-	offset += 4;
-
-	/*Message Id*/
-	proto_tree_add_item(msg_tree, hf_msg_id, tvb, offset, 4, ENC_BIG_ENDIAN);
-	offset += 4;
-
-	/*Message Type*/
-	msg_type = tvb_get_ntohs(tvb, offset);
-	mti = proto_tree_add_item(msg_tree, hf_msg_type, tvb, offset, 2, ENC_BIG_ENDIAN);
-	pay_load = proto_item_add_subtree(ti, ett_sasp_payload);
-	offset += 2;
-
-	switch(msg_type)
-	{
-		case 0x1010:
-			/* Registration  Request */
-			col_set_str(pinfo->cinfo, COL_INFO, "Registration Request");
-			dissect_reg_req(tvb, pay_load, offset);
-			break;
-
-		case 0x1015:
-			/* Registration Reply */
-			col_set_str(pinfo->cinfo, COL_INFO, "Registration Reply");
-			dissect_reg_rep(tvb, pay_load, offset);
-			break;
-
-		case 0x1020:
-			/* Deregistration Request */
-			col_set_str(pinfo->cinfo, COL_INFO, "Deregistration Request");
-			dissect_dereg_req(tvb, pay_load, offset);
-			break;
-
-		case 0x1025:
-			/* Deregistration Reply */
-			col_set_str(pinfo->cinfo, COL_INFO, "Deregistration Reply");
-			dissect_dereg_rep(tvb, pay_load, offset);
-			break;
-
-		case 0x1030:
-			/* Get Weights Request */
-			col_set_str(pinfo->cinfo, COL_INFO, "Get Weights Request");
-			dissect_wt_req(tvb, pay_load, offset);
-			break;
-
-		case 0x1035:
-			/* Get Weights Response */
-			col_set_str(pinfo->cinfo, COL_INFO, "Get Weights Response");
-			dissect_wt_rep(tvb, pay_load, offset);
-			break;
-
-		case 0x1040:
-			/* Send Weights Request */
-			col_set_str(pinfo->cinfo, COL_INFO, "Send Weights Request");
-			dissect_sendwt(tvb, pay_load, offset);
-			break;
-
-		case 0x1050:
-			/* Set LB State Request */
-			col_set_str(pinfo->cinfo, COL_INFO, "Set LB State Request");
-			dissect_setlbstate_req(tvb, pay_load, offset);
-			break;
-
-		case 0x1055:
-			/* Set LB state Reply */
-			col_set_str(pinfo->cinfo, COL_INFO, "Set LB State Reply");
-			dissect_setlbstate_rep(tvb, pay_load, offset);
-			break;
-
-		case 0x1060:
-			/* Set Member State Request*/
-			col_set_str(pinfo->cinfo, COL_INFO, "Set Member State Request");
-			dissect_setmemstate_req(tvb, pay_load, offset);
-			break;
-
-		case 0x1065:
-			/* Set Member State Reply */
-			col_set_str(pinfo->cinfo, COL_INFO, "Set Member State Reply");
-			dissect_setmemstate_rep(tvb, pay_load, offset);
-			break;
-
-		default:
-			/* Unknown SASP Message Type */
-			col_add_fstr(pinfo->cinfo, COL_INFO,
-				"[Malformed: Unknown Message Type [0x%04x]", msg_type);
-			expert_add_info_format(pinfo, mti, &ei_msg_type_invalid,
-				"Unknown SASP Message Type: 0x%4x", msg_type);
-			break;
-	}
-	return tvb_length(tvb);
+    /* Set up structures needed to add the protocol subtree and manage it */
+    proto_item *ti;
+    proto_item *hti;
+    proto_item *mti;
+    proto_tree *sasp_tree;
+    proto_tree *msg_tree;
+    proto_tree *pay_load;
+    guint16     msg_type;
+    guint16     hdr_type;
+    guint32     offset = 0;
+
+    /*protocol is being displayed*/
+
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "SASP");
+    col_clear(pinfo->cinfo, COL_INFO);
+
+    ti = proto_tree_add_item(tree, proto_sasp, tvb, offset, -1, ENC_NA);
+    sasp_tree = proto_item_add_subtree(ti, ett_sasp_header);
+
+    hdr_type = tvb_get_ntohs(tvb, offset);
+    hti = proto_tree_add_uint_format_value(sasp_tree, hf_sasp_type, tvb, offset, 2, hdr_type,
+        "%s", (hdr_type == SASP_HDR_TYPE) ? "SASP" : "[Invalid]");
+    if (hdr_type != SASP_HDR_TYPE)
+    {
+        expert_add_info_format(pinfo, hti, &ei_msg_type_invalid,
+            "Invalid SASP Header Type [0x%04x]", hdr_type);
+        /* XXX: The folowing should actually happen automatically ? */
+        col_set_str(pinfo->cinfo, COL_INFO, "[Malformed: Invalid SASP Header Type]");
+        return tvb_length(tvb);
+    }
+    offset += 2;
+
+    /*length*/
+    proto_tree_add_item(sasp_tree, hf_sasp_length, tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
+
+    /*Header Version */
+    proto_tree_add_item(sasp_tree, hf_sasp_vrsn, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
+
+    /*Message*/
+    msg_tree = proto_item_add_subtree(ti, ett_sasp_msg);
+
+    /*Message Len*/
+    proto_tree_add_item(msg_tree, hf_msg_len, tvb, offset, 4, ENC_BIG_ENDIAN);
+    offset += 4;
+
+    /*Message Id*/
+    proto_tree_add_item(msg_tree, hf_msg_id, tvb, offset, 4, ENC_BIG_ENDIAN);
+    offset += 4;
+
+    /*Message Type*/
+    msg_type = tvb_get_ntohs(tvb, offset);
+    mti = proto_tree_add_item(msg_tree, hf_msg_type, tvb, offset, 2, ENC_BIG_ENDIAN);
+    pay_load = proto_item_add_subtree(ti, ett_sasp_payload);
+    offset += 2;
+
+    switch(msg_type)
+    {
+        case 0x1010:
+            /* Registration  Request */
+            col_set_str(pinfo->cinfo, COL_INFO, "Registration Request");
+            dissect_reg_req(tvb, pay_load, offset);
+            break;
+
+        case 0x1015:
+            /* Registration Reply */
+            col_set_str(pinfo->cinfo, COL_INFO, "Registration Reply");
+            dissect_reg_rep(tvb, pay_load, offset);
+            break;
+
+        case 0x1020:
+            /* Deregistration Request */
+            col_set_str(pinfo->cinfo, COL_INFO, "Deregistration Request");
+            dissect_dereg_req(tvb, pay_load, offset);
+            break;
+
+        case 0x1025:
+            /* Deregistration Reply */
+            col_set_str(pinfo->cinfo, COL_INFO, "Deregistration Reply");
+            dissect_dereg_rep(tvb, pay_load, offset);
+            break;
+
+        case 0x1030:
+            /* Get Weights Request */
+            col_set_str(pinfo->cinfo, COL_INFO, "Get Weights Request");
+            dissect_wt_req(tvb, pay_load, offset);
+            break;
+
+        case 0x1035:
+            /* Get Weights Response */
+            col_set_str(pinfo->cinfo, COL_INFO, "Get Weights Response");
+            dissect_wt_rep(tvb, pay_load, offset);
+            break;
+
+        case 0x1040:
+            /* Send Weights Request */
+            col_set_str(pinfo->cinfo, COL_INFO, "Send Weights Request");
+            dissect_sendwt(tvb, pay_load, offset);
+            break;
+
+        case 0x1050:
+            /* Set LB State Request */
+            col_set_str(pinfo->cinfo, COL_INFO, "Set LB State Request");
+            dissect_setlbstate_req(tvb, pay_load, offset);
+            break;
+
+        case 0x1055:
+            /* Set LB state Reply */
+            col_set_str(pinfo->cinfo, COL_INFO, "Set LB State Reply");
+            dissect_setlbstate_rep(tvb, pay_load, offset);
+            break;
+
+        case 0x1060:
+            /* Set Member State Request*/
+            col_set_str(pinfo->cinfo, COL_INFO, "Set Member State Request");
+            dissect_setmemstate_req(tvb, pay_load, offset);
+            break;
+
+        case 0x1065:
+            /* Set Member State Reply */
+            col_set_str(pinfo->cinfo, COL_INFO, "Set Member State Reply");
+            dissect_setmemstate_rep(tvb, pay_load, offset);
+            break;
+
+        default:
+            /* Unknown SASP Message Type */
+            col_add_fstr(pinfo->cinfo, COL_INFO,
+                "[Malformed: Unknown Message Type [0x%04x]", msg_type);
+            expert_add_info_format(pinfo, mti, &ei_msg_type_invalid,
+                "Unknown SASP Message Type: 0x%4x", msg_type);
+            break;
+    }
+    return tvb_length(tvb);
 }
 
 
 static int
 dissect_sasp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
 {
-	tcp_dissect_pdus(tvb, pinfo, tree, sasp_desegment, SASP_MIN_PACKET_LEN, get_sasp_pdu_len,
-						dissect_sasp_pdu, data);
-	return tvb_length(tvb);
+    tcp_dissect_pdus(tvb, pinfo, tree, sasp_desegment, SASP_MIN_PACKET_LEN, get_sasp_pdu_len,
+                        dissect_sasp_pdu, data);
+    return tvb_length(tvb);
 }
 
 
 static void dissect_reg_req(tvbuff_t *tvb, proto_tree *pay_load, guint32 offset)
 {
-	proto_item *reg_tree;
-	proto_tree *reg_req_data;
-	guint16 gmd_cnt, i;
+    proto_item *reg_tree;
+    proto_tree *reg_req_data;
+    guint16     gmd_cnt, i;
 
-	reg_tree = proto_tree_add_text(pay_load, tvb, offset, -1, "Reg Request");
-	reg_req_data = proto_item_add_subtree(reg_tree, ett_sasp_reg_req_sz);
+    reg_tree = proto_tree_add_text(pay_load, tvb, offset, -1, "Reg Request");
+    reg_req_data = proto_item_add_subtree(reg_tree, ett_sasp_reg_req_sz);
 
-	/* Reg Req Size */
-	proto_tree_add_item(reg_req_data, hf_sasp_reg_req_sz, tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    /* Reg Req Size */
+    proto_tree_add_item(reg_req_data, hf_sasp_reg_req_sz, tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	/* Reg Req LB Flag */
-	proto_tree_add_item(reg_req_data, hf_reg_req_lbflag, tvb, offset, 1, ENC_BIG_ENDIAN);
-	offset += 1;
+    /* Reg Req LB Flag */
+    proto_tree_add_item(reg_req_data, hf_reg_req_lbflag, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
 
-	gmd_cnt = tvb_get_ntohs(tvb, offset);
+    gmd_cnt = tvb_get_ntohs(tvb, offset);
 
-	/* Group MEM Data Count */
-	proto_tree_add_item(reg_req_data, hf_sasp_gmd_cnt, tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    /* Group MEM Data Count */
+    proto_tree_add_item(reg_req_data, hf_sasp_gmd_cnt, tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	for (i=0; i<gmd_cnt; i++)
-		offset = dissect_grp_memdatacomp(tvb, reg_req_data, offset);
+    for (i=0; i<gmd_cnt; i++)
+        offset = dissect_grp_memdatacomp(tvb, reg_req_data, offset);
 }
 
 
 static void dissect_reg_rep(tvbuff_t *tvb, proto_tree *pay_load, guint32 offset)
 {
-	proto_item *reg_rep;
-	proto_tree *reg_rep_tree;
+    proto_item *reg_rep;
+    proto_tree *reg_rep_tree;
 
-	reg_rep = proto_tree_add_text(pay_load, tvb, offset, -1 , "Reg Reply");
-	reg_rep_tree = proto_item_add_subtree(reg_rep, ett_sasp_reg_rep);
+    reg_rep = proto_tree_add_text(pay_load, tvb, offset, -1 , "Reg Reply");
+    reg_rep_tree = proto_item_add_subtree(reg_rep, ett_sasp_reg_rep);
 
-	/* Size */
-	proto_tree_add_item(reg_rep_tree, hf_sasp_reg_rep_sz, tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    /* Size */
+    proto_tree_add_item(reg_rep_tree, hf_sasp_reg_rep_sz, tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	/* Response Code */
-	proto_tree_add_item(reg_rep_tree, hf_sasp_reg_rep_rcode, tvb, offset, 1, ENC_BIG_ENDIAN);
+    /* Response Code */
+    proto_tree_add_item(reg_rep_tree, hf_sasp_reg_rep_rcode, tvb, offset, 1, ENC_BIG_ENDIAN);
 }
 
 
 static void dissect_dereg_req(tvbuff_t *tvb, proto_tree *pay_load, guint32 offset)
 {
-	/*proto_item *dereg_req_reason_flag;*/
-	/*proto_tree *dereg_req_reason_flag_tree;*/
-	guint16     gmd_cnt, i;
-	proto_item *dereg_tree;
-	proto_tree *dereg_req_data;
-	guint8 reason_flag;
-	static gboolean first_flag = TRUE;
-	wmem_strbuf_t *reasonflags_strbuf = wmem_strbuf_new_label(wmem_packet_scope());
-	static const gchar *fstr[] = {"No Reason", "Learned & Purposeful" };
-
-	dereg_tree = proto_tree_add_text(pay_load, tvb, offset, -1 , "DeReg Request");
-	dereg_req_data = proto_item_add_subtree(dereg_tree, ett_sasp_dereg_req_sz);
-
-	/* Size */
-	proto_tree_add_item(dereg_req_data, hf_sasp_dereg_req_sz, tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
-
-	/* LB Flag */
-	proto_tree_add_item(dereg_req_data, hf_dereg_req_lbflag, tvb, offset, 1, ENC_BIG_ENDIAN);
-	offset += 1;
-
-	/* Reason */
-	wmem_strbuf_truncate(reasonflags_strbuf, 0);
-	reason_flag = tvb_get_guint8(tvb, offset);
-
-	if ((reason_flag & SASP_DEREG_REQ_REASON_LEARNED) == 0)
-		wmem_strbuf_append_printf(reasonflags_strbuf, "%s%s", first_flag ? "" : ", ", fstr[0]);
-	else
-		wmem_strbuf_append_printf(reasonflags_strbuf, "%s%s", first_flag ? "" : ", ", fstr[1]);
-	first_flag = FALSE;
-
-	/*dereg_req_reason_flag =*/
-	proto_tree_add_uint_format(dereg_req_data, hf_dereg_req_reason_flag, tvb,
-		offset, 1, reason_flag, "Reason: 0x%02x (%s)", reason_flag,
-		wmem_strbuf_get_str(reasonflags_strbuf));
+    /*proto_item *dereg_req_reason_flag;*/
+    /*proto_tree *dereg_req_reason_flag_tree;*/
+    guint16          gmd_cnt, i;
+    proto_item      *dereg_tree;
+    proto_tree      *dereg_req_data;
+    guint8           reason_flag;
+    static gboolean  first_flag         = TRUE;
+    wmem_strbuf_t   *reasonflags_strbuf = wmem_strbuf_new_label(wmem_packet_scope());
+    static const gchar *fstr[] = {"No Reason", "Learned & Purposeful" };
+
+    dereg_tree = proto_tree_add_text(pay_load, tvb, offset, -1 , "DeReg Request");
+    dereg_req_data = proto_item_add_subtree(dereg_tree, ett_sasp_dereg_req_sz);
+
+    /* Size */
+    proto_tree_add_item(dereg_req_data, hf_sasp_dereg_req_sz, tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
+
+    /* LB Flag */
+    proto_tree_add_item(dereg_req_data, hf_dereg_req_lbflag, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
+
+    /* Reason */
+    wmem_strbuf_truncate(reasonflags_strbuf, 0);
+    reason_flag = tvb_get_guint8(tvb, offset);
+
+    if ((reason_flag & SASP_DEREG_REQ_REASON_LEARNED) == 0)
+        wmem_strbuf_append_printf(reasonflags_strbuf, "%s%s", first_flag ? "" : ", ", fstr[0]);
+    else
+        wmem_strbuf_append_printf(reasonflags_strbuf, "%s%s", first_flag ? "" : ", ", fstr[1]);
+    first_flag = FALSE;
+
+    /*dereg_req_reason_flag =*/
+    proto_tree_add_uint_format(dereg_req_data, hf_dereg_req_reason_flag, tvb,
+        offset, 1, reason_flag, "Reason: 0x%02x (%s)", reason_flag,
+        wmem_strbuf_get_str(reasonflags_strbuf));
 #if 0   /* XXX: ToDo?? Flags to be displayed under a subtree ? */
-	dereg_req_reason_flag_tree = proto_item_add_subtree(dereg_req_reason_flag, ett_dereg_req_reason_flag);
+    dereg_req_reason_flag_tree = proto_item_add_subtree(dereg_req_reason_flag, ett_dereg_req_reason_flag);
 #endif
-	offset += 1;
+    offset += 1;
 
-	gmd_cnt = tvb_get_ntohs(tvb, offset);
+    gmd_cnt = tvb_get_ntohs(tvb, offset);
 
-	/* Group Mem Data Count */
-	proto_tree_add_item(dereg_req_data, hf_sasp_gmd_cnt, tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    /* Group Mem Data Count */
+    proto_tree_add_item(dereg_req_data, hf_sasp_gmd_cnt, tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	/*Group Mem Data */
-	for (i=0; i<gmd_cnt; i++)
-		offset = dissect_grp_memdatacomp(tvb, dereg_req_data, offset);
+    /*Group Mem Data */
+    for (i=0; i<gmd_cnt; i++)
+        offset = dissect_grp_memdatacomp(tvb, dereg_req_data, offset);
 }
 
 
 static void dissect_dereg_rep(tvbuff_t *tvb, proto_tree *pay_load, guint32 offset)
 {
-	proto_item *dereg_rep;
-	proto_tree *dereg_rep_tree;
+    proto_item *dereg_rep;
+    proto_tree *dereg_rep_tree;
 
-	dereg_rep = proto_tree_add_text(pay_load, tvb, offset, -1 , "Dereg Reply");
-	dereg_rep_tree = proto_item_add_subtree(dereg_rep, ett_sasp_dereg_rep);
+    dereg_rep = proto_tree_add_text(pay_load, tvb, offset, -1 , "Dereg Reply");
+    dereg_rep_tree = proto_item_add_subtree(dereg_rep, ett_sasp_dereg_rep);
 
-	/* Size */
-	proto_tree_add_item(dereg_rep_tree, hf_sasp_dereg_rep_sz, tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    /* Size */
+    proto_tree_add_item(dereg_rep_tree, hf_sasp_dereg_rep_sz, tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	/* Return Code */
-	proto_tree_add_item(dereg_rep_tree, hf_sasp_dereg_rep_rcode, tvb, offset, 1, ENC_BIG_ENDIAN);
+    /* Return Code */
+    proto_tree_add_item(dereg_rep_tree, hf_sasp_dereg_rep_rcode, tvb, offset, 1, ENC_BIG_ENDIAN);
 }
 
 
 static void dissect_sendwt(tvbuff_t *tvb, proto_tree *pay_load, guint32 offset)
 {
-	proto_item *sendwt;
-	proto_tree *sendwt_tree;
-	guint16 gwed_cnt, i;
+    proto_item *sendwt;
+    proto_tree *sendwt_tree;
+    guint16     gwed_cnt, i;
 
-	sendwt = proto_tree_add_text(pay_load, tvb, offset, -1 , "Send Weight");
-	sendwt_tree = proto_item_add_subtree(sendwt, ett_sasp_sendwt);
+    sendwt = proto_tree_add_text(pay_load, tvb, offset, -1 , "Send Weight");
+    sendwt_tree = proto_item_add_subtree(sendwt, ett_sasp_sendwt);
 
-	/* Size */
-	proto_tree_add_item(sendwt_tree, hf_sasp_sendwt_sz, tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    /* Size */
+    proto_tree_add_item(sendwt_tree, hf_sasp_sendwt_sz, tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	gwed_cnt = tvb_get_ntohs(tvb, offset);
+    gwed_cnt = tvb_get_ntohs(tvb, offset);
 
-	/* Group Wt Entry Data Count */
-	proto_tree_add_item(sendwt_tree, hf_sasp_sendwt_gwedcnt, tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    /* Group Wt Entry Data Count */
+    proto_tree_add_item(sendwt_tree, hf_sasp_sendwt_gwedcnt, tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	for (i=0; i<gwed_cnt; i++)
-		offset = dissect_grp_wt_entry_datacomp(tvb, sendwt_tree, offset);
+    for (i=0; i<gwed_cnt; i++)
+        offset = dissect_grp_wt_entry_datacomp(tvb, sendwt_tree, offset);
 }
 
 
 static void dissect_setmemstate_req(tvbuff_t *tvb, proto_tree *pay_load, guint32 offset)
 {
-	proto_item *setmemstate;
-	proto_tree *setmemstate_req_data;
-	guint16 gmsd_cnt, i;
+    proto_item *setmemstate;
+    proto_tree *setmemstate_req_data;
+    guint16     gmsd_cnt, i;
 
-	setmemstate = proto_tree_add_text(pay_load, tvb, offset, -1 , "Set Mem State Request");
-	setmemstate_req_data = proto_item_add_subtree(setmemstate, ett_sasp_setmemstate_req);
+    setmemstate = proto_tree_add_text(pay_load, tvb, offset, -1 , "Set Mem State Request");
+    setmemstate_req_data = proto_item_add_subtree(setmemstate, ett_sasp_setmemstate_req);
 
-	/* Size */
-	proto_tree_add_item(setmemstate_req_data, hf_sasp_setmemstate_req_sz, tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    /* Size */
+    proto_tree_add_item(setmemstate_req_data, hf_sasp_setmemstate_req_sz, tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	/*LB Flag*/
-	proto_tree_add_item(setmemstate_req_data, hf_setmemstate_req_lbflag, tvb, offset, 1, ENC_BIG_ENDIAN);
-	offset += 1;
+    /*LB Flag*/
+    proto_tree_add_item(setmemstate_req_data, hf_setmemstate_req_lbflag, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
 
-	/*Group Data Count*/
-	gmsd_cnt = tvb_get_ntohs(tvb, offset);
-	proto_tree_add_item(setmemstate_req_data, hf_sasp_setmemstate_req_gmsd_cnt, tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    /*Group Data Count*/
+    gmsd_cnt = tvb_get_ntohs(tvb, offset);
+    proto_tree_add_item(setmemstate_req_data, hf_sasp_setmemstate_req_gmsd_cnt, tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	for (i=0; i<gmsd_cnt; i++)
-		offset = dissect_grp_memstatedatacomp(tvb, setmemstate_req_data, offset);
+    for (i=0; i<gmsd_cnt; i++)
+        offset = dissect_grp_memstatedatacomp(tvb, setmemstate_req_data, offset);
 }
 
 static void dissect_setmemstate_rep(tvbuff_t *tvb, proto_tree *pay_load, guint32 offset)
 {
-	proto_item *setmemstate_rep;
-	proto_tree *setmemstate_rep_tree;
+    proto_item *setmemstate_rep;
+    proto_tree *setmemstate_rep_tree;
 
-	setmemstate_rep = proto_tree_add_text(pay_load, tvb, offset, -1 , "Set Mem State Reply");
-	setmemstate_rep_tree = proto_item_add_subtree(setmemstate_rep, ett_sasp_setmemstate_rep);
+    setmemstate_rep = proto_tree_add_text(pay_load, tvb, offset, -1 , "Set Mem State Reply");
+    setmemstate_rep_tree = proto_item_add_subtree(setmemstate_rep, ett_sasp_setmemstate_rep);
 
-	/* Size */
-	proto_tree_add_item(setmemstate_rep_tree, hf_sasp_setmemstate_rep_sz, tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    /* Size */
+    proto_tree_add_item(setmemstate_rep_tree, hf_sasp_setmemstate_rep_sz, tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	/* Response Code */
-	proto_tree_add_item(setmemstate_rep_tree, hf_sasp_setmemstate_rep_rcode, tvb, offset, 1, ENC_BIG_ENDIAN);
+    /* Response Code */
+    proto_tree_add_item(setmemstate_rep_tree, hf_sasp_setmemstate_rep_rcode, tvb, offset, 1, ENC_BIG_ENDIAN);
 }
 
 
 static guint32 dissect_memdatacomp(tvbuff_t *tvb, proto_tree *pay_load, guint32 offset, proto_tree **mdct_p)
 {
-	proto_item *memdatacomp;
-	proto_tree *memdatacomp_tree;
-	guint8 lab_len;
-	struct e_in6_addr ipv6_address;
-	const gchar *ip_str;
+    proto_item  *memdatacomp;
+    proto_tree  *memdatacomp_tree;
+    guint8       lab_len;
+    const gchar *ip_str;
+    struct e_in6_addr ipv6_address;
 
-	tvb_get_ipv6(tvb, offset+7, &ipv6_address);
-	ip_str = ip6_to_str(&ipv6_address);
+    tvb_get_ipv6(tvb, offset+7, &ipv6_address);
+    ip_str = ip6_to_str(&ipv6_address);
 
-	lab_len = tvb_get_guint8(tvb, offset+23);
+    lab_len = tvb_get_guint8(tvb, offset+23);
 
-	memdatacomp = proto_tree_add_ipv6_format(pay_load, hf_sasp_memdatacomp_ip,
-		tvb, offset, 24+lab_len, (guint8*)&ipv6_address,
-		"Member Data Comp (%s)", ip_str);
+    memdatacomp = proto_tree_add_ipv6_format(pay_load, hf_sasp_memdatacomp_ip,
+        tvb, offset, 24+lab_len, (guint8*)&ipv6_address,
+        "Member Data Comp (%s)", ip_str);
 
-	memdatacomp_tree = proto_item_add_subtree(memdatacomp, ett_sasp_memdatacomp);
+    memdatacomp_tree = proto_item_add_subtree(memdatacomp, ett_sasp_memdatacomp);
 
-	/* Message Type */
-	proto_tree_add_item(memdatacomp_tree, hf_sasp_memdatacomp_type, tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    /* Message Type */
+    proto_tree_add_item(memdatacomp_tree, hf_sasp_memdatacomp_type, tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	/* Size */
-	proto_tree_add_item(memdatacomp_tree, hf_sasp_memdatacomp_sz, tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    /* Size */
+    proto_tree_add_item(memdatacomp_tree, hf_sasp_memdatacomp_sz, tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	/* Protocol */
-	proto_tree_add_item(memdatacomp_tree, hf_sasp_memdatacomp_protocol, tvb, offset, 1, ENC_BIG_ENDIAN);
-	offset += 1;
+    /* Protocol */
+    proto_tree_add_item(memdatacomp_tree, hf_sasp_memdatacomp_protocol, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
 
-	/* Port */
-	proto_tree_add_item(memdatacomp_tree, hf_sasp_memdatacomp_port, tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    /* Port */
+    proto_tree_add_item(memdatacomp_tree, hf_sasp_memdatacomp_port, tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	/*Ip*/
-	proto_tree_add_item(memdatacomp_tree, hf_sasp_memdatacomp_ip, tvb, offset, 16, ENC_NA);
-	offset += 16;
+    /*Ip*/
+    proto_tree_add_item(memdatacomp_tree, hf_sasp_memdatacomp_ip, tvb, offset, 16, ENC_NA);
+    offset += 16;
 
-	/*Label Len*/
-	proto_tree_add_item(memdatacomp_tree, hf_sasp_memdatacomp_lab_len, tvb, offset, 1, ENC_BIG_ENDIAN);
-	offset += 1;
+    /*Label Len*/
+    proto_tree_add_item(memdatacomp_tree, hf_sasp_memdatacomp_lab_len, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
 
-	/*Label*/
-	proto_tree_add_item(memdatacomp_tree, hf_sasp_memdatacomp_label, tvb, offset, lab_len, ENC_ASCII|ENC_NA);
-	offset += lab_len;
+    /*Label*/
+    proto_tree_add_item(memdatacomp_tree, hf_sasp_memdatacomp_label, tvb, offset, lab_len, ENC_ASCII|ENC_NA);
+    offset += lab_len;
 
-	if (mdct_p != NULL)
-		*mdct_p = memdatacomp_tree;
+    if (mdct_p != NULL)
+        *mdct_p = memdatacomp_tree;
 
-	return offset;
+    return offset;
 }
 
 
 static guint32 dissect_grpdatacomp(tvbuff_t *tvb, proto_tree *pay_load, guint32 offset)
 {
-	proto_item *grpdatacomp;
-	proto_tree *grpdatacomp_tree;
-	guint8 LB_uid_len;
-	guint8 grp_name_len;
+    proto_item *grpdatacomp;
+    proto_tree *grpdatacomp_tree;
+    guint8      LB_uid_len;
+    guint8      grp_name_len;
 
-	grpdatacomp = proto_tree_add_text(pay_load, tvb, offset, -1 , "Group Data Component");
-	grpdatacomp_tree = proto_item_add_subtree(grpdatacomp, ett_sasp_grpdatacomp);
+    grpdatacomp = proto_tree_add_text(pay_load, tvb, offset, -1 , "Group Data Component");
+    grpdatacomp_tree = proto_item_add_subtree(grpdatacomp, ett_sasp_grpdatacomp);
 
-	/*Type*/
-	proto_tree_add_item(grpdatacomp_tree, hf_sasp_grpdatacomp, tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    /*Type*/
+    proto_tree_add_item(grpdatacomp_tree, hf_sasp_grpdatacomp, tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	/*Size*/
-	proto_tree_add_item(grpdatacomp_tree, hf_sasp_grpdatacomp_sz, tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    /*Size*/
+    proto_tree_add_item(grpdatacomp_tree, hf_sasp_grpdatacomp_sz, tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	LB_uid_len = tvb_get_guint8(tvb, offset);
+    LB_uid_len = tvb_get_guint8(tvb, offset);
 
-	/* LB UID Len*/
-	proto_tree_add_item(grpdatacomp_tree, hf_sasp_grpdatacomp_LB_uid_len,
-		tvb, offset, 1, ENC_BIG_ENDIAN);
-	offset += 1;
+    /* LB UID Len*/
+    proto_tree_add_item(grpdatacomp_tree, hf_sasp_grpdatacomp_LB_uid_len,
+        tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
 
-	proto_tree_add_item(grpdatacomp_tree, hf_sasp_grpdatacomp_LB_uid,
-		tvb, offset, LB_uid_len, ENC_ASCII|ENC_NA);
-	offset += (guint8)LB_uid_len;
+    proto_tree_add_item(grpdatacomp_tree, hf_sasp_grpdatacomp_LB_uid,
+        tvb, offset, LB_uid_len, ENC_ASCII|ENC_NA);
+    offset += (guint8)LB_uid_len;
 
-	grp_name_len = tvb_get_guint8(tvb, offset);
+    grp_name_len = tvb_get_guint8(tvb, offset);
 
-	/*Group Name Len */
-	proto_tree_add_item(grpdatacomp_tree, hf_sasp_grpdatacomp_grp_name_len,
-		tvb, offset, 1, ENC_BIG_ENDIAN);
-	offset += 1;
+    /*Group Name Len */
+    proto_tree_add_item(grpdatacomp_tree, hf_sasp_grpdatacomp_grp_name_len,
+        tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
 
-	/*Group Name*/
-	proto_tree_add_item(grpdatacomp_tree, hf_sasp_grpdatacomp_grp_name,
-		tvb, offset, grp_name_len, ENC_ASCII|ENC_NA);
-	offset += grp_name_len;
+    /*Group Name*/
+    proto_tree_add_item(grpdatacomp_tree, hf_sasp_grpdatacomp_grp_name,
+        tvb, offset, grp_name_len, ENC_ASCII|ENC_NA);
+    offset += grp_name_len;
 
-	return offset;
+    return offset;
 }
 
 
 static guint32 dissect_grp_memdatacomp(tvbuff_t *tvb, proto_tree *pay_load, guint32 offset)
 {
-	proto_item *grp_memdatacomp;
-	proto_tree *grp_memdatacomp_tree;
-	guint16 mem_cnt;
-	guint16 i;
+    proto_item *grp_memdatacomp;
+    proto_tree *grp_memdatacomp_tree;
+    guint16     mem_cnt;
+    guint16     i;
 
-	grp_memdatacomp = proto_tree_add_text(pay_load, tvb, offset, -1 , "Group Of Member Data");
-	grp_memdatacomp_tree = proto_item_add_subtree(grp_memdatacomp, ett_sasp_grp_memdatacomp);
+    grp_memdatacomp = proto_tree_add_text(pay_load, tvb, offset, -1 , "Group Of Member Data");
+    grp_memdatacomp_tree = proto_item_add_subtree(grp_memdatacomp, ett_sasp_grp_memdatacomp);
 
-	/* Group MEM Data */
-	proto_tree_add_item(grp_memdatacomp_tree, hf_sasp_grp_memdatacomp, tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    /* Group MEM Data */
+    proto_tree_add_item(grp_memdatacomp_tree, hf_sasp_grp_memdatacomp, tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	/* Group MEM Data Size*/
-	proto_tree_add_item(grp_memdatacomp_tree, hf_sasp_grp_memdatacomp_sz, tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    /* Group MEM Data Size*/
+    proto_tree_add_item(grp_memdatacomp_tree, hf_sasp_grp_memdatacomp_sz, tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	mem_cnt = tvb_get_ntohs(tvb, offset);
+    mem_cnt = tvb_get_ntohs(tvb, offset);
 
-	/* Group MEM Data Count*/
-	proto_tree_add_item(grp_memdatacomp_tree, hf_sasp_grp_memdatacomp_cnt, tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    /* Group MEM Data Count*/
+    proto_tree_add_item(grp_memdatacomp_tree, hf_sasp_grp_memdatacomp_cnt, tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	offset = dissect_grpdatacomp(tvb, grp_memdatacomp_tree, offset);
+    offset = dissect_grpdatacomp(tvb, grp_memdatacomp_tree, offset);
 
-	/* array of memdata */
-	for (i=0; i<mem_cnt; i++)
-		offset = dissect_memdatacomp(tvb, grp_memdatacomp_tree, offset, NULL);
+    /* array of memdata */
+    for (i=0; i<mem_cnt; i++)
+        offset = dissect_memdatacomp(tvb, grp_memdatacomp_tree, offset, NULL);
 
-	return offset;
+    return offset;
 }
 
 
 static void dissect_wt_req(tvbuff_t *tvb, proto_tree *pay_load, guint32 offset)
 {
-	proto_item *get_wt_data;
-	proto_tree *get_wt_tree;
-	guint16 gd_cnt, i;
+    proto_item *get_wt_data;
+    proto_tree *get_wt_tree;
+    guint16     gd_cnt, i;
 
-	get_wt_data = proto_tree_add_text(pay_load, tvb, offset, -1 , "Get Wt Req");
-	get_wt_tree = proto_item_add_subtree(get_wt_data, ett_sasp_getwt);
+    get_wt_data = proto_tree_add_text(pay_load, tvb, offset, -1 , "Get Wt Req");
+    get_wt_tree = proto_item_add_subtree(get_wt_data, ett_sasp_getwt);
 
-	/* Size */
-	proto_tree_add_item(get_wt_tree, hf_sasp_wt_req_sz, tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    /* Size */
+    proto_tree_add_item(get_wt_tree, hf_sasp_wt_req_sz, tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	gd_cnt = tvb_get_ntohs(tvb, offset);
+    gd_cnt = tvb_get_ntohs(tvb, offset);
 
-	/* Group Data Count */
-	proto_tree_add_item(get_wt_tree, hf_sasp_wt_req_gd_cnt, tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    /* Group Data Count */
+    proto_tree_add_item(get_wt_tree, hf_sasp_wt_req_gd_cnt, tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	for (i=0; i<gd_cnt; i++)
-		offset = dissect_grpdatacomp(tvb, get_wt_tree, offset);
+    for (i=0; i<gd_cnt; i++)
+        offset = dissect_grpdatacomp(tvb, get_wt_tree, offset);
 }
 
 
 static void dissect_wt_rep(tvbuff_t *tvb, proto_tree *pay_load, guint32 offset)
 {
-	proto_item *wt_rep;
-	proto_tree *wt_rep_tree;
-	guint16 gwed_cnt, i;
+    proto_item *wt_rep;
+    proto_tree *wt_rep_tree;
+    guint16     gwed_cnt, i;
 
-	wt_rep = proto_tree_add_text(pay_load, tvb, offset, -1 , "Get Weights Reply");
-	wt_rep_tree = proto_item_add_subtree(wt_rep, ett_sasp_wt_rep);
+    wt_rep = proto_tree_add_text(pay_load, tvb, offset, -1 , "Get Weights Reply");
+    wt_rep_tree = proto_item_add_subtree(wt_rep, ett_sasp_wt_rep);
 
-	/* Size */
-	proto_tree_add_item(wt_rep_tree, hf_sasp_wt_rep_sz, tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    /* Size */
+    proto_tree_add_item(wt_rep_tree, hf_sasp_wt_rep_sz, tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	/* Response Code */
-	proto_tree_add_item(wt_rep_tree, hf_sasp_wt_rep_rcode, tvb, offset, 1, ENC_BIG_ENDIAN);
-	offset += 1;
+    /* Response Code */
+    proto_tree_add_item(wt_rep_tree, hf_sasp_wt_rep_rcode, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
 
-	/* Interval */
-	proto_tree_add_item(wt_rep_tree, hf_sasp_wt_rep_interval, tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    /* Interval */
+    proto_tree_add_item(wt_rep_tree, hf_sasp_wt_rep_interval, tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	gwed_cnt = tvb_get_ntohs(tvb, offset);
+    gwed_cnt = tvb_get_ntohs(tvb, offset);
 
-	/* Count of Group of Wt Entry Data */
-	proto_tree_add_item(wt_rep_tree, hf_sasp_wt_rep_gwed_cnt, tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    /* Count of Group of Wt Entry Data */
+    proto_tree_add_item(wt_rep_tree, hf_sasp_wt_rep_gwed_cnt, tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	for (i=0; i<gwed_cnt; i++)
-		offset = dissect_grp_wt_entry_datacomp(tvb, wt_rep_tree, offset);
+    for (i=0; i<gwed_cnt; i++)
+        offset = dissect_grp_wt_entry_datacomp(tvb, wt_rep_tree, offset);
 }
 
 
 static void dissect_setlbstate_req(tvbuff_t *tvb, proto_tree *pay_load, guint32 offset)
 {
-	guint8 LB_uid_len;
+    guint8 LB_uid_len;
 
-	static const int *lbflags[] = {
-		&hf_sasp_pushflag,
-		&hf_sasp_trustflag,
-		&hf_sasp_nochangeflag,
-		NULL
-	};
+    static const int *lbflags[] = {
+        &hf_sasp_pushflag,
+        &hf_sasp_trustflag,
+        &hf_sasp_nochangeflag,
+        NULL
+    };
 
-	proto_item *setlbstate_req;
-	proto_tree *setlbstate_req_tree;
+    proto_item *setlbstate_req;
+    proto_tree *setlbstate_req_tree;
 
-	setlbstate_req = proto_tree_add_text(pay_load, tvb, offset, -1 , "Set LB State Req");
-	setlbstate_req_tree = proto_item_add_subtree(setlbstate_req, ett_sasp_setlbstate_req);
+    setlbstate_req = proto_tree_add_text(pay_load, tvb, offset, -1 , "Set LB State Req");
+    setlbstate_req_tree = proto_item_add_subtree(setlbstate_req, ett_sasp_setlbstate_req);
 
-	/* Size*/
-	proto_tree_add_item(setlbstate_req_tree, hf_sasp_setlbstate_req_sz,
-		tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    /* Size*/
+    proto_tree_add_item(setlbstate_req_tree, hf_sasp_setlbstate_req_sz,
+        tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	LB_uid_len = tvb_get_guint8(tvb, offset);
+    LB_uid_len = tvb_get_guint8(tvb, offset);
 
-	/* LB UID Len */
-	proto_tree_add_item(setlbstate_req_tree, hf_sasp_setlbstate_req_LB_uid_len,
-		tvb, offset, 1, ENC_BIG_ENDIAN);
-	offset += 1;
+    /* LB UID Len */
+    proto_tree_add_item(setlbstate_req_tree, hf_sasp_setlbstate_req_LB_uid_len,
+        tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
 
-	/*LB UID*/
-	proto_tree_add_item(setlbstate_req_tree, hf_sasp_setlbstate_req_LB_uid,
-		tvb, offset, LB_uid_len, ENC_ASCII|ENC_NA);
-	offset += (guint8)LB_uid_len;
+    /*LB UID*/
+    proto_tree_add_item(setlbstate_req_tree, hf_sasp_setlbstate_req_LB_uid,
+        tvb, offset, LB_uid_len, ENC_ASCII|ENC_NA);
+    offset += (guint8)LB_uid_len;
 
-	/*LB Health*/
-	proto_tree_add_item(setlbstate_req_tree, hf_sasp_setlbstate_req_LB_health,
-		tvb, offset, 1, ENC_BIG_ENDIAN);
-	offset += 1;
+    /*LB Health*/
+    proto_tree_add_item(setlbstate_req_tree, hf_sasp_setlbstate_req_LB_health,
+        tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
 
-	proto_tree_add_bitmask_text(setlbstate_req_tree, tvb, offset, 1, "LB Flags:", NULL,
-		ett_setlbstate_req_lbflag, lbflags, ENC_BIG_ENDIAN, 0);
+    proto_tree_add_bitmask_text(setlbstate_req_tree, tvb, offset, 1, "LB Flags:", NULL,
+        ett_setlbstate_req_lbflag, lbflags, ENC_BIG_ENDIAN, 0);
 }
 
 
 static void dissect_setlbstate_rep(tvbuff_t *tvb, proto_tree *pay_load, guint32 offset)
 {
-	proto_item *setlbstate_rep;
-	proto_tree *setlbstate_rep_tree;
+    proto_item *setlbstate_rep;
+    proto_tree *setlbstate_rep_tree;
 
-	setlbstate_rep = proto_tree_add_text(pay_load, tvb, offset, -1 , "Set LB State Rep");
-	setlbstate_rep_tree = proto_item_add_subtree(setlbstate_rep, ett_sasp_setlbstate_rep);
+    setlbstate_rep = proto_tree_add_text(pay_load, tvb, offset, -1 , "Set LB State Rep");
+    setlbstate_rep_tree = proto_item_add_subtree(setlbstate_rep, ett_sasp_setlbstate_rep);
 
-	/* Size */
-	proto_tree_add_item(setlbstate_rep_tree, hf_sasp_setlbstate_rep_sz,
-		tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    /* Size */
+    proto_tree_add_item(setlbstate_rep_tree, hf_sasp_setlbstate_rep_sz,
+        tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	/* Response Code */
-	proto_tree_add_item(setlbstate_rep_tree, hf_sasp_setlbstate_rep_rcode,
-		tvb, offset, 1, ENC_BIG_ENDIAN);
+    /* Response Code */
+    proto_tree_add_item(setlbstate_rep_tree, hf_sasp_setlbstate_rep_rcode,
+        tvb, offset, 1, ENC_BIG_ENDIAN);
 }
 
 
 static guint32 dissect_grp_memstatedatacomp(tvbuff_t *tvb, proto_tree *pay_load, guint32 offset)
 {
-	proto_item *grp_memstatedatacomp;
-	proto_tree *grp_memstatedatacomp_tree;
-	guint16 mem_cnt;
-	guint16 i;
+    proto_item *grp_memstatedatacomp;
+    proto_tree *grp_memstatedatacomp_tree;
+    guint16     mem_cnt;
+    guint16     i;
 
-	grp_memstatedatacomp = proto_tree_add_text(pay_load, tvb, offset, -1 , "Group Mem State Comp");
-	grp_memstatedatacomp_tree = proto_item_add_subtree(grp_memstatedatacomp,
-		ett_sasp_grp_memstatedatacomp);
+    grp_memstatedatacomp = proto_tree_add_text(pay_load, tvb, offset, -1 , "Group Mem State Comp");
+    grp_memstatedatacomp_tree = proto_item_add_subtree(grp_memstatedatacomp,
+        ett_sasp_grp_memstatedatacomp);
 
-	/* Type */
-	proto_tree_add_item(grp_memstatedatacomp_tree, hf_sasp_grp_memstatedatacomp,
-		tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    /* Type */
+    proto_tree_add_item(grp_memstatedatacomp_tree, hf_sasp_grp_memstatedatacomp,
+        tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	/* Size */
-	proto_tree_add_item(grp_memstatedatacomp_tree, hf_sasp_grp_memstatedatacomp_sz,
-		tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    /* Size */
+    proto_tree_add_item(grp_memstatedatacomp_tree, hf_sasp_grp_memstatedatacomp_sz,
+        tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	mem_cnt = tvb_get_ntohs(tvb, offset);
+    mem_cnt = tvb_get_ntohs(tvb, offset);
 
-	/* Count */
-	proto_tree_add_item(grp_memstatedatacomp_tree, hf_sasp_grp_memstatedatacomp_cnt,
-		tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    /* Count */
+    proto_tree_add_item(grp_memstatedatacomp_tree, hf_sasp_grp_memstatedatacomp_cnt,
+        tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	/* Group Data TLV */
-	offset = dissect_grpdatacomp(tvb, grp_memstatedatacomp_tree, offset);
+    /* Group Data TLV */
+    offset = dissect_grpdatacomp(tvb, grp_memstatedatacomp_tree, offset);
 
-	/* Array of Mem State Data */
-	for (i=0; i<mem_cnt; i++)
-		offset = dissect_memstatedatacomp(tvb, grp_memstatedatacomp_tree, offset);
+    /* Array of Mem State Data */
+    for (i=0; i<mem_cnt; i++)
+        offset = dissect_memstatedatacomp(tvb, grp_memstatedatacomp_tree, offset);
 
-	return offset;
+    return offset;
 }
 
 
 static guint32 dissect_memstatedatacomp(tvbuff_t *tvb, proto_tree *pay_load, guint32 offset)
 {
-	proto_tree *memstatedatacomp_tree;
-	proto_item *memstatedatacomp;
-	proto_tree *memdatacomp_tree;
-	guint8      memstate_flag;
-
-	offset = dissect_memdatacomp(tvb, pay_load, offset, &memdatacomp_tree);
-
-	memstatedatacomp = proto_tree_add_text(memdatacomp_tree, tvb, offset, -1 , "Member State Data");
-	memstatedatacomp_tree = proto_item_add_subtree(memstatedatacomp, ett_sasp_memstatedatacomp);
-
-	/* Type */
-	proto_tree_add_item(memstatedatacomp_tree, hf_sasp_memstatedatacomp_instance,
-		tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
-
-	/* Size */
-	proto_tree_add_item(memstatedatacomp_tree, hf_sasp_memstatedatacomp_sz,
-		tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
-
-	/* State */
-	proto_tree_add_item(memstatedatacomp_tree, hf_sasp_memstatedatacomp_state,
-		tvb, offset, 1, ENC_BIG_ENDIAN);
-	offset += 1;
-
-	/* Quiesce flag*/
-	memstate_flag = tvb_get_guint8(tvb, offset);
-	proto_tree_add_boolean(memstatedatacomp_tree, hf_sasp_memstatedatacomp_quiesce_flag,
-		tvb, offset, 1, memstate_flag);
-	offset += 1;
-
-	return offset;
+    proto_tree *memstatedatacomp_tree;
+    proto_item *memstatedatacomp;
+    proto_tree *memdatacomp_tree;
+    guint8      memstate_flag;
+
+    offset = dissect_memdatacomp(tvb, pay_load, offset, &memdatacomp_tree);
+
+    memstatedatacomp = proto_tree_add_text(memdatacomp_tree, tvb, offset, -1 , "Member State Data");
+    memstatedatacomp_tree = proto_item_add_subtree(memstatedatacomp, ett_sasp_memstatedatacomp);
+
+    /* Type */
+    proto_tree_add_item(memstatedatacomp_tree, hf_sasp_memstatedatacomp_instance,
+        tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
+
+    /* Size */
+    proto_tree_add_item(memstatedatacomp_tree, hf_sasp_memstatedatacomp_sz,
+        tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
+
+    /* State */
+    proto_tree_add_item(memstatedatacomp_tree, hf_sasp_memstatedatacomp_state,
+        tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
+
+    /* Quiesce flag*/
+    memstate_flag = tvb_get_guint8(tvb, offset);
+    proto_tree_add_boolean(memstatedatacomp_tree, hf_sasp_memstatedatacomp_quiesce_flag,
+        tvb, offset, 1, memstate_flag);
+    offset += 1;
+
+    return offset;
 }
 
 
 static guint32 dissect_weight_entry_data_comp(tvbuff_t *tvb, proto_tree *pay_load, guint32 offset)
 {
-	proto_tree *weight_entry_data_comp_tree;
-	proto_item *weight_entry_data_comp;
-
-	static const int *wtflags[] = {
-		&hf_sasp_wed_contactsuccess_flag,
-		&hf_sasp_wed_quiesce_flag,
-		&hf_sasp_wed_registration_flag,
-		&hf_sasp_wed_confident_flag,
-		NULL
-	};
-
-	offset = dissect_memdatacomp(tvb, pay_load, offset, NULL);
-
-	weight_entry_data_comp = proto_tree_add_text(pay_load, tvb, offset, -1 , "Weight Entry Data");
-	weight_entry_data_comp_tree = proto_item_add_subtree(weight_entry_data_comp,
-		ett_sasp_weight_entry_data_comp);
-
-	/* Type */
-	proto_tree_add_item(weight_entry_data_comp_tree, hf_sasp_weight_entry_data_comp_type,
-		tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
-
-	/* Size */
-	proto_tree_add_item(weight_entry_data_comp_tree, hf_sasp_weight_entry_data_comp_sz,
-		tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
-
-	proto_tree_add_item(weight_entry_data_comp_tree, hf_sasp_weight_entry_data_comp_state,
-		tvb, offset, 1, ENC_BIG_ENDIAN);
-	offset += 1;
-
-	proto_tree_add_bitmask_text(weight_entry_data_comp_tree, tvb, offset, 1, "Flags:", NULL,
-		ett_wt_entry_data_flag, wtflags, ENC_BIG_ENDIAN, 0);
-	offset += 1;
-
-	/* Weight */
-	proto_tree_add_item(weight_entry_data_comp_tree, hf_sasp_weight_entry_data_comp_weight,
-		tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
-
-	return offset;
+    proto_tree *weight_entry_data_comp_tree;
+    proto_item *weight_entry_data_comp;
+
+    static const int *wtflags[] = {
+        &hf_sasp_wed_contactsuccess_flag,
+        &hf_sasp_wed_quiesce_flag,
+        &hf_sasp_wed_registration_flag,
+        &hf_sasp_wed_confident_flag,
+        NULL
+    };
+
+    offset = dissect_memdatacomp(tvb, pay_load, offset, NULL);
+
+    weight_entry_data_comp = proto_tree_add_text(pay_load, tvb, offset, -1 , "Weight Entry Data");
+    weight_entry_data_comp_tree = proto_item_add_subtree(weight_entry_data_comp,
+        ett_sasp_weight_entry_data_comp);
+
+    /* Type */
+    proto_tree_add_item(weight_entry_data_comp_tree, hf_sasp_weight_entry_data_comp_type,
+        tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
+
+    /* Size */
+    proto_tree_add_item(weight_entry_data_comp_tree, hf_sasp_weight_entry_data_comp_sz,
+        tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
+
+    proto_tree_add_item(weight_entry_data_comp_tree, hf_sasp_weight_entry_data_comp_state,
+        tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
+
+    proto_tree_add_bitmask_text(weight_entry_data_comp_tree, tvb, offset, 1, "Flags:", NULL,
+        ett_wt_entry_data_flag, wtflags, ENC_BIG_ENDIAN, 0);
+    offset += 1;
+
+    /* Weight */
+    proto_tree_add_item(weight_entry_data_comp_tree, hf_sasp_weight_entry_data_comp_weight,
+        tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
+
+    return offset;
 }
 
 
 static guint32 dissect_grp_wt_entry_datacomp(tvbuff_t *tvb, proto_tree *pay_load, guint32 offset)
 {
-	proto_item *grp_wt_entry_datacomp;
-	proto_tree *grp_wt_entry_datacomp_tree;
-	guint16     wt_entry_cnt;
-	guint16     i;
+    proto_item *grp_wt_entry_datacomp;
+    proto_tree *grp_wt_entry_datacomp_tree;
+    guint16     wt_entry_cnt;
+    guint16     i;
 
-	grp_wt_entry_datacomp = proto_tree_add_text(pay_load, tvb, offset, -1 , "Group of Wt Entry Data");
-	grp_wt_entry_datacomp_tree = proto_item_add_subtree(grp_wt_entry_datacomp,
-		ett_sasp_grp_wt_entry_datacomp);
+    grp_wt_entry_datacomp = proto_tree_add_text(pay_load, tvb, offset, -1 , "Group of Wt Entry Data");
+    grp_wt_entry_datacomp_tree = proto_item_add_subtree(grp_wt_entry_datacomp,
+        ett_sasp_grp_wt_entry_datacomp);
 
-	/* Type */
-	proto_tree_add_item(grp_wt_entry_datacomp_tree, hf_sasp_grp_wt_entry_datacomp_type,
-		tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    /* Type */
+    proto_tree_add_item(grp_wt_entry_datacomp_tree, hf_sasp_grp_wt_entry_datacomp_type,
+        tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	/* Size */
-	proto_tree_add_item(grp_wt_entry_datacomp_tree, hf_sasp_grp_wt_entry_datacomp_sz,
-		tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    /* Size */
+    proto_tree_add_item(grp_wt_entry_datacomp_tree, hf_sasp_grp_wt_entry_datacomp_sz,
+        tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	wt_entry_cnt = tvb_get_ntohs(tvb, offset);
+    wt_entry_cnt = tvb_get_ntohs(tvb, offset);
 
-	/* Wt Entry Count*/
-	proto_tree_add_item(grp_wt_entry_datacomp_tree, hf_sasp_grp_wt_entry_datacomp_cnt,
-		tvb, offset, 2, ENC_BIG_ENDIAN);
-	offset += 2;
+    /* Wt Entry Count*/
+    proto_tree_add_item(grp_wt_entry_datacomp_tree, hf_sasp_grp_wt_entry_datacomp_cnt,
+        tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset += 2;
 
-	/* Group Data */
-	offset = dissect_grpdatacomp(tvb, grp_wt_entry_datacomp_tree, offset);
+    /* Group Data */
+    offset = dissect_grpdatacomp(tvb, grp_wt_entry_datacomp_tree, offset);
 
-	/* Member Data */
-	for (i=0; i<wt_entry_cnt; i++)
-		offset = dissect_weight_entry_data_comp(tvb, grp_wt_entry_datacomp_tree, offset);
+    /* Member Data */
+    for (i=0; i<wt_entry_cnt; i++)
+        offset = dissect_weight_entry_data_comp(tvb, grp_wt_entry_datacomp_tree, offset);
 
-	return offset;
+    return offset;
 }
 
 
 /* sasp protocol register */
 void proto_register_sasp(void)
 {
-	static hf_register_info hf[] = {
-		/*SASP Header */
-		{ &hf_sasp_type,
-		  { "Type", "sasp.msg.type",
-		    FT_UINT16, BASE_HEX, NULL, 0x0,
-		    "SASP Header", HFILL }
-		},
-
-		{ &hf_sasp_length,
-		  { "Length", "sasp.header.Len",
-		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "SASP Header Length", HFILL }
-		},
-
-		{ &hf_sasp_vrsn,
-		  { "Version", "sasp.version",
-		    FT_UINT8, BASE_DEC, NULL, 0x0,
-		    "SASP Version", HFILL }
-		},
-
-		{ &hf_msg_len,
-		  { "Message Len", "sasp.msg.len",
-		    FT_UINT32, BASE_DEC, NULL, 0x0,
-		    "SASP Msg Len", HFILL }
-		},
-
-		{ &hf_msg_id,
-		  { "Message Id", "sasp.msg.id",
-		    FT_UINT32, BASE_DEC, NULL, 0x0,
-		    "SASP Msg Id", HFILL }
-		},
-
-		/*Message Type*/
-		{ &hf_msg_type,
-		  { "Message Type", "sasp.msg.type",
-		    FT_UINT16, BASE_HEX|BASE_EXT_STRING, &msg_table_ext, 0x0,
-		    "SASP Msg Type", HFILL }
-		},
-
-		/*Reg Request*/
-		{ &hf_sasp_reg_req_sz,
-		  { "Reg Req-Size", "sasp.reg-req.size",
-		    FT_UINT32, BASE_DEC, NULL, 0x0,
-		    "SASP Reg Req Size", HFILL }
-		},
-
-		{ &hf_reg_req_lbflag,
-		  { "Reg Req-LB Flag", "sasp.reg-req.lbflag",
-		    FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-		    "SASP Reg Req LB Flag", HFILL } },
-
-		{ &hf_sasp_gmd_cnt,
-		  { "Grp Mem Data-Count", "sasp.grp-mem-data.count",
-		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "SASP Grp Mem Data Count", HFILL } },
-
-		/* Reg Reply */
-
-		{ &hf_sasp_reg_rep_sz,
-		  { "Reg Reply-Size", "sasp.reg-rep.size",
-		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "SASP Reg Reply size", HFILL } },
-
-		{ &hf_sasp_reg_rep_rcode,
-		  { "Reg Reply-Return Code", "sasp.reg-rep.retcode",
-		    FT_UINT8, BASE_HEX, VALS(reg_reply_response_code), 0x0,
-		    "SASP Reg Rep Return Code", HFILL } },
-
-		/* Dereg Req */
-		{ &hf_sasp_dereg_req_sz,
-		  { "Dereg Req-Size", "sasp.dereg-req.size",
-		    FT_UINT32, BASE_DEC, NULL, 0x0,
-		    "SASP Dereg Req Size", HFILL } },
-
-		{ &hf_dereg_req_lbflag,
-		  { "Dereg Req-LB Flag", "sasp.dereg-req.lbflag",
-		    FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-		    "SASP Dereg Req LB Flag", HFILL } },
-
-		{ &hf_dereg_req_reason_flag,
-		  { "Reason Flags", "sasp.flags.reason",
-		    FT_UINT8, BASE_HEX, NULL, 0x0,
-		    NULL, HFILL } },
+    static hf_register_info hf[] = {
+        /*SASP Header */
+        { &hf_sasp_type,
+          { "Type", "sasp.msg.type",
+            FT_UINT16, BASE_HEX, NULL, 0x0,
+            "SASP Header", HFILL }
+        },
+
+        { &hf_sasp_length,
+          { "Length", "sasp.header.Len",
+            FT_UINT16, BASE_DEC, NULL, 0x0,
+            "SASP Header Length", HFILL }
+        },
+
+        { &hf_sasp_vrsn,
+          { "Version", "sasp.version",
+            FT_UINT8, BASE_DEC, NULL, 0x0,
+            "SASP Version", HFILL }
+        },
+
+        { &hf_msg_len,
+          { "Message Len", "sasp.msg.len",
+            FT_UINT32, BASE_DEC, NULL, 0x0,
+            "SASP Msg Len", HFILL }
+        },
+
+        { &hf_msg_id,
+          { "Message Id", "sasp.msg.id",
+            FT_UINT32, BASE_DEC, NULL, 0x0,
+            "SASP Msg Id", HFILL }
+        },
+
+        /*Message Type*/
+        { &hf_msg_type,
+          { "Message Type", "sasp.msg.type",
+            FT_UINT16, BASE_HEX|BASE_EXT_STRING, &msg_table_ext, 0x0,
+            "SASP Msg Type", HFILL }
+        },
+
+        /*Reg Request*/
+        { &hf_sasp_reg_req_sz,
+          { "Reg Req-Size", "sasp.reg-req.size",
+            FT_UINT32, BASE_DEC, NULL, 0x0,
+            "SASP Reg Req Size", HFILL }
+        },
+
+        { &hf_reg_req_lbflag,
+          { "Reg Req-LB Flag", "sasp.reg-req.lbflag",
+            FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+            "SASP Reg Req LB Flag", HFILL } },
+
+        { &hf_sasp_gmd_cnt,
+          { "Grp Mem Data-Count", "sasp.grp-mem-data.count",
+            FT_UINT16, BASE_DEC, NULL, 0x0,
+            "SASP Grp Mem Data Count", HFILL } },
+
+        /* Reg Reply */
+
+        { &hf_sasp_reg_rep_sz,
+          { "Reg Reply-Size", "sasp.reg-rep.size",
+            FT_UINT16, BASE_DEC, NULL, 0x0,
+            "SASP Reg Reply size", HFILL } },
+
+        { &hf_sasp_reg_rep_rcode,
+          { "Reg Reply-Return Code", "sasp.reg-rep.retcode",
+            FT_UINT8, BASE_HEX, VALS(reg_reply_response_code), 0x0,
+            "SASP Reg Rep Return Code", HFILL } },
+
+        /* Dereg Req */
+        { &hf_sasp_dereg_req_sz,
+          { "Dereg Req-Size", "sasp.dereg-req.size",
+            FT_UINT32, BASE_DEC, NULL, 0x0,
+            "SASP Dereg Req Size", HFILL } },
+
+        { &hf_dereg_req_lbflag,
+          { "Dereg Req-LB Flag", "sasp.dereg-req.lbflag",
+            FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+            "SASP Dereg Req LB Flag", HFILL } },
+
+        { &hf_dereg_req_reason_flag,
+          { "Reason Flags", "sasp.flags.reason",
+            FT_UINT8, BASE_HEX, NULL, 0x0,
+            NULL, HFILL } },
 
 #if 0
-		{ &hf_dereg_req_reason,
-		  { "Dereg Req-Reason", "sasp.dereg-req.reason",
-		    FT_UINT8, BASE_HEX, NULL, 0x0,
-		    "SASP Dereg Req Reason", HFILL } },
+        { &hf_dereg_req_reason,
+          { "Dereg Req-Reason", "sasp.dereg-req.reason",
+            FT_UINT8, BASE_HEX, NULL, 0x0,
+            "SASP Dereg Req Reason", HFILL } },
 #endif
 
-		/* Dereg Rep */
-		{ &hf_sasp_dereg_rep_sz,
-		  { "Dereg Rep-Size", "sasp.dereg-rep.size",
-		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "SASP Dereg Rep Size", HFILL } },
+        /* Dereg Rep */
+        { &hf_sasp_dereg_rep_sz,
+          { "Dereg Rep-Size", "sasp.dereg-rep.size",
+            FT_UINT16, BASE_DEC, NULL, 0x0,
+            "SASP Dereg Rep Size", HFILL } },
 
-		{ &hf_sasp_dereg_rep_rcode,
-		  { "Dereg Rep-Return Code", "sasp.dereg-rep.retcode",
-		    FT_UINT8, BASE_HEX, VALS(dereg_reply_response_code), 0x0,
-		    "SASP Dereg Rep Return Code", HFILL } },
+        { &hf_sasp_dereg_rep_rcode,
+          { "Dereg Rep-Return Code", "sasp.dereg-rep.retcode",
+            FT_UINT8, BASE_HEX, VALS(dereg_reply_response_code), 0x0,
+            "SASP Dereg Rep Return Code", HFILL } },
 
-		/* Send weight */
+        /* Send weight */
 
-		{ &hf_sasp_sendwt_sz,
-		  { "Sendwt-Size", "sasp.sendwt.size",
-		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "SASP Sendwt-Size", HFILL } },
+        { &hf_sasp_sendwt_sz,
+          { "Sendwt-Size", "sasp.sendwt.size",
+            FT_UINT16, BASE_DEC, NULL, 0x0,
+            "SASP Sendwt-Size", HFILL } },
 
-		{ &hf_sasp_sendwt_gwedcnt,
-		  { "Sendwt-Grp Wt EntryData Count", "sasp.sendwt-grp-wtentrydata.count",
-		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "SASP Sendwt Grp Wt Entry Data Count", HFILL } },
+        { &hf_sasp_sendwt_gwedcnt,
+          { "Sendwt-Grp Wt EntryData Count", "sasp.sendwt-grp-wtentrydata.count",
+            FT_UINT16, BASE_DEC, NULL, 0x0,
+            "SASP Sendwt Grp Wt Entry Data Count", HFILL } },
 
-		/*Set Mem State Req*/
+        /*Set Mem State Req*/
 
-		{ &hf_sasp_setmemstate_req_sz,
-		  { "Set Memstate Req-Size", "sasp.setmemstate-req.size",
-		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "SASP Set Memstate Req Size", HFILL } },
+        { &hf_sasp_setmemstate_req_sz,
+          { "Set Memstate Req-Size", "sasp.setmemstate-req.size",
+            FT_UINT16, BASE_DEC, NULL, 0x0,
+            "SASP Set Memstate Req Size", HFILL } },
 
-		{ &hf_setmemstate_req_lbflag,
-		  { "Set Memstate Req-LB Flag", "sasp.setmemstate-req.lbflag",
-		    FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-		    "SASP Set Memstate Req LB Flag", HFILL } },
+        { &hf_setmemstate_req_lbflag,
+          { "Set Memstate Req-LB Flag", "sasp.setmemstate-req.lbflag",
+            FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+            "SASP Set Memstate Req LB Flag", HFILL } },
 
-		{ &hf_sasp_setmemstate_req_gmsd_cnt,
-		  { "Set Memstate Req-Gmsd Count", "sasp.group-memstate.count",
-		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "Group Of Member State Data Count", HFILL } },
+        { &hf_sasp_setmemstate_req_gmsd_cnt,
+          { "Set Memstate Req-Gmsd Count", "sasp.group-memstate.count",
+            FT_UINT16, BASE_DEC, NULL, 0x0,
+            "Group Of Member State Data Count", HFILL } },
 
-		/* Set Mem State Reply */
+        /* Set Mem State Reply */
 #if 0
-		{ &hf_sasp_setmemstate_rep,
-		  { "Set Memstate Reply", "sasp.setmemstate-rep",
-		    FT_UINT32, BASE_HEX, NULL, 0x0,
-		    "SASP Set Memstate Reply", HFILL } },
+        { &hf_sasp_setmemstate_rep,
+          { "Set Memstate Reply", "sasp.setmemstate-rep",
+            FT_UINT32, BASE_HEX, NULL, 0x0,
+            "SASP Set Memstate Reply", HFILL } },
 #endif
 
-		{ &hf_sasp_setmemstate_rep_sz,
-		  { "Set Memstate Rep-Size", "sasp.setmemstate-rep.size",
-		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "SASP Set Memstate Rep Size", HFILL } },
-
-		{ &hf_sasp_setmemstate_rep_rcode,
-		  { "Set Memstate Rep-Return Code", "sasp.setmemstate-rep.retcode",
-		    FT_UINT8, BASE_HEX, VALS(set_mem_state_reply_response_code), 0x0,
-		    "SASP Set Memstate Rep Return Code", HFILL } },
-
-		/*Mem Data Component*/
-
-		{ &hf_sasp_memdatacomp_type,
-		  { "Message Type", "sasp.msg.type",
-		    FT_UINT16, BASE_HEX|BASE_EXT_STRING, &msg_table_ext, 0x0,
-		    "SASP Mem Data Comp", HFILL } },
-
-		{ &hf_sasp_memdatacomp_sz,
-		  { "Mem Data Comp-Size", "sasp.memdatacomp.size",
-		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "SASP Mem Data Comp Size", HFILL } },
-
-		{ &hf_sasp_memdatacomp_protocol,
-		  { "Mem Data Comp-Protocol", "sasp.memdatacomp.protocol",
-		    FT_UINT8, BASE_HEX, VALS(protocol_table), 0x0,
-		    "SASP Mem Data Comp Protocol", HFILL } },
-
-		{ &hf_sasp_memdatacomp_port,
-		  { "Mem Data Comp-Port", "sasp.memdatacomp.port",
-		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "SASP Mem Data Comp Port", HFILL } },
-
-		{ &hf_sasp_memdatacomp_ip,
-		  { "Mem Data Comp-Ip", "sasp.memdatacomp.ip",
-		    FT_IPv6, BASE_NONE, NULL, 0x0,
-		    "SASP Mem Data Comp Ip", HFILL } },
-
-		{ &hf_sasp_memdatacomp_lab_len,
-		  { "Mem Data Comp-Label Len", "sasp.memdatacomp.label.len",
-		    FT_UINT8, BASE_DEC, NULL, 0x0,
-		    "SASP Mem Data Comp Label Length", HFILL } },
-
-		{ &hf_sasp_memdatacomp_label,
-		  { "Mem Data Comp-Label", "sasp.memdatacomp.label",
-		    FT_STRING, BASE_NONE, NULL, 0x0,
-		    "SASP Mem Data Comp Label", HFILL } },
-
-		/*Get Weight Request*/
-
-		{ &hf_sasp_wt_req_sz,
-		  { "Get Wt Req-Size", "sasp.getwt.req.size",
-		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "SASP Get Wt Req Size", HFILL } },
-
-		{ &hf_sasp_wt_req_gd_cnt,
-		  { "Get Wt Req-Grp Data Count", "sasp.getwt-req-grpdata.count",
-		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "SASP Get Wt Grp Data Count", HFILL } },
-
-		/*Get Weight Reply*/
-
-		{ &hf_sasp_wt_rep_sz,
-		  { "Get Wt Rep-Size", "sasp.getwt.rep.size",
-		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "SASP Get Wt Rep Size", HFILL } },
-
-		{ &hf_sasp_wt_rep_rcode,
-		  { "Get Wt Rep-Return Code", "sasp.getwt-rep.retcode",
-		    FT_UINT8, BASE_HEX, VALS(get_weights_reply_response_code), 0x0,
-		    "SASP Get Wt Rep Return Code", HFILL } },
-
-		{ &hf_sasp_wt_rep_interval,
-		  { "Get Wt Rep-Interval", "sasp.getwt-rep.interval",
-		    FT_UINT8, BASE_DEC, NULL, 0x0,
-		    "SASP Get Wt Rep Interval", HFILL } },
-
-		{ &hf_sasp_wt_rep_gwed_cnt,
-		  { "Get Wt Rep-Grp WtEntry Data Cnt", "sasp.getwt-rep-grpwtentrydata.count",
-		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "SASP Get Wt Rep Grp Wt Entry Data Cnt", HFILL } },
-
-		/*Set LB State Rep */
+        { &hf_sasp_setmemstate_rep_sz,
+          { "Set Memstate Rep-Size", "sasp.setmemstate-rep.size",
+            FT_UINT16, BASE_DEC, NULL, 0x0,
+            "SASP Set Memstate Rep Size", HFILL } },
+
+        { &hf_sasp_setmemstate_rep_rcode,
+          { "Set Memstate Rep-Return Code", "sasp.setmemstate-rep.retcode",
+            FT_UINT8, BASE_HEX, VALS(set_mem_state_reply_response_code), 0x0,
+            "SASP Set Memstate Rep Return Code", HFILL } },
+
+        /*Mem Data Component*/
+
+        { &hf_sasp_memdatacomp_type,
+          { "Message Type", "sasp.msg.type",
+            FT_UINT16, BASE_HEX|BASE_EXT_STRING, &msg_table_ext, 0x0,
+            "SASP Mem Data Comp", HFILL } },
+
+        { &hf_sasp_memdatacomp_sz,
+          { "Mem Data Comp-Size", "sasp.memdatacomp.size",
+            FT_UINT16, BASE_DEC, NULL, 0x0,
+            "SASP Mem Data Comp Size", HFILL } },
+
+        { &hf_sasp_memdatacomp_protocol,
+          { "Mem Data Comp-Protocol", "sasp.memdatacomp.protocol",
+            FT_UINT8, BASE_HEX, VALS(protocol_table), 0x0,
+            "SASP Mem Data Comp Protocol", HFILL } },
+
+        { &hf_sasp_memdatacomp_port,
+          { "Mem Data Comp-Port", "sasp.memdatacomp.port",
+            FT_UINT16, BASE_DEC, NULL, 0x0,
+            "SASP Mem Data Comp Port", HFILL } },
+
+        { &hf_sasp_memdatacomp_ip,
+          { "Mem Data Comp-Ip", "sasp.memdatacomp.ip",
+            FT_IPv6, BASE_NONE, NULL, 0x0,
+            "SASP Mem Data Comp Ip", HFILL } },
+
+        { &hf_sasp_memdatacomp_lab_len,
+          { "Mem Data Comp-Label Len", "sasp.memdatacomp.label.len",
+            FT_UINT8, BASE_DEC, NULL, 0x0,
+            "SASP Mem Data Comp Label Length", HFILL } },
+
+        { &hf_sasp_memdatacomp_label,
+          { "Mem Data Comp-Label", "sasp.memdatacomp.label",
+            FT_STRING, BASE_NONE, NULL, 0x0,
+            "SASP Mem Data Comp Label", HFILL } },
+
+        /*Get Weight Request*/
+
+        { &hf_sasp_wt_req_sz,
+          { "Get Wt Req-Size", "sasp.getwt.req.size",
+            FT_UINT16, BASE_DEC, NULL, 0x0,
+            "SASP Get Wt Req Size", HFILL } },
+
+        { &hf_sasp_wt_req_gd_cnt,
+          { "Get Wt Req-Grp Data Count", "sasp.getwt-req-grpdata.count",
+            FT_UINT16, BASE_DEC, NULL, 0x0,
+            "SASP Get Wt Grp Data Count", HFILL } },
+
+        /*Get Weight Reply*/
+
+        { &hf_sasp_wt_rep_sz,
+          { "Get Wt Rep-Size", "sasp.getwt.rep.size",
+            FT_UINT16, BASE_DEC, NULL, 0x0,
+            "SASP Get Wt Rep Size", HFILL } },
+
+        { &hf_sasp_wt_rep_rcode,
+          { "Get Wt Rep-Return Code", "sasp.getwt-rep.retcode",
+            FT_UINT8, BASE_HEX, VALS(get_weights_reply_response_code), 0x0,
+            "SASP Get Wt Rep Return Code", HFILL } },
+
+        { &hf_sasp_wt_rep_interval,
+          { "Get Wt Rep-Interval", "sasp.getwt-rep.interval",
+            FT_UINT8, BASE_DEC, NULL, 0x0,
+            "SASP Get Wt Rep Interval", HFILL } },
+
+        { &hf_sasp_wt_rep_gwed_cnt,
+          { "Get Wt Rep-Grp WtEntry Data Cnt", "sasp.getwt-rep-grpwtentrydata.count",
+            FT_UINT16, BASE_DEC, NULL, 0x0,
+            "SASP Get Wt Rep Grp Wt Entry Data Cnt", HFILL } },
+
+        /*Set LB State Rep */
 
 #if 0
-		{ &hf_sasp_setlbstate_rep,
-		  { "Set Lbstate Rep", "sasp.msg.type",
-		    FT_UINT32, BASE_HEX, NULL, 0x0,
-		    "SASP Set Lbstate Rep", HFILL } },
+        { &hf_sasp_setlbstate_rep,
+          { "Set Lbstate Rep", "sasp.msg.type",
+            FT_UINT32, BASE_HEX, NULL, 0x0,
+            "SASP Set Lbstate Rep", HFILL } },
 #endif
 
-		{ &hf_sasp_setlbstate_rep_sz,
-		  { "Set Lbstate Rep-Size", "sasp.setlbstate-rep.size",
-		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "SASP Set Lbstate Rep Size", HFILL } },
+        { &hf_sasp_setlbstate_rep_sz,
+          { "Set Lbstate Rep-Size", "sasp.setlbstate-rep.size",
+            FT_UINT16, BASE_DEC, NULL, 0x0,
+            "SASP Set Lbstate Rep Size", HFILL } },
 
-		{ &hf_sasp_setlbstate_rep_rcode,
-		  { "Set Lbstate Rep-Return Code", "sasp.setlbstate-rep.retcode",
-		    FT_UINT8, BASE_HEX, VALS(set_lb_state_reply_response_code), 0x0,
-		    "SASP Set Lbstate Rep Return Code", HFILL } },
+        { &hf_sasp_setlbstate_rep_rcode,
+          { "Set Lbstate Rep-Return Code", "sasp.setlbstate-rep.retcode",
+            FT_UINT8, BASE_HEX, VALS(set_lb_state_reply_response_code), 0x0,
+            "SASP Set Lbstate Rep Return Code", HFILL } },
 
 
-		/*grp data comp */
+        /*grp data comp */
 
-		{ &hf_sasp_grpdatacomp,
-		  { "Message Type", "sasp.msg.type",
-		    FT_UINT16, BASE_HEX|BASE_EXT_STRING, &msg_table_ext, 0x0,
-		    "SASP Grp Data Comp", HFILL } },
+        { &hf_sasp_grpdatacomp,
+          { "Message Type", "sasp.msg.type",
+            FT_UINT16, BASE_HEX|BASE_EXT_STRING, &msg_table_ext, 0x0,
+            "SASP Grp Data Comp", HFILL } },
 
-		{ &hf_sasp_grpdatacomp_sz,
-		  { "Grp Data Comp-Size", "sasp.grpdatacomp.size",
-		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "SASP Grp Data Comp size", HFILL } },
+        { &hf_sasp_grpdatacomp_sz,
+          { "Grp Data Comp-Size", "sasp.grpdatacomp.size",
+            FT_UINT16, BASE_DEC, NULL, 0x0,
+            "SASP Grp Data Comp size", HFILL } },
 
-		{ &hf_sasp_grpdatacomp_LB_uid_len,
-		  { "Grp Data Comp-Label UID Len", "sasp.grpdatacomp.label.uid.len",
-		    FT_UINT8, BASE_DEC, NULL, 0x0,
-		    "SASP Grp Data Comp Label Uid Len", HFILL } },
+        { &hf_sasp_grpdatacomp_LB_uid_len,
+          { "Grp Data Comp-Label UID Len", "sasp.grpdatacomp.label.uid.len",
+            FT_UINT8, BASE_DEC, NULL, 0x0,
+            "SASP Grp Data Comp Label Uid Len", HFILL } },
 
-		{ &hf_sasp_grpdatacomp_LB_uid,
-		  { "Grp Data Comp-Label UID", "sasp.grpdatacomp.label.uid",
-		    FT_STRING, BASE_NONE, NULL, 0x0,
-		    "SASP Grp Data Comp Label Uid", HFILL } },
+        { &hf_sasp_grpdatacomp_LB_uid,
+          { "Grp Data Comp-Label UID", "sasp.grpdatacomp.label.uid",
+            FT_STRING, BASE_NONE, NULL, 0x0,
+            "SASP Grp Data Comp Label Uid", HFILL } },
 
-		{ &hf_sasp_grpdatacomp_grp_name_len,
-		  { "Grp Data Comp-Grp Name Len", "sasp.grpdatacomp.grpname.len",
-		    FT_UINT8, BASE_DEC, NULL, 0x0,
-		    "SASP Grp Data Comp Grp Name Len", HFILL } },
+        { &hf_sasp_grpdatacomp_grp_name_len,
+          { "Grp Data Comp-Grp Name Len", "sasp.grpdatacomp.grpname.len",
+            FT_UINT8, BASE_DEC, NULL, 0x0,
+            "SASP Grp Data Comp Grp Name Len", HFILL } },
 
-		{ &hf_sasp_grpdatacomp_grp_name,
-		  { "Grp Data Comp-Grp Name", "sasp.grpdatacomp.grpname",
-		    FT_STRING, BASE_NONE, NULL, 0x0,
-		    "SASP Grp Data Comp Grp Name", HFILL } },
+        { &hf_sasp_grpdatacomp_grp_name,
+          { "Grp Data Comp-Grp Name", "sasp.grpdatacomp.grpname",
+            FT_STRING, BASE_NONE, NULL, 0x0,
+            "SASP Grp Data Comp Grp Name", HFILL } },
 
-		/*grp mem data comp */
+        /*grp mem data comp */
 
-		{ &hf_sasp_grp_memdatacomp,
-		  { "Message Type", "sasp.msg.type",
-		    FT_UINT16, BASE_HEX|BASE_EXT_STRING, &msg_table_ext, 0x0,
-		    "SASP Grp Mem Data Comp", HFILL } },
+        { &hf_sasp_grp_memdatacomp,
+          { "Message Type", "sasp.msg.type",
+            FT_UINT16, BASE_HEX|BASE_EXT_STRING, &msg_table_ext, 0x0,
+            "SASP Grp Mem Data Comp", HFILL } },
 
 
-		{ &hf_sasp_grp_memdatacomp_sz,
-		  { "Grp Mem Data Comp-Size", "sasp.grp-memdatacomp.size",
-		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "SASP Grp Mem Data Comp Size", HFILL } },
+        { &hf_sasp_grp_memdatacomp_sz,
+          { "Grp Mem Data Comp-Size", "sasp.grp-memdatacomp.size",
+            FT_UINT16, BASE_DEC, NULL, 0x0,
+            "SASP Grp Mem Data Comp Size", HFILL } },
 
-		{ &hf_sasp_grp_memdatacomp_cnt,
-		  { "Grp Mem Data Comp-Count", "sasp.grp.memdatacomp.count",
-		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "SASP Grp Mem Data Comp Cnt", HFILL } },
+        { &hf_sasp_grp_memdatacomp_cnt,
+          { "Grp Mem Data Comp-Count", "sasp.grp.memdatacomp.count",
+            FT_UINT16, BASE_DEC, NULL, 0x0,
+            "SASP Grp Mem Data Comp Cnt", HFILL } },
 
 
-		/*set LB state req*/
+        /*set LB state req*/
 
-		{ &hf_sasp_setlbstate_req_sz,
-		  { "Set LB State Req-Size", "sasp.setlbstate-req.size",
-		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "SASP Set LB State Req  Size", HFILL } },
+        { &hf_sasp_setlbstate_req_sz,
+          { "Set LB State Req-Size", "sasp.setlbstate-req.size",
+            FT_UINT16, BASE_DEC, NULL, 0x0,
+            "SASP Set LB State Req  Size", HFILL } },
 
-		{ &hf_sasp_setlbstate_req_LB_uid_len,
-		  { "Set LB State Req-LB UID Len", "sasp.setlbstate-req.lbuid.len",
-		    FT_UINT8, BASE_DEC, NULL, 0x0,
-		    "SASP Set LB State Req  LB Uid Len", HFILL } },
+        { &hf_sasp_setlbstate_req_LB_uid_len,
+          { "Set LB State Req-LB UID Len", "sasp.setlbstate-req.lbuid.len",
+            FT_UINT8, BASE_DEC, NULL, 0x0,
+            "SASP Set LB State Req  LB Uid Len", HFILL } },
 
-		{ &hf_sasp_setlbstate_req_LB_uid,
-		  { "Set LB State Req-LB UID", "sasp.setlbstate-req.lbuid",
-		    FT_STRING, BASE_NONE, NULL, 0x0,
-		    "SASP Set LB State Req LB UID", HFILL } },
+        { &hf_sasp_setlbstate_req_LB_uid,
+          { "Set LB State Req-LB UID", "sasp.setlbstate-req.lbuid",
+            FT_STRING, BASE_NONE, NULL, 0x0,
+            "SASP Set LB State Req LB UID", HFILL } },
 
-		{ &hf_sasp_setlbstate_req_LB_health,
-		  { "Set LB State Req-LB Health", "sasp.setlbstate-req.lbhealth",
-		    FT_UINT8, BASE_HEX, VALS(lbstate_healthtable), 0x0,
-		    "SASP Set LB State Req LB Health", HFILL } },
+        { &hf_sasp_setlbstate_req_LB_health,
+          { "Set LB State Req-LB Health", "sasp.setlbstate-req.lbhealth",
+            FT_UINT8, BASE_HEX, VALS(lbstate_healthtable), 0x0,
+            "SASP Set LB State Req LB Health", HFILL } },
 
 #if 0
-		{ &hf_lbstate_flag,
-		  { "Flags", "sasp.flags.lbstate",
-		    FT_UINT8, BASE_HEX, NULL, 0x0,
-		    NULL, HFILL } },
+        { &hf_lbstate_flag,
+          { "Flags", "sasp.flags.lbstate",
+            FT_UINT8, BASE_HEX, NULL, 0x0,
+            NULL, HFILL } },
 #endif
 
-		{ &hf_sasp_pushflag,
-		  { "PUSH", "sasp.flags.push",
-		    FT_BOOLEAN, 8, NULL, SASP_PUSH_FLAG,
-		    "SASP Push Flag", HFILL } },
+        { &hf_sasp_pushflag,
+          { "PUSH", "sasp.flags.push",
+            FT_BOOLEAN, 8, NULL, SASP_PUSH_FLAG,
+            "SASP Push Flag", HFILL } },
 
-		{ &hf_sasp_trustflag,
-		  { "TRUST", "sasp.flags.trust",
-		    FT_BOOLEAN, 8, NULL, SASP_TRUST_FLAG,
-		    "SASP Trust Flag", HFILL } },
+        { &hf_sasp_trustflag,
+          { "TRUST", "sasp.flags.trust",
+            FT_BOOLEAN, 8, NULL, SASP_TRUST_FLAG,
+            "SASP Trust Flag", HFILL } },
 
-		{ &hf_sasp_nochangeflag,
-		  { "NOCHANGE", "sasp.flags.nochange",
-		    FT_BOOLEAN, 8, NULL, SASP_NOCHANGE_FLAG,
-		    "SASP Nochange Flag", HFILL } },
+        { &hf_sasp_nochangeflag,
+          { "NOCHANGE", "sasp.flags.nochange",
+            FT_BOOLEAN, 8, NULL, SASP_NOCHANGE_FLAG,
+            "SASP Nochange Flag", HFILL } },
 
-		/*grp mem state data comp */
+        /*grp mem state data comp */
 
-		{ &hf_sasp_grp_memstatedatacomp,
-		  { "Message Type", "sasp.msg.type",
-		    FT_UINT16, BASE_HEX|BASE_EXT_STRING, &msg_table_ext, 0x0,
-		    "SASP Message Type", HFILL } },
+        { &hf_sasp_grp_memstatedatacomp,
+          { "Message Type", "sasp.msg.type",
+            FT_UINT16, BASE_HEX|BASE_EXT_STRING, &msg_table_ext, 0x0,
+            "SASP Message Type", HFILL } },
 
 
-		{ &hf_sasp_grp_memstatedatacomp_sz,
-		  { "Grp Mem State-Size", "sasp.grp.memstate.size",
-		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "SASP Grp Mem State Data Comp Size", HFILL } },
+        { &hf_sasp_grp_memstatedatacomp_sz,
+          { "Grp Mem State-Size", "sasp.grp.memstate.size",
+            FT_UINT16, BASE_DEC, NULL, 0x0,
+            "SASP Grp Mem State Data Comp Size", HFILL } },
 
-		{ &hf_sasp_grp_memstatedatacomp_cnt,
-		  { "Grp Mem State-Count", "sasp.grp.memstate.count",
-		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "SASP Grp Mem State Data Comp Count", HFILL } },
+        { &hf_sasp_grp_memstatedatacomp_cnt,
+          { "Grp Mem State-Count", "sasp.grp.memstate.count",
+            FT_UINT16, BASE_DEC, NULL, 0x0,
+            "SASP Grp Mem State Data Comp Count", HFILL } },
 
-		/*mem state instance */
+        /*mem state instance */
 
-		{ &hf_sasp_memstatedatacomp_instance,
-		  { "Message Type", "sasp.msg.type",
-		    FT_UINT16, BASE_HEX|BASE_EXT_STRING, &msg_table_ext, 0x0,
-		    "SASP Message Type", HFILL } },
+        { &hf_sasp_memstatedatacomp_instance,
+          { "Message Type", "sasp.msg.type",
+            FT_UINT16, BASE_HEX|BASE_EXT_STRING, &msg_table_ext, 0x0,
+            "SASP Message Type", HFILL } },
 
 
-		{ &hf_sasp_memstatedatacomp_sz,
-		  { "Mem State-Size", "sasp.memstate.size",
-		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "SASP Mem State Data Comp Size", HFILL } },
+        { &hf_sasp_memstatedatacomp_sz,
+          { "Mem State-Size", "sasp.memstate.size",
+            FT_UINT16, BASE_DEC, NULL, 0x0,
+            "SASP Mem State Data Comp Size", HFILL } },
 
-		{ &hf_sasp_memstatedatacomp_state,
-		  { "Mem State-State", "sasp.memstate.state",
-		    FT_UINT8, BASE_HEX, NULL, 0x0,
-		    "SASP Mem State Data Comp State", HFILL } },
+        { &hf_sasp_memstatedatacomp_state,
+          { "Mem State-State", "sasp.memstate.state",
+            FT_UINT8, BASE_HEX, NULL, 0x0,
+            "SASP Mem State Data Comp State", HFILL } },
 
-		{ &hf_sasp_memstatedatacomp_quiesce_flag,
-		  { "Mem State-Quiesce Flag", "sasp.flags.quiesce",
-		    FT_BOOLEAN, 8, NULL, SASP_QUIESCE_FLAG,
-		    "SASP Quiesce Flag", HFILL } },
+        { &hf_sasp_memstatedatacomp_quiesce_flag,
+          { "Mem State-Quiesce Flag", "sasp.flags.quiesce",
+            FT_BOOLEAN, 8, NULL, SASP_QUIESCE_FLAG,
+            "SASP Quiesce Flag", HFILL } },
 
-		/*weight entry data comp*/
+        /*weight entry data comp*/
 
-		{ &hf_sasp_weight_entry_data_comp_type,
-		  { "Wt Entry Data Comp", "sasp.msg.type",
-		    FT_UINT16, BASE_HEX|BASE_EXT_STRING, &msg_table_ext, 0x0,
-		    "SASP Wt Entry Data Comp", HFILL } },
+        { &hf_sasp_weight_entry_data_comp_type,
+          { "Wt Entry Data Comp", "sasp.msg.type",
+            FT_UINT16, BASE_HEX|BASE_EXT_STRING, &msg_table_ext, 0x0,
+            "SASP Wt Entry Data Comp", HFILL } },
 
-		{ &hf_sasp_weight_entry_data_comp_sz,
-		  { "Wt Entry Data Comp-Size", "sasp.wtentry.size",
-		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "SASP Wt Entry Data Comp Size", HFILL } },
+        { &hf_sasp_weight_entry_data_comp_sz,
+          { "Wt Entry Data Comp-Size", "sasp.wtentry.size",
+            FT_UINT16, BASE_DEC, NULL, 0x0,
+            "SASP Wt Entry Data Comp Size", HFILL } },
 
-		{ &hf_sasp_weight_entry_data_comp_state,
-		  { "Wt Entry Data Comp-state", "sasp.wtentry.state",
-		    FT_UINT8, BASE_HEX, NULL, 0x0,
-		    "SASP Wt Entry Data Comp State", HFILL } },
+        { &hf_sasp_weight_entry_data_comp_state,
+          { "Wt Entry Data Comp-state", "sasp.wtentry.state",
+            FT_UINT8, BASE_HEX, NULL, 0x0,
+            "SASP Wt Entry Data Comp State", HFILL } },
 
 #if 0
-		{ &hf_wtstate_flag,
-		  { "Flags", "sasp.flags.wtstate",
-		    FT_UINT8, BASE_HEX, NULL, 0x0,
-		    NULL, HFILL } },
+        { &hf_wtstate_flag,
+          { "Flags", "sasp.flags.wtstate",
+            FT_UINT8, BASE_HEX, NULL, 0x0,
+            NULL, HFILL } },
 #endif
 
-		{ &hf_sasp_wed_contactsuccess_flag,
-		  { "Contact Success", "sasp.flags.contactsuccess",
-		    FT_BOOLEAN, 8, NULL, SASP_WED_CONTACT_SUCCESS_FLAG,
-		    "SASP Contact Success Flag", HFILL } },
-
-		{ &hf_sasp_wed_quiesce_flag,
-		  { "Quiesce", "sasp.flags.quiesce",
-		    FT_BOOLEAN, 8, NULL, SASP_WED_QUIESCE_FLAG,
-		    "SASP Quiesce Flag", HFILL } },
-
-		{ &hf_sasp_wed_registration_flag,
-		  { "Registration", "sasp.flags.registration",
-		    FT_BOOLEAN, 8, NULL, SASP_WED_REG_FLAG,
-		    "SASP Registration Flag", HFILL } },
-
-		{ &hf_sasp_wed_confident_flag,
-		  { "Confident", "sasp.flags.confident",
-		    FT_BOOLEAN, 8, NULL, SASP_WED_CONF_FLAG,
-		    "SASP Confident Flag", HFILL } },
-
-		{ &hf_sasp_weight_entry_data_comp_weight,
-		  { "Wt Entry Data Comp-weight", "sasp.wtentrydatacomp.weight",
-		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "SASP Wt Entry Data Comp weight", HFILL } },
-
-
-		/*grp wt entry data comp */
-
-		{ &hf_sasp_grp_wt_entry_datacomp_type,
-		  { "Grp Wt Entry Data Comp", "sasp.msg.type",
-		    FT_UINT16, BASE_HEX|BASE_EXT_STRING, &msg_table_ext, 0x0,
-		    "SASP Grp Wt Entry Data Comp", HFILL } },
-
-		{ &hf_sasp_grp_wt_entry_datacomp_sz,
-		  { "Grp Wt Entry Data Comp Size", "sasp.grp-wtentrydata.size",
-		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "SASP Grp Wt Entry Data Comp Size", HFILL } },
-
-		{ &hf_sasp_grp_wt_entry_datacomp_cnt,
-		  { "Grp Wt Entry Data Comp Cnt", "sasp.grp-wtentrydata.count",
-		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "SASP Grp Wt Entry Data Comp Cnt", HFILL } }
-	};
-
-	/* Setup protocol subtree array */
-
-	static gint *ett[] = {
-		&ett_sasp_data,
-		&ett_sasp_header,
-		&ett_sasp_msg,
-		&ett_sasp_payload,
-		&ett_sasp_reg_req,
-		&ett_sasp_reg_rep,
-		&ett_sasp_reg_req_sz,
-		&ett_sasp_dereg_req_sz,
-		&ett_sasp_dereg_rep,
-		&ett_sasp_sendwt,
-		&ett_sasp_setmemstate_req,
-		&ett_sasp_setmemstate_rep,
-		&ett_sasp_memdatacomp,
-		&ett_sasp_grpdatacomp,
-		&ett_sasp_grp_memdatacomp,
-		&ett_sasp_setlbstate_req,
-		&ett_sasp_setlbstate_rep,
-		&ett_sasp_getwt,
-		&ett_setlbstate_req_lbflag,
-		&ett_sasp_grp_memstatedatacomp,
-		&ett_sasp_memstatedatacomp,
-/*		&ett_dereg_req_reason_flag, */
-		&ett_sasp_grp_wt_entry_datacomp,
-		&ett_sasp_weight_entry_data_comp,
-		&ett_wt_entry_data_flag,
-		&ett_sasp_wt_rep
-	};
-
-	static ei_register_info ei[] = {
-		{ &ei_msg_type_invalid, { "sasp.msg.type.invalid", PI_PROTOCOL, PI_WARN, "Invalid Type", EXPFILL }}
-	};
-
-	module_t *sasp_module;
-	expert_module_t* expert_sasp;
-
-	proto_sasp = proto_register_protocol("Server/Application State Protocol", "SASP", "sasp");
-
-	proto_register_field_array(proto_sasp, hf, array_length(hf));
-	proto_register_subtree_array(ett, array_length(ett));
-	expert_sasp = expert_register_protocol(proto_sasp);
-	expert_register_field_array(expert_sasp, ei, array_length(ei));
-
-	sasp_module = prefs_register_protocol(proto_sasp, NULL);
-	prefs_register_bool_preference(sasp_module, "desegment_sasp_messages",
-		"Reassemble SASP messages spanning multiple TCP segments",
-		"Whether the SASP dissector should reassemble messages"
-		" spanning multiple TCP segments."
-		" To use this option, you must also enable"
-		" \"Allow subdissectors to reassemble TCP streams\""
-		" in the TCP protocol settings.",
-		&sasp_desegment);
+        { &hf_sasp_wed_contactsuccess_flag,
+          { "Contact Success", "sasp.flags.contactsuccess",
+            FT_BOOLEAN, 8, NULL, SASP_WED_CONTACT_SUCCESS_FLAG,
+            "SASP Contact Success Flag", HFILL } },
+
+        { &hf_sasp_wed_quiesce_flag,
+          { "Quiesce", "sasp.flags.quiesce",
+            FT_BOOLEAN, 8, NULL, SASP_WED_QUIESCE_FLAG,
+            "SASP Quiesce Flag", HFILL } },
+
+        { &hf_sasp_wed_registration_flag,
+          { "Registration", "sasp.flags.registration",
+            FT_BOOLEAN, 8, NULL, SASP_WED_REG_FLAG,
+            "SASP Registration Flag", HFILL } },
+
+        { &hf_sasp_wed_confident_flag,
+          { "Confident", "sasp.flags.confident",
+            FT_BOOLEAN, 8, NULL, SASP_WED_CONF_FLAG,
+            "SASP Confident Flag", HFILL } },
+
+        { &hf_sasp_weight_entry_data_comp_weight,
+          { "Wt Entry Data Comp-weight", "sasp.wtentrydatacomp.weight",
+            FT_UINT16, BASE_DEC, NULL, 0x0,
+            "SASP Wt Entry Data Comp weight", HFILL } },
+
+
+        /*grp wt entry data comp */
+
+        { &hf_sasp_grp_wt_entry_datacomp_type,
+          { "Grp Wt Entry Data Comp", "sasp.msg.type",
+            FT_UINT16, BASE_HEX|BASE_EXT_STRING, &msg_table_ext, 0x0,
+            "SASP Grp Wt Entry Data Comp", HFILL } },
+
+        { &hf_sasp_grp_wt_entry_datacomp_sz,
+          { "Grp Wt Entry Data Comp Size", "sasp.grp-wtentrydata.size",
+            FT_UINT16, BASE_DEC, NULL, 0x0,
+            "SASP Grp Wt Entry Data Comp Size", HFILL } },
+
+        { &hf_sasp_grp_wt_entry_datacomp_cnt,
+          { "Grp Wt Entry Data Comp Cnt", "sasp.grp-wtentrydata.count",
+            FT_UINT16, BASE_DEC, NULL, 0x0,
+            "SASP Grp Wt Entry Data Comp Cnt", HFILL } }
+    };
+
+    /* Setup protocol subtree array */
+
+    static gint *ett[] = {
+        &ett_sasp_data,
+        &ett_sasp_header,
+        &ett_sasp_msg,
+        &ett_sasp_payload,
+        &ett_sasp_reg_req,
+        &ett_sasp_reg_rep,
+        &ett_sasp_reg_req_sz,
+        &ett_sasp_dereg_req_sz,
+        &ett_sasp_dereg_rep,
+        &ett_sasp_sendwt,
+        &ett_sasp_setmemstate_req,
+        &ett_sasp_setmemstate_rep,
+        &ett_sasp_memdatacomp,
+        &ett_sasp_grpdatacomp,
+        &ett_sasp_grp_memdatacomp,
+        &ett_sasp_setlbstate_req,
+        &ett_sasp_setlbstate_rep,
+        &ett_sasp_getwt,
+        &ett_setlbstate_req_lbflag,
+        &ett_sasp_grp_memstatedatacomp,
+        &ett_sasp_memstatedatacomp,
+/*      &ett_dereg_req_reason_flag, */
+        &ett_sasp_grp_wt_entry_datacomp,
+        &ett_sasp_weight_entry_data_comp,
+        &ett_wt_entry_data_flag,
+        &ett_sasp_wt_rep
+    };
+
+    static ei_register_info ei[] = {
+        { &ei_msg_type_invalid, { "sasp.msg.type.invalid", PI_PROTOCOL, PI_WARN, "Invalid Type", EXPFILL }}
+    };
+
+    module_t *sasp_module;
+    expert_module_t* expert_sasp;
+
+    proto_sasp = proto_register_protocol("Server/Application State Protocol", "SASP", "sasp");
+
+    proto_register_field_array(proto_sasp, hf, array_length(hf));
+    proto_register_subtree_array(ett, array_length(ett));
+    expert_sasp = expert_register_protocol(proto_sasp);
+    expert_register_field_array(expert_sasp, ei, array_length(ei));
+
+    sasp_module = prefs_register_protocol(proto_sasp, NULL);
+    prefs_register_bool_preference(sasp_module, "desegment_sasp_messages",
+        "Reassemble SASP messages spanning multiple TCP segments",
+        "Whether the SASP dissector should reassemble messages"
+        " spanning multiple TCP segments."
+        " To use this option, you must also enable"
+        " \"Allow subdissectors to reassemble TCP streams\""
+        " in the TCP protocol settings.",
+        &sasp_desegment);
 }
 
 
@@ -1581,10 +1581,10 @@ void proto_register_sasp(void)
 void
 proto_reg_handoff_sasp(void)
 {
-	dissector_handle_t sasp_handle;
+    dissector_handle_t sasp_handle;
 
-	sasp_handle = new_create_dissector_handle(dissect_sasp, proto_sasp);
-	dissector_add_uint("tcp.port", SASP_GLOBAL_PORT, sasp_handle);
+    sasp_handle = new_create_dissector_handle(dissect_sasp, proto_sasp);
+    dissector_add_uint("tcp.port", SASP_GLOBAL_PORT, sasp_handle);
 }
 
 /*
@@ -1592,11 +1592,10 @@ proto_reg_handoff_sasp(void)
  *
  * Local variables:
  * c-basic-offset: 4
- * tab-width: 4
- * indent-tabs-mode: t
+ * tab-width: 8
+ * indent-tabs-mode: nil
  * End:
  *
- * vi: set shiftwidth=4 tabstop=8 noexpandtab:
- * :indentSize=4:tabSize=8:noTabs=false:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
  */
-
diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c
index fb55a86980..b0256ede87 100644
--- a/epan/dissectors/packet-socks.c
+++ b/epan/dissectors/packet-socks.c
@@ -30,20 +30,20 @@
  *
  * See
  *  http://www.openssh.org/txt/socks4.protocol
- *	http://www.openssh.org/txt/socks4a.protocol
+ *  http://www.openssh.org/txt/socks4a.protocol
  *
  * for information on SOCKS version 4 and 4a.
  *
  * Revisions:
  *
  * 2003-09-18 JCFoster Fixed problem with socks tunnel in socks tunnel
- *			causing heap overflow because of an infinite loop
- *			where the socks dissect was call over and over.
+ *          causing heap overflow because of an infinite loop
+ *          where the socks dissect was call over and over.
  *
- *			Also remove some old code marked with __JUNK__
+ *          Also remove some old code marked with __JUNK__
  *
  * 2001-01-08 JCFoster Fixed problem with NULL pointer for hash data.
- *			Now test and exit if hash_info is null.
+ *          Now test and exit if hash_info is null.
  */
 
 /* Possible enhancements -
@@ -51,9 +51,9 @@
  * Add GSS-API authentication per rfc-1961
  * Add CHAP authentication
  * Decode FLAG bits per
- * 	http://archive.socks.permeo.com/draft/draft-ietf-aft-socks-pro-v5-04.txt
+ *  http://archive.socks.permeo.com/draft/draft-ietf-aft-socks-pro-v5-04.txt
  * In call_next_dissector, could load the destination address into
- * 	pinfo->src or pinfo->dst structure before calling next dissector.
+ *  pinfo->src or pinfo->dst structure before calling next dissector.
 */
 
 
@@ -137,95 +137,95 @@ static dissector_handle_t socks_udp_handle;
 /************* State Machine names ***********/
 
 enum ClientState {
-	clientNoInit = -1,
-	clientStart = 0,
-	clientWaitForAuthReply,
-	clientV5Command,
-	clientUserNameRequest,
-	clientGssApiAuthRequest,
-	clientDone,
-	clientError
+    clientNoInit = -1,
+    clientStart = 0,
+    clientWaitForAuthReply,
+    clientV5Command,
+    clientUserNameRequest,
+    clientGssApiAuthRequest,
+    clientDone,
+    clientError
 };
 
 enum ServerState {
-	serverNoInit = -1,
-	serverStart = 0,
-	serverInitReply,
-	serverCommandReply,
-	serverUserReply,
-	serverGssApiReply,
-	serverBindReply,
-	serverDone,
-	serverError
+    serverNoInit = -1,
+    serverStart = 0,
+    serverInitReply,
+    serverCommandReply,
+    serverUserReply,
+    serverGssApiReply,
+    serverBindReply,
+    serverDone,
+    serverError
 };
 
 typedef struct {
-	int in_socks_dissector_flag;
-	enum ClientState client;
-	enum ServerState server;
+    int in_socks_dissector_flag;
+    enum ClientState client;
+    enum ServerState server;
 } sock_state_t;
 
 typedef struct {
-	enum ClientState clientState;
-	enum ServerState serverState;
-	int version;
-	int command;
-	int authentication_method;
-	guint32 server_port;
-	guint32 port;
-	guint32 udp_port;
-	guint32 udp_remote_port;
-	address	dst_addr;
-
-	guint32 start_done_frame;
+    enum ClientState clientState;
+    enum ServerState serverState;
+    int     version;
+    int     command;
+    int     authentication_method;
+    guint32 server_port;
+    guint32 port;
+    guint32 udp_port;
+    guint32 udp_remote_port;
+    address dst_addr;
+
+    guint32 start_done_frame;
 }socks_hash_entry_t;
 
 
 static const value_string address_type_table[] = {
-	{1, "IPv4"},
-	{3, "Domain Name"},
-	{4, "IPv6"},
-	{0, NULL}
+    {1, "IPv4"},
+    {3, "Domain Name"},
+    {4, "IPv6"},
+    {0, NULL}
 };
 
 /* String table for the V4 reply status messages */
 
 static const value_string reply_table_v4[] = {
-	{90, "Granted"},
-	{91, "Rejected or Failed"},
-	{92, "Rejected because SOCKS server cannot connect to identd on the client"},
-	{93, "Rejected because the client program and identd report different user-ids"},
-	{0, NULL}
+    {90, "Granted"},
+    {91, "Rejected or Failed"},
+    {92, "Rejected because SOCKS server cannot connect to identd on the client"},
+    {93, "Rejected because the client program and identd report different user-ids"},
+    {0, NULL}
 };
 
 /* String table for the V5 reply status messages */
 
 static const value_string reply_table_v5[] = {
-	{0, "Succeeded"},
-	{1, "General SOCKS server failure"},
-	{2, "Connection not allowed by ruleset"},
-	{3, "Network unreachable"},
-	{4, "Host unreachable"},
-	{5, "Connection refused"},
-	{6, "TTL expired"},
-	{7, "Command not supported"},
-	{8, "Address type not supported"},
-	{0, NULL},
+    {0, "Succeeded"},
+    {1, "General SOCKS server failure"},
+    {2, "Connection not allowed by ruleset"},
+    {3, "Network unreachable"},
+    {4, "Host unreachable"},
+    {5, "Connection refused"},
+    {6, "TTL expired"},
+    {7, "Command not supported"},
+    {8, "Address type not supported"},
+    {0, NULL},
 };
 
 static const value_string cmd_strings[] = {
-	{CONNECT_COMMAND, "Connect"},
-	{BIND_COMMAND, "Bind"},
-	{UDP_ASSOCIATE_COMMAND, "UdpAssociate"},
-	{PING_COMMAND, "Ping"},
-	{TRACERT_COMMAND, "Traceroute"},
-	{0, NULL}
+    {CONNECT_COMMAND,       "Connect"},
+    {BIND_COMMAND,          "Bind"},
+    {UDP_ASSOCIATE_COMMAND, "UdpAssociate"},
+    {PING_COMMAND,          "Ping"},
+    {TRACERT_COMMAND,       "Traceroute"},
+    {0, NULL}
 };
 
 static const value_string gssapi_command_table[] = {
-	{ 1, "Authentication" },
-	{ 0xFF, "Failure" },
-	{ 0, NULL }
+    { 1,    "Authentication" },
+    { 0xFF, "Failure" },
+    { 0, NULL }
 };
 
 
@@ -235,89 +235,89 @@ static const char *get_auth_method_name( guint Number){
 
 /* return the name of the authenication method */
 
-	if ( Number == 0) return "No authentication";
-	if ( Number == 1) return "GSSAPI";
-	if ( Number == 2) return "Username/Password";
-	if ( Number == 3) return "Chap";
-	if (( Number >= 4) && ( Number <= 0x7f))return "IANA assigned";
-	if (( Number >= 0x80) && ( Number <= 0xfe)) return "private method";
-	if ( Number == 0xff) return "no acceptable method";
+    if ( Number == 0) return "No authentication";
+    if ( Number == 1) return "GSSAPI";
+    if ( Number == 2) return "Username/Password";
+    if ( Number == 3) return "Chap";
+    if (( Number >= 4) && ( Number <= 0x7f))return "IANA assigned";
+    if (( Number >= 0x80) && ( Number <= 0xfe)) return "private method";
+    if ( Number == 0xff) return "no acceptable method";
 
-	/* shouldn't reach here */
+    /* shouldn't reach here */
 
-	return "Bad method number (not 0-0xff)";
+    return "Bad method number (not 0-0xff)";
 }
 
 static int display_address(tvbuff_t *tvb, int offset, proto_tree *tree) {
 
 /* decode and display the v5 address, return offset of next byte */
 
-	int a_type = tvb_get_guint8(tvb, offset);
+    int a_type = tvb_get_guint8(tvb, offset);
 
-	proto_tree_add_item( tree, hf_socks_address_type, tvb, offset, 1, ENC_NA);
-	++offset;
+    proto_tree_add_item( tree, hf_socks_address_type, tvb, offset, 1, ENC_NA);
+    offset += 1;
 
-	switch (a_type)
-	{
+    switch (a_type)
+    {
     case 1: /* IPv4 address */
-		proto_tree_add_item( tree, hf_socks_ip_dst, tvb, offset, 4, ENC_BIG_ENDIAN);
-		offset += 4;
-		break;
-	case 3: /* domain name address */
-		{
-		guint8 len;
-		gchar* str;
-
-		len = tvb_get_guint8(tvb, offset);
-		str = tvb_get_string(wmem_packet_scope(), tvb, offset+1, len);
-		proto_tree_add_string(tree, hf_socks_remote_name, tvb, offset, len+1, str);
-		offset += (len+1);
-		}
-		break;
-	case 4: /* IPv6 address */
-		proto_tree_add_item( tree, hf_socks_ip6_dst, tvb, offset, 16, ENC_NA);
-		offset += 16;
-		break;
-	}
-
-	return offset;
+        proto_tree_add_item( tree, hf_socks_ip_dst, tvb, offset, 4, ENC_BIG_ENDIAN);
+        offset += 4;
+        break;
+    case 3: /* domain name address */
+        {
+        guint8 len;
+        gchar* str;
+
+        len = tvb_get_guint8(tvb, offset);
+        str = tvb_get_string(wmem_packet_scope(), tvb, offset+1, len);
+        proto_tree_add_string(tree, hf_socks_remote_name, tvb, offset, len+1, str);
+        offset += (len+1);
+        }
+        break;
+    case 4: /* IPv6 address */
+        proto_tree_add_item( tree, hf_socks_ip6_dst, tvb, offset, 16, ENC_NA);
+        offset += 16;
+        break;
+    }
+
+    return offset;
 }
 
 
 static int get_address_v5(tvbuff_t *tvb, int offset,
-	socks_hash_entry_t *hash_info) {
-
-	/* decode the v5 address and return offset of next byte */
-	int a_type;
-	address addr;
-
-	a_type = tvb_get_guint8(tvb, offset);
-	offset++;
-
-	switch(a_type)
-	{
-	case 1: /* IPv4 address */
-		if ( hash_info) {
-			TVB_SET_ADDRESS(&addr, AT_IPv4, tvb, offset, 4);
-			SE_COPY_ADDRESS(&hash_info->dst_addr, &addr);
-		}
-		offset += 4;
-		break;
-
-	case 4: /* IPv6 address */
-		if ( hash_info) {
-			TVB_SET_ADDRESS(&addr, AT_IPv6, tvb, offset, 16);
-			SE_COPY_ADDRESS(&hash_info->dst_addr, &addr);
-		}
-		offset += 16;
-		break;
-
-	case 3: /* domain name address */
-		offset += tvb_get_guint8(tvb, offset) + 1;
-		break;
-	}
-
-	return offset;
+    socks_hash_entry_t *hash_info) {
+
+    /* decode the v5 address and return offset of next byte */
+    int     a_type;
+    address addr;
+
+    a_type = tvb_get_guint8(tvb, offset);
+    offset += 1;
+
+    switch(a_type)
+    {
+    case 1: /* IPv4 address */
+        if ( hash_info) {
+            TVB_SET_ADDRESS(&addr, AT_IPv4, tvb, offset, 4);
+            SE_COPY_ADDRESS(&hash_info->dst_addr, &addr);
+        }
+        offset += 4;
+        break;
+
+    case 4: /* IPv6 address */
+        if ( hash_info) {
+            TVB_SET_ADDRESS(&addr, AT_IPv6, tvb, offset, 16);
+            SE_COPY_ADDRESS(&hash_info->dst_addr, &addr);
+        }
+        offset += 16;
+        break;
+
+    case 3: /* domain name address */
+        offset += tvb_get_guint8(tvb, offset) + 1;
+        break;
+    }
+
+    return offset;
 }
 
 
@@ -327,93 +327,93 @@ static void
 socks_udp_dissector(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
 
 /* Conversation dissector called from UDP dissector. Decode and display */
-/* the socks header, the pass the rest of the data to the udp port 	*/
-/* decode routine to  handle the payload.				*/
+/* the socks header, the pass the rest of the data to the udp port  */
+/* decode routine to  handle the payload.               */
 
-	int offset = 0;
-	guint32 *ptr;
-	socks_hash_entry_t *hash_info;
-	conversation_t *conversation;
-	proto_tree      *socks_tree;
-	proto_item      *ti;
+    int                 offset = 0;
+    guint32            *ptr;
+    socks_hash_entry_t *hash_info;
+    conversation_t     *conversation;
+    proto_tree         *socks_tree;
+    proto_item         *ti;
 
-	conversation = find_conversation( pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype,
-		pinfo->srcport, pinfo->destport, 0);
+    conversation = find_conversation( pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype,
+        pinfo->srcport, pinfo->destport, 0);
 
-	DISSECTOR_ASSERT( conversation);	/* should always find a conversation */
+    DISSECTOR_ASSERT( conversation);    /* should always find a conversation */
 
-	hash_info = (socks_hash_entry_t *)conversation_get_proto_data(conversation, proto_socks);
+    hash_info = (socks_hash_entry_t *)conversation_get_proto_data(conversation, proto_socks);
 
-	col_set_str(pinfo->cinfo, COL_PROTOCOL, "Socks");
-	col_set_str(pinfo->cinfo, COL_INFO, "Version: 5, UDP Associated packet");
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "Socks");
+    col_set_str(pinfo->cinfo, COL_INFO, "Version: 5, UDP Associated packet");
 
-	if ( tree) {
-		ti = proto_tree_add_protocol_format( tree, proto_socks, tvb, offset, -1, "Socks" );
+    if ( tree) {
+        ti = proto_tree_add_protocol_format( tree, proto_socks, tvb, offset, -1, "Socks" );
 
-		socks_tree = proto_item_add_subtree(ti, ett_socks);
+        socks_tree = proto_item_add_subtree(ti, ett_socks);
 
-		proto_tree_add_item(socks_tree, hf_socks_reserved2, tvb, offset, 2, ENC_BIG_ENDIAN);
-		offset += 2;
+        proto_tree_add_item(socks_tree, hf_socks_reserved2, tvb, offset, 2, ENC_BIG_ENDIAN);
+        offset += 2;
 
-		proto_tree_add_item(socks_tree, hf_socks_fragment_number, tvb, offset, 1, ENC_NA);
-		++offset;
+        proto_tree_add_item(socks_tree, hf_socks_fragment_number, tvb, offset, 1, ENC_NA);
+        offset += 1;
 
-		offset = display_address( tvb, offset, socks_tree);
-		hash_info->udp_remote_port = tvb_get_ntohs(tvb, offset);
+        offset = display_address( tvb, offset, socks_tree);
+        hash_info->udp_remote_port = tvb_get_ntohs(tvb, offset);
 
-		proto_tree_add_uint( socks_tree, hf_socks_dstport, tvb,
-			offset, 2, hash_info->udp_remote_port);
+        proto_tree_add_uint( socks_tree, hf_socks_dstport, tvb,
+            offset, 2, hash_info->udp_remote_port);
 
-		offset += 2;
-	}
-	else { 		/* no tree, skip past the socks header */
-		offset += 3;
-		offset = get_address_v5( tvb, offset, 0) + 2;
-	}
+        offset += 2;
+    }
+    else {      /* no tree, skip past the socks header */
+        offset += 3;
+        offset = get_address_v5( tvb, offset, 0) + 2;
+    }
 
-	/* set pi src/dst port and call the udp sub-dissector lookup */
+    /* set pi src/dst port and call the udp sub-dissector lookup */
 
-	if ( pinfo->srcport == hash_info->port)
-		ptr = &pinfo->destport;
-	else
-		ptr = &pinfo->srcport;
+    if ( pinfo->srcport == hash_info->port)
+        ptr = &pinfo->destport;
+    else
+        ptr = &pinfo->srcport;
 
-	*ptr = hash_info->udp_remote_port;
+    *ptr = hash_info->udp_remote_port;
 
-	decode_udp_ports( tvb, offset, pinfo, tree, pinfo->srcport, pinfo->destport, -1);
+    decode_udp_ports( tvb, offset, pinfo, tree, pinfo->srcport, pinfo->destport, -1);
 
-	*ptr = hash_info->udp_port;
+    *ptr = hash_info->udp_port;
 }
 
 
 static void
 new_udp_conversation( socks_hash_entry_t *hash_info, packet_info *pinfo){
 
-	conversation_t *conversation = conversation_new( pinfo->fd->num, &pinfo->src, &pinfo->dst,  PT_UDP,
-			hash_info->udp_port, hash_info->port, 0);
+    conversation_t *conversation = conversation_new( pinfo->fd->num, &pinfo->src, &pinfo->dst,  PT_UDP,
+            hash_info->udp_port, hash_info->port, 0);
 
-	DISSECTOR_ASSERT( conversation);
+    DISSECTOR_ASSERT( conversation);
 
-	conversation_add_proto_data(conversation, proto_socks, hash_info);
-	conversation_set_dissector(conversation, socks_udp_handle);
+    conversation_add_proto_data(conversation, proto_socks, hash_info);
+    conversation_set_dissector(conversation, socks_udp_handle);
 }
 
 static void
 save_client_state(packet_info *pinfo, enum ClientState state)
 {
-	sock_state_t* state_info = (sock_state_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_socks, 0);
-	if ((state_info != NULL) && (state_info->client == clientNoInit)) {
-		state_info->client = state;
-	}
+    sock_state_t* state_info = (sock_state_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_socks, 0);
+    if ((state_info != NULL) && (state_info->client == clientNoInit)) {
+        state_info->client = state;
+    }
 }
 
 static void
 save_server_state(packet_info *pinfo, enum ServerState state)
 {
-	sock_state_t* state_info = (sock_state_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_socks, 0);
-	if ((state_info != NULL) && (state_info->server == serverNoInit)) {
-		state_info->server = state;
-	}
+    sock_state_t* state_info = (sock_state_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_socks, 0);
+    if ((state_info != NULL) && (state_info->server == serverNoInit)) {
+        state_info->server = state;
+    }
 }
 
 
@@ -421,255 +421,255 @@ save_server_state(packet_info *pinfo, enum ServerState state)
 
 static void
 display_socks_v4(tvbuff_t *tvb, int offset, packet_info *pinfo,
-	proto_tree *tree, socks_hash_entry_t *hash_info, sock_state_t* state_info) {
-
-
-/* Display the protocol tree for the V4 version. This routine uses the	*/
-/* stored frame information to decide what to do with the row.	*/
-
-	unsigned char ipaddr[4];
-	guint str_len;
-
-	/* Either there is an error, or we're done with the state machine
-	  (so there's nothing to display) */
-	if (state_info == NULL)
-		return;
-
-	if (hash_info->server_port == pinfo->destport) {
-		/* Client side */
-		switch (state_info->client)
-		{
-		case clientStart:
-			proto_tree_add_item( tree, hf_socks_ver, tvb, offset, 1, ENC_BIG_ENDIAN);
-			++offset;
-
-			proto_tree_add_item( tree, hf_socks_cmd, tvb, offset, 1, ENC_NA);
-			++offset;
-
-			/* Do remote port */
-			proto_tree_add_item( tree, hf_socks_dstport, tvb, offset, 2, ENC_BIG_ENDIAN);
-			offset += 2;
-
-			/* Do destination address */
-			tvb_memcpy(tvb, ipaddr, offset, 4);
-			proto_tree_add_item( tree, hf_socks_ip_dst, tvb, offset, 4, ENC_BIG_ENDIAN);
-			offset += 4;
-
-			/* display user name */
-			str_len = tvb_strsize(tvb, offset);
-			proto_tree_add_item( tree, hf_socks_username, tvb, offset, str_len, ENC_ASCII|ENC_NA);
-			offset += str_len;
-
-			if ( ipaddr[0] == 0 && ipaddr[1] == 0 &&
-				 ipaddr[2] == 0 && ipaddr[3] != 0) {
-				/* 0.0.0.x , where x!=0 means v4a support */
-				str_len = tvb_strsize(tvb, offset);
-				proto_tree_add_item( tree, hf_v4a_dns_name, tvb, offset, str_len, ENC_ASCII|ENC_NA);
-			}
-			break;
-		default:
-			break;
-		}
-	} else {
-		/* Server side */
-		switch (state_info->server)
-		{
-		case serverStart:
-			proto_tree_add_item( tree, hf_socks_ver, tvb, offset, 1, ENC_BIG_ENDIAN);
-			++offset;
-							/* Do results code */
-			proto_tree_add_item( tree, hf_socks_results_4, tvb, offset, 1, ENC_BIG_ENDIAN);
-			++offset;
-
-							/* Do remote port */
-			proto_tree_add_item( tree, hf_socks_dstport, tvb, offset, 2, ENC_BIG_ENDIAN);
-			offset += 2;
-							/* Do remote address */
-			proto_tree_add_item( tree, hf_socks_ip_dst, tvb, offset, 4, ENC_BIG_ENDIAN);
-			break;
-		default:
-			break;
-		}
-	}
+    proto_tree *tree, socks_hash_entry_t *hash_info, sock_state_t* state_info) {
+
+
+/* Display the protocol tree for the V4 version. This routine uses the  */
+/* stored frame information to decide what to do with the row.  */
+
+    unsigned char ipaddr[4];
+    guint         str_len;
+
+    /* Either there is an error, or we're done with the state machine
+      (so there's nothing to display) */
+    if (state_info == NULL)
+        return;
+
+    if (hash_info->server_port == pinfo->destport) {
+        /* Client side */
+        switch (state_info->client)
+        {
+        case clientStart:
+            proto_tree_add_item( tree, hf_socks_ver, tvb, offset, 1, ENC_BIG_ENDIAN);
+            offset += 1;
+
+            proto_tree_add_item( tree, hf_socks_cmd, tvb, offset, 1, ENC_NA);
+            offset += 1;
+
+            /* Do remote port */
+            proto_tree_add_item( tree, hf_socks_dstport, tvb, offset, 2, ENC_BIG_ENDIAN);
+            offset += 2;
+
+            /* Do destination address */
+            tvb_memcpy(tvb, ipaddr, offset, 4);
+            proto_tree_add_item( tree, hf_socks_ip_dst, tvb, offset, 4, ENC_BIG_ENDIAN);
+            offset += 4;
+
+            /* display user name */
+            str_len = tvb_strsize(tvb, offset);
+            proto_tree_add_item( tree, hf_socks_username, tvb, offset, str_len, ENC_ASCII|ENC_NA);
+            offset += str_len;
+
+            if ( ipaddr[0] == 0 && ipaddr[1] == 0 &&
+                 ipaddr[2] == 0 && ipaddr[3] != 0) {
+                /* 0.0.0.x , where x!=0 means v4a support */
+                str_len = tvb_strsize(tvb, offset);
+                proto_tree_add_item( tree, hf_v4a_dns_name, tvb, offset, str_len, ENC_ASCII|ENC_NA);
+            }
+            break;
+        default:
+            break;
+        }
+    } else {
+        /* Server side */
+        switch (state_info->server)
+        {
+        case serverStart:
+            proto_tree_add_item( tree, hf_socks_ver, tvb, offset, 1, ENC_BIG_ENDIAN);
+            offset += 1;
+                            /* Do results code */
+            proto_tree_add_item( tree, hf_socks_results_4, tvb, offset, 1, ENC_BIG_ENDIAN);
+            offset += 1;
+
+                            /* Do remote port */
+            proto_tree_add_item( tree, hf_socks_dstport, tvb, offset, 2, ENC_BIG_ENDIAN);
+            offset += 2;
+                            /* Do remote address */
+            proto_tree_add_item( tree, hf_socks_ip_dst, tvb, offset, 4, ENC_BIG_ENDIAN);
+            break;
+        default:
+            break;
+        }
+    }
 }
 
 static void
 client_display_socks_v5(tvbuff_t *tvb, int offset, packet_info *pinfo,
-	proto_tree *tree, socks_hash_entry_t *hash_info, sock_state_t* state_info) {
-
-/* Display the protocol tree for the version. This routine uses the	*/
-/* stored conversation information to decide what to do with the row.	*/
-/* Per packet information would have been better to do this, but we	*/
-/* didn't have that when I wrote this. And I didn't expect this to get	*/
-/* so messy.								*/
-
-	unsigned int i;
-	const char *AuthMethodStr;
-	sock_state_t new_state_info;
-
-	/* Either there is an error, or we're done with the state machine
-	  (so there's nothing to display) */
-	if (state_info == NULL)
-		return;
-
-	proto_tree_add_item( tree, hf_socks_ver, tvb, offset, 1, ENC_BIG_ENDIAN);
-	++offset;
-
-	if (state_info->client == clientStart)
-	{
-		proto_tree      *AuthTree;
-		proto_item      *ti;
-		guint8 num_auth_methods, auth;
-
-		ti = proto_tree_add_text( tree, tvb, offset, -1, "Client Authentication Methods");
-		AuthTree = proto_item_add_subtree(ti, ett_socks_auth);
-
-		num_auth_methods = tvb_get_guint8(tvb, offset);
-		proto_item_set_len(ti, num_auth_methods+1);
-
-		proto_tree_add_item( AuthTree, hf_client_auth_method_count, tvb, offset, 1, ENC_NA);
-		++offset;
-
-		for( i = 0; i  < num_auth_methods; ++i) {
-			auth = tvb_get_guint8( tvb, offset);
-			AuthMethodStr = get_auth_method_name(auth);
-
-			proto_tree_add_uint_format(AuthTree, hf_client_auth_method, tvb, offset, 1, auth,
-										"Method[%u]: %u (%s)", i, auth, AuthMethodStr);
-			++offset;
-		}
-
-		if ((num_auth_methods == 1) &&
-			(tvb_bytes_exist(tvb, offset + 2, 1)) &&
-			(tvb_get_guint8(tvb, offset + 2) == 0) &&
-			(tvb_reported_length_remaining(tvb, offset + 2 + num_auth_methods) > 0)) {
-				new_state_info.client = clientV5Command;
-				client_display_socks_v5(tvb, offset, pinfo, tree, hash_info, &new_state_info);
-		}
-	}
-	else if (state_info->client == clientV5Command) {
-
-		proto_tree_add_item( tree, hf_socks_cmd, tvb, offset, 1, ENC_NA);
-		++offset;
-
-		proto_tree_add_item( tree, hf_socks_reserved, tvb, offset, 1, ENC_NA);
-		++offset;
-
-		offset = display_address(tvb, offset, tree);
-		proto_tree_add_item( tree, hf_client_port, tvb, offset, 2, ENC_BIG_ENDIAN);
-	}
-	else if ((state_info->client == clientWaitForAuthReply) &&
-			 (state_info->server == serverInitReply)) {
-		guint16 len;
-		gchar* str;
-
-		switch(hash_info->authentication_method)
-		{
-		case NO_AUTHENTICATION:
-			break;
-		case USER_NAME_AUTHENTICATION:
-			/* process user name */
-			len = tvb_get_guint8(tvb, offset);
-			str = tvb_get_string(wmem_packet_scope(), tvb, offset+1, len);
-			proto_tree_add_string(tree, hf_socks_username, tvb, offset, len+1, str);
-			offset += (len+1);
-
-			len = tvb_get_guint8(tvb, offset);
-			str = tvb_get_string(wmem_packet_scope(), tvb, offset+1, len);
-			proto_tree_add_string(tree, hf_socks_password, tvb, offset, len+1, str);
-			/* offset += (len+1); */
-			break;
-		case GSS_API_AUTHENTICATION:
-			proto_tree_add_item( tree, hf_gssapi_command, tvb, offset, 1, ENC_BIG_ENDIAN);
-			proto_tree_add_item( tree, hf_gssapi_length, tvb, offset+1, 2, ENC_BIG_ENDIAN);
-			len = tvb_get_ntohs(tvb, offset+1);
-			if (len > 0)
-				proto_tree_add_item( tree, hf_gssapi_payload, tvb, offset+3, len, ENC_NA);
-			break;
-		default:
-			break;
-		}
-	}
+    proto_tree *tree, socks_hash_entry_t *hash_info, sock_state_t* state_info) {
+
+/* Display the protocol tree for the version. This routine uses the */
+/* stored conversation information to decide what to do with the row.   */
+/* Per packet information would have been better to do this, but we */
+/* didn't have that when I wrote this. And I didn't expect this to get  */
+/* so messy.                                */
+
+    unsigned int  i;
+    const char   *AuthMethodStr;
+    sock_state_t  new_state_info;
+
+    /* Either there is an error, or we're done with the state machine
+      (so there's nothing to display) */
+    if (state_info == NULL)
+        return;
+
+    proto_tree_add_item( tree, hf_socks_ver, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
+
+    if (state_info->client == clientStart)
+    {
+        proto_tree      *AuthTree;
+        proto_item      *ti;
+        guint8 num_auth_methods, auth;
+
+        ti = proto_tree_add_text( tree, tvb, offset, -1, "Client Authentication Methods");
+        AuthTree = proto_item_add_subtree(ti, ett_socks_auth);
+
+        num_auth_methods = tvb_get_guint8(tvb, offset);
+        proto_item_set_len(ti, num_auth_methods+1);
+
+        proto_tree_add_item( AuthTree, hf_client_auth_method_count, tvb, offset, 1, ENC_NA);
+        offset += 1;
+
+        for( i = 0; i  < num_auth_methods; ++i) {
+            auth = tvb_get_guint8( tvb, offset);
+            AuthMethodStr = get_auth_method_name(auth);
+
+            proto_tree_add_uint_format(AuthTree, hf_client_auth_method, tvb, offset, 1, auth,
+                                        "Method[%u]: %u (%s)", i, auth, AuthMethodStr);
+            offset += 1;
+        }
+
+        if ((num_auth_methods == 1) &&
+            (tvb_bytes_exist(tvb, offset + 2, 1)) &&
+            (tvb_get_guint8(tvb, offset + 2) == 0) &&
+            (tvb_reported_length_remaining(tvb, offset + 2 + num_auth_methods) > 0)) {
+                new_state_info.client = clientV5Command;
+                client_display_socks_v5(tvb, offset, pinfo, tree, hash_info, &new_state_info);
+        }
+    }
+    else if (state_info->client == clientV5Command) {
+
+        proto_tree_add_item( tree, hf_socks_cmd, tvb, offset, 1, ENC_NA);
+        offset += 1;
+
+        proto_tree_add_item( tree, hf_socks_reserved, tvb, offset, 1, ENC_NA);
+        offset += 1;
+
+        offset = display_address(tvb, offset, tree);
+        proto_tree_add_item( tree, hf_client_port, tvb, offset, 2, ENC_BIG_ENDIAN);
+    }
+    else if ((state_info->client == clientWaitForAuthReply) &&
+             (state_info->server == serverInitReply)) {
+        guint16 len;
+        gchar* str;
+
+        switch(hash_info->authentication_method)
+        {
+        case NO_AUTHENTICATION:
+            break;
+        case USER_NAME_AUTHENTICATION:
+            /* process user name */
+            len = tvb_get_guint8(tvb, offset);
+            str = tvb_get_string(wmem_packet_scope(), tvb, offset+1, len);
+            proto_tree_add_string(tree, hf_socks_username, tvb, offset, len+1, str);
+            offset += (len+1);
+
+            len = tvb_get_guint8(tvb, offset);
+            str = tvb_get_string(wmem_packet_scope(), tvb, offset+1, len);
+            proto_tree_add_string(tree, hf_socks_password, tvb, offset, len+1, str);
+            /* offset += (len+1); */
+            break;
+        case GSS_API_AUTHENTICATION:
+            proto_tree_add_item( tree, hf_gssapi_command, tvb, offset, 1, ENC_BIG_ENDIAN);
+            proto_tree_add_item( tree, hf_gssapi_length, tvb, offset+1, 2, ENC_BIG_ENDIAN);
+            len = tvb_get_ntohs(tvb, offset+1);
+            if (len > 0)
+                proto_tree_add_item( tree, hf_gssapi_payload, tvb, offset+3, len, ENC_NA);
+            break;
+        default:
+            break;
+        }
+    }
 }
 
 static void
 server_display_socks_v5(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
-	proto_tree *tree, socks_hash_entry_t *hash_info _U_, sock_state_t* state_info) {
-
-/* Display the protocol tree for the version. This routine uses the	*/
-/* stored conversation information to decide what to do with the row.	*/
-/* Per packet information would have been better to do this, but we	*/
-/* didn't have that when I wrote this. And I didn't expect this to get	*/
-/* so messy.								*/
-
-	const char *AuthMethodStr;
-	guint8 auth, auth_status;
-	proto_item* ti;
-
-	/* Either there is an error, or we're done with the state machine
-	  (so there's nothing to display) */
-	if (state_info == NULL)
-		return;
-
-	proto_tree_add_item( tree, hf_socks_ver, tvb, offset, 1, ENC_BIG_ENDIAN);
-	++offset;
-
-	switch(state_info->server)
-	{
-	case serverStart:
-		auth = tvb_get_guint8( tvb, offset);
-		AuthMethodStr = get_auth_method_name(auth);
-
-		proto_tree_add_uint_format_value(tree, hf_server_accepted_auth_method, tvb, offset, 1, auth,
-										"0x%0x (%s)", auth, AuthMethodStr);
-		break;
-
-	case serverUserReply:
-		auth_status = tvb_get_guint8(tvb, offset);
-		ti = proto_tree_add_item(tree, hf_server_auth_status, tvb, offset, 1, ENC_NA);
-		if(auth_status != 0)
-			proto_item_append_text(ti, " (failure)");
-		else
-			proto_item_append_text(ti, " (success)");
-		break;
-
-	case serverGssApiReply:
-		auth_status = tvb_get_guint8(tvb, offset);
-		proto_tree_add_item( tree, hf_gssapi_command, tvb, offset, 1, ENC_BIG_ENDIAN);
-		if (auth_status != 0xFF) {
-			guint16 len;
-
-			proto_tree_add_item( tree, hf_gssapi_length, tvb, offset+1, 2, ENC_BIG_ENDIAN);
-			len = tvb_get_ntohs(tvb, offset+1);
-			if (len > 0)
-				proto_tree_add_item( tree, hf_gssapi_payload, tvb, offset+3, len, ENC_NA);
-		}
-		break;
-
-	case serverCommandReply:
-		proto_tree_add_item( tree, hf_socks_results_5, tvb, offset, 1, ENC_BIG_ENDIAN);
-		++offset;
-
-		proto_tree_add_item( tree, hf_socks_reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
-		++offset;
-
-		offset = display_address(tvb, offset, tree);
-		proto_tree_add_item( tree, hf_client_port, tvb, offset, 2, ENC_BIG_ENDIAN);
-		break;
-
-	case serverBindReply:
-		proto_tree_add_item( tree, hf_socks_results_5, tvb, offset, 1, ENC_BIG_ENDIAN);
-		++offset;
-
-		proto_tree_add_item( tree, hf_socks_reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
-		++offset;
-
-		offset = display_address(tvb, offset, tree);
-		proto_tree_add_item( tree, hf_server_remote_host_port, tvb, offset, 2, ENC_BIG_ENDIAN);
-		break;
+    proto_tree *tree, socks_hash_entry_t *hash_info _U_, sock_state_t* state_info) {
+
+/* Display the protocol tree for the version. This routine uses the */
+/* stored conversation information to decide what to do with the row.   */
+/* Per packet information would have been better to do this, but we */
+/* didn't have that when I wrote this. And I didn't expect this to get  */
+/* so messy.                                */
+
+    const char *AuthMethodStr;
+    guint8      auth, auth_status;
+    proto_item *ti;
+
+    /* Either there is an error, or we're done with the state machine
+      (so there's nothing to display) */
+    if (state_info == NULL)
+        return;
+
+    proto_tree_add_item( tree, hf_socks_ver, tvb, offset, 1, ENC_BIG_ENDIAN);
+    offset += 1;
+
+    switch(state_info->server)
+    {
+    case serverStart:
+        auth = tvb_get_guint8( tvb, offset);
+        AuthMethodStr = get_auth_method_name(auth);
+
+        proto_tree_add_uint_format_value(tree, hf_server_accepted_auth_method, tvb, offset, 1, auth,
+                                        "0x%0x (%s)", auth, AuthMethodStr);
+        break;
+
+    case serverUserReply:
+        auth_status = tvb_get_guint8(tvb, offset);
+        ti = proto_tree_add_item(tree, hf_server_auth_status, tvb, offset, 1, ENC_NA);
+        if(auth_status != 0)
+            proto_item_append_text(ti, " (failure)");
+        else
+            proto_item_append_text(ti, " (success)");
+        break;
+
+    case serverGssApiReply:
+        auth_status = tvb_get_guint8(tvb, offset);
+        proto_tree_add_item( tree, hf_gssapi_command, tvb, offset, 1, ENC_BIG_ENDIAN);
+        if (auth_status != 0xFF) {
+            guint16 len;
+
+            proto_tree_add_item( tree, hf_gssapi_length, tvb, offset+1, 2, ENC_BIG_ENDIAN);
+            len = tvb_get_ntohs(tvb, offset+1);
+            if (len > 0)
+                proto_tree_add_item( tree, hf_gssapi_payload, tvb, offset+3, len, ENC_NA);
+        }
+        break;
+
+    case serverCommandReply:
+        proto_tree_add_item( tree, hf_socks_results_5, tvb, offset, 1, ENC_BIG_ENDIAN);
+        offset += 1;
+
+        proto_tree_add_item( tree, hf_socks_reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
+        offset += 1;
+
+        offset = display_address(tvb, offset, tree);
+        proto_tree_add_item( tree, hf_client_port, tvb, offset, 2, ENC_BIG_ENDIAN);
+        break;
+
+    case serverBindReply:
+        proto_tree_add_item( tree, hf_socks_results_5, tvb, offset, 1, ENC_BIG_ENDIAN);
+        offset += 1;
+
+        proto_tree_add_item( tree, hf_socks_reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
+        offset += 1;
+
+        offset = display_address(tvb, offset, tree);
+        proto_tree_add_item( tree, hf_server_remote_host_port, tvb, offset, 2, ENC_BIG_ENDIAN);
+        break;
     default:
         break;
-	}
+    }
 }
 
 
@@ -678,205 +678,205 @@ server_display_socks_v5(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
 
 static void
 state_machine_v4( socks_hash_entry_t *hash_info, tvbuff_t *tvb,
-	int offset, packet_info *pinfo) {
+    int offset, packet_info *pinfo) {
 
-/* Decode V4 protocol.  This is done on the first pass through the 	*/
-/* list.  Based upon the current state, decode the packet and determine	*/
+/* Decode V4 protocol.  This is done on the first pass through the  */
+/* list.  Based upon the current state, decode the packet and determine */
 /* what the next state should be.  */
-	address addr;
+    address addr;
 
-	if (hash_info->clientState != clientDone)
-		save_client_state(pinfo, hash_info->clientState);
+    if (hash_info->clientState != clientDone)
+        save_client_state(pinfo, hash_info->clientState);
 
-	if (hash_info->serverState != serverDone)
-		save_server_state(pinfo, hash_info->serverState);
+    if (hash_info->serverState != serverDone)
+        save_server_state(pinfo, hash_info->serverState);
 
-	if (hash_info->server_port == pinfo->destport) {
-		/* Client side, only a single request */
-		col_append_str(pinfo->cinfo, COL_INFO, " Connect to server request");
+    if (hash_info->server_port == pinfo->destport) {
+        /* Client side, only a single request */
+        col_append_str(pinfo->cinfo, COL_INFO, " Connect to server request");
 
-		hash_info->command = tvb_get_guint8(tvb, offset + 1);
+        hash_info->command = tvb_get_guint8(tvb, offset + 1);
 
-		/* get remote port */
-		if ( hash_info->command == CONNECT_COMMAND)
-			hash_info->port =  tvb_get_ntohs(tvb, offset + 2);
+        /* get remote port */
+        if ( hash_info->command == CONNECT_COMMAND)
+            hash_info->port =  tvb_get_ntohs(tvb, offset + 2);
 
-		/* get remote address */
-		TVB_SET_ADDRESS(&addr, AT_IPv4, tvb, offset, 4);
-		SE_COPY_ADDRESS(&hash_info->dst_addr, &addr);
+        /* get remote address */
+        TVB_SET_ADDRESS(&addr, AT_IPv4, tvb, offset, 4);
+        SE_COPY_ADDRESS(&hash_info->dst_addr, &addr);
 
-		hash_info->clientState = clientDone;
-	}
-	else {
-		col_append_str(pinfo->cinfo, COL_INFO, " Connect Response");
+        hash_info->clientState = clientDone;
+    }
+    else {
+        col_append_str(pinfo->cinfo, COL_INFO, " Connect Response");
 
-		if (tvb_get_guint8(tvb, offset + 1) == 90)
-			hash_info->serverState = serverDone;
-		else
-			hash_info->serverState = serverError;
-	}
+        if (tvb_get_guint8(tvb, offset + 1) == 90)
+            hash_info->serverState = serverDone;
+        else
+            hash_info->serverState = serverError;
+    }
 }
 
 static void
 client_state_machine_v5( socks_hash_entry_t *hash_info, tvbuff_t *tvb,
-	int offset, packet_info *pinfo, gboolean start_of_frame) {
+    int offset, packet_info *pinfo, gboolean start_of_frame) {
 
-/* Decode client side of V5 protocol.  This is done on the first pass through the 	*/
-/* list.  Based upon the current state, decode the packet and determine	*/
+/* Decode client side of V5 protocol.  This is done on the first pass through the   */
+/* list.  Based upon the current state, decode the packet and determine */
 /* what the next state should be. */
 
-	if (start_of_frame)
-		save_client_state(pinfo, hash_info->clientState);
-
-	if (hash_info->clientState == clientStart)
-	{
-		guint8 num_auth_methods;
-		col_append_str(pinfo->cinfo, COL_INFO, " Connect to server request");
-
-		num_auth_methods = tvb_get_guint8(tvb, offset + 1);
-						/* skip past auth methods */
-
-		if ((num_auth_methods == 0) ||
-			((num_auth_methods == 1) &&
-			 (tvb_get_guint8(tvb, offset + 2) == 0))) {
-			/* No authentication needed */
-			hash_info->clientState = clientV5Command;
-			if (tvb_reported_length_remaining(tvb, offset + 2 + num_auth_methods) > 0) {
-				client_state_machine_v5(hash_info, tvb, offset + 2 + num_auth_methods, pinfo, FALSE);
-			}
-		} else {
-			hash_info->clientState = clientWaitForAuthReply;
-		}
-	} else if ((hash_info->clientState == clientWaitForAuthReply) &&
-			   (hash_info->serverState == serverInitReply)) {
-
-		switch(hash_info->authentication_method)
-		{
-		case NO_AUTHENTICATION:
-			hash_info->clientState = clientV5Command;
-			hash_info->serverState = serverCommandReply;
-			break;
-		case USER_NAME_AUTHENTICATION:
-			hash_info->clientState = clientV5Command;
-			hash_info->serverState = serverUserReply;
-			break;
-		case GSS_API_AUTHENTICATION:
-			hash_info->clientState = clientV5Command;
-			hash_info->serverState = serverGssApiReply;
-			break;
-		default:
-			hash_info->clientState = clientError;	/*Auth failed or error*/
-			break;
-		}
-	} else if (hash_info->clientState == clientV5Command) {
-
-		hash_info->command = tvb_get_guint8(tvb, offset + 1); /* get command */
-
-		col_append_fstr(pinfo->cinfo, COL_INFO, " Command Request - %s",
-				val_to_str_const(hash_info->command, cmd_strings, "Unknown"));
-
-		offset += 3;			/* skip to address type */
-
-		offset = get_address_v5(tvb, offset, hash_info);
-
-		/** temp = tvb_get_guint8(tvb, offset);  XX: what was this for ? **/
-
-		if (( hash_info->command == CONNECT_COMMAND) ||
-			( hash_info->command == UDP_ASSOCIATE_COMMAND))
-						/* get remote port	*/
-			hash_info->port =  tvb_get_ntohs(tvb, offset);
-
-		hash_info->clientState = clientDone;
-	}
+    if (start_of_frame)
+        save_client_state(pinfo, hash_info->clientState);
+
+    if (hash_info->clientState == clientStart)
+    {
+        guint8 num_auth_methods;
+        col_append_str(pinfo->cinfo, COL_INFO, " Connect to server request");
+
+        num_auth_methods = tvb_get_guint8(tvb, offset + 1);
+                        /* skip past auth methods */
+
+        if ((num_auth_methods == 0) ||
+            ((num_auth_methods == 1) &&
+             (tvb_get_guint8(tvb, offset + 2) == 0))) {
+            /* No authentication needed */
+            hash_info->clientState = clientV5Command;
+            if (tvb_reported_length_remaining(tvb, offset + 2 + num_auth_methods) > 0) {
+                client_state_machine_v5(hash_info, tvb, offset + 2 + num_auth_methods, pinfo, FALSE);
+            }
+        } else {
+            hash_info->clientState = clientWaitForAuthReply;
+        }
+    } else if ((hash_info->clientState == clientWaitForAuthReply) &&
+               (hash_info->serverState == serverInitReply)) {
+
+        switch(hash_info->authentication_method)
+        {
+        case NO_AUTHENTICATION:
+            hash_info->clientState = clientV5Command;
+            hash_info->serverState = serverCommandReply;
+            break;
+        case USER_NAME_AUTHENTICATION:
+            hash_info->clientState = clientV5Command;
+            hash_info->serverState = serverUserReply;
+            break;
+        case GSS_API_AUTHENTICATION:
+            hash_info->clientState = clientV5Command;
+            hash_info->serverState = serverGssApiReply;
+            break;
+        default:
+            hash_info->clientState = clientError;   /*Auth failed or error*/
+            break;
+        }
+    } else if (hash_info->clientState == clientV5Command) {
+
+        hash_info->command = tvb_get_guint8(tvb, offset + 1); /* get command */
+
+        col_append_fstr(pinfo->cinfo, COL_INFO, " Command Request - %s",
+                val_to_str_const(hash_info->command, cmd_strings, "Unknown"));
+
+        offset += 3;            /* skip to address type */
+
+        offset = get_address_v5(tvb, offset, hash_info);
+
+        /** temp = tvb_get_guint8(tvb, offset);  XX: what was this for ? **/
+
+        if (( hash_info->command == CONNECT_COMMAND) ||
+            ( hash_info->command == UDP_ASSOCIATE_COMMAND))
+                        /* get remote port  */
+            hash_info->port =  tvb_get_ntohs(tvb, offset);
+
+        hash_info->clientState = clientDone;
+    }
 }
 
 static void
 server_state_machine_v5( socks_hash_entry_t *hash_info, tvbuff_t *tvb,
-	int offset, packet_info *pinfo, gboolean start_of_frame) {
+    int offset, packet_info *pinfo, gboolean start_of_frame) {
 
-/* Decode server side of V5 protocol.  This is done on the first pass through the 	*/
-/* list.  Based upon the current state, decode the packet and determine	*/
+/* Decode server side of V5 protocol.  This is done on the first pass through the   */
+/* list.  Based upon the current state, decode the packet and determine */
 /* what the next state should be. */
 
-	if (start_of_frame)
-		save_server_state(pinfo, hash_info->serverState);
-
-	switch (hash_info->serverState) {
-	case serverStart:
-		col_append_str(pinfo->cinfo, COL_INFO, " Connect to server response");
-
-		hash_info->authentication_method = tvb_get_guint8(tvb, offset + 1);
-		hash_info->serverState = serverInitReply;
-
-		switch (hash_info->authentication_method)
-		{
-		case NO_AUTHENTICATION:
-			hash_info->serverState = serverCommandReply;
-			break;
-		case USER_NAME_AUTHENTICATION:
-			hash_info->serverState = serverUserReply;
-			break;
-		case GSS_API_AUTHENTICATION:
-			hash_info->serverState = serverGssApiReply;
-			break;
-		default:
-			hash_info->serverState = serverError;
-			break;
-		}
-		break;
-	case serverUserReply:
-		col_append_str(pinfo->cinfo, COL_INFO, " User authentication reply");
-		break;
-	case serverGssApiReply:
-		if (tvb_get_guint8(tvb, offset+1) == 0xFF) {
-			col_append_str(pinfo->cinfo, COL_INFO, " GSSAPI Authentication failure");
-			hash_info->serverState = serverError;
-		} else {
-			col_append_str(pinfo->cinfo, COL_INFO, " GSSAPI Authentication reply");
-			if (tvb_get_ntohs(tvb, offset+2) == 0)
-				hash_info->serverState = serverCommandReply;
-		}
-		break;
-	case serverCommandReply:
-		col_append_fstr(pinfo->cinfo, COL_INFO, " Command Response - %s",
-				val_to_str_const(hash_info->command, cmd_strings, "Unknown"));
-
-		switch(hash_info->command)
-		{
-		case CONNECT_COMMAND:
-		case PING_COMMAND:
-		case TRACERT_COMMAND:
-			hash_info->serverState = serverDone;
-			break;
-
-		case BIND_COMMAND:
-			hash_info->serverState = serverBindReply;
-			if ((tvb_get_guint8(tvb, offset + 2) == 0) &&
-				(tvb_reported_length_remaining(tvb, offset) > 5)) {
-					offset = display_address(tvb, offset, NULL);
-					client_state_machine_v5(hash_info, tvb, offset, pinfo, FALSE);
-			}
-			break;
-
-		case UDP_ASSOCIATE_COMMAND:
-			offset += 3;		/* skip to address type */
-			offset = get_address_v5(tvb, offset, hash_info);
-
-			/* save server udp port and create udp conversation */
-			hash_info->udp_port =  tvb_get_ntohs(tvb, offset);
-
-			if (!pinfo->fd->flags.visited)
-				new_udp_conversation( hash_info, pinfo);
-
-			break;
-		}
-		break;
-	case serverBindReply:
-		col_append_str(pinfo->cinfo, COL_INFO, " Command Response: Bind remote host info");
-		break;
-	default:
-		break;
-	}
+    if (start_of_frame)
+        save_server_state(pinfo, hash_info->serverState);
+
+    switch (hash_info->serverState) {
+    case serverStart:
+        col_append_str(pinfo->cinfo, COL_INFO, " Connect to server response");
+
+        hash_info->authentication_method = tvb_get_guint8(tvb, offset + 1);
+        hash_info->serverState = serverInitReply;
+
+        switch (hash_info->authentication_method)
+        {
+        case NO_AUTHENTICATION:
+            hash_info->serverState = serverCommandReply;
+            break;
+        case USER_NAME_AUTHENTICATION:
+            hash_info->serverState = serverUserReply;
+            break;
+        case GSS_API_AUTHENTICATION:
+            hash_info->serverState = serverGssApiReply;
+            break;
+        default:
+            hash_info->serverState = serverError;
+            break;
+        }
+        break;
+    case serverUserReply:
+        col_append_str(pinfo->cinfo, COL_INFO, " User authentication reply");
+        break;
+    case serverGssApiReply:
+        if (tvb_get_guint8(tvb, offset+1) == 0xFF) {
+            col_append_str(pinfo->cinfo, COL_INFO, " GSSAPI Authentication failure");
+            hash_info->serverState = serverError;
+        } else {
+            col_append_str(pinfo->cinfo, COL_INFO, " GSSAPI Authentication reply");
+            if (tvb_get_ntohs(tvb, offset+2) == 0)
+                hash_info->serverState = serverCommandReply;
+        }
+        break;
+    case serverCommandReply:
+        col_append_fstr(pinfo->cinfo, COL_INFO, " Command Response - %s",
+                val_to_str_const(hash_info->command, cmd_strings, "Unknown"));
+
+        switch(hash_info->command)
+        {
+        case CONNECT_COMMAND:
+        case PING_COMMAND:
+        case TRACERT_COMMAND:
+            hash_info->serverState = serverDone;
+            break;
+
+        case BIND_COMMAND:
+            hash_info->serverState = serverBindReply;
+            if ((tvb_get_guint8(tvb, offset + 2) == 0) &&
+                (tvb_reported_length_remaining(tvb, offset) > 5)) {
+                    offset = display_address(tvb, offset, NULL);
+                    client_state_machine_v5(hash_info, tvb, offset, pinfo, FALSE);
+            }
+            break;
+
+        case UDP_ASSOCIATE_COMMAND:
+            offset += 3;        /* skip to address type */
+            offset = get_address_v5(tvb, offset, hash_info);
+
+            /* save server udp port and create udp conversation */
+            hash_info->udp_port =  tvb_get_ntohs(tvb, offset);
+
+            if (!pinfo->fd->flags.visited)
+                new_udp_conversation( hash_info, pinfo);
+
+            break;
+        }
+        break;
+    case serverBindReply:
+        col_append_str(pinfo->cinfo, COL_INFO, " Command Response: Bind remote host info");
+        break;
+    default:
+        break;
+    }
 }
 
 
@@ -885,102 +885,102 @@ display_ping_and_tracert(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
 
 /* Display the ping/trace_route conversation */
 
-	const guchar    *data, *dataend;
-	const guchar   *lineend, *eol;
-	int             linelen;
-
-				/* handle the end command */
-	if ( pinfo->destport == TCP_PORT_SOCKS){
-		col_append_str(pinfo->cinfo, COL_INFO, ", Terminate Request");
-
-		if ( tree)
-			proto_tree_add_text(tree, tvb, offset, 1,
-				(hash_info->command  == PING_COMMAND) ?
-				"Ping: End command" :
-				"Traceroute: End command");
-	}
-	else { 		/* display the PING or Traceroute results */
-		col_append_str(pinfo->cinfo, COL_INFO, ", Results");
-
-		if ( tree){
-			proto_tree_add_text(tree, tvb, offset, -1,
-				(hash_info->command  == PING_COMMAND) ?
-				"Ping Results:" :
-				"Traceroute Results");
-
-			data = tvb_get_ptr(tvb, offset, -1);
-			dataend = data + tvb_length_remaining(tvb, offset);
-
-			while (data < dataend) {
-
-				lineend = find_line_end(data, dataend, &eol);
-				linelen = (int)(lineend - data);
-
-				proto_tree_add_text( tree, tvb, offset, linelen,
-					"%s", format_text(data, linelen));
-				offset += linelen;
-				data = lineend;
-			}
-		}
-	}
+    const guchar *data, *dataend;
+    const guchar *lineend, *eol;
+    int           linelen;
+
+                /* handle the end command */
+    if ( pinfo->destport == TCP_PORT_SOCKS){
+        col_append_str(pinfo->cinfo, COL_INFO, ", Terminate Request");
+
+        if ( tree)
+            proto_tree_add_text(tree, tvb, offset, 1,
+                (hash_info->command  == PING_COMMAND) ?
+                "Ping: End command" :
+                "Traceroute: End command");
+    }
+    else {      /* display the PING or Traceroute results */
+        col_append_str(pinfo->cinfo, COL_INFO, ", Results");
+
+        if ( tree){
+            proto_tree_add_text(tree, tvb, offset, -1,
+                (hash_info->command  == PING_COMMAND) ?
+                "Ping Results:" :
+                "Traceroute Results");
+
+            data = tvb_get_ptr(tvb, offset, -1);
+            dataend = data + tvb_length_remaining(tvb, offset);
+
+            while (data < dataend) {
+
+                lineend = find_line_end(data, dataend, &eol);
+                linelen = (int)(lineend - data);
+
+                proto_tree_add_text( tree, tvb, offset, linelen,
+                    "%s", format_text(data, linelen));
+                offset += linelen;
+                data = lineend;
+            }
+        }
+    }
 }
 
 static void clear_in_socks_dissector_flag(void *s)
 {
-	sock_state_t* state_info = (sock_state_t*)s;
-	state_info->in_socks_dissector_flag = 0; /* avoid recursive overflow */
+    sock_state_t* state_info = (sock_state_t*)s;
+    state_info->in_socks_dissector_flag = 0; /* avoid recursive overflow */
 }
 
 static void call_next_dissector(tvbuff_t *tvb, int offset, packet_info *pinfo,
-	proto_tree *tree, proto_tree *socks_tree,
-	socks_hash_entry_t *hash_info, sock_state_t* state_info, struct tcpinfo *tcpinfo)
+    proto_tree *tree, proto_tree *socks_tree,
+    socks_hash_entry_t *hash_info, sock_state_t* state_info, struct tcpinfo *tcpinfo)
 {
 
-/* Display the results for PING and TRACERT extensions or		*/
-/* Call TCP dissector for the port that was passed during the	    	*/
-/* connect process  						     	*/
-/* Load pointer to pinfo->XXXport depending upon the direction,		*/
-/* change pinfo port to the remote port, call next dissecotr to decode	*/
-/* the payload, and restore the pinfo port after that is done.		*/
+/* Display the results for PING and TRACERT extensions or       */
+/* Call TCP dissector for the port that was passed during the           */
+/* connect process                                  */
+/* Load pointer to pinfo->XXXport depending upon the direction,     */
+/* change pinfo port to the remote port, call next dissecotr to decode  */
+/* the payload, and restore the pinfo port after that is done.      */
 
-	guint32 *ptr;
-	guint16 save_can_desegment;
-	struct tcp_analysis *tcpd=NULL;
+    guint32 *ptr;
+    guint16 save_can_desegment;
+    struct tcp_analysis *tcpd=NULL;
 
-	tcpd=get_tcp_conversation_data(NULL,pinfo);
+    tcpd=get_tcp_conversation_data(NULL,pinfo);
 
-	if (( hash_info->command  == PING_COMMAND) ||
-		( hash_info->command  == TRACERT_COMMAND))
+    if (( hash_info->command  == PING_COMMAND) ||
+        ( hash_info->command  == TRACERT_COMMAND))
 
-		display_ping_and_tracert(tvb, offset, pinfo, tree, hash_info);
+        display_ping_and_tracert(tvb, offset, pinfo, tree, hash_info);
 
-	else {		/* call the tcp port decoder to handle the payload */
+    else {      /* call the tcp port decoder to handle the payload */
 
 /*XXX may want to load dest address here */
 
-		if ( pinfo->destport  == TCP_PORT_SOCKS)
-				ptr = &pinfo->destport;
-		else
-				ptr = &pinfo->srcport;
+        if ( pinfo->destport  == TCP_PORT_SOCKS)
+                ptr = &pinfo->destport;
+        else
+                ptr = &pinfo->srcport;
 
-			*ptr = hash_info->port;
+            *ptr = hash_info->port;
 
 /* 2003-09-18 JCFoster Fixed problem with socks tunnel in socks tunnel */
 
-		state_info->in_socks_dissector_flag = 1; /* avoid recursive overflow */
-		CLEANUP_PUSH(clear_in_socks_dissector_flag, state_info);
+        state_info->in_socks_dissector_flag = 1; /* avoid recursive overflow */
+        CLEANUP_PUSH(clear_in_socks_dissector_flag, state_info);
 
-		save_can_desegment = pinfo->can_desegment;
-		pinfo->can_desegment = pinfo->saved_can_desegment;
-		dissect_tcp_payload(tvb, pinfo, offset, tcpinfo->seq,
-			tcpinfo->nxtseq, pinfo->srcport, pinfo->destport,
-			tree, socks_tree, tcpd, tcpinfo);
-		pinfo->can_desegment = save_can_desegment;
+        save_can_desegment = pinfo->can_desegment;
+        pinfo->can_desegment = pinfo->saved_can_desegment;
+        dissect_tcp_payload(tvb, pinfo, offset, tcpinfo->seq,
+            tcpinfo->nxtseq, pinfo->srcport, pinfo->destport,
+            tree, socks_tree, tcpd, tcpinfo);
+        pinfo->can_desegment = save_can_desegment;
 
-		CLEANUP_CALL_AND_POP;
+        CLEANUP_CALL_AND_POP;
 
-		*ptr = TCP_PORT_SOCKS;
-	}
+        *ptr = TCP_PORT_SOCKS;
+    }
 }
 
 
@@ -988,165 +988,165 @@ static void call_next_dissector(tvbuff_t *tvb, int offset, packet_info *pinfo,
 static int
 dissect_socks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) {
 
-	int offset = 0;
-	proto_tree *socks_tree = NULL;
-	proto_item *ti;
-	socks_hash_entry_t *hash_info;
-	conversation_t *conversation;
-	sock_state_t* state_info;
-	guint8 version;
-	struct tcpinfo *tcpinfo = (struct tcpinfo*)data;
-
-	state_info = (sock_state_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_socks, 0);
-	if (state_info == NULL) {
-		state_info = wmem_new(wmem_file_scope(), sock_state_t);
-		state_info->in_socks_dissector_flag = 0;
-		state_info->client = clientNoInit;
-		state_info->server = serverNoInit;
-
-		p_add_proto_data(wmem_file_scope(), pinfo, proto_socks, 0, state_info);
-	}
-
-	/* avoid recursive overflow */
-	if (state_info->in_socks_dissector_flag)
-		return 0;
-
-	conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst,
-					 pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
-	if (conversation == NULL) {
-		/* If we don't already have a conversation, make sure the first
-		   byte is a valid version number */
-		version = tvb_get_guint8(tvb, offset);
-		if ((version != 4) && (version != 5))
-			return 0;
-
-		conversation = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst,
-										pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
-	}
-
-	hash_info = (socks_hash_entry_t *)conversation_get_proto_data(conversation,proto_socks);
-	if (hash_info == NULL){
-		hash_info = wmem_new0(wmem_file_scope(), socks_hash_entry_t);
-		hash_info->start_done_frame = G_MAXINT;
-		hash_info->clientState = clientStart;
-		hash_info->serverState = serverStart;
-
-		hash_info->server_port = pinfo->destport;
-		hash_info->port = 0;
-		hash_info->version = tvb_get_guint8(tvb, offset); /* get version*/
-
-		conversation_add_proto_data(conversation, proto_socks, hash_info);
-
-						/* set dissector for now */
-		conversation_set_dissector(conversation, socks_handle);
-	}
-
-	/* display summary window information  */
-	col_set_str(pinfo->cinfo, COL_PROTOCOL, "Socks");
-
-	if (( hash_info->version == 4) || ( hash_info->version == 5)){
-		col_add_fstr(pinfo->cinfo, COL_INFO, "Version: %d",
-			hash_info->version);
-	}
-	else			/* unknown version display error */
-		col_set_str(pinfo->cinfo, COL_INFO, "Unknown");
-
-
-	if ( hash_info->command == PING_COMMAND)
-		col_append_str(pinfo->cinfo, COL_INFO, ", Ping Req");
-	if ( hash_info->command == TRACERT_COMMAND)
-		col_append_str(pinfo->cinfo, COL_INFO, ", Traceroute Req");
-
-	if ( hash_info->port != 0)
-		col_append_fstr(pinfo->cinfo, COL_INFO, ", Remote Port: %u",
-			hash_info->port);
-
-	/* run state machine if needed */
-	if ((!pinfo->fd->flags.visited) &&
-		(!((hash_info->clientState == clientDone) &&
-		   (hash_info->serverState == serverDone)))) {
-
-		if (hash_info->server_port == pinfo->destport) {
-			if ((hash_info->clientState != clientError) &&
-				(hash_info->clientState != clientDone))
-			{
-				if ( hash_info->version == 4) {
-					state_machine_v4( hash_info, tvb, offset, pinfo);
-				} else if ( hash_info->version == 5) {
-					client_state_machine_v5( hash_info, tvb, offset, pinfo, TRUE);
-				}
-			}
-		} else {
-			if ((hash_info->serverState != serverError) &&
-				(hash_info->serverState != serverDone)) {
-				if ( hash_info->version == 4) {
-					state_machine_v4( hash_info, tvb, offset, pinfo);
-				} else if ( hash_info->version == 5) {
-					server_state_machine_v5( hash_info, tvb, offset, pinfo, TRUE);
-				}
+    int                 offset     = 0;
+    proto_tree         *socks_tree = NULL;
+    proto_item         *ti;
+    socks_hash_entry_t *hash_info;
+    conversation_t     *conversation;
+    sock_state_t*       state_info;
+    guint8              version;
+    struct tcpinfo     *tcpinfo    = (struct tcpinfo*)data;
+
+    state_info = (sock_state_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_socks, 0);
+    if (state_info == NULL) {
+        state_info = wmem_new(wmem_file_scope(), sock_state_t);
+        state_info->in_socks_dissector_flag = 0;
+        state_info->client = clientNoInit;
+        state_info->server = serverNoInit;
+
+        p_add_proto_data(wmem_file_scope(), pinfo, proto_socks, 0, state_info);
+    }
+
+    /* avoid recursive overflow */
+    if (state_info->in_socks_dissector_flag)
+        return 0;
+
+    conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst,
+                     pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
+    if (conversation == NULL) {
+        /* If we don't already have a conversation, make sure the first
+           byte is a valid version number */
+        version = tvb_get_guint8(tvb, offset);
+        if ((version != 4) && (version != 5))
+            return 0;
+
+        conversation = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst,
+                                        pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
+    }
+
+    hash_info = (socks_hash_entry_t *)conversation_get_proto_data(conversation,proto_socks);
+    if (hash_info == NULL){
+        hash_info = wmem_new0(wmem_file_scope(), socks_hash_entry_t);
+        hash_info->start_done_frame = G_MAXINT;
+        hash_info->clientState = clientStart;
+        hash_info->serverState = serverStart;
+
+        hash_info->server_port = pinfo->destport;
+        hash_info->port = 0;
+        hash_info->version = tvb_get_guint8(tvb, offset); /* get version*/
+
+        conversation_add_proto_data(conversation, proto_socks, hash_info);
+
+                        /* set dissector for now */
+        conversation_set_dissector(conversation, socks_handle);
+    }
+
+    /* display summary window information  */
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "Socks");
+
+    if (( hash_info->version == 4) || ( hash_info->version == 5)){
+        col_add_fstr(pinfo->cinfo, COL_INFO, "Version: %d",
+            hash_info->version);
+    }
+    else            /* unknown version display error */
+        col_set_str(pinfo->cinfo, COL_INFO, "Unknown");
+
+
+    if ( hash_info->command == PING_COMMAND)
+        col_append_str(pinfo->cinfo, COL_INFO, ", Ping Req");
+    if ( hash_info->command == TRACERT_COMMAND)
+        col_append_str(pinfo->cinfo, COL_INFO, ", Traceroute Req");
+
+    if ( hash_info->port != 0)
+        col_append_fstr(pinfo->cinfo, COL_INFO, ", Remote Port: %u",
+            hash_info->port);
+
+    /* run state machine if needed */
+    if ((!pinfo->fd->flags.visited) &&
+        (!((hash_info->clientState == clientDone) &&
+           (hash_info->serverState == serverDone)))) {
+
+        if (hash_info->server_port == pinfo->destport) {
+            if ((hash_info->clientState != clientError) &&
+                (hash_info->clientState != clientDone))
+            {
+                if ( hash_info->version == 4) {
+                    state_machine_v4( hash_info, tvb, offset, pinfo);
+                } else if ( hash_info->version == 5) {
+                    client_state_machine_v5( hash_info, tvb, offset, pinfo, TRUE);
+                }
             }
-		}
-
-		if ((hash_info->clientState == clientDone) &&
-			(hash_info->serverState == serverDone)) { 	/* if done now 	*/
-			hash_info->start_done_frame = pinfo->fd->num;
-		}
-	}
-
-	/* if proto tree, decode and display */
-	if (tree) {
-		ti = proto_tree_add_item( tree, proto_socks, tvb, offset, -1, ENC_NA );
-		socks_tree = proto_item_add_subtree(ti, ett_socks);
-
-		if (hash_info->server_port == pinfo->destport) {
-			if ( hash_info->version == 4) {
-				display_socks_v4(tvb, offset, pinfo, socks_tree, hash_info, state_info);
-			} else if ( hash_info->version == 5) {
-				client_display_socks_v5(tvb, offset, pinfo, socks_tree, hash_info, state_info);
-			}
-		} else {
-			if ( hash_info->version == 4) {
-				display_socks_v4(tvb, offset, pinfo, socks_tree, hash_info, state_info);
-			} else if ( hash_info->version == 5) {
-				server_display_socks_v5(tvb, offset, pinfo, socks_tree, hash_info, state_info);
-			}
-		}
-
-		/* if past startup, add the faked stuff */
-		if ( pinfo->fd->num > hash_info->start_done_frame){
-						/*  add info to tree */
-			ti = proto_tree_add_uint( socks_tree, hf_socks_cmd, tvb, offset, 0, hash_info->command);
-			PROTO_ITEM_SET_GENERATED(ti);
-
-			if (hash_info->dst_addr.type == AT_IPv4) {
-				ti = proto_tree_add_ipv4( socks_tree, hf_socks_ip_dst, tvb,
-					offset, 0, *((guint32*)hash_info->dst_addr.data));
-				PROTO_ITEM_SET_GENERATED(ti);
-			} else if (hash_info->dst_addr.type == AT_IPv6) {
-				ti = proto_tree_add_ipv6( socks_tree, hf_socks_ip6_dst, tvb,
-					offset, 0, (const guint8*)hash_info->dst_addr.data);
-				PROTO_ITEM_SET_GENERATED(ti);
-			}
-
-				/* no fake address for ping & traceroute */
-
-			if (( hash_info->command != PING_COMMAND) &&
-				( hash_info->command != TRACERT_COMMAND)){
-				ti = proto_tree_add_uint( socks_tree, hf_socks_dstport, tvb, offset, 0, hash_info->port);
-				PROTO_ITEM_SET_GENERATED(ti);
-			}
-		}
-
-	}
-
-
-	/* call next dissector if ready */
-	if ( pinfo->fd->num > hash_info->start_done_frame){
-		call_next_dissector(tvb, offset, pinfo, tree, socks_tree,
-			hash_info, state_info, tcpinfo);
-	}
-
-	return tvb_reported_length(tvb);
+        } else {
+            if ((hash_info->serverState != serverError) &&
+                (hash_info->serverState != serverDone)) {
+                if ( hash_info->version == 4) {
+                    state_machine_v4( hash_info, tvb, offset, pinfo);
+                } else if ( hash_info->version == 5) {
+                    server_state_machine_v5( hash_info, tvb, offset, pinfo, TRUE);
+                }
+            }
+        }
+
+        if ((hash_info->clientState == clientDone) &&
+            (hash_info->serverState == serverDone)) {   /* if done now  */
+            hash_info->start_done_frame = pinfo->fd->num;
+        }
+    }
+
+    /* if proto tree, decode and display */
+    if (tree) {
+        ti = proto_tree_add_item( tree, proto_socks, tvb, offset, -1, ENC_NA );
+        socks_tree = proto_item_add_subtree(ti, ett_socks);
+
+        if (hash_info->server_port == pinfo->destport) {
+            if ( hash_info->version == 4) {
+                display_socks_v4(tvb, offset, pinfo, socks_tree, hash_info, state_info);
+            } else if ( hash_info->version == 5) {
+                client_display_socks_v5(tvb, offset, pinfo, socks_tree, hash_info, state_info);
+            }
+        } else {
+            if ( hash_info->version == 4) {
+                display_socks_v4(tvb, offset, pinfo, socks_tree, hash_info, state_info);
+            } else if ( hash_info->version == 5) {
+                server_display_socks_v5(tvb, offset, pinfo, socks_tree, hash_info, state_info);
+            }
+        }
+
+        /* if past startup, add the faked stuff */
+        if ( pinfo->fd->num > hash_info->start_done_frame){
+                        /*  add info to tree */
+            ti = proto_tree_add_uint( socks_tree, hf_socks_cmd, tvb, offset, 0, hash_info->command);
+            PROTO_ITEM_SET_GENERATED(ti);
+
+            if (hash_info->dst_addr.type == AT_IPv4) {
+                ti = proto_tree_add_ipv4( socks_tree, hf_socks_ip_dst, tvb,
+                    offset, 0, *((guint32*)hash_info->dst_addr.data));
+                PROTO_ITEM_SET_GENERATED(ti);
+            } else if (hash_info->dst_addr.type == AT_IPv6) {
+                ti = proto_tree_add_ipv6( socks_tree, hf_socks_ip6_dst, tvb,
+                    offset, 0, (const guint8*)hash_info->dst_addr.data);
+                PROTO_ITEM_SET_GENERATED(ti);
+            }
+
+                /* no fake address for ping & traceroute */
+
+            if (( hash_info->command != PING_COMMAND) &&
+                ( hash_info->command != TRACERT_COMMAND)){
+                ti = proto_tree_add_uint( socks_tree, hf_socks_dstport, tvb, offset, 0, hash_info->port);
+                PROTO_ITEM_SET_GENERATED(ti);
+            }
+        }
+
+    }
+
+
+    /* call next dissector if ready */
+    if ( pinfo->fd->num > hash_info->start_done_frame){
+        call_next_dissector(tvb, offset, pinfo, tree, socks_tree,
+            hash_info, state_info, tcpinfo);
+    }
+
+    return tvb_reported_length(tvb);
 }
 
 
@@ -1154,163 +1154,163 @@ dissect_socks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) {
 void
 proto_register_socks( void){
 
-	static gint *ett[] = {
-		&ett_socks,
-		&ett_socks_auth,
-		&ett_socks_name
-	};
-
-  	static hf_register_info hf[] = {
-
-
-		{ &hf_socks_ver,
-			{ "Version", "socks.version", FT_UINT8, BASE_DEC, NULL,
-				0x0, NULL, HFILL
-			}
-		},
-		{ &hf_socks_ip_dst,
-			{ "Remote Address", "socks.dst", FT_IPv4, BASE_NONE, NULL,
-				0x0, NULL, HFILL
-			}
-		},
-		{ &hf_socks_ip6_dst,
-			{ "Remote Address(ipv6)", "socks.dstV6", FT_IPv6, BASE_NONE, NULL,
-				0x0, NULL, HFILL
-			}
-		},
-		{ &hf_gssapi_payload,
-			{ "GSSAPI data", "socks.gssapi.data", FT_BYTES, BASE_NONE, NULL,
-				0x0, NULL, HFILL
-			}
-		},
-		{ &hf_gssapi_command,
-			{ "SOCKS/GSSAPI command", "socks.gssapi.command", FT_UINT8, BASE_DEC,
-				VALS(gssapi_command_table), 0x0, NULL, HFILL
-			}
-		},
-		{ &hf_gssapi_length,
-			{ "SOCKS/GSSAPI data length", "socks.gssapi.length", FT_UINT16, BASE_DEC, NULL,
-				0x0, NULL, HFILL
-			}
-		},
-		{ &hf_v4a_dns_name,
-			{ "SOCKS v4a Remote Domain Name", "socks.v4a_dns_name", FT_STRINGZ, BASE_NONE,
-				NULL, 0x0, NULL, HFILL
-			}
-		},
-		{ &hf_socks_dstport,
-			{ "Remote Port", "socks.dstport", FT_UINT16,
-				BASE_DEC, NULL, 0x0, NULL, HFILL
-			}
-		},
-		{ &hf_socks_cmd,
-			{ "Command", "socks.command", FT_UINT8,
-				BASE_DEC,  VALS(cmd_strings), 0x0, NULL, HFILL
-			}
-		},
-		{ &hf_socks_results_4,
-			{ "Results(V4)", "socks.results", FT_UINT8,
-				BASE_DEC, VALS(reply_table_v4), 0x0, NULL, HFILL
-			}
-		},
-		{ &hf_socks_results_5,
-			{ "Results(V5)", "socks.results", FT_UINT8,
-				BASE_DEC, VALS(reply_table_v5), 0x0, NULL, HFILL
-			}
-		},
-		{ &hf_client_auth_method_count,
-			{ "Authentication Method Count", "socks.auth_method_count", FT_UINT8,
-				BASE_DEC, NULL, 0x0, NULL, HFILL
-			}
-		},
-		{ &hf_client_auth_method,
-			{ "Method", "socks.auth_method", FT_UINT8,
-				BASE_DEC, NULL, 0x0, NULL, HFILL
-			}
-		},
-		{ &hf_socks_reserved,
-			{ "Reserved", "socks.reserved", FT_UINT8,
-				BASE_DEC, NULL, 0x0, NULL, HFILL
-			}
-		},
-		{ &hf_socks_reserved2,
-			{ "Reserved", "socks.reserved", FT_UINT16,
-				BASE_DEC, NULL, 0x0, NULL, HFILL
-			}
-		},
-		{ &hf_client_port,
-			{ "Port", "socks.port", FT_UINT16,
-				BASE_DEC, NULL, 0x0, NULL, HFILL
-			}
-		},
-		{ &hf_server_accepted_auth_method,
-			{ "Accepted Auth Method", "socks.auth_accepted_method", FT_UINT8,
-				BASE_DEC, NULL, 0x0, NULL, HFILL
-			}
-		},
-		{ &hf_server_auth_status,
-			{ "Status", "socks.auth_status", FT_UINT8,
-				BASE_DEC, NULL, 0x0, NULL, HFILL
-			}
-		},
-		{ &hf_server_remote_host_port,
-			{ "Remote Host Port", "socks.remote_host_port", FT_UINT16,
-				BASE_DEC, NULL, 0x0, NULL, HFILL
-			}
-		},
-		{ &hf_socks_username,
-			{ "User name", "socks.username", FT_STRING, BASE_NONE,
-				NULL, 0x0, NULL, HFILL
-			}
-		},
-		{ &hf_socks_password,
-			{ "Password", "socks.password", FT_STRING, BASE_NONE,
-				NULL, 0x0, NULL, HFILL
-			}
-		},
-		{ &hf_socks_remote_name,
-			{ "Remote name", "socks.remote_name", FT_STRING, BASE_NONE,
-				NULL, 0x0, NULL, HFILL
-			}
-		},
-		{ &hf_socks_address_type,
-			{ "Address Type", "socks.address_type", FT_UINT8,
-				BASE_DEC, VALS(address_type_table), 0x0, NULL, HFILL
-			}
-		},
-		{ &hf_socks_fragment_number,
-			{ "Fragment Number", "socks.fragment_number", FT_UINT8,
-				BASE_DEC, NULL, 0x0, NULL, HFILL
-			}
-		},
-	};
-
-	proto_socks = proto_register_protocol ( "Socks Protocol", "Socks", "socks");
-
-	proto_register_field_array(proto_socks, hf, array_length(hf));
-	proto_register_subtree_array(ett, array_length(ett));
+    static gint *ett[] = {
+        &ett_socks,
+        &ett_socks_auth,
+        &ett_socks_name
+    };
+
+    static hf_register_info hf[] = {
+
+
+        { &hf_socks_ver,
+            { "Version", "socks.version", FT_UINT8, BASE_DEC, NULL,
+                0x0, NULL, HFILL
+            }
+        },
+        { &hf_socks_ip_dst,
+            { "Remote Address", "socks.dst", FT_IPv4, BASE_NONE, NULL,
+                0x0, NULL, HFILL
+            }
+        },
+        { &hf_socks_ip6_dst,
+            { "Remote Address(ipv6)", "socks.dstV6", FT_IPv6, BASE_NONE, NULL,
+                0x0, NULL, HFILL
+            }
+        },
+        { &hf_gssapi_payload,
+            { "GSSAPI data", "socks.gssapi.data", FT_BYTES, BASE_NONE, NULL,
+                0x0, NULL, HFILL
+            }
+        },
+        { &hf_gssapi_command,
+            { "SOCKS/GSSAPI command", "socks.gssapi.command", FT_UINT8, BASE_DEC,
+                VALS(gssapi_command_table), 0x0, NULL, HFILL
+            }
+        },
+        { &hf_gssapi_length,
+            { "SOCKS/GSSAPI data length", "socks.gssapi.length", FT_UINT16, BASE_DEC, NULL,
+                0x0, NULL, HFILL
+            }
+        },
+        { &hf_v4a_dns_name,
+            { "SOCKS v4a Remote Domain Name", "socks.v4a_dns_name", FT_STRINGZ, BASE_NONE,
+                NULL, 0x0, NULL, HFILL
+            }
+        },
+        { &hf_socks_dstport,
+            { "Remote Port", "socks.dstport", FT_UINT16,
+                BASE_DEC, NULL, 0x0, NULL, HFILL
+            }
+        },
+        { &hf_socks_cmd,
+            { "Command", "socks.command", FT_UINT8,
+                BASE_DEC,  VALS(cmd_strings), 0x0, NULL, HFILL
+            }
+        },
+        { &hf_socks_results_4,
+            { "Results(V4)", "socks.results", FT_UINT8,
+                BASE_DEC, VALS(reply_table_v4), 0x0, NULL, HFILL
+            }
+        },
+        { &hf_socks_results_5,
+            { "Results(V5)", "socks.results", FT_UINT8,
+                BASE_DEC, VALS(reply_table_v5), 0x0, NULL, HFILL
+            }
+        },
+        { &hf_client_auth_method_count,
+            { "Authentication Method Count", "socks.auth_method_count", FT_UINT8,
+                BASE_DEC, NULL, 0x0, NULL, HFILL
+            }
+        },
+        { &hf_client_auth_method,
+            { "Method", "socks.auth_method", FT_UINT8,
+                BASE_DEC, NULL, 0x0, NULL, HFILL
+            }
+        },
+        { &hf_socks_reserved,
+            { "Reserved", "socks.reserved", FT_UINT8,
+                BASE_DEC, NULL, 0x0, NULL, HFILL
+            }
+        },
+        { &hf_socks_reserved2,
+            { "Reserved", "socks.reserved", FT_UINT16,
+                BASE_DEC, NULL, 0x0, NULL, HFILL
+            }
+        },
+        { &hf_client_port,
+            { "Port", "socks.port", FT_UINT16,
+                BASE_DEC, NULL, 0x0, NULL, HFILL
+            }
+        },
+        { &hf_server_accepted_auth_method,
+            { "Accepted Auth Method", "socks.auth_accepted_method", FT_UINT8,
+                BASE_DEC, NULL, 0x0, NULL, HFILL
+            }
+        },
+        { &hf_server_auth_status,
+            { "Status", "socks.auth_status", FT_UINT8,
+                BASE_DEC, NULL, 0x0, NULL, HFILL
+            }
+        },
+        { &hf_server_remote_host_port,
+            { "Remote Host Port", "socks.remote_host_port", FT_UINT16,
+                BASE_DEC, NULL, 0x0, NULL, HFILL
+            }
+        },
+        { &hf_socks_username,
+            { "User name", "socks.username", FT_STRING, BASE_NONE,
+                NULL, 0x0, NULL, HFILL
+            }
+        },
+        { &hf_socks_password,
+            { "Password", "socks.password", FT_STRING, BASE_NONE,
+                NULL, 0x0, NULL, HFILL
+            }
+        },
+        { &hf_socks_remote_name,
+            { "Remote name", "socks.remote_name", FT_STRING, BASE_NONE,
+                NULL, 0x0, NULL, HFILL
+            }
+        },
+        { &hf_socks_address_type,
+            { "Address Type", "socks.address_type", FT_UINT8,
+                BASE_DEC, VALS(address_type_table), 0x0, NULL, HFILL
+            }
+        },
+        { &hf_socks_fragment_number,
+            { "Fragment Number", "socks.fragment_number", FT_UINT8,
+                BASE_DEC, NULL, 0x0, NULL, HFILL
+            }
+        },
+    };
+
+    proto_socks = proto_register_protocol ( "Socks Protocol", "Socks", "socks");
+
+    proto_register_field_array(proto_socks, hf, array_length(hf));
+    proto_register_subtree_array(ett, array_length(ett));
 }
 
 
 void
 proto_reg_handoff_socks(void) {
 
-	/* dissector install routine */
-	socks_udp_handle = create_dissector_handle(socks_udp_dissector, proto_socks);
-	socks_handle = new_create_dissector_handle(dissect_socks, proto_socks);
+    /* dissector install routine */
+    socks_udp_handle = create_dissector_handle(socks_udp_dissector, proto_socks);
+    socks_handle = new_create_dissector_handle(dissect_socks, proto_socks);
 
-	dissector_add_uint("tcp.port", TCP_PORT_SOCKS, socks_handle);
+    dissector_add_uint("tcp.port", TCP_PORT_SOCKS, socks_handle);
 }
 
 /*
-* Editor modelines - http://www.wireshark.org/tools/modelines.html
-*
-* Local variables:
-* c-basic-offset: 4
-* tab-width: 4
-* indent-tabs-mode: t
-* End:
-*
-* ex: set shiftwidth=4 tabstop=4 expandtab:
-* :indentSize=4:tabSize=4:noTabs=false:
-*/
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
diff --git a/epan/dissectors/packet-usb-video.c b/epan/dissectors/packet-usb-video.c
index fcbfe3f83d..79213f096e 100644
--- a/epan/dissectors/packet-usb-video.c
+++ b/epan/dissectors/packet-usb-video.c
@@ -355,205 +355,205 @@ static expert_field ei_usb_vid_bitmask_len = EI_INIT;
 
 /* Lookup tables */
 static const value_string vc_ep_descriptor_subtypes[] = {
-        { EP_INTERRUPT, "Interrupt" },
-        { 0, NULL }
+    { EP_INTERRUPT, "Interrupt" },
+    { 0, NULL }
 };
 
 static const value_string vid_descriptor_type_vals[] = {
-        {CS_INTERFACE, "video class interface"},
-        {CS_ENDPOINT, "video class endpoint"},
-        {0,NULL}
+    {CS_INTERFACE, "video class interface"},
+    {CS_ENDPOINT, "video class endpoint"},
+    {0,NULL}
 };
 static value_string_ext vid_descriptor_type_vals_ext =
     VALUE_STRING_EXT_INIT(vid_descriptor_type_vals);
 
 static const value_string vc_if_descriptor_subtypes[] = {
-        { VC_HEADER,              "Header" },
-        { VC_INPUT_TERMINAL,      "Input Terminal" },
-        { VC_OUTPUT_TERMINAL,     "Output Terminal" },
-        { VC_SELECTOR_UNIT,       "Selector Unit" },
-        { VC_PROCESSING_UNIT,     "Processing Unit" },
-        { VC_EXTENSION_UNIT,      "Extension Unit" },
-        { VC_ENCODING_UNIT,       "Encoding Unit" },
-        { 0, NULL }
+    { VC_HEADER,              "Header" },
+    { VC_INPUT_TERMINAL,      "Input Terminal" },
+    { VC_OUTPUT_TERMINAL,     "Output Terminal" },
+    { VC_SELECTOR_UNIT,       "Selector Unit" },
+    { VC_PROCESSING_UNIT,     "Processing Unit" },
+    { VC_EXTENSION_UNIT,      "Extension Unit" },
+    { VC_ENCODING_UNIT,       "Encoding Unit" },
+    { 0, NULL }
 };
 static value_string_ext vc_if_descriptor_subtypes_ext =
     VALUE_STRING_EXT_INIT(vc_if_descriptor_subtypes);
 
 static const value_string cs_control_interface[] = {
-        { VC_CONTROL_UNDEFINED,          "Undefined" },
-        { VC_VIDEO_POWER_MODE_CONTROL,   "Video Power Mode" },
-        { VC_REQUEST_ERROR_CODE_CONTROL, "Request Error Code" },
-        { VC_REQUEST_INDICATE_HOST_CLOCK_CONTROL, "Request Indicate Host Clock" },
-        { 0, NULL }
+    { VC_CONTROL_UNDEFINED,          "Undefined" },
+    { VC_VIDEO_POWER_MODE_CONTROL,   "Video Power Mode" },
+    { VC_REQUEST_ERROR_CODE_CONTROL, "Request Error Code" },
+    { VC_REQUEST_INDICATE_HOST_CLOCK_CONTROL, "Request Indicate Host Clock" },
+    { 0, NULL }
 };
 static value_string_ext cs_control_interface_ext =
     VALUE_STRING_EXT_INIT(cs_control_interface);
 
 static const value_string cs_streaming_interface[] = {
-        { VS_CONTROL_UNDEFINED,            "Undefined" },
-        { VS_PROBE_CONTROL,                "Probe" },
-        { VS_COMMIT_CONTROL,               "Commit" },
-        { VS_STILL_PROBE_CONTROL,          "Still Probe" },
-        { VS_STILL_COMMIT_CONTROL,         "Still Commit" },
-        { VS_STILL_IMAGE_TRIGGER_CONTROL,  "Still Image Trigger" },
-        { VS_STREAM_ERROR_CODE_CONTROL,    "Stream Error Code" },
-        { VS_GENERATE_KEY_FRAME_CONTROL,   "Generate Key Frame" },
-        { VS_UPDATE_FRAME_SEGMENT_CONTROL, "Update Frame Segment" },
-        { VS_SYNCH_DELAY_CONTROL,          "Synch Delay" },
-        { 0, NULL }
+    { VS_CONTROL_UNDEFINED,            "Undefined" },
+    { VS_PROBE_CONTROL,                "Probe" },
+    { VS_COMMIT_CONTROL,               "Commit" },
+    { VS_STILL_PROBE_CONTROL,          "Still Probe" },
+    { VS_STILL_COMMIT_CONTROL,         "Still Commit" },
+    { VS_STILL_IMAGE_TRIGGER_CONTROL,  "Still Image Trigger" },
+    { VS_STREAM_ERROR_CODE_CONTROL,    "Stream Error Code" },
+    { VS_GENERATE_KEY_FRAME_CONTROL,   "Generate Key Frame" },
+    { VS_UPDATE_FRAME_SEGMENT_CONTROL, "Update Frame Segment" },
+    { VS_SYNCH_DELAY_CONTROL,          "Synch Delay" },
+    { 0, NULL }
 };
 static value_string_ext cs_streaming_interface_ext =
     VALUE_STRING_EXT_INIT(cs_streaming_interface);
 
 static const value_string cs_selector_unit[] = {
-        { SU_CONTROL_UNDEFINED,              "Undefined" },
-        { SU_INPUT_SELECT_CONTROL,           "Input Select" },
-        { 0, NULL }
+    { SU_CONTROL_UNDEFINED,              "Undefined" },
+    { SU_INPUT_SELECT_CONTROL,           "Input Select" },
+    { 0, NULL }
 };
 static value_string_ext cs_selector_unit_ext =
     VALUE_STRING_EXT_INIT(cs_selector_unit);
 
 static const value_string cs_camera_terminal[] = {
-        { CT_CONTROL_UNDEFINED,              "Undefined" },
-        { CT_SCANNING_MODE_CONTROL,          "Scanning Mode" },
-        { CT_AE_MODE_CONTROL,                "Auto-Exposure Mode" },
-        { CT_AE_PRIORITY_CONTROL,            "Auto-Exposure Priority" },
-        { CT_EXPOSURE_TIME_ABSOLUTE_CONTROL, "Exposure Time (Absolute)" },
-        { CT_EXPOSURE_TIME_RELATIVE_CONTROL, "Exposure Time (Relative)" },
-        { CT_FOCUS_ABSOLUTE_CONTROL,         "Focus (Absolute)" },
-        { CT_FOCUS_RELATIVE_CONTROL,         "Focus (Relative)" },
-        { CT_FOCUS_AUTO_CONTROL,             "Focus, Auto" },
-        { CT_IRIS_ABSOLUTE_CONTROL,          "Iris (Absolute)" },
-        { CT_IRIS_RELATIVE_CONTROL,          "Iris (Relative)" },
-        { CT_ZOOM_ABSOLUTE_CONTROL,          "Zoom (Absolute)" },
-        { CT_ZOOM_RELATIVE_CONTROL,          "Zoom (Relative)" },
-        { CT_PANTILT_ABSOLUTE_CONTROL,       "PanTilt (Absolute)" },
-        { CT_PANTILT_RELATIVE_CONTROL,       "PanTilt (Relative)" },
-        { CT_ROLL_ABSOLUTE_CONTROL,          "Roll (Absolute)" },
-        { CT_ROLL_RELATIVE_CONTROL,          "Roll (Relative)" },
-        { CT_PRIVACY_CONTROL,                "Privacy" },
-        { CT_FOCUS_SIMPLE_CONTROL,           "Focus (Simple)" },
-        { CT_WINDOW_CONTROL,                 "Window" },
-        { CT_REGION_OF_INTEREST_CONTROL,     "Region of Interest" },
-        { 0, NULL }
+    { CT_CONTROL_UNDEFINED,              "Undefined" },
+    { CT_SCANNING_MODE_CONTROL,          "Scanning Mode" },
+    { CT_AE_MODE_CONTROL,                "Auto-Exposure Mode" },
+    { CT_AE_PRIORITY_CONTROL,            "Auto-Exposure Priority" },
+    { CT_EXPOSURE_TIME_ABSOLUTE_CONTROL, "Exposure Time (Absolute)" },
+    { CT_EXPOSURE_TIME_RELATIVE_CONTROL, "Exposure Time (Relative)" },
+    { CT_FOCUS_ABSOLUTE_CONTROL,         "Focus (Absolute)" },
+    { CT_FOCUS_RELATIVE_CONTROL,         "Focus (Relative)" },
+    { CT_FOCUS_AUTO_CONTROL,             "Focus, Auto" },
+    { CT_IRIS_ABSOLUTE_CONTROL,          "Iris (Absolute)" },
+    { CT_IRIS_RELATIVE_CONTROL,          "Iris (Relative)" },
+    { CT_ZOOM_ABSOLUTE_CONTROL,          "Zoom (Absolute)" },
+    { CT_ZOOM_RELATIVE_CONTROL,          "Zoom (Relative)" },
+    { CT_PANTILT_ABSOLUTE_CONTROL,       "PanTilt (Absolute)" },
+    { CT_PANTILT_RELATIVE_CONTROL,       "PanTilt (Relative)" },
+    { CT_ROLL_ABSOLUTE_CONTROL,          "Roll (Absolute)" },
+    { CT_ROLL_RELATIVE_CONTROL,          "Roll (Relative)" },
+    { CT_PRIVACY_CONTROL,                "Privacy" },
+    { CT_FOCUS_SIMPLE_CONTROL,           "Focus (Simple)" },
+    { CT_WINDOW_CONTROL,                 "Window" },
+    { CT_REGION_OF_INTEREST_CONTROL,     "Region of Interest" },
+    { 0, NULL }
 };
 static value_string_ext cs_camera_terminal_ext =
     VALUE_STRING_EXT_INIT(cs_camera_terminal);
 
 static const value_string cs_processing_unit[] = {
-        { PU_CONTROL_UNDEFINED,                     "Undefined" },
-        { PU_BACKLIGHT_COMPENSATION_CONTROL,        "Backlight Compensation" },
-        { PU_BRIGHTNESS_CONTROL,                    "Brightness" },
-        { PU_CONTRAST_CONTROL,                      "Contrast" },
-        { PU_GAIN_CONTROL,                          "Gain" },
-        { PU_POWER_LINE_FREQUENCY_CONTROL,          "Power Line Frequency" },
-        { PU_HUE_CONTROL,                           "Hue" },
-        { PU_SATURATION_CONTROL,                    "Saturation" },
-        { PU_SHARPNESS_CONTROL,                     "Sharpness" },
-        { PU_GAMMA_CONTROL,                         "Gamma" },
-        { PU_WHITE_BALANCE_TEMPERATURE_CONTROL,     "White Balance Temperature" },
-        { PU_WHITE_BALANCE_TEMPERATURE_AUTO_CONTROL,"White Balance Temperature Auto" },
-        { PU_WHITE_BALANCE_COMPONENT_CONTROL,       "White Balance Component" },
-        { PU_WHITE_BALANCE_COMPONENT_AUTO_CONTROL,  "White Balance Component Auto" },
-        { PU_DIGITAL_MULTIPLIER_CONTROL,            "Digital Multiplier" },
-        { PU_DIGITAL_MULTIPLIER_LIMIT_CONTROL,      "Digital Multiplier Limit" },
-        { PU_HUE_AUTO_CONTROL,                      "Hue Auto" },
-        { PU_ANALOG_VIDEO_STANDARD_CONTROL,         "Video Standard" },
-        { PU_ANALOG_LOCK_STATUS_CONTROL,            "Analog Lock Status" },
-        { PU_CONTRAST_AUTO_CONTROL,                 "Contrast Auto" },
-        { 0, NULL }
+    { PU_CONTROL_UNDEFINED,                     "Undefined" },
+    { PU_BACKLIGHT_COMPENSATION_CONTROL,        "Backlight Compensation" },
+    { PU_BRIGHTNESS_CONTROL,                    "Brightness" },
+    { PU_CONTRAST_CONTROL,                      "Contrast" },
+    { PU_GAIN_CONTROL,                          "Gain" },
+    { PU_POWER_LINE_FREQUENCY_CONTROL,          "Power Line Frequency" },
+    { PU_HUE_CONTROL,                           "Hue" },
+    { PU_SATURATION_CONTROL,                    "Saturation" },
+    { PU_SHARPNESS_CONTROL,                     "Sharpness" },
+    { PU_GAMMA_CONTROL,                         "Gamma" },
+    { PU_WHITE_BALANCE_TEMPERATURE_CONTROL,     "White Balance Temperature" },
+    { PU_WHITE_BALANCE_TEMPERATURE_AUTO_CONTROL,"White Balance Temperature Auto" },
+    { PU_WHITE_BALANCE_COMPONENT_CONTROL,       "White Balance Component" },
+    { PU_WHITE_BALANCE_COMPONENT_AUTO_CONTROL,  "White Balance Component Auto" },
+    { PU_DIGITAL_MULTIPLIER_CONTROL,            "Digital Multiplier" },
+    { PU_DIGITAL_MULTIPLIER_LIMIT_CONTROL,      "Digital Multiplier Limit" },
+    { PU_HUE_AUTO_CONTROL,                      "Hue Auto" },
+    { PU_ANALOG_VIDEO_STANDARD_CONTROL,         "Video Standard" },
+    { PU_ANALOG_LOCK_STATUS_CONTROL,            "Analog Lock Status" },
+    { PU_CONTRAST_AUTO_CONTROL,                 "Contrast Auto" },
+    { 0, NULL }
 };
 static value_string_ext cs_processing_unit_ext =
     VALUE_STRING_EXT_INIT(cs_processing_unit);
 
 static const value_string vc_terminal_types[] = {
-        { TT_VENDOR_SPECIFIC,         "Vendor Specific", },
-        { TT_STREAMING,               "Streaming" },
-        { ITT_VENDOR_SPECIFIC,        "Vendor Specific Input" },
-        { ITT_CAMERA,                 "Camera Input" },
-        { ITT_MEDIA_TRANSPORT_INPUT,  "Media Transport Input" },
-        { OTT_VENDOR_SPECIFIC,        "Vendor Specific Output" },
-        { OTT_DISPLAY,                "Display Output" },
-        { OTT_MEDIA_TRANSPORT_OUTPUT, "Media Transport Output" },
-        { EXTERNAL_VENDOR_SPECIFIC,   "Vendor Specific External" },
-        { COMPOSITE_CONNECTOR,        "Composite Connector" },
-        { SVIDEO_CONNECTOR,           "SVideo Connector" },
-        { COMPONENT_CONNECTOR,        "Component Connector" },
-        { 0, NULL }
+    { TT_VENDOR_SPECIFIC,         "Vendor Specific", },
+    { TT_STREAMING,               "Streaming" },
+    { ITT_VENDOR_SPECIFIC,        "Vendor Specific Input" },
+    { ITT_CAMERA,                 "Camera Input" },
+    { ITT_MEDIA_TRANSPORT_INPUT,  "Media Transport Input" },
+    { OTT_VENDOR_SPECIFIC,        "Vendor Specific Output" },
+    { OTT_DISPLAY,                "Display Output" },
+    { OTT_MEDIA_TRANSPORT_OUTPUT, "Media Transport Output" },
+    { EXTERNAL_VENDOR_SPECIFIC,   "Vendor Specific External" },
+    { COMPOSITE_CONNECTOR,        "Composite Connector" },
+    { SVIDEO_CONNECTOR,           "SVideo Connector" },
+    { COMPONENT_CONNECTOR,        "Component Connector" },
+    { 0, NULL }
 };
 static value_string_ext vc_terminal_types_ext =
     VALUE_STRING_EXT_INIT(vc_terminal_types);
 
 static const value_string vs_if_descriptor_subtypes[] = {
-        { VS_UNDEFINED,             "Undefined" },
-        { VS_INPUT_HEADER,          "Input Header" },
-        { VS_OUTPUT_HEADER,         "Output Header" },
-        { VS_STILL_IMAGE_FRAME,     "Still Image Frame" },
-        { VS_FORMAT_UNCOMPRESSED,   "Format Uncompressed" },
-        { VS_FRAME_UNCOMPRESSED,    "Frame Uncompressed" },
-        { VS_FORMAT_MJPEG,          "Format MJPEG" },
-        { VS_FRAME_MJPEG,           "Frame MJPEG" },
-        { VS_FORMAT_MPEG1,          "Format MPEG1" },
-        { VS_FORMAT_MPEG2PS,        "Format MPEG2-PS" },
-        { VS_FORMAT_MPEG2TS,        "Format MPEG2-TS" },
-        { VS_FORMAT_MPEG4SL,        "Format MPEG4-SL" },
-        { VS_FORMAT_DV,             "Format DV" },
-        { VS_COLORFORMAT,           "Colorformat" },
-        { VS_FORMAT_VENDOR,         "Format Vendor" },
-        { VS_FRAME_VENDOR,          "Frame Vendor" },
-        { VS_FORMAT_FRAME_BASED,    "Format Frame-Based" },
-        { VS_FRAME_FRAME_BASED,     "Frame Frame-Based" },
-        { VS_FORMAT_STREAM_BASED,   "Format Stream Based" },
-        { VS_FORMAT_H264,           "Format H.264" },
-        { VS_FRAME_H264,            "Frame H.264" },
-        { VS_FORMAT_H264_SIMULCAST, "Format H.264 Simulcast" },
-        { VS_FORMAT_VP8,            "Format VP8" },
-        { VS_FRAME_VP8,             "Frame VP8" },
-        { VS_FORMAT_VP8_SIMULCAST,  "Format VP8 Simulcast" },
-        { 0, NULL }
+    { VS_UNDEFINED,             "Undefined" },
+    { VS_INPUT_HEADER,          "Input Header" },
+    { VS_OUTPUT_HEADER,         "Output Header" },
+    { VS_STILL_IMAGE_FRAME,     "Still Image Frame" },
+    { VS_FORMAT_UNCOMPRESSED,   "Format Uncompressed" },
+    { VS_FRAME_UNCOMPRESSED,    "Frame Uncompressed" },
+    { VS_FORMAT_MJPEG,          "Format MJPEG" },
+    { VS_FRAME_MJPEG,           "Frame MJPEG" },
+    { VS_FORMAT_MPEG1,          "Format MPEG1" },
+    { VS_FORMAT_MPEG2PS,        "Format MPEG2-PS" },
+    { VS_FORMAT_MPEG2TS,        "Format MPEG2-TS" },
+    { VS_FORMAT_MPEG4SL,        "Format MPEG4-SL" },
+    { VS_FORMAT_DV,             "Format DV" },
+    { VS_COLORFORMAT,           "Colorformat" },
+    { VS_FORMAT_VENDOR,         "Format Vendor" },
+    { VS_FRAME_VENDOR,          "Frame Vendor" },
+    { VS_FORMAT_FRAME_BASED,    "Format Frame-Based" },
+    { VS_FRAME_FRAME_BASED,     "Frame Frame-Based" },
+    { VS_FORMAT_STREAM_BASED,   "Format Stream Based" },
+    { VS_FORMAT_H264,           "Format H.264" },
+    { VS_FRAME_H264,            "Frame H.264" },
+    { VS_FORMAT_H264_SIMULCAST, "Format H.264 Simulcast" },
+    { VS_FORMAT_VP8,            "Format VP8" },
+    { VS_FRAME_VP8,             "Frame VP8" },
+    { VS_FORMAT_VP8_SIMULCAST,  "Format VP8 Simulcast" },
+    { 0, NULL }
 };
 static value_string_ext vs_if_descriptor_subtypes_ext =
     VALUE_STRING_EXT_INIT(vs_if_descriptor_subtypes);
 
 static const value_string interrupt_status_types[] = {
-        { INT_VIDEOCONTROL,       "VideoControl Interface"   },
-        { INT_VIDEOSTREAMING,     "VideoStreaming Interface" },
-        { 0, NULL }
+    { INT_VIDEOCONTROL,       "VideoControl Interface"   },
+    { INT_VIDEOSTREAMING,     "VideoStreaming Interface" },
+    { 0, NULL }
 };
 
 static const value_string control_change_types[] = {
-        { CONTROL_CHANGE_VALUE,   "Value" },
-        { CONTROL_CHANGE_INFO,    "Info" },
-        { CONTROL_CHANGE_FAILURE, "Failure" },
-        { CONTROL_CHANGE_MIN,     "Min" },
-        { CONTROL_CHANGE_MAX,     "Max" },
-        { 0, NULL }
+    { CONTROL_CHANGE_VALUE,   "Value" },
+    { CONTROL_CHANGE_INFO,    "Info" },
+    { CONTROL_CHANGE_FAILURE, "Failure" },
+    { CONTROL_CHANGE_MIN,     "Min" },
+    { CONTROL_CHANGE_MAX,     "Max" },
+    { 0, NULL }
 };
 static value_string_ext control_change_types_ext =
     VALUE_STRING_EXT_INIT(control_change_types);
 
 static const value_string control_interrupt_events[] = {
-        { CONTROL_INTERRUPT_EVENT_CONTROL_CHANGE,  "Control Change" },
-        { 0, NULL }
+    { CONTROL_INTERRUPT_EVENT_CONTROL_CHANGE,  "Control Change" },
+    { 0, NULL }
 };
 
 /* Table 3-13 VS Interface Input Header Descriptor - bStillCaptureMethod field */
 static const value_string vs_still_capture_methods[] = {
-        { 0,  "None" },
-        { 1,  "Uninterrupted streaming" },
-        { 2,  "Suspended streaming" },
-        { 3,  "Dedicated pipe" },
-        { 0, NULL }
+    { 0,  "None" },
+    { 1,  "Uninterrupted streaming" },
+    { 2,  "Suspended streaming" },
+    { 3,  "Dedicated pipe" },
+    { 0, NULL }
 };
 static value_string_ext vs_still_capture_methods_ext =
     VALUE_STRING_EXT_INIT(vs_still_capture_methods);
 
 /* Table 3-13 VS Interface Input Header Descriptor - bTriggerUsage field */
 static const value_string vs_trigger_usage[] = {
-        { 0,  "Initiate still image capture" },
-        { 1,  "General purpose button event" },
-        { 0, NULL }
+    { 0,  "Initiate still image capture" },
+    { 1,  "General purpose button event" },
+    { 0, NULL }
 };
 
 /* bmInterlaceFlags for format descriptors */
@@ -570,20 +570,20 @@ static const true_false_string interlaced_fields_meaning = {
 
 /* bmInterlaceFlags for format descriptors */
 static const value_string field_pattern_meaning[] = {
-        { 0,  "Field 1 only" },
-        { 1,  "Field 2 only" },
-        { 2,  "Regular pattern of fields 1 and 2" },
-        { 3,  "Random pattern of fields 1 and 2" },
-        {0, NULL},
+    { 0,  "Field 1 only" },
+    { 1,  "Field 2 only" },
+    { 2,  "Regular pattern of fields 1 and 2" },
+    { 3,  "Random pattern of fields 1 and 2" },
+    {0, NULL},
 };
 static value_string_ext field_pattern_meaning_ext =
     VALUE_STRING_EXT_INIT(field_pattern_meaning);
 
 /* bCopyProtect for format descriptors */
 static const value_string copy_protect_meaning[] = {
-        { 0,  "No restrictions" },
-        { 1,  "Restrict duplication" },
-        {0, NULL},
+    { 0,  "No restrictions" },
+    { 1,  "Restrict duplication" },
+    {0, NULL},
 };
 
 /* Table 4-46 Video Probe and Commit Controls - bmHint field */
@@ -594,57 +594,57 @@ static const true_false_string probe_hint_meaning = {
 
 /* Table 3-19 Color Matching Descriptor - bColorPrimaries field */
 static const value_string color_primaries_meaning[] = {
-        { 0,  "Unspecified" },
-        { 1,  "BT.709, sRGB" },
-        { 2,  "BT.470-2 (M)" },
-        { 3,  "BT.470-2 (B,G)" },
-        { 4,  "SMPTE 170M" },
-        { 5,  "SMPTE 240M" },
-        {0, NULL},
+    { 0,  "Unspecified" },
+    { 1,  "BT.709, sRGB" },
+    { 2,  "BT.470-2 (M)" },
+    { 3,  "BT.470-2 (B,G)" },
+    { 4,  "SMPTE 170M" },
+    { 5,  "SMPTE 240M" },
+    {0, NULL},
 };
 static value_string_ext color_primaries_meaning_ext =
     VALUE_STRING_EXT_INIT(color_primaries_meaning);
 
 /* Table 3-19 Color Matching Descriptor - bTransferCharacteristics field */
 static const value_string color_transfer_characteristics[] = {
-        { 0,  "Unspecified" },
-        { 1,  "BT.709" },
-        { 2,  "BT.470-2 (M)" },
-        { 3,  "BT.470-2 (B,G)" },
-        { 4,  "SMPTE 170M" },
-        { 5,  "SMPTE 240M" },
-        { 6,  "Linear (V=Lc)" },
-        { 7,  "sRGB" },
-        {0, NULL},
+    { 0,  "Unspecified" },
+    { 1,  "BT.709" },
+    { 2,  "BT.470-2 (M)" },
+    { 3,  "BT.470-2 (B,G)" },
+    { 4,  "SMPTE 170M" },
+    { 5,  "SMPTE 240M" },
+    { 6,  "Linear (V=Lc)" },
+    { 7,  "sRGB" },
+    {0, NULL},
 };
 static value_string_ext color_transfer_characteristics_ext =
     VALUE_STRING_EXT_INIT(color_transfer_characteristics);
 
 /* Table 3-19 Color Matching Descriptor - bMatrixCoefficients field */
 static const value_string matrix_coefficients_meaning[] = {
-        { 0,  "Unspecified" },
-        { 1,  "BT.709" },
-        { 2,  "FCC" },
-        { 3,  "BT.470-2 (B,G)" },
-        { 4,  "SMPTE 170M (BT.601)" },
-        { 5,  "SMPTE 240M" },
-        {0, NULL},
+    { 0,  "Unspecified" },
+    { 1,  "BT.709" },
+    { 2,  "FCC" },
+    { 3,  "BT.470-2 (B,G)" },
+    { 4,  "SMPTE 170M (BT.601)" },
+    { 5,  "SMPTE 240M" },
+    {0, NULL},
 };
 static value_string_ext matrix_coefficients_meaning_ext =
     VALUE_STRING_EXT_INIT(matrix_coefficients_meaning);
 
 static const value_string request_error_codes[] = {
-        { UVC_ERROR_NONE,             "No error" },
-        { UVC_ERROR_NOT_READY,        "Not ready" },
-        { UVC_ERROR_WRONG_STATE,      "Wrong state" },
-        { UVC_ERROR_POWER,            "Insufficient power" } ,
-        { UVC_ERROR_OUT_OF_RANGE,     "Out of range" },
-        { UVC_ERROR_INVALID_UNIT,     "Invalid unit" },
-        { UVC_ERROR_INVALID_CONTROL,  "Invalid control" },
-        { UVC_ERROR_INVALID_REQUEST,  "Invalid request" },
-        { UVC_ERROR_INVALID_VALUE,    "Invalid value within range" },
-        { UVC_ERROR_UNKNOWN,          "Unknown" },
-        {0, NULL},
+    { UVC_ERROR_NONE,             "No error" },
+    { UVC_ERROR_NOT_READY,        "Not ready" },
+    { UVC_ERROR_WRONG_STATE,      "Wrong state" },
+    { UVC_ERROR_POWER,            "Insufficient power" } ,
+    { UVC_ERROR_OUT_OF_RANGE,     "Out of range" },
+    { UVC_ERROR_INVALID_UNIT,     "Invalid unit" },
+    { UVC_ERROR_INVALID_CONTROL,  "Invalid control" },
+    { UVC_ERROR_INVALID_REQUEST,  "Invalid request" },
+    { UVC_ERROR_INVALID_VALUE,    "Invalid value within range" },
+    { UVC_ERROR_UNKNOWN,          "Unknown" },
+    {0, NULL},
 };
 static value_string_ext request_error_codes_ext =
     VALUE_STRING_EXT_INIT(request_error_codes);
@@ -897,20 +897,20 @@ dissect_usb_video_control_interface_descriptor(proto_tree *parent_tree, tvbuff_t
                                                guint8 descriptor_len, packet_info *pinfo, usb_conv_info_t *usb_conv_info)
 {
     video_conv_info_t *video_conv_info = NULL;
-    video_entity_t *entity = NULL;
-    proto_item *item = NULL;
-    proto_item *subtype_item = NULL;
-    proto_tree *tree = NULL;
-    guint8  entity_id = 0;
-    guint16 terminal_type = 0;
-    int offset = 0;
-    guint8 subtype;
+    video_entity_t    *entity          = NULL;
+    proto_item *item          = NULL;
+    proto_item *subtype_item  = NULL;
+    proto_tree *tree          = NULL;
+    guint8      entity_id     = 0;
+    guint16     terminal_type = 0;
+    int         offset        = 0;
+    guint8      subtype;
 
     subtype = tvb_get_guint8(tvb, offset+2);
 
     if (parent_tree)
     {
-        const gchar* subtype_str;
+        const gchar *subtype_str;
 
         subtype_str = val_to_str_ext(subtype, &vc_if_descriptor_subtypes_ext, "Unknown (0x%x)");
 
@@ -1245,10 +1245,10 @@ dissect_usb_video_frame(proto_tree *tree, tvbuff_t *tvb, int offset,
         NULL
     };
     proto_item *desc_item;
-    guint8 bFrameIntervalType;
-    guint8  frame_index;
-    guint16 frame_width;
-    guint16 frame_height;
+    guint8      bFrameIntervalType;
+    guint8      frame_index;
+    guint16     frame_width;
+    guint16     frame_height;
 
     frame_index = tvb_get_guint8(tvb, offset);
     proto_tree_add_item(tree, hf_usb_vid_frame_index, tvb, offset, 1, ENC_NA);
@@ -1348,11 +1348,11 @@ static int
 dissect_usb_video_streaming_interface_descriptor(proto_tree *parent_tree, tvbuff_t *tvb,
                                                  guint8 descriptor_len)
 {
-    proto_item *item;
-    proto_tree *tree;
-    int offset = 0;
-    const gchar* subtype_str;
-    guint8 subtype;
+    proto_item  *item;
+    proto_tree  *tree;
+    int          offset = 0;
+    const gchar *subtype_str;
+    guint8       subtype;
 
     subtype = tvb_get_guint8(tvb, offset+2);
 
@@ -1418,10 +1418,10 @@ static int
 dissect_usb_video_endpoint_descriptor(proto_tree *parent_tree, tvbuff_t *tvb,
                                       guint8 descriptor_len)
 {
-    proto_item *item = NULL;
-    proto_tree *tree = NULL;
-    int offset = 0;
-    guint8 subtype;
+    proto_item *item   = NULL;
+    proto_tree *tree   = NULL;
+    int         offset = 0;
+    guint8      subtype;
 
     subtype = tvb_get_guint8(tvb, offset+2);
 
@@ -1713,9 +1713,9 @@ dissect_usb_vid_control_info(proto_tree *tree, tvbuff_t *tvb, int offset)
 static void
 dissect_usb_vid_control_value(proto_tree *tree, tvbuff_t *tvb, int offset, guint8 request)
 {
-    gint value_size;
-    const char* fallback_name;
-    int hf;
+    gint        value_size;
+    const char *fallback_name;
+    int         hf;
 
     switch (request)
     {
@@ -1800,9 +1800,9 @@ dissect_usb_vid_get_set(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
                         usb_trans_info_t *usb_trans_info,
                         usb_conv_info_t *usb_conv_info)
 {
-    const gchar       *short_name = NULL;
-    guint8 control_sel;
-    guint8 entity_id;
+    const gchar *short_name = NULL;
+    guint8       control_sel;
+    guint8       entity_id;
 
     entity_id   = usb_trans_info->setup.wIndex >> 8;
     control_sel = usb_trans_info->setup.wValue >> 8;
@@ -1996,11 +1996,11 @@ static const value_string setup_request_names_vals[] = {
 static int
 dissect_usb_vid_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
 {
-    gboolean is_request = (pinfo->srcport == NO_ENDPOINT);
-    usb_conv_info_t  *usb_conv_info;
-    usb_trans_info_t *usb_trans_info;
-    int offset = 0;
-    usb_setup_dissector dissector = NULL;
+    gboolean             is_request = (pinfo->srcport == NO_ENDPOINT);
+    usb_conv_info_t     *usb_conv_info;
+    usb_trans_info_t    *usb_trans_info;
+    int                  offset     = 0;
+    usb_setup_dissector  dissector  = NULL;
     const usb_setup_dissector_table_t *tmp;
 
     /* Reject the packet if data or usb_trans_info are NULL */
@@ -2053,9 +2053,9 @@ dissect_usb_vid_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
 static int
 dissect_usb_vid_interrupt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
 {
-    usb_conv_info_t  *usb_conv_info;
+    usb_conv_info_t *usb_conv_info;
     gint bytes_available;
-    int offset = 0;
+    int  offset = 0;
 
     usb_conv_info   = (usb_conv_info_t *)data;
     bytes_available = tvb_length_remaining(tvb, offset);
@@ -3254,10 +3254,10 @@ proto_reg_handoff_usb_vid(void)
  *
  * Local variables:
  * c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
  * indent-tabs-mode: nil
  * End:
  *
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
  */
diff --git a/epan/dissectors/packet-whois.c b/epan/dissectors/packet-whois.c
index 4783e7d8d2..b13e471c11 100644
--- a/epan/dissectors/packet-whois.c
+++ b/epan/dissectors/packet-whois.c
@@ -47,8 +47,8 @@ static expert_field ei_whois_nocrlf = EI_INIT;
 static gint ett_whois = -1;
 
 typedef struct _whois_transaction_t {
-    guint32 req_frame;
-    guint32 rep_frame;
+    guint32  req_frame;
+    guint32  rep_frame;
     nstime_t req_time;
 } whois_transaction_t;
 
@@ -56,12 +56,12 @@ static int
 dissect_whois(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     void *data _U_)
 {
-    proto_item *ti, *expert_ti;
-    proto_tree *whois_tree;
-    conversation_t *conversation;
+    proto_item          *ti, *expert_ti;
+    proto_tree          *whois_tree;
+    conversation_t      *conversation;
     whois_transaction_t *whois_trans;
-    gboolean is_query;
-    guint len;
+    gboolean             is_query;
+    guint                len;
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "WHOIS");
 
@@ -215,11 +215,11 @@ proto_reg_handoff_whois(void)
  *
  * Local variables:
  * c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
  * indent-tabs-mode: nil
  * End:
  *
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
  */
 
diff --git a/epan/dissectors/packet-wtp.c b/epan/dissectors/packet-wtp.c
index 6a440336eb..799e66e66e 100644
--- a/epan/dissectors/packet-wtp.c
+++ b/epan/dissectors/packet-wtp.c
@@ -1077,10 +1077,10 @@ proto_reg_handoff_wtp(void)
  *
  * Local variables:
  * c-basic-offset: 4
- * tab-width: 4
+ * tab-width: 8
  * indent-tabs-mode: nil
  * End:
  *
- * vi: set shiftwidth=4 tabstop=4 expandtab:
- * :indentSize=4:tabSize=4:noTabs=true:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
  */