packet-mq: Improve some display by adding CONST values

Change-Id: I66f9dc050735fd0a73b9938a9db0c5978cec40a4
Reviewed-on: https://code.wireshark.org/review/24834
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>

2 files changed, 161 insertions, 97 deletions

diff --git a/epan/dissectors/packet-mq-base.c b/epan/dissectors/packet-mq-base.c
index ec015e5c7d..d381b3bea5 100644
--- a/epan/dissectors/packet-mq-base.c
+++ b/epan/dissectors/packet-mq-base.c
@@ -167,7 +167,7 @@ DEF_VALSB(IPAddressVersion)
 /* 1*/ DEF_VALS1(MQIPADDR_IPV6),
 DEF_VALSE;
 
-DEF_VALSB(GroupUR)
+DEF_VALSB(MQGUR)
 /* 0*/ DEF_VALS1(MQGUR_DISABLED),
 /* 1*/ DEF_VALS1(MQGUR_ENABLED),
 DEF_VALSE;
@@ -229,7 +229,7 @@ DEF_VALSB(NonPersistentMsgSpeed)
 /* 2*/ DEF_VALS1(MQNPMS_FAST),
 DEF_VALSE;
 
-DEF_VALSB(ChannelCompression)
+DEF_VALSB(MQCOMPRESS)
 /*         -1*/ DEF_VALS1(MQCOMPRESS_NOT_AVAILABLE),
 /*          0*/ DEF_VALS1(MQCOMPRESS_NONE),
 /*          1*/ DEF_VALS1(MQCOMPRESS_RLE),
@@ -423,7 +423,7 @@ DEF_VALSB(ReorgCtls)
 DEF_VALSE;
 #endif
 
-DEF_VALSB(ReadAheadValues)
+DEF_VALSB(MQREADA)
 /* 0*/ DEF_VALS1(MQREADA_NO),
 /* 1*/ DEF_VALS1(MQREADA_YES),
 /* 2*/ DEF_VALS1(MQREADA_DISABLED),
@@ -690,12 +690,10 @@ DEF_VALSB(ChinitStatus)
 DEF_VALSE;
 #endif
 
-#if 0
-DEF_VALSB(ChinitInboundDisp)
+DEF_VALSB(MQINBD)
 /* 0*/ DEF_VALS1(MQINBD_Q_MGR),
 /* 3*/ DEF_VALS1(MQINBD_GROUP),
 DEF_VALSE;
-#endif
 
 DEF_VALSB(ChinitTraceAutoStart)
 /* 0*/ DEF_VALS1(MQTRAXSTR_NO),
@@ -798,13 +796,6 @@ DEF_VALSB(PubSubMode)
 /* 2*/ DEF_VALS1(MQPSM_ENABLED),
 DEF_VALSE;
 
-DEF_VALSB(PubSubNP)
-/* 0*/ DEF_VALS1(MQUNDELIVERED_NORMAL),
-/* 1*/ DEF_VALS1(MQUNDELIVERED_SAFE),
-/* 2*/ DEF_VALS1(MQUNDELIVERED_DISCARD),
-/* 3*/ DEF_VALS1(MQUNDELIVERED_KEEP),
-DEF_VALSE;
-
 DEF_VALSB(PubSubSync)
 /* 0*/ DEF_VALS1(MQSYNCPOINT_YES),
 /* 1*/ DEF_VALS1(MQSYNCPOINT_IFPER),
@@ -933,8 +924,7 @@ DEF_VALSB(ReplaceOptions)
 /* 1*/ DEF_VALS1(MQRP_YES),
 DEF_VALSE;
 
-#if 0
-DEF_VALSB(ReasonQualifiers)
+DEF_VALSB(MQRQ)
 /*  1*/ DEF_VALS1(MQRQ_CONN_NOT_AUTHORIZED),
 /*  2*/ DEF_VALS1(MQRQ_OPEN_NOT_AUTHORIZED),
 /*  3*/ DEF_VALS1(MQRQ_CLOSE_NOT_AUTHORIZED),
@@ -968,7 +958,6 @@ DEF_VALSB(ReasonQualifiers)
 /* 31*/ DEF_VALS1(MQRQ_FAILOVER_NOT_PERMITTED),
 /* 32*/ DEF_VALS1(MQRQ_STANDBY_ACTIVATED),
 DEF_VALSE;
-#endif
 
 #if 0
 DEF_VALSB(RefreshTypes)
@@ -985,8 +974,7 @@ DEF_VALSB(QueueDefinitionScope)
 /* 2*/ DEF_VALS1(MQSCO_CELL),
 DEF_VALSE;
 
-#if 0
-DEF_VALSB(SecurityItems)
+DEF_VALSB(MQSECITEM)
 /*  0*/ DEF_VALS1(MQSECITEM_ALL),
 /*  1*/ DEF_VALS1(MQSECITEM_MQADMIN),
 /*  2*/ DEF_VALS1(MQSECITEM_MQNLIST),
@@ -1000,10 +988,8 @@ DEF_VALSB(SecurityItems)
 /* 10*/ DEF_VALS1(MQSECITEM_MXQUEUE),
 /* */ DEF_VALS1(MQSECITEM_MXTOPIC),
 DEF_VALSE;
-#endif
 
-#if 0
-DEF_VALSB(SecuritySwitches)
+DEF_VALSB(MQSECSW)
 /*  1*/ DEF_VALS1(MQSECSW_PROCESS),
 /*  2*/ DEF_VALS1(MQSECSW_NAMELIST),
 /*  3*/ DEF_VALS1(MQSECSW_Q),
@@ -1023,36 +1009,30 @@ DEF_VALSB(SecuritySwitches)
 /* 25*/ DEF_VALS1(MQSECSW_OFF_ERROR),
 /* 26*/ DEF_VALS1(MQSECSW_ON_OVERRIDDEN),
 DEF_VALSE;
-#endif
 
-#if 0
-DEF_VALSB(SecurityTypes)
+DEF_VALSB(MQSECTYPE)
 /* 1*/ DEF_VALS1(MQSECTYPE_AUTHSERV),
 /* 2*/ DEF_VALS1(MQSECTYPE_SSL),
 /* 3*/ DEF_VALS1(MQSECTYPE_CLASSES),
 /* 4*/ DEF_VALS1(MQSECTYPE_CONNAUTH),
 DEF_VALSE;
-#endif
 
-#if 0
-DEF_VALSB(AuthenticationValidationTypes)
+DEF_VALSB(MQCHK)
 /* 0*/ DEF_VALS1(MQCHK_OPTIONAL),
 /* 1*/ DEF_VALS1(MQCHK_NONE),
 /* 2*/ DEF_VALS1(MQCHK_REQUIRED_ADMIN),
 /* 3*/ DEF_VALS1(MQCHK_REQUIRED),
 /* 4*/ DEF_VALS1(MQCHK_AS_Q_MGR),
 DEF_VALSE;
