From robionekenobi: Enhancement of the packet-mq dissector (WMQ 7.1-7.5)

 Add more detail for SPI Open LPOO Structure
 Add more int_to_vals for INQ_Q_MGR reply
 Add more display detail for encoding value
 Some fix and display correction

Note: The patch used was the *original* patch submitted (plus some fixes by me).

That is: (https://bugs.wireshark.org/bugzilla/attachment.cgi?id=11962)
         plus my fixes

See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9367 and comments for
details.

From me:
- Fix bug which resulted in a macro expansion fail on GCC
- Fix a -Wshadow error in packet-mq-pcf.c


svn path=/trunk/; revision=53078

1 files changed, 87 insertions, 19 deletions

diff --git a/epan/dissectors/packet-mq-base.c b/epan/dissectors/packet-mq-base.c
index 2b797ff70e..e16fbc0632 100644
--- a/epan/dissectors/packet-mq-base.c
+++ b/epan/dissectors/packet-mq-base.c
@@ -59,7 +59,7 @@ guint16 tvb_get_guint16_endian(tvbuff_t *a_tvb, gint a_iOffset, gint a_rep)
 	return sResult;
 };
 /* This routine truncates the string at the first blank space */
-guint32 strip_trailing_blanks(guint8* a_str, guint32 a_size)
+gint32 strip_trailing_blanks(guint8* a_str, guint32 a_size)
 {
 	gint32 i = 0;
 	if (a_str != NULL)
@@ -75,6 +75,15 @@ guint32 strip_trailing_blanks(guint8* a_str, guint32 a_size)
 	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_VALRE;
+
 DEF_VALSB(mqat)
 	DEF_VALS1(MQAT_UNKNOWN          ),
 	DEF_VALS1(MQAT_NO_CONTEXT       ),
@@ -1713,8 +1722,8 @@ DEF_VALSE;
 
 DEF_VALSB(Monitoring)
 	DEF_VALS1(MQMON_NONE  ),
-	DEF_VALS1(MQMON_ON    ),
-	DEF_VALS1(MQMON_OFF   ),
+	DEF_VALS2(MQMON_ON    ,"ON/ENABLED"),
+	DEF_VALS2(MQMON_OFF   ,"OFF/DISABLED"),
 	DEF_VALS1(MQMON_LOW   ),
 	DEF_VALS1(MQMON_MEDIUM),
 	DEF_VALS1(MQMON_HIGH  ),
@@ -4881,10 +4890,6 @@ DEF_VALSB(IGQPutAuthority)
 	DEF_VALS1(MQIGQPA_ALTERNATE_OR_IGQ),
 DEF_VALSE;
 
-/*Only on z/OS */
-#define MQSCYC_UPPER                   0
-#define MQSCYC_MIXED                   1
-
 DEF_VALSB(SecurityCase)
 	DEF_VALS1(MQSCYC_UPPER),
 	DEF_VALS1(MQSCYC_MIXED),
@@ -4892,8 +4897,8 @@ DEF_VALSE;
 
 DEF_VALSB(ChlauthType)
 	DEF_VALS1(MQCAUT_BLOCKUSER ),
-	DEF_VALS1(MQCAUT_BLOCKADDR ), 
-	DEF_VALS1(MQCAUT_SSLPEERMAP), 
+	DEF_VALS1(MQCAUT_BLOCKADDR ),
+	DEF_VALS1(MQCAUT_SSLPEERMAP),
 	DEF_VALS1(MQCAUT_ADDRESSMAP),
 	DEF_VALS1(MQCAUT_USERMAP   ),
 	DEF_VALS1(MQCAUT_QMGRMAP   ),
@@ -4910,10 +4915,52 @@ DEF_VALSB(Warning)
 	DEF_VALS1(MQWARN_YES),
 DEF_VALSE;
 
+DEF_VALSB(CertValPolicy)
+	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_VALSE;
+
+DEF_VALSB(ChlAuthRecords)
+	DEF_VALS1(MQCHLA_DISABLED),
+	DEF_VALS1(MQCHLA_ENABLED ),
+DEF_VALSE;
+
+DEF_VALSB(DefClusXmitTyp)
+	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_VALSE;
+
+DEF_VALSB(Capability)
+	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_VALSE;
+
+DEF_VALSB(SyncpointAvailability)
+	DEF_VALS1(MQSP_AVAILABLE    ),
+	DEF_VALS1(MQSP_NOT_AVAILABLE),
+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_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)),
@@ -4925,17 +4972,17 @@ DEF_VALSB(MQCFINT_Parse)
 	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_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_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(MQIACF_UOW_TYPE              ,GET_VALSP(UOWTypes)),
 	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)),
@@ -4954,29 +5001,39 @@ DEF_VALSB(MQCFINT_Parse)
 	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_AUTH_INFO_TYPE          ,GET_VALSP(AuthInfoType)),
 	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_DURABLE_SUB             ,GET_VALSP(DurableSubscriptions)),
 	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)),
@@ -4989,23 +5046,26 @@ DEF_VALSB(MQCFINT_Parse)
 	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_PM_DELIVERY             ,GET_VALSP(MsgDelivery)),
-	DEF_VALS2(MQIA_NPM_DELIVERY            ,GET_VALSP(MsgDelivery)),
 	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_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)),
 	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)),
@@ -5020,8 +5080,15 @@ DEF_VALSB(MQCFINT_Parse)
 	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_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)),
@@ -5032,6 +5099,7 @@ DEF_VALSB(MQCFINT_Parse)
 	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;
 
 /*