packet-mq: Add support for IMS+TM Struct

Added support for IMS, TM, TMC2 Struct
Improve display some Flags in ID Struct
Fix display for FCNO Struct
Fix error in get_mq_pdu_len
Code reformat (VS2017)
Moved DEFINE to header file
More struct display fixed
Fix for IMS Msg len display

Change-Id: I80bfd25a5079598fc44124dc2c7b850640a38b00
Reviewed-on: https://code.wireshark.org/review/25295
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 20 insertions, 20 deletions

diff --git a/epan/dissectors/packet-mq-base.c b/epan/dissectors/packet-mq-base.c
index f4bd9c3003..db6ba01411 100644
--- a/epan/dissectors/packet-mq-base.c
+++ b/epan/dissectors/packet-mq-base.c
@@ -2,7 +2,7 @@
  * Routines for IBM WebSphere MQ packet dissection base
  *
  * metatech <metatech@flashmail.com>
- * robionekenobi <robionekenobi@bluewin.ch>
+ * Robert Grange <robionekenobi@bluewin.ch>
  *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
@@ -129,7 +129,7 @@ DEF_VALSBX(FilterOP)
 /* 29*/ DEF_VALS1(MQCFOP_EXCLUDES_GEN),
 DEF_VALSE;
 
-DEF_VALSB(PutResponse)
+DEF_VALSBX(MQPRT)
 /* 0*/ DEF_VALS1(MQPRT_RESPONSE_AS_PARENT),
 /* 1*/ DEF_VALS1(MQPRT_SYNC_RESPONSE),
 /* 2*/ DEF_VALS1(MQPRT_ASYNC_RESPONSE),
@@ -424,7 +424,7 @@ DEF_VALSB(ReorgCtls)
 DEF_VALSE;
 #endif
 
-DEF_VALSB(MQREADA)
+DEF_VALSBX(MQREADA)
 /* 0*/ DEF_VALS1(MQREADA_NO),
 /* 1*/ DEF_VALS1(MQREADA_YES),
 /* 2*/ DEF_VALS1(MQREADA_DISABLED),
@@ -432,7 +432,7 @@ DEF_VALSB(MQREADA)
 /* 4*/ DEF_VALS1(MQREADA_BACKLOG),
 DEF_VALSE;
 
-DEF_VALSB(PropertyCtlVal)
+DEF_VALSBX(MQPROP)
 /* 0*/ DEF_VALS1(MQPROP_COMPATIBILITY),
 /* 1*/ DEF_VALS1(MQPROP_NONE),
 /* 2*/ DEF_VALS1(MQPROP_ALL),
@@ -452,7 +452,7 @@ DEF_VALSB(EvtOrig)
 /* 8*/ DEF_VALS1(MQEVO_REST),
 DEF_VALSE;
 
-DEF_VALSB(Persistence)
+DEF_VALSBX(MQPER)
 /* -1*/ DEF_VALS1(MQPER_PERSISTENCE_AS_PARENT),
 /*  0*/ DEF_VALS1(MQPER_NOT_PERSISTENT),
 /*  1*/ DEF_VALS1(MQPER_PERSISTENT),
@@ -485,8 +485,9 @@ DEF_VALSB(MQIMGRCOV)
 /*   1*/ DEF_VALS1(MQIMGRCOV_YES),
 /*   2*/ DEF_VALS1(MQIMGRCOV_AS_Q_MGR),
 DEF_VALSE;
+#endif
 
-DEF_VALSB(MsgType)
+DEF_VALSBX(MQMT)
 /*   1*/ DEF_VALS1(MQMT_REQUEST),
 /*   2*/ DEF_VALS1(MQMT_REPLY),
 /*   3*/ DEF_VALS1(MQMT_DATAGRAM),
@@ -494,7 +495,6 @@ DEF_VALSB(MsgType)
 /* 112*/ DEF_VALS1(MQMT_MQE_FIELDS_FROM_MQE),
 /* 113*/ DEF_VALS1(MQMT_MQE_FIELDS),
 DEF_VALSE;
-#endif
 
 DEF_VALSB(Platform)
 /*  1*/ DEF_VALS2(MQPL_ZOS, "ZOS/MVS/OS390"),
@@ -1609,7 +1609,7 @@ DEF_VALSB(SMDSUsage)
 /* 1*/ DEF_VALS1(MQUSAGE_SMDS_NO_DATA),
 DEF_VALSE;
 