-#endif
 
-#if 0
-DEF_VALSB(AuthenticationAdoptionContext)
+
+DEF_VALSB(MQADPCTX)
 /* 0*/ DEF_VALS1(MQADPCTX_NO),
 /* 1*/ DEF_VALS1(MQADPCTX_YES),
 DEF_VALSE;
-#endif
 
 #if 0
-DEF_VALSB(LDAP_SSL_TLS_ConnectionState)
+DEF_VALSB(MQSECCOMM)
 /* 0*/ DEF_VALS1(MQSECCOMM_NO),
 /* 1*/ DEF_VALS1(MQSECCOMM_YES),
 /* 2*/ DEF_VALS1(MQSECCOMM_ANON),
@@ -1153,8 +1133,7 @@ DEF_VALSB(SyncpointPubSub)
 DEF_VALSE;
 #endif
 
-#if 0
-DEF_VALSB(SystemParameterValues)
+DEF_VALSB(MQSYSP)
 /*  0*/ DEF_VALS1(MQSYSP_NO),
 /*  1*/ DEF_VALS1(MQSYSP_YES),
 /*  2*/ DEF_VALS1(MQSYSP_EXTENDED),
@@ -1174,7 +1153,6 @@ DEF_VALSB(SystemParameterValues)
 /* 35*/ DEF_VALS1(MQSYSP_STATUS_COPYING_BSDS),
 /* 36*/ DEF_VALS1(MQSYSP_STATUS_COPYING_LOG),
 DEF_VALSE;
-#endif
 
 DEF_VALSB(DurableSubscriptions)
 /* 0*/ DEF_VALS1(MQSUB_DURABLE_AS_PARENT),
@@ -1243,14 +1221,12 @@ DEF_VALSB(UserIDSupport)
 DEF_VALSE;
 #endif
 
-#if 0
-DEF_VALSB(UndeliveredPubSub)
+DEF_VALSB(MQUNDELIVERED)
 /* 0*/ DEF_VALS1(MQUNDELIVERED_NORMAL),
 /* 1*/ DEF_VALS1(MQUNDELIVERED_SAFE),
 /* 2*/ DEF_VALS1(MQUNDELIVERED_DISCARD),
 /* 3*/ DEF_VALS1(MQUNDELIVERED_KEEP),
 DEF_VALSE;
-#endif
 
 DEF_VALSB(UOWStates)
 /* 0*/ DEF_VALS1(MQUOWST_NONE),
@@ -1267,30 +1243,24 @@ DEF_VALSB(UOWTypes)
 /* 4*/ DEF_VALS1(MQUOWT_XA),
 DEF_VALSE;
 
-#if 0
-DEF_VALSB(PageSetStatus)
+DEF_VALSB(MQUSAGE_PS)
 /* 0*/ DEF_VALS1(MQUSAGE_PS_AVAILABLE),
 /* 1*/ DEF_VALS1(MQUSAGE_PS_DEFINED),
 /* 2*/ DEF_VALS1(MQUSAGE_PS_OFFLINE),
 /* 3*/ DEF_VALS1(MQUSAGE_PS_NOT_DEFINED),
 DEF_VALSE;
-#endif
 
-#if 0
-DEF_VALSB(ExpandType)
+DEF_VALSB(MQUSAGE_EXPAND)
 /* 1*/ DEF_VALS1(MQUSAGE_EXPAND_USER),
 /* 2*/ DEF_VALS1(MQUSAGE_EXPAND_SYSTEM),
 /* 3*/ DEF_VALS1(MQUSAGE_EXPAND_NONE),
 DEF_VALSE;
-#endif
 
-#if 0
-DEF_VALSB(DataSetType)
+DEF_VALSB(MQUSAGE_DS)
 /* 10*/ DEF_VALS1(MQUSAGE_DS_OLDEST_ACTIVE_UOW),
 /* 11*/ DEF_VALS1(MQUSAGE_DS_OLDEST_PS_RECOVERY),
 /* 12*/ DEF_VALS1(MQUSAGE_DS_OLDEST_CF_RECOVERY),
 DEF_VALSE;
-#endif
 
 #if 0
 DEF_VALSB(ActivityOperations)
@@ -1316,8 +1286,7 @@ DEF_VALSB(ConnInfoType)
 /* 1113*/ DEF_VALS1(MQIACF_CONN_INFO_ALL),
 DEF_VALSE;
 
-#if 0
-DEF_VALSB(Priority)
+DEF_VALSB(MQPRI)
 /* -3*/ DEF_VALS1(MQPRI_PRIORITY_AS_PUBLISHED),
 /* -2*/ DEF_VALS1(MQPRI_PRIORITY_AS_PARENT),
 /* -1*/ DEF_VALS1(MQPRI_PRIORITY_AS_Q_DEF),
@@ -1332,16 +1301,13 @@ DEF_VALSB(Priority)
 /*  8*/ DEF_VALS1(8),
 /*  9*/ DEF_VALS1(9),
 DEF_VALSE;
-#endif
 
-#if 0
-DEF_VALSB(PublishSubscribeProperties)
+DEF_VALSB(MQPSPROP)
 /* 0*/ DEF_VALS1(MQPSPROP_NONE),
 /* 1*/ DEF_VALS1(MQPSPROP_COMPAT),
 /* 2*/ DEF_VALS1(MQPSPROP_RFH2),
 /* 3*/ DEF_VALS1(MQPSPROP_MSGPROP),
 DEF_VALSE;
-#endif
 
 DEF_VALSB(PubSubScope)
 /* 0*/ DEF_VALS1(MQSCOPE_ALL),
@@ -1349,31 +1315,43 @@ DEF_VALSB(PubSubScope)
 /* 4*/ DEF_VALS1(MQSCOPE_QMGR),
 DEF_VALSE;
 
-#if 0
-DEF_VALSB(EncryptionPolicySuiteB)
+DEF_VALSB(MQ_SUITE_B)
 /* 0*/ DEF_VALS1(MQ_SUITE_B_NOT_AVAILABLE),
 /* 1*/ DEF_VALS1(MQ_SUITE_B_NONE),
 /* 2*/ DEF_VALS1(MQ_SUITE_B_128_BIT),
 /* 4*/ DEF_VALS1(MQ_SUITE_B_192_BIT),
 DEF_VALSE;
-#endif
 
-#if 0
-DEF_VALSB(Multicast)
+DEF_VALSB(MQMC)
 /* 0*/ DEF_VALS1(MQMC_AS_PARENT),
 /* 1*/ DEF_VALS1(MQMC_ENABLED),
 /* 2*/ DEF_VALS1(MQMC_DISABLED),
 /* 3*/ DEF_VALS1(MQMC_ONLY),
 DEF_VALSE;
