aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Grange <robionekenobi@bluewin.ch>2018-04-11 16:37:07 +0200
committerAnders Broman <a.broman58@gmail.com>2018-04-15 06:37:13 +0000
commit0efafe8616a9fba7b1adf1221cf8bcadc2e9ae04 (patch)
tree5e54c5dc61ba98e03d3d5235005cc544749136a9
parent9c5049a80b635d5d12829a4c51db9696dadaee00 (diff)
packet-mq: Fix for Missing Const
Fix to fill in some missing const in Display Change-Id: Ic9fa51eef84cefffc29f7424246e707c560ba1d0 Reviewed-on: https://code.wireshark.org/review/26892 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--epan/dissectors/packet-mq-base.c92
1 files changed, 45 insertions, 47 deletions
diff --git a/epan/dissectors/packet-mq-base.c b/epan/dissectors/packet-mq-base.c
index ae92fa4..49f5f4e 100644
--- a/epan/dissectors/packet-mq-base.c
+++ b/epan/dissectors/packet-mq-base.c
@@ -244,7 +244,7 @@ DEF_VALSB(DataConversion)
/* 1*/ DEF_VALS1(MQCDC_SENDER_CONVERSION),
DEF_VALSE;
-DEF_VALSB(Usage)
+DEF_VALSB(MQUS)
/* 0*/ DEF_VALS1(MQUS_NORMAL),
/* 1*/ DEF_VALS1(MQUS_TRANSMISSION),
DEF_VALSE;
@@ -269,7 +269,7 @@ DEF_VALSB(ServiceIntervalEvent)
/* 2*/ DEF_VALS1(MQQSIE_OK),
DEF_VALSE;
-DEF_VALSB(Monitoring)
+DEF_VALSB(MQMON)
/* -3*/ DEF_VALS1(MQMON_Q_MGR),
/* -1*/ DEF_VALS2(MQMON_NONE, "NONE/NOTAVAIL"),
/* 0*/ DEF_VALS2(MQMON_OFF, "OFF/DISABLED"),
@@ -279,7 +279,7 @@ DEF_VALSB(Monitoring)
/* 65*/ DEF_VALS1(MQMON_HIGH),
DEF_VALSE;
-DEF_VALSB(QueueType)
+DEF_VALSB(MQQT)
/* 1*/ DEF_VALS1(MQQT_LOCAL),
/* 2*/ DEF_VALS1(MQQT_MODEL),
/* 3*/ DEF_VALS1(MQQT_ALIAS),
@@ -298,7 +298,7 @@ DEF_VALSB(MQEVR)
/* 6*/ DEF_VALS1(MQEVR_USER_ONLY),
DEF_VALSE;
-DEF_VALSB(InputOpenOption)
+DEF_VALSB(MQOO)
/* 0x00000002*/ DEF_VALS1(MQOO_INPUT_SHARED),
/* 0x00000004*/ DEF_VALS1(MQOO_INPUT_EXCLUSIVE),
DEF_VALSE;
@@ -315,14 +315,14 @@ DEF_VALSB(CLWLUseQ)
/* 1*/ DEF_VALS1(MQCLWL_USEQ_ANY),
DEF_VALSE;
-DEF_VALSB(DefinitionType)
+DEF_VALSB(MQQDT)
/* 1*/ DEF_VALS1(MQQDT_PREDEFINED),
/* 2*/ DEF_VALS1(MQQDT_PERMANENT_DYNAMIC),
/* 3*/ DEF_VALS1(MQQDT_TEMPORARY_DYNAMIC),
/* 4*/ DEF_VALS1(MQQDT_SHARED_DYNAMIC),
DEF_VALSE;
-DEF_VALSB(InhibitGetVal)
+DEF_VALSB(MQQA_GET)
/* 0*/ DEF_VALS1(MQQA_GET_ALLOWED),
/* 1*/ DEF_VALS1(MQQA_GET_INHIBITED),
DEF_VALSE;
@@ -332,7 +332,7 @@ DEF_VALSB(IntraGroupQueuing)
/* 1*/ DEF_VALS1(MQIGQ_ENABLED),
DEF_VALSE;
-DEF_VALSB(InhibitPutVal)
+DEF_VALSB(MQQA_PUT)
/* 0*/ DEF_VALS1(MQQA_PUT_ALLOWED),
/* 1*/ DEF_VALS1(MQQA_PUT_INHIBITED),
DEF_VALSE;
@@ -342,12 +342,12 @@ DEF_VALSB(Shareability)
/* 1*/ DEF_VALS1(MQQA_SHAREABLE),
DEF_VALSE;
-DEF_VALSB(BackOutHardening)
+DEF_VALSB(MQQA_BACKOUT)
/* 0*/ DEF_VALS1(MQQA_BACKOUT_NOT_HARDENED),
/* 1*/ DEF_VALS1(MQQA_BACKOUT_HARDENED),
DEF_VALSE;
-DEF_VALSB(MsgDelivSeq)
+DEF_VALSB(MQMDS)
/* 0*/ DEF_VALS1(MQMDS_PRIORITY),
/* 1*/ DEF_VALS1(MQMDS_FIFO),
DEF_VALSE;
@@ -672,16 +672,6 @@ DEF_VALSB(ChannelTableTypes)
DEF_VALSE;
#endif
-#if 0
-DEF_VALSB(ChinitStatus)
-/* 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;
-#endif
-
DEF_VALSB(MQINBD)
/* 0*/ DEF_VALS1(MQINBD_Q_MGR),
/* 3*/ DEF_VALS1(MQINBD_GROUP),
@@ -1200,12 +1190,10 @@ DEF_VALSB(WildcardSchema)
DEF_VALSE;
#endif
-#if 0
-DEF_VALSB(UserIDSupport)
+DEF_VALSB(MQUIDSUPP)
/* 0*/ DEF_VALS1(MQUIDSUPP_NO),
/* 1*/ DEF_VALS1(MQUIDSUPP_YES),
DEF_VALSE;
-#endif
DEF_VALSB(MQUNDELIVERED)
/* 0*/ DEF_VALS1(MQUNDELIVERED_NORMAL),
@@ -1406,7 +1394,7 @@ DEF_VALSB(MQSVC_STATUS)
/* 4*/ DEF_VALS1(MQSVC_STATUS_RETRYING),
DEF_VALSE;
-DEF_VALSB(Capability)
+DEF_VALSB(MQCAP)
/* 0*/ DEF_VALS1(MQCAP_NOT_SUPPORTED),
/* 1*/ DEF_VALS1(MQCAP_SUPPORTED),
/* 2*/ DEF_VALS1(MQCAP_EXPIRED),
@@ -1597,6 +1585,11 @@ DEF_VALSB(SMDSUsage)
/* 1*/ DEF_VALS1(MQUSAGE_SMDS_NO_DATA),
DEF_VALSE;
+DEF_VALSB(MQSTDBY)
+/* 0*/ DEF_VALS1(MQSTDBY_NOT_PERMITTED),
+/* 1*/ DEF_VALS1(MQSTDBY_PERMITTED),
+DEF_VALSE;
+
DEF_VALSB(MQAT)
/* 0*/ DEF_VALS1(MQAT_NO_CONTEXT),
/* 1*/ DEF_VALS1(MQAT_CICS),
@@ -4457,16 +4450,16 @@ DEF_VALS_EXTBX(selector);
DEF_VALSB(MQCFINT_Parse)
/* 1*/ DEF_VALS2(MQIA_APPL_TYPE, GET_VALSP(MQAT)),
-/* 4*/ DEF_VALS2(MQIA_DEF_INPUT_OPEN_OPTION, GET_VALSP(InputOpenOption)),
+/* 4*/ DEF_VALS2(MQIA_DEF_INPUT_OPEN_OPTION, GET_VALSP(MQOO)),
/* 5*/ DEF_VALS2(MQIA_DEF_PERSISTENCE, GET_VALSP(MQPER)),
/* 6*/ DEF_VALS2(MQIA_DEF_PRIORITY, GET_VALSP(MQPRI)),
-/* 7*/ DEF_VALS2(MQIA_DEFINITION_TYPE, GET_VALSP(DefinitionType)),
-/* 8*/ DEF_VALS2(MQIA_HARDEN_GET_BACKOUT, GET_VALSP(BackOutHardening)),
-/* 9*/ DEF_VALS2(MQIA_INHIBIT_GET, GET_VALSP(InhibitGetVal)),
-/* 10*/ DEF_VALS2(MQIA_INHIBIT_PUT, GET_VALSP(InhibitPutVal)),
-/* 12*/ DEF_VALS2(MQIA_USAGE, GET_VALSP(Usage)),
-/* 16*/ DEF_VALS2(MQIA_MSG_DELIVERY_SEQUENCE, GET_VALSP(MsgDelivSeq)),
-/* 20*/ DEF_VALS2(MQIA_Q_TYPE, GET_VALSP(QueueType)),
+/* 7*/ DEF_VALS2(MQIA_DEFINITION_TYPE, GET_VALSP(MQQDT)),
+/* 8*/ DEF_VALS2(MQIA_HARDEN_GET_BACKOUT, GET_VALSP(MQQA_BACKOUT)),
+/* 9*/ DEF_VALS2(MQIA_INHIBIT_GET, GET_VALSP(MQQA_GET)),
+/* 10*/ DEF_VALS2(MQIA_INHIBIT_PUT, GET_VALSP(MQQA_PUT)),
+/* 12*/ DEF_VALS2(MQIA_USAGE, GET_VALSP(MQUS)),
+/* 16*/ DEF_VALS2(MQIA_MSG_DELIVERY_SEQUENCE, GET_VALSP(MQMDS)),
+/* 20*/ DEF_VALS2(MQIA_Q_TYPE, GET_VALSP(MQQT)),
/* 23*/ DEF_VALS2(MQIA_SHAREABILITY, GET_VALSP(Shareability)),
/* 24*/ DEF_VALS2(MQIA_TRIGGER_CONTROL, GET_VALSP(TriggerControl)),
/* 28*/ DEF_VALS2(MQIA_TRIGGER_TYPE, GET_VALSP(TriggerType)),
@@ -4513,18 +4506,18 @@ DEF_VALSB(MQCFINT_Parse)
/* 117*/ DEF_VALS2(MQIA_CHINIT_TRACE_AUTO_START, GET_VALSP(ChinitTraceAutoStart)),
/* 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)),
-/* 124*/ DEF_VALS2(MQIA_MONITORING_AUTO_CLUSSDR, GET_VALSP(Monitoring)),
-/* 127*/ DEF_VALS2(MQIA_STATISTICS_MQI, GET_VALSP(Monitoring)),
-/* 128*/ DEF_VALS2(MQIA_STATISTICS_Q, GET_VALSP(Monitoring)),
-/* 129*/ DEF_VALS2(MQIA_STATISTICS_CHANNEL, GET_VALSP(Monitoring)),
-/* 130*/ DEF_VALS2(MQIA_STATISTICS_AUTO_CLUSSDR, GET_VALSP(Monitoring)),
-/* 131*/ DEF_VALS2(MQIA_STATISTICS_INTERVAL, GET_VALSP(Monitoring)),
-/* 133*/ DEF_VALS2(MQIA_ACCOUNTING_MQI, GET_VALSP(Monitoring)),
-/* 134*/ DEF_VALS2(MQIA_ACCOUNTING_Q, GET_VALSP(Monitoring)),
-/* 136*/ DEF_VALS2(MQIA_ACCOUNTING_CONN_OVERRIDE, GET_VALSP(Monitoring)),
+/* 122*/ DEF_VALS2(MQIA_MONITORING_CHANNEL, GET_VALSP(MQMON)),
+/* 123*/ DEF_VALS2(MQIA_MONITORING_Q, GET_VALSP(MQMON)),
+/* 124*/ DEF_VALS2(MQIA_MONITORING_AUTO_CLUSSDR, GET_VALSP(MQMON)),
+/* 124*/ DEF_VALS2(MQIA_MONITORING_AUTO_CLUSSDR, GET_VALSP(MQMON)),
+/* 127*/ DEF_VALS2(MQIA_STATISTICS_MQI, GET_VALSP(MQMON)),
+/* 128*/ DEF_VALS2(MQIA_STATISTICS_Q, GET_VALSP(MQMON)),
+/* 129*/ DEF_VALS2(MQIA_STATISTICS_CHANNEL, GET_VALSP(MQMON)),
+/* 130*/ DEF_VALS2(MQIA_STATISTICS_AUTO_CLUSSDR, GET_VALSP(MQMON)),
+/* 131*/ DEF_VALS2(MQIA_STATISTICS_INTERVAL, GET_VALSP(MQMON)),
+/* 133*/ DEF_VALS2(MQIA_ACCOUNTING_MQI, GET_VALSP(MQMON)),
+/* 134*/ DEF_VALS2(MQIA_ACCOUNTING_Q, GET_VALSP(MQMON)),
+/* 136*/ DEF_VALS2(MQIA_ACCOUNTING_CONN_OVERRIDE, GET_VALSP(MQMON)),
/* 137*/ DEF_VALS2(MQIA_TRACE_ROUTE_RECORDING, GET_VALSP(TraceRouteRecording)),
/* 138*/ DEF_VALS2(MQIA_ACTIVITY_RECORDING, GET_VALSP(ActivityRecording)),
/* 141*/ DEF_VALS2(MQIA_SECURITY_CASE, GET_VALSP(SecurityCase)),
@@ -4557,8 +4550,9 @@ DEF_VALSB(MQCFINT_Parse)
/* 232*/ DEF_VALS2(MQIA_COMM_EVENT, GET_VALSP(MQEVR)),
/* 233*/ DEF_VALS2(MQIA_MCAST_BRIDGE, GET_VALSP(MQMCB)),
/* 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)),
+/* 239*/ DEF_VALS2(MQIA_ACTIVITY_CONN_OVERRIDE, GET_VALSP(MQMON)),
+/* 240*/ DEF_VALS2(MQIA_ACTIVITY_TRACE, GET_VALSP(MQMON)),
+/* 243*/ DEF_VALS2(MQIA_XR_CAPABILITY, GET_VALSP(MQCAP)),
/* 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)),
@@ -4566,7 +4560,7 @@ DEF_VALSB(MQCFINT_Parse)
/* 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)),
+/* 251*/ DEF_VALS2(MQIA_PROT_POLICY_CAPABILITY, GET_VALSP(MQCAP)),
/* 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)),
@@ -4577,6 +4571,7 @@ DEF_VALSB(MQCFINT_Parse)
/* 261*/ DEF_VALS2(MQIA_LDAP_SECURE_COMM, GET_VALSP(MQSECCOMM)),
/* 263*/ DEF_VALS2(MQIA_LDAP_AUTHORMD, GET_VALSP(MQLDAP_AUTHORMD)),
/* 264*/ DEF_VALS2(MQIA_LDAP_NESTGRP, GET_VALSP(MQLDAP_NESTGRP)),
+/* 265*/ DEF_VALS2(MQIA_AMQP_CAPABILITY, GET_VALSP(MQCAP)),
/* 266*/ DEF_VALS2(MQIA_AUTHENTICATION_METHOD, GET_VALSP(MQAUTHENTICATE)),
/* 267*/ DEF_VALS2(MQIA_KEY_REUSE_COUNT, GET_VALSP(Keyreusecount)),
/* 1001*/ DEF_VALS2(MQIACF_Q_MGR_ATTRS, GET_VALSP(PrmId)),
@@ -4634,7 +4629,9 @@ DEF_VALSB(MQCFINT_Parse)
/* 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(QueueType)),
+/* 1233*/ DEF_VALS2(MQIACF_CMD_SERVER_STATUS, GET_VALSP(MQSVC_STATUS)),
+/* 1261*/ DEF_VALS2(MQIACF_Q_TYPES, GET_VALSP(MQQT)),
+/* 1262*/ DEF_VALS2(MQIACF_USER_ID_SUPPORT, GET_VALSP(MQUIDSUPP)),
/* 1265*/ DEF_VALS2(MQIACF_USAGE_EXPAND_TYPE, GET_VALSP(MQUSAGE_EXPAND)),
/* 1271*/ DEF_VALS2(MQIACF_PUBSUB_PROPERTIES, GET_VALSP(MQPSPROP)),
/* 1274*/ DEF_VALS2(MQIACF_DURABLE_SUBSCRIPTION, GET_VALSP(MQSUB_DURABLE)),
@@ -4647,6 +4644,7 @@ DEF_VALSB(MQCFINT_Parse)
/* 1308*/ DEF_VALS2(MQIACF_PS_STATUS_TYPE, GET_VALSP(MQPSST)),
/* 1322*/ DEF_VALS2(MQIACF_LOG_COMPRESSION, GET_VALSP(MQCOMPRESS)),
/* 1324*/ DEF_VALS2(MQIACF_MULC_CAPTURE, GET_VALSP(MQMULC)),
+/* 1325*/ DEF_VALS2(MQIACF_PERMIT_STANDBY, GET_VALSP(MQSTDBY)),
/* 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)),