-DEF_VALSB(mqat)
+DEF_VALSB(MQAT)
 /*    0*/ DEF_VALS1(MQAT_NO_CONTEXT),
 /*    1*/ DEF_VALS1(MQAT_CICS),
 /*    2*/ DEF_VALS1(MQAT_ZOS),
@@ -1646,9 +1646,9 @@ DEF_VALSB(mqat)
 /*   37*/ DEF_VALS1(MQAT_AMQP),
 /*   -1*/ DEF_VALS1(MQAT_UNKNOWN),
 DEF_VALSE;
-DEF_VALS_EXTBX(mqat);
+DEF_VALS_EXTBX(MQAT);
 
-DEF_VALSB(mqcmd)
+DEF_VALSB(MQCMD)
 /*    0*/ DEF_VALS1(MQCMD_NONE),
 /*    1*/ DEF_VALS1(MQCMD_CHANGE_Q_MGR),
 /*    2*/ DEF_VALS1(MQCMD_INQUIRE_Q_MGR),
@@ -1843,9 +1843,9 @@ DEF_VALSB(mqcmd)
 /*  217*/ DEF_VALS1(MQCMD_AMQP_DIAGNOSTICS),
 
 DEF_VALSE;
-DEF_VALS_EXTBX(mqcmd);
+DEF_VALS_EXTBX(MQCMD);
 
-DEF_VALSB(mqrc)
+DEF_VALSB(MQRC)
 /*    0*/ DEF_VALS1(MQRC_NONE),
 /* 2001*/ DEF_VALS1(MQRC_ALIAS_BASE_Q_TYPE_ERROR),
 /* 2002*/ DEF_VALS1(MQRC_ALREADY_CONNECTED),
@@ -2744,7 +2744,7 @@ DEF_VALSB(mqrc)
 /* 6129*/ DEF_VALS1(MQRC_REFERENCE_ERROR),
 /* 6130*/ DEF_VALS1(MQRC_XR_NOT_AVAILABLE),
 DEF_VALSE;
-DEF_VALS_EXTBX(mqrc);
+DEF_VALS_EXTBX(MQRC);
 
 DEF_VALSB(objtype)
 /*    0*/ DEF_VALS1(MQOT_NONE),
@@ -4468,9 +4468,9 @@ DEF_VALSE;
 DEF_VALS_EXTBX(selector);
 
 DEF_VALSB(MQCFINT_Parse)
-/*    1*/ DEF_VALS2(MQIA_APPL_TYPE, GET_VALSP(mqat)),
+/*    1*/ DEF_VALS2(MQIA_APPL_TYPE, GET_VALSP(MQAT)),
 /*    4*/ DEF_VALS2(MQIA_DEF_INPUT_OPEN_OPTION, GET_VALSP(InputOpenOption)),
-/*    5*/ DEF_VALS2(MQIA_DEF_PERSISTENCE, GET_VALSP(Persistence)),
+/*    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)),
@@ -4544,12 +4544,12 @@ DEF_VALSB(MQCFINT_Parse)
 /*  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)),
+/*  184*/ DEF_VALS2(MQIA_DEF_PUT_RESPONSE_TYPE, GET_VALSP(MQPRT)),
+/*  185*/ DEF_VALS2(MQIA_TOPIC_DEF_PERSISTENCE, GET_VALSP(MQPER)),
 /*  187*/ DEF_VALS2(MQIA_PUBSUB_MODE, GET_VALSP(PubSubMode)),
 /*  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)),
+/*  190*/ DEF_VALS2(MQIA_PROPERTY_CONTROL, GET_VALSP(MQPROP)),
 /*  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)),
@@ -4594,12 +4594,12 @@ DEF_VALSB(MQCFINT_Parse)
 /* 1001*/ DEF_VALS2(MQIACF_Q_MGR_ATTRS, GET_VALSP(PrmId)),
 /* 1002*/ DEF_VALS2(MQIACF_Q_ATTRS, GET_VALSP(PrmId)),
 /* 1006*/ DEF_VALS2(MQIACF_REPLACE, GET_VALSP(ReplaceOptions)),
-/* 1010*/ DEF_VALS2(MQIACF_EVENT_APPL_TYPE, GET_VALSP(mqat)),
+/* 1010*/ DEF_VALS2(MQIACF_EVENT_APPL_TYPE, GET_VALSP(MQAT)),
 /* 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)),
+/* 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)),
 /* 1028*/ DEF_VALS2(MQIACF_HANDLE_STATE, GET_VALSP(HandleStates)),