-#endif
 
-#if 0
-DEF_VALSB(UseDLQueue)
+DEF_VALSB(MQUSEDLQ)
 /* 0*/ DEF_VALS1(MQUSEDLQ_AS_PARENT),
 /* 1*/ DEF_VALS1(MQUSEDLQ_NO),
 /* 2*/ DEF_VALS1(MQUSEDLQ_YES),
 DEF_VALSE;
-#endif
+
+DEF_VALSB(MQCLROUTE)
+/* 0*/ DEF_VALS1(MQCLROUTE_DIRECT),
+/* 1*/ DEF_VALS1(MQCLROUTE_TOPIC_HOST),
+/* 2*/ DEF_VALS1(MQCLROUTE_NONE),
+DEF_VALSE;
+
+DEF_VALSB(MQCLST)
+/* 0*/ DEF_VALS1(MQCLST_ACTIVE),
+/* 1*/ DEF_VALS1(MQCLST_PENDING),
+/* 2*/ DEF_VALS1(MQCLST_INVALID),
+/* 3*/ DEF_VALS1(MQCLST_ERROR),
+DEF_VALSE;
+
+DEF_VALSB(MQMULC)
+/* 0*/ DEF_VALS1(MQMULC_STANDARD),
+/* 1*/ DEF_VALS1(MQMULC_REFINED),
+DEF_VALSE;
 
 DEF_VALSB(IGQPutAuthority)
 /* 1*/ DEF_VALS1(MQIGQPA_DEFAULT),
@@ -1428,12 +1406,20 @@ DEF_VALSB(DefClusXmitTyp)
 /* 1*/ DEF_VALS1(MQCLXQ_CHANNEL),
 DEF_VALSE;
 
-DEF_VALSB(ServiceControl)
+DEF_VALSB(MQSVC_CONTROL)
 /* 0*/ DEF_VALS1(MQSVC_CONTROL_Q_MGR),
 /* 1*/ DEF_VALS1(MQSVC_CONTROL_Q_MGR_START),
 /* 2*/ DEF_VALS1(MQSVC_CONTROL_MANUAL),
 DEF_VALSE;
 
+DEF_VALSB(MQSVC_STATUS)
+/* 0*/ DEF_VALS1(MQSVC_STATUS_STOPPED),
+/* 1*/ DEF_VALS1(MQSVC_STATUS_STARTING),
+/* 2*/ DEF_VALS1(MQSVC_STATUS_RUNNING),
+/* 3*/ DEF_VALS1(MQSVC_STATUS_STOPPING),
+/* 4*/ DEF_VALS1(MQSVC_STATUS_RETRYING),
+DEF_VALSE;
+
 DEF_VALSB(Capability)
 /* 0*/ DEF_VALS1(MQCAP_NOT_SUPPORTED),
 /* 1*/ DEF_VALS1(MQCAP_SUPPORTED),
@@ -1594,11 +1580,9 @@ DEF_VALSB(SMDSExpandSt)
 /* 2*/ DEF_VALS1(MQS_EXPANDST_MAXIMUM),
 DEF_VALSE;
 
-DEF_VALSB(UsageType)
-/* 1168*/ DEF_VALS1(MQIACF_USAGE_PAGESET),
-/* 1169*/ DEF_VALS1(MQIACF_USAGE_DATA_SET),
-/* 1170*/ DEF_VALS1(MQIACF_USAGE_BUFFER_POOL),
-/* 1335*/ DEF_VALS1(MQIACF_USAGE_SMDS),
+DEF_VALSB(MQRDNS)
+/* 0*/ DEF_VALS1(MQRDNS_ENABLED),
+/* 1*/ DEF_VALS1(MQRDNS_DISABLED),
 DEF_VALSE;
 
 DEF_VALSB(SMDSUsage)
@@ -2979,6 +2963,8 @@ DEF_VALSB(PrmId)
 /*  227*/ DEF_VALS1(MQIA_CF_OFFLOAD_THRESHOLD3),
 /*  228*/ DEF_VALS1(MQIA_CF_SMDS_BUFFERS),
 /*  229*/ DEF_VALS1(MQIA_CF_OFFLDUSE),
+/*  230*/ DEF_VALS1(MQIA_MAX_RESPONSES),
+/*  231*/ DEF_VALS1(MQIA_RESPONSE_RESTART_POINT),
 /*  232*/ DEF_VALS1(MQIA_COMM_EVENT),
 /*  233*/ DEF_VALS1(MQIA_MCAST_BRIDGE),
 /*  234*/ DEF_VALS1(MQIA_USE_DEAD_LETTER_Q),
@@ -3014,9 +3000,14 @@ DEF_VALSB(PrmId)
 /*  265*/ DEF_VALS1(MQIA_AMQP_CAPABILITY),
 /*  266*/ DEF_VALS1(MQIA_AUTHENTICATION_METHOD),
 /*  267*/ DEF_VALS1(MQIA_KEY_REUSE_COUNT),
+/*  268*/ DEF_VALS1(MQIA_MEDIA_IMAGE_SCHEDULING),
+/*  269*/ DEF_VALS1(MQIA_MEDIA_IMAGE_INTERVAL),
+/*  270*/ DEF_VALS1(MQIA_MEDIA_IMAGE_LOG_LENGTH),
+/*  271*/ DEF_VALS1(MQIA_MEDIA_IMAGE_RECOVER_OBJ),
+/*  272*/ DEF_VALS1(MQIA_MEDIA_IMAGE_RECOVER_Q),
 /*  702*/ DEF_VALS1(MQIAMO_AVG_BATCH_SIZE),
 /*  703*/ DEF_VALS1(MQIAMO_AVG_Q_TIME),
-/*  703  DEF_VALS1(MQIAMO64_AVG_Q_TIME), XXX - duplicate */
+/*  703   DEF_VALS1(MQIAMO64_AVG_Q_TIME), */
 /*  704*/ DEF_VALS1(MQIAMO_BACKOUTS),
 /*  705*/ DEF_VALS1(MQIAMO_BROWSES),
 /*  706*/ DEF_VALS1(MQIAMO_BROWSE_MAX_BYTES),
@@ -3055,11 +3046,11 @@ DEF_VALSB(PrmId)
 /*  739*/ DEF_VALS1(MQIAMO_Q_MAX_DEPTH),
 /*  740*/ DEF_VALS1(MQIAMO_Q_MIN_DEPTH),
 /*  741*/ DEF_VALS1(MQIAMO_Q_TIME_AVG),
-/*  741  DEF_VALS1(MQIAMO64_Q_TIME_AVG), XXX - duplicate */
+/*  741   DEF_VALS1(MQIAMO64_Q_TIME_AVG), */
 /*  742*/ DEF_VALS1(MQIAMO_Q_TIME_MAX),
