Enhancement of the packet-mq dissector (WMQ 7.1-7.5). Bug 9267 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9267)

From robionekenobi

From me: Pass data through dissectors instead of using pinfo->private_data

svn path=/trunk/; revision=52707

1 files changed, 246 insertions, 47 deletions

diff --git a/epan/dissectors/packet-mq-base.c b/epan/dissectors/packet-mq-base.c
index ef40e2b745..2b797ff70e 100644
--- a/epan/dissectors/packet-mq-base.c
+++ b/epan/dissectors/packet-mq-base.c
@@ -1,34 +1,32 @@
 /* packet-mq-base.c
-* Routines for IBM WebSphere MQ PCF packet dissection
-*
-* metatech <metatech@flashmail.com>
-* robionekenobi <robionekenobi@bluewin.ch>
-*
-* $Id$
-*
-* Wireshark - Network traffic analyzer
-* By Gerald Combs <gerald@wireshark.org>
-* Copyright 1998 Gerald Combs
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Routines for IBM WebSphere MQ packet dissection base
+ *
+ * metatech <metatech@flashmail.com>
+ * robionekenobi <robionekenobi@bluewin.ch>
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "config.h"
-
 #include <string.h>
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-mq.h"
@@ -618,9 +616,24 @@ DEF_VALSB(mqrc)
 	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_TYPE_ERROR             ),
 	DEF_VALS1(MQRCCF_CFH_LENGTH_ERROR           ),
 	DEF_VALS1(MQRCCF_CFH_VERSION_ERROR          ),
 	DEF_VALS1(MQRCCF_CFH_MSG_SEQ_NUMBER_ERR     ),
@@ -942,6 +955,7 @@ DEF_VALSB(mqrc)
 	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_VALSB(selector)
@@ -1844,7 +1858,7 @@ DEF_VALSB(ReadAheadValues)
 	DEF_VALS1(MQREADA_BACKLOG  ),
 DEF_VALSE;
 
-DEF_VALSB(ChanPropCtlVal)
+DEF_VALSB(PropertyCtlVal)
 	DEF_VALS1(MQPROP_COMPATIBILITY),
 	DEF_VALS1(MQPROP_NONE),
 	DEF_VALS1(MQPROP_ALL),
@@ -2204,6 +2218,7 @@ DEF_VALSB(PrmId)
 	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     ),
@@ -2368,16 +2383,53 @@ DEF_VALSB(PrmId)
 	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          ),
@@ -2391,6 +2443,7 @@ DEF_VALSB(PrmId)
 	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      ),
@@ -2400,6 +2453,8 @@ DEF_VALSB(PrmId)
 	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         ),
@@ -2407,15 +2462,18 @@ DEF_VALSB(PrmId)
 	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              ),
@@ -2538,7 +2596,10 @@ DEF_VALSB(PrmId)
 	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           ),
@@ -2550,6 +2611,7 @@ DEF_VALSB(PrmId)
 	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        ),
@@ -2583,6 +2645,7 @@ DEF_VALSB(PrmId)
 	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           ),
@@ -2810,6 +2873,7 @@ DEF_VALSB(PrmId)
 	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      ),
@@ -2828,9 +2892,7 @@ DEF_VALSB(PrmId)
 	DEF_VALS1(MQIACH_BATCH_INTERVAL         ),
 	DEF_VALS1(MQIACH_BATCH_SIZE             ),
 	DEF_VALS1(MQIACH_BATCH_SIZE_INDICATOR   ),
-	DEF_VALS2(MQIACH_BUFFERS_RECEIVED,"MQIACH_BUFFERS_RCVD"),
 	DEF_VALS1(MQIACH_BUFFERS_SENT           ),
-	DEF_VALS2(MQIACH_BYTES_RECEIVED,"MQIACH_BYTES_RCVD"),
 	DEF_VALS1(MQIACH_BYTES_SENT             ),
 	DEF_VALS1(MQIACH_CHANNEL_DISP           ),
 	DEF_VALS1(MQIACH_CHANNEL_ERROR_DATA     ),
@@ -2854,7 +2916,6 @@ DEF_VALSB(PrmId)
 	DEF_VALS1(MQIACH_CURRENT_CHL_MAX        ),
 	DEF_VALS1(MQIACH_CURRENT_CHL_TCP        ),
 	DEF_VALS1(MQIACH_CURRENT_MSGS           ),
-	DEF_VALS2(MQIACH_CURRENT_SEQUENCE_NUMBER,"MQIACH_CURRENT_SEQ_NUMBER"),
 	DEF_VALS1(MQIACH_CURRENT_SHARING_CONVS  ),
 	DEF_VALS1(MQIACH_DATA_CONVERSION        ),
 	DEF_VALS1(MQIACH_DATA_COUNT             ),
@@ -2870,7 +2931,6 @@ DEF_VALSB(PrmId)
 	DEF_VALS1(MQIACH_INDOUBT_STATUS         ),
 	DEF_VALS1(MQIACH_IN_DOUBT               ),
 	DEF_VALS1(MQIACH_KEEP_ALIVE_INTERVAL    ),
-	DEF_VALS2(MQIACH_LAST_SEQUENCE_NUMBER,"MQIACH_LAST_SEQ_NUMBER"),
 	DEF_VALS1(MQIACH_LISTENER_CONTROL       ),
 	DEF_VALS1(MQIACH_LISTENER_STATUS        ),
 	DEF_VALS1(MQIACH_LONG_RETRIES_LEFT      ),
@@ -2912,14 +2972,44 @@ DEF_VALSB(PrmId)
 	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_VALS2(MQIAMO_AVG_Q_TIME,"MQIAMO64_AVG_Q_TIME"),
 	DEF_VALS1(MQIAMO_BACKOUTS               ),
 	DEF_VALS1(MQIAMO_BROWSES                ),
 	DEF_VALS1(MQIAMO_BROWSES_FAILED         ),
@@ -2971,9 +3061,6 @@ DEF_VALSB(PrmId)
 	DEF_VALS1(MQIAMO_PUT_RETRIES            ),
 	DEF_VALS1(MQIAMO_Q_MAX_DEPTH            ),
 	DEF_VALS1(MQIAMO_Q_MIN_DEPTH            ),
-	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_SETS                   ),
 	DEF_VALS1(MQIAMO_SETS_FAILED            ),
 	DEF_VALS1(MQIAMO_STATS                  ),
@@ -2994,6 +3081,61 @@ DEF_VALSB(PrmId)
 	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  ),
@@ -3007,6 +3149,7 @@ DEF_VALSB(PrmId)
 	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           ),
@@ -4138,7 +4281,7 @@ DEF_VALSB(IndoubtStatus)
 	DEF_VALS1(MQCHIDS_INDOUBT     ),
 DEF_VALSE;
 
-DEF_VALSB(ChannelDispositions)
+DEF_VALSB(ChannelDisp)
 	DEF_VALS1(MQCHLD_ALL                      ),
 	DEF_VALS1(MQCHLD_DEFAULT                  ),
 	DEF_VALS1(MQCHLD_SHARED                   ),
@@ -4562,11 +4705,16 @@ DEF_VALSB(SystemParameterValues)
 	DEF_VALS1(MQSYSP_STATUS_COPYING_LOG    ),
 DEF_VALSE;
 
-DEF_VALSB(SubscriptionDurable)
+DEF_VALSB(DurableSubscriptions)
+	DEF_VALS1(MQSUB_DURABLE_AS_PARENT   ),
+	DEF_VALS1(MQSUB_DURABLE_ALLOWED  ),
+	DEF_VALS1(MQSUB_DURABLE_INHIBITED),
+DEF_VALSE;
+
+DEF_VALSB(Durable)
 	DEF_VALS1(MQSUB_DURABLE_ALL ),
 	DEF_VALS1(MQSUB_DURABLE_YES ),
 	DEF_VALS1(MQSUB_DURABLE_NO  ),
-	DEF_VALS1(MQSUB_DURABLE_AS_PARENT ),
 DEF_VALSE;
 
 DEF_VALSB(SubscriptionTypes)
@@ -4700,12 +4848,7 @@ DEF_VALSB(PublishSubscribeProperties)
 	DEF_VALS1(MQPSPROP_MSGPROP ),
 DEF_VALSE;
 
-DEF_VALSB(SubscriptionScope)
-	DEF_VALS1(MQTSCOPE_ALL  ),
-	DEF_VALS1(MQTSCOPE_QMGR ),
-DEF_VALSE;
-
-DEF_VALSB(PublicationScope)
+DEF_VALSB(PubSubScope)
 	DEF_VALS1(MQSCOPE_ALL       ),
 	DEF_VALS1(MQSCOPE_AS_PARENT ),
 	DEF_VALS1(MQSCOPE_QMGR      ),
@@ -4747,36 +4890,76 @@ DEF_VALSB(SecurityCase)
 	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_VALSE;
+
+DEF_VALSB(UserSource)
+	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_VALSE;
+
 DEF_VALSB(MQCFINT_Parse)
+	DEF_VALS2(MQIACF_ASYNC_STATE           ,GET_VALSP(AsynchronousStateValues)),
+	DEF_VALS2(MQIACF_CLUSTER_Q_MGR_ATTRS   ,GET_VALSP(PrmId)),
+	DEF_VALS2(MQIACF_CHLAUTH_TYPE          ,GET_VALSP(ChlauthType)),
 	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_TYPE             ,GET_VALSP(QueueStatusOpenTypes)),
+	DEF_VALS2(MQIACF_OPEN_SET              ,GET_VALSP(QueueStatusOptionsYesNo)),
 	DEF_VALS2(MQIACF_PARAMETER_ID          ,GET_VALSP(PrmId)),
 	DEF_VALS2(MQIACF_Q_ATTRS               ,GET_VALSP(PrmId)),
 	DEF_VALS2(MQIACF_Q_MGR_ATTRS           ,GET_VALSP(PrmId)),
+	DEF_VALS2(MQIACF_QSG_DISPS             ,GET_VALSP(QShrGrpDisp)),
 	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(MQIACH_CHANNEL_STATUS		   ,GET_VALSP(ChannelStatus)),
+	DEF_VALS2(MQIACF_UOW_TYPE              ,GET_VALSP(UOWTypes)),
+	DEF_VALS2(MQIACF_UOW_STATE             ,GET_VALSP(UOWStates)),
+	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_Q            ,GET_VALSP(Monitoring)),
 	DEF_VALS2(MQIA_ACTIVITY_RECORDING      ,GET_VALSP(ActivityRecording)),
 	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_AUTH_INFO_TYPE          ,GET_VALSP(AuthInfoType)),
 	DEF_VALS2(MQIA_AUTHORITY_EVENT         ,GET_VALSP(EventRule)),
 	DEF_VALS2(MQIA_BASE_TYPE               ,GET_VALSP(BaseType)),
 	DEF_VALS2(MQIA_BRIDGE_EVENT            ,GET_VALSP(EventRule)),
@@ -4790,23 +4973,34 @@ DEF_VALSB(MQCFINT_Parse)
 	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_DURABLE_SUB             ,GET_VALSP(DurableSubscriptions)),
+	DEF_VALS2(MQIA_DIST_LISTS              ,GET_VALSP(DistributionLists)),
 	DEF_VALS2(MQIA_DNS_WLM                 ,GET_VALSP(DNSWLM)),
 	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_MONITORING_AUTO_CLUSSDR ,GET_VALSP(Monitoring)),
 	DEF_VALS2(MQIA_MONITORING_CHANNEL      ,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_PM_DELIVERY             ,GET_VALSP(MsgDelivery)),
+	DEF_VALS2(MQIA_NPM_DELIVERY            ,GET_VALSP(MsgDelivery)),
+	DEF_VALS2(MQIA_NPM_CLASS               ,GET_VALSP(NonpersistentMsgCls)),
 	DEF_VALS2(MQIA_PERFORMANCE_EVENT       ,GET_VALSP(EventRule)),
 	DEF_VALS2(MQIA_PLATFORM                ,GET_VALSP(Platform)),
+	DEF_VALS2(MQIA_PROPERTY_CONTROL        ,GET_VALSP(PropertyCtlVal)),
+	DEF_VALS2(MQIA_PROXY_SUB               ,GET_VALSP(ProxySubscriptions)),
+	DEF_VALS2(MQIA_PUB_SCOPE               ,GET_VALSP(PubSubScope)),
 	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)),
@@ -4821,18 +5015,23 @@ DEF_VALSB(MQCFINT_Parse)
 	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_SUB_SCOPE               ,GET_VALSP(PubSubScope)),
 	DEF_VALS2(MQIA_START_STOP_EVENT        ,GET_VALSP(EventRule)),
 	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_VALSE;
 
 /*