-/*  742 DEF_VALS1(MQIAMO64_Q_TIME_MAX), XXX - duplicate */
+/*  742   DEF_VALS1(MQIAMO64_Q_TIME_MAX), */
 /*  743*/ DEF_VALS1(MQIAMO_Q_TIME_MIN),
-/*  743 DEF_VALS1(MQIAMO64_Q_TIME_MIN), XXX - duplicate */
+/*  743   DEF_VALS1(MQIAMO64_Q_TIME_MIN), */
 /*  744*/ DEF_VALS1(MQIAMO_SETS),
 /*  745*/ DEF_VALS1(MQIAMO64_BROWSE_BYTES),
 /*  746*/ DEF_VALS1(MQIAMO64_BYTES),
@@ -3164,12 +3155,14 @@ DEF_VALSB(PrmId)
 /* 1005*/ DEF_VALS1(MQIACF_FORCE),
 /* 1006*/ DEF_VALS1(MQIACF_REPLACE),
 /* 1007*/ DEF_VALS1(MQIACF_PURGE),
+/* 1008*/ DEF_VALS1(MQIACF_MODE),
 /* 1008*/ DEF_VALS1(MQIACF_QUIESCE),
 /* 1009*/ DEF_VALS1(MQIACF_ALL),
 /* 1010*/ DEF_VALS1(MQIACF_EVENT_APPL_TYPE),
 /* 1011*/ DEF_VALS1(MQIACF_EVENT_ORIGIN),
 /* 1012*/ DEF_VALS1(MQIACF_PARAMETER_ID),
-/* 1013*/ DEF_VALS1(MQIACF_ERROR_IDENTIFIER),
+/* 1013*/ DEF_VALS1(MQIACF_ERROR_ID),
+/* 1013   DEF_VALS1(MQIACF_ERROR_IDENTIFIER), */
 /* 1014*/ DEF_VALS1(MQIACF_SELECTOR),
 /* 1015*/ DEF_VALS1(MQIACF_CHANNEL_ATTRS),
 /* 1016*/ DEF_VALS1(MQIACF_OBJECT_TYPE),
@@ -3416,10 +3409,14 @@ DEF_VALSB(PrmId)
 /* 1324*/ DEF_VALS1(MQIACF_MULC_CAPTURE),
 /* 1325*/ DEF_VALS1(MQIACF_PERMIT_STANDBY),
 /* 1326*/ DEF_VALS1(MQIACF_OPERATION_MODE),
+/* 1327*/ DEF_VALS1(MQIACF_COMM_INFO_ATTRS),
 /* 1328*/ DEF_VALS1(MQIACF_CF_SMDS_BLOCK_SIZE),
 /* 1329*/ DEF_VALS1(MQIACF_CF_SMDS_EXPAND),
+/* 1330*/ DEF_VALS1(MQIACF_USAGE_FREE_BUFF),
+/* 1331*/ DEF_VALS1(MQIACF_USAGE_FREE_BUFF_PERC),
 /* 1332*/ DEF_VALS1(MQIACF_CF_STRUC_ACCESS),
 /* 1333*/ DEF_VALS1(MQIACF_CF_STATUS_SMDS),
+/* 1334*/ DEF_VALS1(MQIACF_SMDS_ATTRS),
 /* 1335*/ DEF_VALS1(MQIACF_USAGE_SMDS),
 /* 1336*/ DEF_VALS1(MQIACF_USAGE_BLOCK_SIZE),
 /* 1337*/ DEF_VALS1(MQIACF_USAGE_DATA_BLOCKS),
@@ -3461,7 +3458,6 @@ DEF_VALSB(PrmId)
 /* 1374*/ DEF_VALS1(MQIACF_BUFFER_LENGTH),
 /* 1375*/ DEF_VALS1(MQIACF_TRACE_DATA_LENGTH),
 /* 1376*/ DEF_VALS1(MQIACF_SMDS_EXPANDST),
-/* 1376*/ DEF_VALS1(MQIACF_SMDS_EXPANDST),
 /* 1377*/ DEF_VALS1(MQIACF_STRUC_LENGTH),
 /* 1378*/ DEF_VALS1(MQIACF_ITEM_COUNT),
 /* 1379*/ DEF_VALS1(MQIACF_EXPIRY_TIME),
@@ -3535,15 +3531,19 @@ DEF_VALSB(PrmId)
 /* 1526*/ DEF_VALS1(MQIACH_CHANNEL_TABLE),
 /* 1527*/ DEF_VALS1(MQIACH_CHANNEL_STATUS),
 /* 1528*/ DEF_VALS1(MQIACH_INDOUBT_STATUS),
-/* 1529*/ DEF_VALS1(MQIACH_LAST_SEQUENCE_NUMBER),
+/* 1529*/ DEF_VALS1(MQIACH_LAST_SEQ_NUMBER),
+/* 1529   DEF_VALS1(MQIACH_LAST_SEQUENCE_NUMBER),*/
 /* 1531*/ DEF_VALS1(MQIACH_CURRENT_MSGS),
+/* 1532*/ DEF_VALS1(MQIACH_CURRENT_SEQ_NUMBER),
 /* 1532*/ DEF_VALS1(MQIACH_CURRENT_SEQUENCE_NUMBER),
 /* 1533*/ DEF_VALS1(MQIACH_SSL_RETURN_CODE),
 /* 1534*/ DEF_VALS1(MQIACH_MSGS),
 /* 1535*/ DEF_VALS1(MQIACH_BYTES_SENT),
+/* 1536*/ DEF_VALS1(MQIACH_BYTES_RCVD),
 /* 1536*/ DEF_VALS1(MQIACH_BYTES_RECEIVED),
 /* 1537*/ DEF_VALS1(MQIACH_BATCHES),
 /* 1538*/ DEF_VALS1(MQIACH_BUFFERS_SENT),
+/* 1539*/ DEF_VALS1(MQIACH_BUFFERS_RCVD),
 /* 1539*/ DEF_VALS1(MQIACH_BUFFERS_RECEIVED),
 /* 1540*/ DEF_VALS1(MQIACH_LONG_RETRIES_LEFT),
 /* 1541*/ DEF_VALS1(MQIACH_SHORT_RETRIES_LEFT),
@@ -3610,8 +3610,6 @@ DEF_VALSB(PrmId)
 /* 1620*/ DEF_VALS1(MQIACH_CLIENT_CHANNEL_WEIGHT),
 /* 1621*/ DEF_VALS1(MQIACH_CONNECTION_AFFINITY),
 /* 1623*/ DEF_VALS1(MQIACH_RESET_REQUESTED),
-/* 1623*/ DEF_VALS1(MQIACH_RESET_REQUESTED),
-/* 1624*/ DEF_VALS1(MQIACH_BATCH_DATA_LIMIT),
 /* 1624*/ DEF_VALS1(MQIACH_BATCH_DATA_LIMIT),
 /* 1625*/ DEF_VALS1(MQIACH_MSG_HISTORY),
 /* 1626*/ DEF_VALS1(MQIACH_MULTICAST_PROPERTIES),
@@ -3622,20 +3620,14 @@ DEF_VALSB(PrmId)
 /* 1631*/ DEF_VALS1(MQIACH_IN_DOUBT_IN),
 /* 1632*/ DEF_VALS1(MQIACH_IN_DOUBT_OUT),
 /* 1633*/ DEF_VALS1(MQIACH_MSGS_SENT),
-/* 1633*/ DEF_VALS1(MQIACH_MSGS_SENT),
-/* 1634*/ DEF_VALS1(MQIACH_MSGS_RECEIVED),
-/* 1635*/ DEF_VALS1(MQIACH_PENDING_OUT),
+/* 1634*/ DEF_VALS1(MQIACH_MSGS_RCVD),
+/* 1634   DEF_VALS1(MQIACH_MSGS_RECEIVED), */
 /* 1635*/ DEF_VALS1(MQIACH_PENDING_OUT),
 /* 1636*/ DEF_VALS1(MQIACH_AVAILABLE_CIPHERSPECS),
-/* 1636*/ DEF_VALS1(MQIACH_AVAILABLE_CIPHERSPECS),
-/* 1637*/ DEF_VALS1(MQIACH_MATCH),
 /* 1637*/ DEF_VALS1(MQIACH_MATCH),
 /* 1638*/ DEF_VALS1(MQIACH_USER_SOURCE),
-/* 1638*/ DEF_VALS1(MQIACH_USER_SOURCE),
-/* 1639*/ DEF_VALS1(MQIACH_WARNING),
 /* 1639*/ DEF_VALS1(MQIACH_WARNING),
 /* 1640*/ DEF_VALS1(MQIACH_DEF_RECONNECT),
-/* 1640*/ DEF_VALS1(MQIACH_DEF_RECONNECT),
 /* 1642*/ DEF_VALS1(MQIACH_CHANNEL_SUMMARY_ATTRS),
 /* 1643*/ DEF_VALS1(MQIACH_PROTOCOL),
 /* 1644*/ DEF_VALS1(MQIACH_AMQP_KEEP_ALIVE),
@@ -3643,6 +3635,7 @@ DEF_VALSB(PrmId)
 /* 2000*/ DEF_VALS1(MQIA_USER_LIST),
 /* 2001*/ DEF_VALS1(MQCA_APPL_ID),
 /* 2002*/ DEF_VALS1(MQCA_BASE_OBJECT_NAME),
+/* 2002   DEF_VALS1(MQCA_BASE_Q_NAME), */
 /* 2003*/ DEF_VALS1(MQCA_COMMAND_INPUT_Q_NAME),
 /* 2004*/ DEF_VALS1(MQCA_CREATION_DATE),
 /* 2005*/ DEF_VALS1(MQCA_CREATION_TIME),
@@ -3745,10 +3738,22 @@ DEF_VALSB(PrmId)
 /* 2117*/ DEF_VALS1(MQCA_INSTALLATION_PATH),
 /* 2118*/ DEF_VALS1(MQCA_CHLAUTH_DESC),
 /* 2119*/ DEF_VALS1(MQCA_CUSTOM),
-/* 2120*/ DEF_VALS1(MQCA_XR_VERSION2),
+/* 2120*/ DEF_VALS1(MQCA_VERSION),
+/* 2121*/ DEF_VALS1(MQCA_CERT_LABEL),
 /* 2122*/ DEF_VALS1(MQCA_XR_VERSION),
 /* 2123*/ DEF_VALS1(MQCA_XR_SSL_CIPHER_SUITES),
 /* 2124*/ DEF_VALS1(MQCA_CLUS_CHL_NAME),
+/* 2125*/ DEF_VALS1(MQCA_CONN_AUTH),
+/* 2126*/ DEF_VALS1(MQCA_LDAP_BASE_DN_USERS),
+/* 2127*/ DEF_VALS1(MQCA_LDAP_SHORT_USER_FIELD),
+/* 2128*/ DEF_VALS1(MQCA_LDAP_USER_OBJECT_CLASS),
+/* 2129*/ DEF_VALS1(MQCA_LDAP_USER_ATTR_FIELD),
+/* 2130*/ DEF_VALS1(MQCA_SSL_CERT_ISSUER_NAME),
+/* 2131*/ DEF_VALS1(MQCA_QSG_CERT_LABEL),
+/* 2132*/ DEF_VALS1(MQCA_LDAP_BASE_DN_GROUPS),
+/* 2133*/ DEF_VALS1(MQCA_LDAP_GROUP_OBJECT_CLASS),
+/* 2134*/ DEF_VALS1(MQCA_LDAP_GROUP_ATTR_FIELD),
+/* 2135*/ DEF_VALS1(MQCA_LDAP_FIND_GROUP_FIELD),
 /* 2136*/ DEF_VALS1(MQCA_AMQP_VERSION),
 /* 2137*/ DEF_VALS1(MQCA_AMQP_SSL_CIPHER_SUITES),
 /* 2701*/ DEF_VALS1(MQCAMO_CLOSE_DATE),
@@ -4027,6 +4032,7 @@ DEF_VALSB(PrmId)
 /* 3568*/ DEF_VALS1(MQCACH_MCA_USER_ID_LIST),
 /* 3569*/ DEF_VALS1(MQCACH_SSL_CIPHER_SUITE),
 /* 3570*/ DEF_VALS1(MQCACH_WEBCONTENT_PATH),
+/* 3571*/ DEF_VALS1(MQCACH_TOPIC_ROOT),
 /* 4000*/ DEF_VALS1(MQCA_USER_LIST),
 /* 7001*/ DEF_VALS1(MQBACF_EVENT_ACCOUNTING_TOKEN),
 /* 7002*/ DEF_VALS1(MQBACF_EVENT_SECURITY_ID),
@@ -4497,8 +4503,8 @@ DEF_VALSB(MQCFINT_Parse)
 /*  115*/ DEF_VALS2(MQIA_TCP_KEEP_ALIVE, GET_VALSP(TCPKeepAlive)),
 /*  116*/ DEF_VALS2(MQIA_TCP_STACK_TYPE, GET_VALSP(TCPStackType)),
 /*  117*/ DEF_VALS2(MQIA_CHINIT_TRACE_AUTO_START, GET_VALSP(ChinitTraceAutoStart)),
-/*  119*/ DEF_VALS2(MQIA_CHINIT_CONTROL, GET_VALSP(ServiceControl)),
-/*  120*/ DEF_VALS2(MQIA_CMD_SERVER_CONTROL, GET_VALSP(ServiceControl)),
+/*  119*/ DEF_VALS2(MQIA_CHINIT_CONTROL, GET_VALSP(MQSVC_CONTROL)),
+/*  120*/ DEF_VALS2(MQIA_CMD_SERVER_CONTROL, GET_VALSP(MQSVC_CONTROL)),
 /*  122*/ DEF_VALS2(MQIA_MONITORING_CHANNEL, GET_VALSP(Monitoring)),
 /*  123*/ DEF_VALS2(MQIA_MONITORING_Q, GET_VALSP(Monitoring)),
 /*  124*/ DEF_VALS2(MQIA_MONITORING_AUTO_CLUSSDR, GET_VALSP(Monitoring)),
@@ -4515,38 +4521,48 @@ DEF_VALSB(MQCFINT_Parse)
 /*  138*/ DEF_VALS2(MQIA_ACTIVITY_RECORDING, GET_VALSP(ActivityRecording)),
 /*  141*/ DEF_VALS2(MQIA_SECURITY_CASE, GET_VALSP(SecurityCase)),
 /*  175*/ DEF_VALS2(MQIA_DURABLE_SUB, GET_VALSP(DurableSubscriptions)),
+/*  176*/ DEF_VALS2(MQIA_MULTICAST, GET_VALSP(MQMC)),
 /*  181*/ DEF_VALS2(MQIA_INHIBIT_PUB, GET_VALSP(InhibitPublications)),
 /*  182*/ DEF_VALS2(MQIA_INHIBIT_SUB, GET_VALSP(InhibitSubscriptions)),
 /*  184*/ DEF_VALS2(MQIA_DEF_PUT_RESPONSE_TYPE, GET_VALSP(PutResponse)),
 /*  185*/ DEF_VALS2(MQIA_TOPIC_DEF_PERSISTENCE, GET_VALSP(Persistence)),
 /*  187*/ DEF_VALS2(MQIA_PUBSUB_MODE, GET_VALSP(PubSubMode)),
-/*  188*/ DEF_VALS2(MQIA_DEF_READ_AHEAD, GET_VALSP(ReadAheadValues)),
+/*  188*/ DEF_VALS2(MQIA_DEF_READ_AHEAD, GET_VALSP(MQREADA)),
+/*  189*/ DEF_VALS2(MQIA_READ_AHEAD, GET_VALSP(MQREADA)),
 /*  190*/ DEF_VALS2(MQIA_PROPERTY_CONTROL, GET_VALSP(PropertyCtlVal)),
 /*  193*/ DEF_VALS2(MQIA_BASE_TYPE, GET_VALSP(objtype)),
 /*  195*/ DEF_VALS2(MQIA_PM_DELIVERY, GET_VALSP(MsgDelivery)),
 /*  196*/ DEF_VALS2(MQIA_NPM_DELIVERY, GET_VALSP(MsgDelivery)),
 /*  199*/ DEF_VALS2(MQIA_PROXY_SUB, GET_VALSP(ProxySubscriptions)),
-/*  203*/ DEF_VALS2(MQIA_PUBSUB_NP_MSG, GET_VALSP(PubSubNP)),
-/*  205*/ DEF_VALS2(MQIA_PUBSUB_NP_RESP, GET_VALSP(PubSubNP)),
+/*  203*/ DEF_VALS2(MQIA_PUBSUB_NP_MSG, GET_VALSP(MQUNDELIVERED)),
+/*  205*/ DEF_VALS2(MQIA_PUBSUB_NP_RESP, GET_VALSP(MQUNDELIVERED)),
 /*  207*/ DEF_VALS2(MQIA_PUBSUB_SYNC_PT, GET_VALSP(PubSubSync)),
 /*  208*/ DEF_VALS2(MQIA_TOPIC_TYPE, GET_VALSP(TopicType)),
 /*  216*/ DEF_VALS2(MQIA_WILDCARD_OPERATION, GET_VALSP(WildcardOperation)),
 /*  218*/ DEF_VALS2(MQIA_SUB_SCOPE, GET_VALSP(PubSubScope)),
 /*  219*/ DEF_VALS2(MQIA_PUB_SCOPE, GET_VALSP(PubSubScope)),
-/*  221*/ DEF_VALS2(MQIA_GROUP_UR, GET_VALSP(GroupUR)),
+/*  221*/ DEF_VALS2(MQIA_GROUP_UR, GET_VALSP(MQGUR)),
 /*  222*/ DEF_VALS2(MQIA_UR_DISP, GET_VALSP(QShrGrpDisp)),
 /*  224*/ DEF_VALS2(MQIA_CF_OFFLOAD, GET_VALSP(OffloadUse)),
 /*  229*/ DEF_VALS2(MQIA_CF_OFFLDUSE, GET_VALSP(OffloadUse)),
+/*  234*/ DEF_VALS2(MQIA_USE_DEAD_LETTER_Q, GET_VALSP(MQUSEDLQ)),
 /*  240*/ DEF_VALS2(MQIA_ACTIVITY_TRACE, GET_VALSP(Monitoring)),
 /*  243*/ DEF_VALS2(MQIA_XR_CAPABILITY, GET_VALSP(Capability)),
 /*  244*/ DEF_VALS2(MQIA_CF_RECAUTO, GET_VALSP(CFAutomaticRecovery)),
 /*  245*/ DEF_VALS2(MQIA_QMGR_CFCONLOS, GET_VALSP(CFConLoss)),
 /*  246*/ DEF_VALS2(MQIA_CF_CFCONLOS, GET_VALSP(CFLossConnectivity)),
+/*  247*/ DEF_VALS2(MQIA_SUITE_B_STRENGTH, GET_VALSP(MQ_SUITE_B)),
 /*  248*/ DEF_VALS2(MQIA_CHLAUTH_RECORDS, GET_VALSP(ChlAuthRecords)),
 /*  249*/ DEF_VALS2(MQIA_PUBSUB_CLUSTER, GET_VALSP(PubSubCluster)),
 /*  250*/ DEF_VALS2(MQIA_DEF_CLUSTER_XMIT_Q_TYPE, GET_VALSP(DefClusXmitTyp)),
 /*  251*/ DEF_VALS2(MQIA_PROT_POLICY_CAPABILITY, GET_VALSP(Capability)),
 /*  252*/ DEF_VALS2(MQIA_CERT_VAL_POLICY, GET_VALSP(CertValPolicy)),
+/*  254*/ DEF_VALS2(MQIA_REVERSE_DNS_LOOKUP, GET_VALSP(MQRDNS)),
+/*  255*/ DEF_VALS2(MQIA_CLUSTER_PUB_ROUTE, GET_VALSP(MQCLROUTE)),
+/*  256*/ DEF_VALS2(MQIA_CLUSTER_OBJECT_STATE, GET_VALSP(MQCLST)),
+/*  257*/ DEF_VALS2(MQIA_CHECK_LOCAL_BINDING, GET_VALSP(MQCHK)),
+/*  258*/ DEF_VALS2(MQIA_CHECK_CLIENT_BINDING, GET_VALSP(MQCHK)),
+/*  260*/ DEF_VALS2(MQIA_ADOPT_CONTEXT, GET_VALSP(MQADPCTX)),
 /*  267*/ DEF_VALS2(MQIA_KEY_REUSE_COUNT, GET_VALSP(Keyreusecount)),
 /* 1001*/ DEF_VALS2(MQIACF_Q_MGR_ATTRS, GET_VALSP(PrmId)),
 /* 1002*/ DEF_VALS2(MQIACF_Q_ATTRS, GET_VALSP(PrmId)),
@@ -4555,6 +4571,7 @@ DEF_VALSB(MQCFINT_Parse)
 /* 1011*/ DEF_VALS2(MQIACF_EVENT_ORIGIN, GET_VALSP(EvtOrig)),
 /* 1012*/ DEF_VALS2(MQIACF_PARAMETER_ID, GET_VALSP(PrmId)),
 /* 1016*/ DEF_VALS2(MQIACF_OBJECT_TYPE, GET_VALSP(objtype)),
+/* 1020*/ DEF_VALS2(MQIACF_REASON_QUALIFIER, GET_VALSP(MQRQ)),
 /* 1021*/ DEF_VALS2(MQIACF_COMMAND, GET_VALSP(mqcmd)),
 /* 1023*/ DEF_VALS2(MQIACF_OPEN_TYPE, GET_VALSP(QueueStatusOpenTypes)),
 /* 1026*/ DEF_VALS2(MQIACF_Q_STATUS_ATTRS, GET_VALSP(PrmId)),
@@ -4566,11 +4583,13 @@ DEF_VALSB(MQCFINT_Parse)
 /* 1101*/ DEF_VALS2(MQIACF_OPEN_INQUIRE, GET_VALSP(QueueStatusOptionsYesNo)),
 /* 1102*/ DEF_VALS2(MQIACF_OPEN_BROWSE, GET_VALSP(QueueStatusOptionsYesNo)),
 /* 1103*/ DEF_VALS2(MQIACF_Q_STATUS_TYPE, GET_VALSP(PrmId)),
+/* 1106*/ DEF_VALS2(MQIACF_SECURITY_TYPE, GET_VALSP(MQSECTYPE)),
 /* 1107*/ DEF_VALS2(MQIACF_CONNECTION_ATTRS, GET_VALSP(PrmId)),
 /* 1110*/ DEF_VALS2(MQIACF_CONN_INFO_TYPE, GET_VALSP(ConnInfoType)),
 /* 1120*/ DEF_VALS2(MQIACF_COMMAND_INFO, GET_VALSP(CommandInformationValues)),
 /* 1126*/ DEF_VALS2(MQIACF_QSG_DISPS, GET_VALSP(QShrGrpDisp)),
 /* 1128*/ DEF_VALS2(MQIACF_UOW_STATE, GET_VALSP(UOWStates)),
+/* 1129*/ DEF_VALS2(MQIACF_SECURITY_ITEM, GET_VALSP(MQSECITEM)),
 /* 1130*/ DEF_VALS2(MQIACF_CF_STRUC_STATUS, GET_VALSP(CFStatus)),
 /* 1132*/ DEF_VALS2(MQIACF_UOW_TYPE, GET_VALSP(UOWTypes)),
 /* 1133*/ DEF_VALS2(MQIACF_CF_STRUC_ATTRS, GET_VALSP(PrmId)),
@@ -4578,9 +4597,34 @@ DEF_VALSB(MQCFINT_Parse)
 /* 1139*/ DEF_VALS2(MQIACF_CF_STRUC_TYPE, GET_VALSP(CFStructType)),
 /* 1149*/ DEF_VALS2(MQIACF_Q_MGR_STATUS, GET_VALSP(QSGStatus)),
 /* 1150*/ DEF_VALS2(MQIACF_DB2_CONN_STATUS, GET_VALSP(QSGStatus)),
-/* 1157*/ DEF_VALS2(MQIACF_USAGE_TYPE, GET_VALSP(UsageType)),
-/* 1261*/ DEF_VALS2(MQIACF_Q_TYPES, GET_VALSP(QueueType)),
+/* 1154*/ DEF_VALS2(MQIACF_SECURITY_SWITCH, GET_VALSP(MQSECSW)),
+/* 1155*/ DEF_VALS2(MQIACF_SECURITY_SETTING, GET_VALSP(MQSECSW)),
+/* 1157*/ DEF_VALS2(MQIACF_USAGE_TYPE, GET_VALSP(PrmId)),
+/* 1165*/ DEF_VALS2(MQIACF_PAGESET_STATUS, GET_VALSP(PrmId)),
+/* 1167*/ DEF_VALS2(MQIACF_USAGE_DATA_SET_TYPE, GET_VALSP(MQUSAGE_DS)),
+/* 1175*/ DEF_VALS2(MQIACF_SYSP_TYPE, GET_VALSP(MQSYSP)),
+/* 1182*/ DEF_VALS2(MQIACF_SYSP_ARCHIVE, GET_VALSP(MQSYSP)),
+/* 1183*/ DEF_VALS2(MQIACF_SYSP_DUAL_ACTIVE, GET_VALSP(MQSYSP)),
+/* 1184*/ DEF_VALS2(MQIACF_SYSP_DUAL_ARCHIVE, GET_VALSP(MQSYSP)),
+/* 1185*/ DEF_VALS2(MQIACF_SYSP_DUAL_BSDS, GET_VALSP(MQSYSP)),
+/* 1197*/ DEF_VALS2(MQIACF_SYSP_SMF_ACCOUNTING, GET_VALSP(MQSYSP)),
+/* 1198*/ DEF_VALS2(MQIACF_SYSP_SMF_STATS, GET_VALSP(MQSYSP)),
+/* 1203*/ DEF_VALS2(MQIACF_SYSP_ALLOC_UNIT, GET_VALSP(MQSYSP)),
+/* 1205*/ DEF_VALS2(MQIACF_SYSP_ARCHIVE_WTOR, GET_VALSP(MQSYSP)),
+/* 1207*/ DEF_VALS2(MQIACF_SYSP_CATALOG, GET_VALSP(MQSYSP)),
+/* 1208*/ DEF_VALS2(MQIACF_SYSP_COMPACT, GET_VALSP(MQSYSP)),
+/* 1211*/ DEF_VALS2(MQIACF_SYSP_PROTECT, GET_VALSP(MQSYSP)),
+/* 1218*/ DEF_VALS2(MQIACF_SYSP_LOG_SUSPEND, GET_VALSP(MQSYSP)),
+/* 1219*/ DEF_VALS2(MQIACF_SYSP_OFFLOAD_STATUS, GET_VALSP(MQSYSP)),
+/* 1232*/ DEF_VALS2(MQIACF_CHINIT_STATUS, GET_VALSP(MQSVC_STATUS)),
+/* 1261*/ DEF_VALS2(MQIACF_Q_TYPES, GET_VALSP(MQUSAGE_PS)),
+/* 1265*/ DEF_VALS2(MQIACF_USAGE_EXPAND_TYPE, GET_VALSP(MQUSAGE_EXPAND)),
+/* 1271*/ DEF_VALS2(MQIACF_PUBSUB_PROPERTIES, GET_VALSP(MQPSPROP)),
+/* 1283*/ DEF_VALS2(MQIACF_PUB_PRIORITY, GET_VALSP(MQPRI)),
+/* 1302*/ DEF_VALS2(MQIACF_TOPIC_STATUS_TYPE, GET_VALSP(PrmId)),
 /* 1308*/ DEF_VALS2(MQIACF_ASYNC_STATE, GET_VALSP(AsynchronousStateValues)),
+/* 1322*/ DEF_VALS2(MQIACF_LOG_COMPRESSION, GET_VALSP(MQCOMPRESS)),
+/* 1324*/ DEF_VALS2(MQIACF_MULC_CAPTURE, GET_VALSP(MQMULC)),
 /* 1328*/ DEF_VALS2(MQIACF_CF_SMDS_BLOCK_SIZE, GET_VALSP(DSBlock)),
 /* 1329*/ DEF_VALS2(MQIACF_CF_SMDS_EXPAND, GET_VALSP(DSExpand)),
 /* 1332*/ DEF_VALS2(MQIACF_CF_STRUC_ACCESS, GET_VALSP(AccessOptions)),
@@ -4591,6 +4635,7 @@ DEF_VALSB(MQCFINT_Parse)
 /* 1350*/ DEF_VALS2(MQIACF_SMDS_AVAIL, GET_VALSP(SMDSAvail)),
 /* 1352*/ DEF_VALS2(MQIACF_CHLAUTH_TYPE, GET_VALSP(ChlauthType)),
 /* 1376*/ DEF_VALS2(MQIACF_SMDS_EXPANDST, GET_VALSP(SMDSExpandSt)),
+/* 1414*/ DEF_VALS2(MQIACF_SYSP_ZHYPERWRITE, GET_VALSP(MQSYSP)),
 /* 1501*/ DEF_VALS2(MQIACH_XMIT_PROTOCOL_TYPE, GET_VALSP(TransportType)),
 /* 1508*/ DEF_VALS2(MQIACH_PUT_AUTHORITY, GET_VALSP(PutAuthority)),
 /* 1511*/ DEF_VALS2(MQIACH_CHANNEL_TYPE, GET_VALSP(ChannelType)),
@@ -4603,10 +4648,13 @@ DEF_VALSB(MQCFINT_Parse)
 /* 1543*/ DEF_VALS2(MQIACH_STOP_REQUESTED, GET_VALSP(ChannelStopOptions)),
 /* 1562*/ DEF_VALS2(MQIACH_NPM_SPEED, GET_VALSP(NonPersistentMsgSpeed)),
 /* 1568*/ DEF_VALS2(MQIACH_SSL_CLIENT_AUTH, GET_VALSP(SSLClientAuthentication)),
-/* 1575*/ DEF_VALS2(MQIACH_HDR_COMPRESSION, GET_VALSP(ChannelCompression)),
-/* 1576*/ DEF_VALS2(MQIACH_MSG_COMPRESSION, GET_VALSP(ChannelCompression)),
+/* 1575*/ DEF_VALS2(MQIACH_HDR_COMPRESSION, GET_VALSP(MQCOMPRESS)),
+/* 1576*/ DEF_VALS2(MQIACH_MSG_COMPRESSION, GET_VALSP(MQCOMPRESS)),
 /* 1580*/ DEF_VALS2(MQIACH_CHANNEL_DISP, GET_VALSP(ChannelDisp)),
+/* 1581*/ DEF_VALS2(MQIACH_INBOUND_DISP, GET_VALSP(MQINBD)),
+/* 1599*/ DEF_VALS2(MQIACH_LISTENER_STATUS, GET_VALSP(MQSVC_STATUS)),
 /* 1609*/ DEF_VALS2(MQIACH_CHANNEL_SUBSTATE, GET_VALSP(ChannelSubStates)),
+/* 1614*/ DEF_VALS2(MQIACH_DEF_CHANNEL_DISP, GET_VALSP(ChannelDisp)),
 /* 1638*/ DEF_VALS2(MQIACH_USER_SOURCE, GET_VALSP(UserSource)),
 /* 1639*/ DEF_VALS2(MQIACH_WARNING, GET_VALSP(Warning)),
 DEF_VALSE;
diff --git a/epan/dissectors/packet-mq.h b/epan/dissectors/packet-mq.h
index 54629bde7f..ef86c8587c 100644
--- a/epan/dissectors/packet-mq.h
+++ b/epan/dissectors/packet-mq.h
@@ -4242,7 +4242,8 @@ typedef struct _mq_parm_t
 #define MQ_MQCACH_MCA_USER_ID_LIST        3568
 #define MQ_MQCACH_SSL_CIPHER_SUITE        3569
 #define MQ_MQCACH_WEBCONTENT_PATH         3570
-#define MQ_MQCACH_LAST_USED               3570
+#define MQ_MQCACH_TOPIC_ROOT              3571
+#define MQ_MQCACH_LAST_USED               3571
 
 /****************************************************************/
 /* Values Related to Group Parameter Structures                 */
@@ -4754,6 +4755,21 @@ typedef struct _mq_parm_t
 #define MQ_MQCHLA_DISABLED                0
 #define MQ_MQCHLA_ENABLED                 1
 
+/* REVDNS QMGR State */
+#define MQ_MQRDNS_ENABLED                 0
+#define MQ_MQRDNS_DISABLED                1
+
+/* CLROUTE Topic State */
+#define MQ_MQCLROUTE_DIRECT               0
+#define MQ_MQCLROUTE_TOPIC_HOST           1
+#define MQ_MQCLROUTE_NONE                 2
+
+/* CLSTATE Clustered Topic Definition State */
+#define MQ_MQCLST_ACTIVE                  0
+#define MQ_MQCLST_PENDING                 1
+#define MQ_MQCLST_INVALID                 2
+#define MQ_MQCLST_ERROR                   3
+
 /* Transmission queue types */
 #define MQ_MQCLXQ_SCTQ                    0
 #define MQ_MQCLXQ_CHANNEL                 1