MQ: use FT_STRING, not FT_STRINGZ, for strings.

The documentation mentioned looks more like API/ABI documentation than
"data on the wire" documentation, but the strings all look like counted
strings, with no trwminating NUL.  Use FT_STRING, not FT_STRINGZ.

Add a URL for the MQ PCF documentation and replace no-longer-working
URLs for the MQ documentation with a working URL.

Change-Id: Id656a3e6cd75bff34d1a5a650229b4ba749ef365
Reviewed-on: https://code.wireshark.org/review/38134
Petri-Dish: Guy Harris <gharris@sonic.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <gharris@sonic.net>
This commit is contained in:
Guy Harris 2020-08-11 23:51:02 -07:00
parent 9c1a55a5ae
commit 3e9bf7d7cb
2 changed files with 128 additions and 124 deletions

View File

@ -15,8 +15,13 @@
*
* The MQ Programmable Command Formats API allows remotely configuring a queue manager.
*
* MQ PCF documentation is called "WebSphere MQ Programmable Command Formats and Administration Interface"
*/
* MQ PCF documentation is called "WebSphere MQ Programmable Command
* Formats and Administration Interface"
*
* See:
*
* ftp://public.dhe.ibm.com/software/integration/wmq/docs/V7.0/PDFs/V7.0_2008/csqzak11.pdf
*/
#include "config.h"
@ -662,8 +667,8 @@ void proto_register_mqpcf(void)
{ &hf_mq_pcf_prmstrlen , { "ParmStrLn", "mqpcf.parm.strlen" , FT_UINT32 , BASE_DEC, NULL, 0x0, "MQPCF parameter strlen", HFILL }},
{ &hf_mq_pcf_prmcount , { "ParmCount", "mqpcf.parm.count" , FT_UINT32 , BASE_DEC, NULL, 0x0, "MQPCF parameter count", HFILL }},
{ &hf_mq_pcf_prmunused , { "ParmUnuse", "mqpcf.parm.unused" , FT_UINT32 , BASE_DEC, NULL, 0x0, "MQPCF parameter unused", HFILL }},
{ &hf_mq_pcf_string , { "String...", "mqpcf.parm.string" , FT_STRINGZ, BASE_NONE, NULL, 0x0, "MQPCF parameter string", HFILL }},
{ &hf_mq_pcf_stringlist , { "StrList..", "mqpcf.parm.stringlist", FT_STRINGZ, BASE_NONE, NULL, 0x0, "MQPCF parameter string list", HFILL }},
{ &hf_mq_pcf_string , { "String...", "mqpcf.parm.string" , FT_STRING, BASE_NONE, NULL, 0x0, "MQPCF parameter string", HFILL }},
{ &hf_mq_pcf_stringlist , { "StrList..", "mqpcf.parm.stringlist", FT_STRING, BASE_NONE, NULL, 0x0, "MQPCF parameter string list", HFILL }},
{ &hf_mq_pcf_int , { "Integer..", "mqpcf.parm.int" , FT_INT32 , BASE_DEC, NULL, 0x0, "MQPCF parameter int", HFILL }},
{ &hf_mq_pcf_intlist , { "IntList..", "mqpcf.parm.intlist" , FT_INT32 , BASE_DEC, NULL, 0x0, "MQPCF parameter int list", HFILL }},
{ &hf_mq_pcf_bytestring , { "ByteStr..", "mqpcf.parm.bytestring", FT_BYTES , BASE_NONE, NULL, 0x0, "MQPCF parameter byte string", HFILL }},

View File

@ -41,9 +41,7 @@
*
* See:
*
* http://www-01.ibm.com/support/docview.wss?uid=pub1sc34606203
*
* http://www-01.ibm.com/support/docview.wss?uid=pub1sc34694001
* ftp://public.dhe.ibm.com/software/integration/wmq/docs/V7.0/PDFs/V7.0_2008/csqzak11.pdf
*
* Possible structures combinations :
* TSH [ ID ^ UID ^ CONN ^ INQ ^ OD ]
@ -56,7 +54,8 @@
* This dissector is a beta version. To be improved
* - Translate the integers/flags into their descriptions
* - Find the semantics of the unknown fields
* - Display EBCDIC strings as ASCII
* - Display EBCDIC strings as ASCII (XXX - we do this in some places;
* do any remain to be fixed?)
* - Packets which structures built on different platforms
*/
@ -3809,7 +3808,7 @@ void proto_register_mq(void)
{
static hf_register_info hf[] =
{
{ &hf_mq_tsh_StructID , {"StructID..", "mq.tsh.structid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
{ &hf_mq_tsh_StructID , {"StructID..", "mq.tsh.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
{ &hf_mq_tsh_mqseglen , {"MQSegmLen.", "mq.tsh.seglength", FT_UINT32, BASE_DEC, NULL, 0x0, "TSH MQ Segment length", HFILL }},
{ &hf_mq_tsh_convid , {"Convers ID", "mq.tsh.convid", FT_UINT32, BASE_DEC, NULL, 0x0, "TSH Conversation ID", HFILL }},
{ &hf_mq_tsh_requestid, {"Request ID", "mq.tsh.requestid", FT_UINT32, BASE_DEC, NULL, 0x0, "TSH Request ID", HFILL }},
@ -3847,27 +3846,27 @@ void proto_register_mq(void)
{ &hf_mq_socket_parm1 , {"Parm1....", "mq.socket.parm1", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "Socket Parameter 1", HFILL }},
{ &hf_mq_socket_parm2 , {"Parm2....", "mq.socket.parm2", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "Socket Parameter 2", HFILL }},
{ &hf_mq_caut_StructID , {"StructID.", "mq.caut.structid" , FT_STRINGZ, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
{ &hf_mq_caut_StructID , {"StructID.", "mq.caut.structid" , FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
{ &hf_mq_caut_AuthType , {"AuthType.", "mq.caut.authtype" , FT_UINT32 , BASE_HEX_DEC, NULL, 0x0, "CAUT Authority Type", HFILL }},
{ &hf_mq_caut_UsrMaxLen, {"UsrMaxLen", "mq.caut.usrmaxlen", FT_UINT32 , BASE_HEX_DEC, NULL, 0x0, "CAUT userid Maximum length", HFILL }},
{ &hf_mq_caut_PwdMaxLen, {"PwdMaxLen", "mq.caut.pwdmaxlen", FT_UINT32 , BASE_HEX_DEC, NULL, 0x0, "CAUT password Maximum length", HFILL }},
{ &hf_mq_caut_UsrLength, {"UsrLength", "mq.caut.usrlength", FT_UINT32 , BASE_HEX_DEC, NULL, 0x0, "CAUT userid length", HFILL }},
{ &hf_mq_caut_PwdLength, {"PwdLength", "mq.caut.pswlength", FT_UINT32 , BASE_HEX_DEC, NULL, 0x0, "CAUT password length", HFILL }},
{ &hf_mq_caut_usr , {"userid...", "mq.msh.userid" , FT_STRINGZ, STR_UNICODE, NULL, 0x0, "CAUT UserId", HFILL }},
{ &hf_mq_caut_psw , {"password.", "mq.msh.password" , FT_STRINGZ, STR_UNICODE, NULL, 0x0, "CAUT Password", HFILL }},
{ &hf_mq_caut_usr , {"userid...", "mq.msh.userid" , FT_STRING, STR_UNICODE, NULL, 0x0, "CAUT UserId", HFILL }},
{ &hf_mq_caut_psw , {"password.", "mq.msh.password" , FT_STRING, STR_UNICODE, NULL, 0x0, "CAUT Password", HFILL }},
{ &hf_mq_msh_StructID , {"StructID", "mq.msh.structid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
{ &hf_mq_msh_StructID , {"StructID", "mq.msh.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
{ &hf_mq_msh_seqnum , {"Seq Numb", "mq.msh.seqnum", FT_UINT32, BASE_DEC, NULL, 0x0, "MSH sequence number", HFILL }},
{ &hf_mq_msh_datalength, {"Buf len.", "mq.msh.buflength", FT_UINT32, BASE_DEC, NULL, 0x0, "MSH buffer length", HFILL }},
{ &hf_mq_msh_unknown1 , {"Unknown1", "mq.msh.unknown1", FT_UINT32, BASE_HEX, NULL, 0x0, "MSH unknown1", HFILL }},
{ &hf_mq_msh_msglength , {"Msg len.", "mq.msh.msglength", FT_UINT32, BASE_DEC, NULL, 0x0, "MSH message length", HFILL }},
{ &hf_mq_xqh_StructID , {"StructID", "mq.xqh.structid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
{ &hf_mq_xqh_StructID , {"StructID", "mq.xqh.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
{ &hf_mq_xqh_version , {"Version.", "mq.xqh.version", FT_UINT32, BASE_DEC, NULL, 0x0, "XQH version", HFILL }},
{ &hf_mq_xqh_remoteq , {"Remote Q", "mq.xqh.remoteq", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "XQH remote queue", HFILL }},
{ &hf_mq_xqh_remoteqmgr, {"Rmt QMgr", "mq.xqh.remoteqmgr", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "XQH remote queue manager", HFILL }},
{ &hf_mq_xqh_remoteq , {"Remote Q", "mq.xqh.remoteq", FT_STRING, STR_UNICODE, NULL, 0x0, "XQH remote queue", HFILL }},
{ &hf_mq_xqh_remoteqmgr, {"Rmt QMgr", "mq.xqh.remoteqmgr", FT_STRING, STR_UNICODE, NULL, 0x0, "XQH remote queue manager", HFILL }},
{ &hf_mq_id_StructID , {"Structid..", "mq.id.structid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
{ &hf_mq_id_StructID , {"Structid..", "mq.id.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
{ &hf_mq_id_FapLevel , {"FAP level.", "mq.id.level", FT_UINT8, BASE_DEC, NULL, 0x0, "ID Formats And Protocols level", HFILL }},
{ &hf_mq_id_icf1 , {"CapFlag1..", "mq.id.idflags", FT_UINT8, BASE_HEX, NULL, 0x0, "ID Capability Flags 1", HFILL }},
{ &hf_mq_id_Eicf1 , {"ECapFlag1.", "mq.id.ideflags", FT_UINT8, BASE_HEX, NULL, 0x0, "ID E Capability Flags 1", HFILL }},
@ -3877,11 +3876,11 @@ void proto_register_mq(void)
{ &hf_mq_id_MaxTrSize , {"MaxTrSize.", "mq.id.MaxTrSize", FT_UINT32, BASE_DEC, NULL, 0x0, "ID max trans size", HFILL }},
{ &hf_mq_id_MaxMsgSize , {"MaxMsgSize", "mq.id.maxmsgsize", FT_UINT32, BASE_DEC, NULL, 0x0, "ID max msg size", HFILL }},
{ &hf_mq_id_SeqWrapVal , {"SeqWrapVal", "mq.id.seqwrap", FT_UINT32, BASE_DEC, NULL, 0x0, "ID seq wrap value", HFILL }},
{ &hf_mq_id_channel , {"ChannelNme", "mq.id.channelname", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "ID channel name", HFILL }},
{ &hf_mq_id_channel , {"ChannelNme", "mq.id.channelname", FT_STRING, STR_UNICODE, NULL, 0x0, "ID channel name", HFILL }},
{ &hf_mq_id_icf2 , {"CapFlag2..", "mq.id.idflags2", FT_UINT8, BASE_HEX, NULL, 0x0, "ID Capability flags 2", HFILL }},
{ &hf_mq_id_Eicf2 , {"ECapFlag2.", "mq.id.ideflags2", FT_UINT8, BASE_HEX, NULL, 0x0, "ID E Capabitlity flags 2", HFILL }},
{ &hf_mq_id_ccsid , {"ccsid.....", "mq.id.ccsid", FT_INT16, BASE_DEC | BASE_RANGE_STRING, RVALS(GET_VALRV(ccsid)), 0x0, "ID Coded Character Set ID", HFILL }},
{ &hf_mq_id_qmgrname , {"QMgrName..", "mq.id.qm", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "ID Queue Manager Name", HFILL }},
{ &hf_mq_id_qmgrname , {"QMgrName..", "mq.id.qm", FT_STRING, STR_UNICODE, NULL, 0x0, "ID Queue Manager Name", HFILL }},
{ &hf_mq_id_HBInterval , {"HBInterval", "mq.id.hbint", FT_UINT32, BASE_DEC, NULL, 0x0, "ID Heartbeat interval", HFILL }},
{ &hf_mq_id_EFLLength , {"EFLLength.", "mq.id.efllength", FT_UINT16, BASE_HEX_DEC, NULL, 0x0, "ID EFL Length", HFILL }},
{ &hf_mq_id_ief2 , {"IniErrFlg2", "mq.id.inierrflg2", FT_UINT8, BASE_HEX_DEC, NULL, 0x0, "ID Initial Error Flags 2", HFILL }},
@ -3897,8 +3896,8 @@ void proto_register_mq(void)
{ &hf_mq_id_ProcessId , {"ProcessId.", "mq.id.processid", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "ID Process Identifier", HFILL }},
{ &hf_mq_id_ThreadId , {"ThreadId..", "mq.id.threadid", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "ID Thread Identifier", HFILL }},
{ &hf_mq_id_TraceId , {"TraceId...", "mq.id.traceid", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "ID Trace Identifier", HFILL }},
{ &hf_mq_id_ProdId , {"ProdId....", "mq.id.prodid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "ID Product Identifier", HFILL }},
{ &hf_mq_id_mqmid , {"MQM ID....", "mq.id.mqmid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "ID MQM ID", HFILL }},
{ &hf_mq_id_ProdId , {"ProdId....", "mq.id.prodid", FT_STRING, STR_UNICODE, NULL, 0x0, "ID Product Identifier", HFILL }},
{ &hf_mq_id_mqmid , {"MQM ID....", "mq.id.mqmid", FT_STRING, STR_UNICODE, NULL, 0x0, "ID MQM ID", HFILL }},
{ &hf_mq_id_pal , {"PAL.......", "mq.id.pal", FT_BYTES, BASE_NONE, NULL, 0x0, "ID PAL", HFILL}},
{ &hf_mq_id_r , {"R.........", "mq.id.r", FT_BYTES, BASE_NONE, NULL, 0x0, "ID R", HFILL}},
@ -3943,44 +3942,44 @@ void proto_register_mq(void)
{&hf_mq_id_ief3_MPlxSyGet ,{"Invalid Multiplex_synchget", "mq.id.ief3.multiplexsynchget" , FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_IEF3_MULTIPLEX_SYNCGET, "ID invalid MULTIPLEX_SYNCGET", HFILL}},
{&hf_mq_id_ief3_ProtAlgorit ,{"Invalid Prot Algorithms", "mq.id.ief3.protalgorithms" , FT_BOOLEAN, 8, TFS(&tfs_set_notset), MQ_IEF3_PROT_ALGORITHMS, "ID invalid Prot Algorithms", HFILL}},
{ &hf_mq_uid_StructID , {"Structid", "mq.uid.structid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
{ &hf_mq_uid_userid , {"User ID.", "mq.uid.userid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "UID structid", HFILL }},
{ &hf_mq_uid_password , {"Password", "mq.uid.password", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "UID password", HFILL }},
{ &hf_mq_uid_longuserid, {"Long UID", "mq.uid.longuserid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "UID long user id", HFILL }},
{ &hf_mq_uid_StructID , {"Structid", "mq.uid.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
{ &hf_mq_uid_userid , {"User ID.", "mq.uid.userid", FT_STRING, STR_UNICODE, NULL, 0x0, "UID structid", HFILL }},
{ &hf_mq_uid_password , {"Password", "mq.uid.password", FT_STRING, STR_UNICODE, NULL, 0x0, "UID password", HFILL }},
{ &hf_mq_uid_longuserid, {"Long UID", "mq.uid.longuserid", FT_STRING, STR_UNICODE, NULL, 0x0, "UID long user id", HFILL }},
{ &hf_mq_sidlen , {"SID Len.", "mq.uid.sidlen", FT_UINT8, BASE_DEC, NULL, 0x0, "Sid Len", HFILL }},
{ &hf_mq_sidtyp , {"SIDType.", "mq.uid.sidtyp", FT_UINT8, BASE_DEC, VALS(GET_VALSV(sidtype)), 0x0, "Sid Typ", HFILL }},
{ &hf_mq_securityid , {"SecurID.", "mq.uid.securityid", FT_BYTES, BASE_NONE, NULL, 0x0, "Security ID", HFILL }},
{ &hf_mq_conn_QMgr , {"QMgr....", "mq.conn.qm", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "CONN queue manager", HFILL }},
{ &hf_mq_conn_appname , {"ApplName", "mq.conn.appname", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "CONN application name", HFILL }},
{ &hf_mq_conn_QMgr , {"QMgr....", "mq.conn.qm", FT_STRING, STR_UNICODE, NULL, 0x0, "CONN queue manager", HFILL }},
{ &hf_mq_conn_appname , {"ApplName", "mq.conn.appname", FT_STRING, STR_UNICODE, NULL, 0x0, "CONN application name", HFILL }},
{ &hf_mq_conn_apptype , {"ApplType", "mq.conn.apptype", FT_INT32, BASE_DEC | BASE_EXT_STRING, GET_VALS_EXTP(MQAT), 0x0, "CONN application type", HFILL }},
{ &hf_mq_conn_acttoken , {"AccntTok", "mq.conn.acttoken", FT_BYTES, BASE_NONE, NULL, 0x0, "CONN accounting token", HFILL }},
{ &hf_mq_conn_options , {"Options.", "mq.conn.options", FT_UINT32, BASE_DEC, VALS(mq_conn_options_vals), 0x0, "CONN options", HFILL }},
{ &hf_mq_conn_Xoptions , {"XOptions", "mq.conn.xoptions", FT_UINT32, BASE_HEX, NULL, 0x0, "CONN Xoptions", HFILL }},
{ &hf_mq_fcno_StructID , {"StructId.", "mq.fcno.structid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
{ &hf_mq_fcno_StructID , {"StructId.", "mq.fcno.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
{ &hf_mq_fcno_version , {"version..", "mq.fcno.version", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "FCNO version", HFILL }},
{ &hf_mq_fcno_option , {"Option...", "mq.fcno.option", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "FCNO option", HFILL }},
{ &hf_mq_fcno_connid , {"connId...", "mq.fcno.connid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "FCNO Connection ID", HFILL }},
{ &hf_mq_fcno_connid , {"connId...", "mq.fcno.connid", FT_STRING, STR_UNICODE, NULL, 0x0, "FCNO Connection ID", HFILL }},
{ &hf_mq_fcno_unknowb01, {"unknowb01", "mq.fcno.unknowb01", FT_BYTES, BASE_NONE, NULL, 0x0, "FCNO unknown bytes 01", HFILL }},
{ &hf_mq_fcno_prodid , {"prodid...", "mq.fcno.prodid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "FCNO Product Id", HFILL}},
{ &hf_mq_fcno_mqmid , {"MqmId....", "mq.fcno.mqmid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "FCNO Mqm ID", HFILL }},
{ &hf_mq_fcno_prodid , {"prodid...", "mq.fcno.prodid", FT_STRING, STR_UNICODE, NULL, 0x0, "FCNO Product Id", HFILL}},
{ &hf_mq_fcno_mqmid , {"MqmId....", "mq.fcno.mqmid", FT_STRING, STR_UNICODE, NULL, 0x0, "FCNO Mqm ID", HFILL }},
{ &hf_mq_inq_nbsel , {"Selector count..", "mq.inq.nbsel", FT_UINT32, BASE_DEC, NULL, 0x0, "INQ Selector count", HFILL }},
{ &hf_mq_inq_nbint , {"Integer count...", "mq.inq.nbint", FT_UINT32, BASE_DEC, NULL, 0x0, "INQ Integer count", HFILL }},
{ &hf_mq_inq_charlen , {"Character length", "mq.inq.charlen", FT_UINT32, BASE_DEC, NULL, 0x0, "INQ Character length", HFILL }},
{ &hf_mq_inq_sel , {"Selector........", "mq.inq.sel", FT_UINT32, BASE_DEC | BASE_EXT_STRING, GET_VALS_EXTP(selector), 0x0, "INQ Selector", HFILL }},
{ &hf_mq_inq_intvalue , {"Integer value...", "mq.inq.intvalue", FT_UINT32, BASE_DEC, NULL, 0x0, "INQ Integer value", HFILL }},
{ &hf_mq_inq_charvalues, {"Char values.....", "mq.inq.charvalues", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "INQ Character values", HFILL }},
{ &hf_mq_inq_charvalues, {"Char values.....", "mq.inq.charvalues", FT_STRING, STR_UNICODE, NULL, 0x0, "INQ Character values", HFILL }},
{ &hf_mq_spi_verb , {"SPI Verb", "mq.spi.verb", FT_UINT32, BASE_DEC, VALS(GET_VALSV(spi_verbs)), 0x0, NULL, HFILL }},
{ &hf_mq_spi_version , {"Version", "mq.spi.version", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Version", HFILL }},
{ &hf_mq_spi_length , {"Max reply size", "mq.spi.replength", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Max reply size", HFILL }},
{ &hf_mq_spi_base_StructID, {"SPI Structid", "mq.spib.structid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
{ &hf_mq_spi_base_StructID, {"SPI Structid", "mq.spib.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
{ &hf_mq_spi_base_version , {"Version", "mq.spib.version", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Base Version", HFILL }},
{ &hf_mq_spi_base_length , {"Length", "mq.spib.length", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Base Length", HFILL }},
@ -3992,9 +3991,9 @@ void proto_register_mq(void)
{ &hf_mq_spi_spqo_flags , {"Flags", "mq.spqo.flags", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Query Output flags", HFILL }},
{ &hf_mq_spi_spai_mode , {"Mode", "mq.spai.mode", FT_UINT32, BASE_DEC, VALS(GET_VALSV(spi_activate)), 0x0, "SPI Activate Input mode", HFILL }},
{ &hf_mq_spi_spai_unknown1, {"Unknown1", "mq.spai.unknown1", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "SPI Activate Input unknown1", HFILL }},
{ &hf_mq_spi_spai_unknown2, {"Unknown2", "mq.spai.unknown2", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "SPI Activate Input unknown2", HFILL }},
{ &hf_mq_spi_spai_msgid , {"Message Id", "mq.spai.msgid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "SPI Activate Input message id", HFILL }},
{ &hf_mq_spi_spai_unknown1, {"Unknown1", "mq.spai.unknown1", FT_STRING, STR_UNICODE, NULL, 0x0, "SPI Activate Input unknown1", HFILL }},
{ &hf_mq_spi_spai_unknown2, {"Unknown2", "mq.spai.unknown2", FT_STRING, STR_UNICODE, NULL, 0x0, "SPI Activate Input unknown2", HFILL }},
{ &hf_mq_spi_spai_msgid , {"Message Id", "mq.spai.msgid", FT_STRING, STR_UNICODE, NULL, 0x0, "SPI Activate Input message id", HFILL }},
{ &hf_mq_spi_spgi_batchsz , {"Batch size", "mq.spgi.batchsize", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Get Input batch size", HFILL }},
{ &hf_mq_spi_spgi_batchint, {"Batch interval", "mq.spgi.batchint", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Get Input batch interval", HFILL }},
{ &hf_mq_spi_spgi_maxmsgsz, {"Max message size", "mq.spgi.maxmsgsize", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Get Input max message size", HFILL }},
@ -4039,7 +4038,7 @@ void proto_register_mq(void)
{ &hf_mq_open_options_NO_MULTICAST , {"NO_MULTICAST", "mq.open.options.NoMulticast", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_NO_MULTICAST, "OPEN options NO_MULTICAST", HFILL }},
{ &hf_mq_open_options_BIND_ON_GROUP , {"BIND_ON_GROUP", "mq.open.options.BindOnGroup", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQOO_BIND_ON_GROUP, "OPEN options BIND_ON_GROUP", HFILL }},
{ &hf_mq_fopa_StructID , {"StructId.......", "mq.fopa.structid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
{ &hf_mq_fopa_StructID , {"StructId.......", "mq.fopa.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
{ &hf_mq_fopa_version , {"Version........", "mq.fopa.version", FT_UINT32, BASE_DEC, NULL, 0x0, "FOPA Version", HFILL }},
{ &hf_mq_fopa_length , {"Length.........", "mq.fopa.length", FT_UINT32, BASE_DEC, NULL, 0x0, "FOPA Length", HFILL }},
{ &hf_mq_fopa_DefPersistence , {"DefPersistence.", "mq.fopa.defpersistence", FT_INT32, BASE_DEC, VALS(GET_VALSV(MQPER)), 0x0, "FOPA DefPersistence", HFILL }},
@ -4085,7 +4084,7 @@ void proto_register_mq(void)
{ &hf_mq_msgasy_MsgToken , {"MsgToken.", "mq.msgasy.msgtoken" , FT_BYTES , BASE_NONE , NULL, 0x0, "MSGASYNC Mesasage Token", HFILL }},
{ &hf_mq_msgasy_Status , {"status...", "mq.msgasy.status" , FT_UINT16, BASE_HEX , NULL, 0x0, "MSGASYNC Status", HFILL }},
{ &hf_mq_msgasy_resolQNLn, {"resolQNLn", "mq.msgasy.resolqnln", FT_UINT8 , BASE_DEC , NULL, 0x0, "MSGASYNC Resolved Queue Name Length", HFILL }},
{ &hf_mq_msgasy_resolQNme, {"resolQNme", "mq.msgasy.resolqnme", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "MSGASYNC Resolved Queue Name", HFILL }},
{ &hf_mq_msgasy_resolQNme, {"resolQNme", "mq.msgasy.resolqnme", FT_STRING, STR_UNICODE, NULL, 0x0, "MSGASYNC Resolved Queue Name", HFILL }},
{ &hf_mq_msgasy_padding , {"Padding..", "mq.msgasy.padding" , FT_BYTES , BASE_NONE , NULL, 0x0, "MSGASYNC Padding", HFILL }},
{ &hf_mq_notif_vers , {"version.", "mq.notif.vers" , FT_UINT32, BASE_HEX_DEC, NULL, 0x0, "NOTIFICATION version", HFILL }},
@ -4103,13 +4102,13 @@ void proto_register_mq(void)
{ &hf_mq_status_code , {"Code..", "mq.status.code" , FT_UINT32, BASE_DEC | BASE_EXT_STRING, GET_VALS_EXTP(status), 0x0, "STATUS code", HFILL }},
{ &hf_mq_status_value , {"Value.", "mq.status.value" , FT_UINT32, BASE_DEC, NULL, 0x0, "STATUS value", HFILL }},
{ &hf_mq_od_StructID , {"StructID.........", "mq.od.structid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
{ &hf_mq_od_StructID , {"StructID.........", "mq.od.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
{ &hf_mq_od_version , {"version..........", "mq.od.version", FT_UINT32, BASE_DEC, NULL, 0x0, "OD version", HFILL }},
{ &hf_mq_od_objecttype , {"ObjType..........", "mq.od.objtype", FT_UINT32, BASE_DEC | BASE_EXT_STRING, GET_VALS_EXTP(objtype), 0x0, "OD object type", HFILL }},
{ &hf_mq_od_objectname , {"ObjName..........", "mq.od.objname", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "OD object name", HFILL }},
{ &hf_mq_od_objqmgrname , {"ObjQMgr..........", "mq.od.objqmgrname", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "OD object queue manager name", HFILL }},
{ &hf_mq_od_dynqname , {"DynQName.........", "mq.od.dynqname", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "OD dynamic queue name", HFILL }},
{ &hf_mq_od_altuserid , {"AltUserID........", "mq.od.altuserid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "OD alternate userid", HFILL }},
{ &hf_mq_od_objectname , {"ObjName..........", "mq.od.objname", FT_STRING, STR_UNICODE, NULL, 0x0, "OD object name", HFILL }},
{ &hf_mq_od_objqmgrname , {"ObjQMgr..........", "mq.od.objqmgrname", FT_STRING, STR_UNICODE, NULL, 0x0, "OD object queue manager name", HFILL }},
{ &hf_mq_od_dynqname , {"DynQName.........", "mq.od.dynqname", FT_STRING, STR_UNICODE, NULL, 0x0, "OD dynamic queue name", HFILL }},
{ &hf_mq_od_altuserid , {"AltUserID........", "mq.od.altuserid", FT_STRING, STR_UNICODE, NULL, 0x0, "OD alternate userid", HFILL }},
{ &hf_mq_od_recspresent , {"NbrRecord........", "mq.od.nbrrec", FT_UINT32, BASE_DEC, NULL, 0x0, "OD number of records", HFILL }},
{ &hf_mq_od_knowndstcnt , {"Known Dest Count.", "mq.od.kdestcount", FT_UINT32, BASE_DEC, NULL, 0x0, "OD known destination count", HFILL }},
{ &hf_mq_od_unknowdstcnt, {"Unknown Dest Cnt.", "mq.od.udestcount", FT_UINT32, BASE_DEC, NULL, 0x0, "OD unknown destination count", HFILL }},
@ -4118,13 +4117,13 @@ void proto_register_mq(void)
{ &hf_mq_od_resprecofs , {"Offset of 1st RR.", "mq.od.offsetrr", FT_UINT32, BASE_DEC, NULL, 0x0, "OD offset of first RR", HFILL }},
{ &hf_mq_od_objrecptr , {"Addr of 1st OR.", "mq.od.addror", FT_UINT32, BASE_HEX, NULL, 0x0, "OD address of first OR", HFILL }},
{ &hf_mq_od_resprecptr , {"Addr of 1st RR.", "mq.od.addrrr", FT_UINT32, BASE_HEX, NULL, 0x0, "OD address of first RR", HFILL }},
{ &hf_mq_od_altsecurid , {"Alt security id..", "mq.od.altsecid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "OD alternate security id", HFILL }},
{ &hf_mq_od_resolvqname , {"Resolved Q Name..", "mq.od.resolvq", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "OD resolved queue name", HFILL }},
{ &hf_mq_od_resolvqmgrnm, {"Resolved QMgrName", "mq.od.resolvqmgr", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "OD resolved queue manager name", HFILL }},
{ &hf_mq_od_altsecurid , {"Alt security id..", "mq.od.altsecid", FT_STRING, STR_UNICODE, NULL, 0x0, "OD alternate security id", HFILL }},
{ &hf_mq_od_resolvqname , {"Resolved Q Name..", "mq.od.resolvq", FT_STRING, STR_UNICODE, NULL, 0x0, "OD resolved queue name", HFILL }},
{ &hf_mq_od_resolvqmgrnm, {"Resolved QMgrName", "mq.od.resolvqmgr", FT_STRING, STR_UNICODE, NULL, 0x0, "OD resolved queue manager name", HFILL }},
{ &hf_mq_od_resolvobjtyp, {"Resolv Obj Type..", "mq.od.resolvedobjtype", FT_UINT32, BASE_DEC | BASE_EXT_STRING, GET_VALS_EXTP(objtype), 0x0, "OD resolved object type", HFILL }},
{ &hf_mq_or_objname , {"Object name...", "mq.or.objname", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "OR object name", HFILL }},
{ &hf_mq_or_objqmgrname , {"Object QMgr Nm", "mq.or.objqmgrname", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "OR object queue manager name", HFILL }},
{ &hf_mq_or_objname , {"Object name...", "mq.or.objname", FT_STRING, STR_UNICODE, NULL, 0x0, "OR object name", HFILL }},
{ &hf_mq_or_objqmgrname , {"Object QMgr Nm", "mq.or.objqmgrname", FT_STRING, STR_UNICODE, NULL, 0x0, "OR object queue manager name", HFILL }},
{ &hf_mq_rr_compcode , {"Comp Code", "mq.rr.completioncode", FT_UINT32, BASE_DEC, NULL, 0x0, "OR completion code", HFILL }},
{ &hf_mq_rr_reascode , {"Reas Code", "mq.rr.reasoncode", FT_UINT32, BASE_DEC, NULL, 0x0, "OR reason code", HFILL }},
@ -4135,7 +4134,7 @@ void proto_register_mq(void)
{ &hf_mq_pmr_feedback , {"Feedback", "mq.pmr.feedback", FT_UINT32, BASE_DEC, NULL, 0x0, "PMR Feedback", HFILL }},
{ &hf_mq_pmr_acttoken , {"Accounting token", "mq.pmr.acttoken", FT_BYTES, BASE_NONE, NULL, 0x0, "PMR accounting token", HFILL }},
{ &hf_mq_md_StructID , {"StructID.", "mq.md.structid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
{ &hf_mq_md_StructID , {"StructID.", "mq.md.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
{ &hf_mq_md_version , {"Version..", "mq.md.version", FT_UINT32, BASE_DEC, NULL, 0x0, "MD version", HFILL }},
{ &hf_mq_md_report , {"Report...", "mq.md.report", FT_UINT32, BASE_DEC, NULL, 0x0, "MD report", HFILL }},
{ &hf_mq_md_msgtype , {"Msg Type.", "mq.md.msgtype", FT_UINT32, BASE_DEC , VALS(GET_VALSV(MQMT)), 0x0, "MD message type", HFILL }},
@ -4143,42 +4142,42 @@ void proto_register_mq(void)
{ &hf_mq_md_feedback , {"Feedback.", "mq.md.feedback", FT_UINT32, BASE_DEC, NULL, 0x0, "MD feedback", HFILL }},
{ &hf_mq_md_encoding , {"Encoding.", "mq.md.encoding", FT_UINT32, BASE_DEC, NULL, 0x0, "MD encoding", HFILL }},
{ &hf_mq_md_ccsid , {"CCSID....", "mq.md.ccsid", FT_INT32, BASE_DEC | BASE_RANGE_STRING, RVALS(GET_VALRV(ccsid)), 0x0, "MD character set", HFILL }},
{ &hf_mq_md_format , {"Format...", "mq.md.format", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "MD format", HFILL }},
{ &hf_mq_md_format , {"Format...", "mq.md.format", FT_STRING, STR_UNICODE, NULL, 0x0, "MD format", HFILL }},
{ &hf_mq_md_priority , {"Priority.", "mq.md.priority", FT_INT32, BASE_DEC, NULL, 0x0, "MD priority", HFILL }},
{ &hf_mq_md_persistence , {"Persist..", "mq.md.persistence", FT_UINT32, BASE_DEC , VALS(GET_VALSV(MQPER)), 0x0, "MD persistence", HFILL }},
{ &hf_mq_md_msgid , {"Msg ID...", "mq.md.msgid", FT_BYTES, BASE_NONE, NULL, 0x0, "MD Message Id", HFILL }},
{ &hf_mq_md_correlid , {"CorrelID.", "mq.md.correlid", FT_BYTES, BASE_NONE, NULL, 0x0, "MD Correlation Id", HFILL }},
{ &hf_mq_md_backoutcnt , {"BackoCnt.", "mq.md.backount", FT_UINT32, BASE_DEC, NULL, 0x0, "MD Backout count", HFILL }},
{ &hf_mq_md_replytoq , {"ReplyToQ.", "mq.md.replytoq", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "MD ReplyTo queue", HFILL }},
{ &hf_mq_md_replytoqmgr , {"RepToQMgr", "mq.md.replytoqmgr", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "MD ReplyTo queue manager", HFILL }},
{ &hf_mq_md_userid , {"UserId...", "mq.md.userid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "MD UserId", HFILL }},
{ &hf_mq_md_replytoq , {"ReplyToQ.", "mq.md.replytoq", FT_STRING, STR_UNICODE, NULL, 0x0, "MD ReplyTo queue", HFILL }},
{ &hf_mq_md_replytoqmgr , {"RepToQMgr", "mq.md.replytoqmgr", FT_STRING, STR_UNICODE, NULL, 0x0, "MD ReplyTo queue manager", HFILL }},
{ &hf_mq_md_userid , {"UserId...", "mq.md.userid", FT_STRING, STR_UNICODE, NULL, 0x0, "MD UserId", HFILL }},
{ &hf_mq_md_acttoken , {"AccntTok.", "mq.md.acttoken", FT_BYTES, BASE_NONE, NULL, 0x0, "MD accounting token", HFILL }},
{ &hf_mq_md_appliddata , {"AppIdData", "mq.md.appldata", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "MD Put applicationId data", HFILL }},
{ &hf_mq_md_appliddata , {"AppIdData", "mq.md.appldata", FT_STRING, STR_UNICODE, NULL, 0x0, "MD Put applicationId data", HFILL }},
{ &hf_mq_md_putappltype , {"PutAppTyp", "mq.md.appltype", FT_INT32, BASE_DEC | BASE_EXT_STRING, GET_VALS_EXTP(MQAT), 0x0, "MD Put application type", HFILL }},
{ &hf_mq_md_putapplname , {"PutAppNme", "mq.md.applname", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "MD Put application name", HFILL }},
{ &hf_mq_md_putdate , {"PutDatGMT", "mq.md.date", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "MD Put date", HFILL }},
{ &hf_mq_md_puttime , {"PutTimGMT", "mq.md.time", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "MD Put time", HFILL }},
{ &hf_mq_md_apporigdata , {"AppOriDat", "mq.md.origdata", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "MD Application original data", HFILL }},
{ &hf_mq_md_putapplname , {"PutAppNme", "mq.md.applname", FT_STRING, STR_UNICODE, NULL, 0x0, "MD Put application name", HFILL }},
{ &hf_mq_md_putdate , {"PutDatGMT", "mq.md.date", FT_STRING, STR_UNICODE, NULL, 0x0, "MD Put date", HFILL }},
{ &hf_mq_md_puttime , {"PutTimGMT", "mq.md.time", FT_STRING, STR_UNICODE, NULL, 0x0, "MD Put time", HFILL }},
{ &hf_mq_md_apporigdata , {"AppOriDat", "mq.md.origdata", FT_STRING, STR_UNICODE, NULL, 0x0, "MD Application original data", HFILL }},
{ &hf_mq_md_groupid , {"GroupId..", "mq.md.groupid", FT_BYTES, BASE_NONE, NULL, 0x0, "MD GroupId", HFILL }},
{ &hf_mq_md_msgseqnumber, {"MsgSeqNum", "mq.md.msgseqnumber", FT_UINT32, BASE_DEC, NULL, 0x0, "MD Message sequence number", HFILL }},
{ &hf_mq_md_offset , {"Offset...", "mq.md.offset", FT_UINT32, BASE_DEC, NULL, 0x0, "MD Offset", HFILL }},
{ &hf_mq_md_msgflags , {"Msg flags", "mq.md.msgflags", FT_UINT32, BASE_HEX, NULL, 0x0, "MD Message flags", HFILL }},
{ &hf_mq_md_origlen , {"Orig len.", "mq.md.origlength", FT_INT32, BASE_DEC, NULL, 0x0, "MD Original length", HFILL }},
{ &hf_mq_dlh_StructID , {"StructID.", "mq.dlh.structid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
{ &hf_mq_dlh_StructID , {"StructID.", "mq.dlh.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
{ &hf_mq_dlh_version , {"Version..", "mq.dlh.version", FT_UINT32, BASE_DEC, NULL, 0x0, "DLH version", HFILL }},
{ &hf_mq_dlh_reason , {"Reason...", "mq.dlh.reason", FT_UINT32, BASE_DEC, NULL, 0x0, "DLH reason", HFILL }},
{ &hf_mq_dlh_destq , {"Dest Q...", "mq.dlh.destq", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "DLH destination queue", HFILL }},
{ &hf_mq_dlh_destqmgr , {"DestQMgr.", "mq.dlh.destqmgr", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "DLH destination queue manager", HFILL }},
{ &hf_mq_dlh_destq , {"Dest Q...", "mq.dlh.destq", FT_STRING, STR_UNICODE, NULL, 0x0, "DLH destination queue", HFILL }},
{ &hf_mq_dlh_destqmgr , {"DestQMgr.", "mq.dlh.destqmgr", FT_STRING, STR_UNICODE, NULL, 0x0, "DLH destination queue manager", HFILL }},
{ &hf_mq_dlh_encoding , {"Encoding.", "mq.dlh.encoding", FT_UINT32, BASE_DEC, NULL, 0x0, "DLH encoding", HFILL }},
{ &hf_mq_dlh_ccsid , {"CCSID....", "mq.dlh.ccsid", FT_INT32, BASE_DEC | BASE_RANGE_STRING, RVALS(GET_VALRV(ccsid)), 0x0, "DLH character set", HFILL }},
{ &hf_mq_dlh_format , {"Format...", "mq.dlh.format", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "DLH format", HFILL }},
{ &hf_mq_dlh_format , {"Format...", "mq.dlh.format", FT_STRING, STR_UNICODE, NULL, 0x0, "DLH format", HFILL }},
{ &hf_mq_dlh_putappltype, {"PutAppTyp", "mq.dlh.putappltype", FT_INT32, BASE_DEC | BASE_EXT_STRING, GET_VALS_EXTP(MQAT), 0x0, "DLH put application type", HFILL }},
{ &hf_mq_dlh_putapplname, {"PutAppNme", "mq.dlh.putapplname", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "DLH put application name", HFILL }},
{ &hf_mq_dlh_putdate , {"PutDatGMT", "mq.dlh.putdate", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "DLH put date", HFILL }},
{ &hf_mq_dlh_puttime , {"PutTimGMT", "mq.dlh.puttime", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "DLH put time", HFILL }},
{ &hf_mq_dlh_putapplname, {"PutAppNme", "mq.dlh.putapplname", FT_STRING, STR_UNICODE, NULL, 0x0, "DLH put application name", HFILL }},
{ &hf_mq_dlh_putdate , {"PutDatGMT", "mq.dlh.putdate", FT_STRING, STR_UNICODE, NULL, 0x0, "DLH put date", HFILL }},
{ &hf_mq_dlh_puttime , {"PutTimGMT", "mq.dlh.puttime", FT_STRING, STR_UNICODE, NULL, 0x0, "DLH put time", HFILL }},
{ &hf_mq_gmo_StructID , {"StructID.", "mq.gmo.structid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
{ &hf_mq_gmo_StructID , {"StructID.", "mq.gmo.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
{ &hf_mq_gmo_version , {"Version..", "mq.gmo.version", FT_UINT32, BASE_DEC, NULL, 0x0, "GMO version", HFILL }},
{ &hf_mq_gmo_options , {"GetMsgOpt", "mq.gmo.getmsgopt", FT_UINT32, BASE_HEX, NULL, 0x0, "GMO Get Message Options", HFILL }},
@ -4214,7 +4213,7 @@ void proto_register_mq(void)
{ &hf_mq_gmo_waitinterval, {"WaitIntv.", "mq.gmo.waitint", FT_INT32, BASE_DEC, NULL, 0x0, "GMO wait interval", HFILL }},
{ &hf_mq_gmo_signal1 , {"Signal 1.", "mq.gmo.signal1", FT_UINT32, BASE_HEX, NULL, 0x0, "GMO signal 1", HFILL }},
{ &hf_mq_gmo_signal2 , {"Signal 2.", "mq.gmo.signal2", FT_UINT32, BASE_HEX, NULL, 0x0, "GMO signal 2", HFILL }},
{ &hf_mq_gmo_resolvqname , {"ResQName.", "mq.gmo.resolvq", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "GMO resolved queue name", HFILL }},
{ &hf_mq_gmo_resolvqname , {"ResQName.", "mq.gmo.resolvq", FT_STRING, STR_UNICODE, NULL, 0x0, "GMO resolved queue name", HFILL }},
{ &hf_mq_gmo_matchoptions, {"MatchOpt.", "mq.gmo.matchopt", FT_UINT32, BASE_HEX, NULL, 0x0, "GMO match options", HFILL }},
{ &hf_mq_gmo_matchoptions_MATCH_MSG_TOKEN , {"MATCH_MSG_TOKEN", "mq.gmo.matchoptions.MATCH_MSG_TOKEN", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQMO_MATCH_MSG_TOKEN , "GMO matchoptions MATCH_MSG_TOKEN", HFILL }},
@ -4231,7 +4230,7 @@ void proto_register_mq(void)
{ &hf_mq_gmo_msgtoken , {"MsgToken.", "mq.gmo.msgtoken", FT_BYTES, BASE_NONE, NULL, 0x0, "GMO message token", HFILL }},
{ &hf_mq_gmo_returnedlen , {"RtnLength", "mq.gmo.retlen", FT_INT32, BASE_DEC, NULL, 0x0, "GMO returned length", HFILL }},
{ &hf_mq_lpoo_StructID , {"StructID......", "mq.lpoo.structid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
{ &hf_mq_lpoo_StructID , {"StructID......", "mq.lpoo.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
{ &hf_mq_lpoo_version , {"Version.......", "mq.lpoo.version", FT_UINT32, BASE_DEC, NULL, 0x0, "LPOO version", HFILL }},
{ &hf_mq_lpoo_lpivers , {"LpiVersion....", "mq.lpoo.lpivers", FT_UINT32, BASE_HEX, NULL, 0x0, "LPOO Lpi Version", HFILL }},
{ &hf_mq_lpoo_lpiopts , {"LpiOpts.......", "mq.lpoo.lpioopts", FT_UINT32, BASE_HEX, NULL, 0x0, "LPOO Lpi Options", HFILL }},
@ -4244,10 +4243,10 @@ void proto_register_mq(void)
{ &hf_mq_lpoo_defputresptype, {"DefPutRespType", "mq.lpoo.defputresptype", FT_INT32, BASE_DEC, VALS(GET_VALSV(MQPRT)), 0x0, "LPOO Default Put Response Type", HFILL }},
{ &hf_mq_lpoo_defreadahead , {"DefReadAHead..", "mq.lpoo.defreadahead", FT_INT32, BASE_DEC, VALS(GET_VALSV(MQREADA)), 0x0, "LPOO Default Read AHead", HFILL }},
{ &hf_mq_lpoo_propertyctl , {"PropertyCtl...", "mq.lpoo.propertyctl", FT_INT32, BASE_DEC, NULL, 0x0, "LPOO Property Control", HFILL}},
{ &hf_mq_lpoo_qprotect , {"qprotect......", "mq.lpoo.qprotect", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "LPOO queue protection", HFILL }},
{ &hf_mq_lpoo_qprotect , {"qprotect......", "mq.lpoo.qprotect", FT_STRING, STR_UNICODE, NULL, 0x0, "LPOO queue protection", HFILL }},
{ &hf_mq_lpoo_xtradata , {"ExtraData.....", "mq.lpoo.extradata", FT_INT32, BASE_DEC, NULL, 0x0, "LPOO Extra Data", HFILL }},
{ &hf_mq_pmo_StructID , {"StructID...", "mq.pmo.structid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
{ &hf_mq_pmo_StructID , {"StructID...", "mq.pmo.structid", FT_STRING, STR_UNICODE, NULL, 0x0, NULL, HFILL }},
{ &hf_mq_pmo_version , {"Version....", "mq.pmo.version", FT_UINT32, BASE_DEC, NULL, 0x0, "PMO version", HFILL }},
{ &hf_mq_pmo_options , {"Options....", "mq.pmo.options", FT_UINT32, BASE_HEX, NULL, 0x0, "PMO options", HFILL }},
{ &hf_mq_pmo_options_NOT_OWN_SUBS , {"NOT_OWN_SUBS", "mq.pmo.options.NOT_OWN_SUBS", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQPMO_NOT_OWN_SUBS , "PMO options NOT_OWN_SUBS", HFILL }},
@ -4278,8 +4277,8 @@ void proto_register_mq(void)
{ &hf_mq_pmo_knowndstcnt , {"KnDstCnt...", "mq.pmo.kdstcount", FT_UINT32, BASE_DEC, NULL, 0x0, "PMO known destination count", HFILL }},
{ &hf_mq_pmo_unkndstcnt , {"UkDstCnt...", "mq.pmo.udestcount", FT_UINT32, BASE_DEC, NULL, 0x0, "PMO unknown destination count", HFILL }},
{ &hf_mq_pmo_invaldstcnt , {"InDstCnt...", "mq.pmo.idestcount", FT_UINT32, BASE_DEC, NULL, 0x0, "PMO invalid destination count", HFILL }},
{ &hf_mq_pmo_resolvqname , {"ResQName...", "mq.pmo.resolvq", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "PMO resolved queue name", HFILL }},
{ &hf_mq_pmo_resolvqmgr , {"ResQMgr....", "mq.pmo.resolvqmgr", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "PMO resolved queue manager name", HFILL }},
{ &hf_mq_pmo_resolvqname , {"ResQName...", "mq.pmo.resolvq", FT_STRING, STR_UNICODE, NULL, 0x0, "PMO resolved queue name", HFILL }},
{ &hf_mq_pmo_resolvqmgr , {"ResQMgr....", "mq.pmo.resolvqmgr", FT_STRING, STR_UNICODE, NULL, 0x0, "PMO resolved queue manager name", HFILL }},
{ &hf_mq_pmo_recspresent , {"NumRecs....", "mq.pmo.nbrrec", FT_UINT32, BASE_DEC, NULL, 0x0, "PMO number of records", HFILL }},
{ &hf_mq_pmo_putmsgrecfld, {"PMR Flag...", "mq.pmo.flagspmr", FT_UINT32, BASE_HEX, NULL, 0x0, "PMO flags PMR fields", HFILL }},
{ &hf_mq_pmo_putmsgrecofs, {"Ofs1stPMR..", "mq.pmo.offsetpmr", FT_UINT32, BASE_DEC, NULL, 0x0, "PMO offset of first PMR", HFILL }},
@ -4305,27 +4304,27 @@ void proto_register_mq(void)
{ &hf_mq_xa_tmflags_fail , {"FAIL", "mq.xa.tmflags.fail", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_XA_TMFAIL, "XA TM Flags FAIL", HFILL }},
{ &hf_mq_xa_tmflags_onephase , {"ONEPHASE", "mq.xa.tmflags.onephase", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_XA_TMONEPHASE, "XA TM Flags ONEPHASE", HFILL }},
{ &hf_mq_xa_xid_formatid , {"Format ID....", "mq.xa.xid.formatid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "XA Xid Format ID", HFILL }},
{ &hf_mq_xa_xid_formatid , {"Format ID....", "mq.xa.xid.formatid", FT_STRING, STR_UNICODE, NULL, 0x0, "XA Xid Format ID", HFILL }},
{ &hf_mq_xa_xid_glbxid_len, {"GlbTransIDLen", "mq.xa.xid.gxidl", FT_UINT8, BASE_DEC, NULL, 0x0, "XA Xid Global TransactionId Length", HFILL }},
{ &hf_mq_xa_xid_brq_length, {"BranchQualLen", "mq.xa.xid.bql", FT_UINT8, BASE_DEC, NULL, 0x0, "XA Xid Branch Qualifier Length", HFILL }},
{ &hf_mq_xa_xid_globalxid , {"GlbTransactID", "mq.xa.xid.gxid", FT_BYTES, BASE_NONE, NULL, 0x0, "XA Xid Global TransactionId", HFILL }},
{ &hf_mq_xa_xid_brq , {"BranchQualif.", "mq.xa.xid.bq", FT_BYTES, BASE_NONE, NULL, 0x0, "XA Xid Branch Qualifier", HFILL }},
{ &hf_mq_xa_xainfo_length , {"Length.......", "mq.xa.xainfo.length", FT_UINT8, BASE_DEC, NULL, 0x0, "XA XA_info Length", HFILL }},
{ &hf_mq_xa_xainfo_value , {"Value........", "mq.xa.xainfo.value", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "XA XA_info Value", HFILL }},
{ &hf_mq_xa_xainfo_value , {"Value........", "mq.xa.xainfo.value", FT_STRING, STR_UNICODE, NULL, 0x0, "XA XA_info Value", HFILL }},
{ &hf_mq_charv_vsptr , {"VLStr Addr.", "mq.charv.vsptr", FT_UINT32, BASE_HEX, NULL, 0x0, "VS Address", HFILL }},
{ &hf_mq_charv_vsoffset , {"VLStr Offs.", "mq.charv.vsoffset", FT_UINT32, BASE_DEC, NULL, 0x0, "VS Offset", HFILL }},
{ &hf_mq_charv_vsbufsize , {"VLStr BufSz", "mq.charv.vsbufsize", FT_UINT32, BASE_DEC, NULL, 0x0, "VS BufSize", HFILL }},
{ &hf_mq_charv_vslength , {"VLStr Len..", "mq.charv.vslength", FT_UINT32, BASE_DEC, NULL, 0x0, "VS Length", HFILL }},
{ &hf_mq_charv_vsccsid , {"VLStr Ccsid", "mq.charv.vsccsid", FT_INT32, BASE_DEC, NULL, 0x0, "VS CCSID", HFILL }},
{ &hf_mq_charv_vsvalue , {"VLStr Value", "mq.charv.vsvalue", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "VS value", HFILL }},
{ &hf_mq_charv_vsvalue , {"VLStr Value", "mq.charv.vsvalue", FT_STRING, STR_UNICODE, NULL, 0x0, "VS value", HFILL }},
{ &hf_mq_head_StructID , {"Structid", "mq.head.structid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "Header structid", HFILL }},
{ &hf_mq_head_StructID , {"Structid", "mq.head.structid", FT_STRING, STR_UNICODE, NULL, 0x0, "Header structid", HFILL }},
{ &hf_mq_head_version , {"version.", "mq.head.version", FT_UINT32, BASE_DEC, NULL, 0x0, "Header version", HFILL }},
{ &hf_mq_head_length , {"Length..", "mq.head.length", FT_UINT32, BASE_DEC, NULL, 0x0, "Header length", HFILL }},
{ &hf_mq_head_encoding , {"Encoding", "mq.head.encoding", FT_UINT32, BASE_DEC, NULL, 0x0, "Header encoding", HFILL }},
{ &hf_mq_head_ccsid , {"CCSID...", "mq.head.ccsid", FT_INT32, BASE_DEC | BASE_RANGE_STRING, RVALS(GET_VALRV(ccsid)), 0x0, "Header character set", HFILL }},
{ &hf_mq_head_format , {"Format..", "mq.head.format", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "Header format", HFILL }},
{ &hf_mq_head_format , {"Format..", "mq.head.format", FT_STRING, STR_UNICODE, NULL, 0x0, "Header format", HFILL }},
{ &hf_mq_head_flags , {"Flags...", "mq.head.flags", FT_UINT32, BASE_HEX, NULL, 0x0, "Header flags", HFILL }},
{ &hf_mq_head_struct , {"Struct..", "mq.head.struct", FT_BYTES, BASE_NONE, NULL, 0x0, "Header struct", HFILL }},
@ -4342,15 +4341,15 @@ void proto_register_mq(void)
{ &hf_mq_iih_flags_replyfmtnone, {"REPL_FMT_NONE", "mq.iih.flags.replyfmtnone", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQIIH_REPLY_FORMAT_NONE, "MQ IIH Flags REPLY_FORMAT_NONE", HFILL }},
{ &hf_mq_iih_flags_passexpir , {"PASS_EXPIR...", "mq.iih.flags.passexpir" , FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQIIH_PASS_EXPIRATION, "MQ IIH Flags PASS_EXPIRATION", HFILL }},
{ &hf_mq_iih_ltermoverride, {"LTerm Override", "mq.iih.ltermoverrid" , FT_STRINGZ, STR_UNICODE, NULL, 0x0, "Logical Terminal Override", HFILL }},
{ &hf_mq_iih_mfsmapname , {"MFS Map Name..", "mq.iih.mfsmapname" , FT_STRINGZ, STR_UNICODE, NULL, 0x0, "MFS Map Name", HFILL }},
{ &hf_mq_iih_replytofmt , {"ReplyToFormat.", "mq.iih.replytofmt" , FT_STRINGZ, STR_UNICODE, NULL, 0x0, "Reply To Format", HFILL }},
{ &hf_mq_iih_authenticator, {"Authenticator.", "mq.iih.authenticator", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "Password or Passcode", HFILL }},
{ &hf_mq_iih_ltermoverride, {"LTerm Override", "mq.iih.ltermoverrid" , FT_STRING, STR_UNICODE, NULL, 0x0, "Logical Terminal Override", HFILL }},
{ &hf_mq_iih_mfsmapname , {"MFS Map Name..", "mq.iih.mfsmapname" , FT_STRING, STR_UNICODE, NULL, 0x0, "MFS Map Name", HFILL }},
{ &hf_mq_iih_replytofmt , {"ReplyToFormat.", "mq.iih.replytofmt" , FT_STRING, STR_UNICODE, NULL, 0x0, "Reply To Format", HFILL }},
{ &hf_mq_iih_authenticator, {"Authenticator.", "mq.iih.authenticator", FT_STRING, STR_UNICODE, NULL, 0x0, "Password or Passcode", HFILL }},
{ &hf_mq_iih_transinstid , {"TransInstIdent", "mq.iih.transinstid" , FT_BYTES, BASE_NONE, NULL, 0x0, "Transaction Instance Identifier", HFILL }},
{ &hf_mq_iih_transstate , {"TransactState.", "mq.iih.transstate" , FT_STRINGZ, STR_UNICODE, NULL, 0x0, "Transaction State", HFILL }},
{ &hf_mq_iih_commimode , {"Commit Mode...", "mq.iih.commimode" , FT_STRINGZ, STR_UNICODE, NULL, 0x0, "Commit Mode", HFILL }},
{ &hf_mq_iih_securityscope, {"SecurityScope.", "mq.iih.securityscope", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "Security Scope", HFILL }},
{ &hf_mq_iih_reserved , {"Reserved......", "mq.iih.reserved" , FT_STRINGZ, STR_UNICODE, NULL, 0x0, "Reserved", HFILL }},
{ &hf_mq_iih_transstate , {"TransactState.", "mq.iih.transstate" , FT_STRING, STR_UNICODE, NULL, 0x0, "Transaction State", HFILL }},
{ &hf_mq_iih_commimode , {"Commit Mode...", "mq.iih.commimode" , FT_STRING, STR_UNICODE, NULL, 0x0, "Commit Mode", HFILL }},
{ &hf_mq_iih_securityscope, {"SecurityScope.", "mq.iih.securityscope", FT_STRING, STR_UNICODE, NULL, 0x0, "Security Scope", HFILL }},
{ &hf_mq_iih_reserved , {"Reserved......", "mq.iih.reserved" , FT_STRING, STR_UNICODE, NULL, 0x0, "Reserved", HFILL }},
{&hf_mq_cih_flags_synconret ,{"SYNC_ON_RETURN", "mq.iih.flags.synconret" , FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQCIH_SYNC_ON_RETURN, "MQ CIH Flags IGNORE_PURG", HFILL}},
{&hf_mq_cih_flags_replywonulls,{"REPLY_WO_NULLS", "mq.iih.flags.replywonulls", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQCIH_REPLY_WITHOUT_NULLS, "MQ CIH Flags REPLY_WITHOUT_NULLS", HFILL}},
@ -4358,29 +4357,29 @@ void proto_register_mq(void)
{&hf_mq_ims_ll ,{"ll..", "mq.ims.ll" , FT_UINT16, BASE_DEC, NULL, 0x0, "IMS ll", HFILL}},
{&hf_mq_ims_zz ,{"zz..", "mq.ims.zz" , FT_UINT16, BASE_DEC, NULL, 0x0, "IMS zz", HFILL}},
{&hf_mq_ims_trx ,{"trx.", "mq.ims.trx", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "IMS Transaction", HFILL}},
{&hf_mq_ims_trx ,{"trx.", "mq.ims.trx", FT_STRING, STR_UNICODE, NULL, 0x0, "IMS Transaction", HFILL}},
{&hf_mq_ims_data,{"data", "mq.ims.data", FT_BYTES, BASE_NONE, NULL, 0x0, "Transaction Instance Identifier", HFILL}},
{&hf_mq_tm_StructID ,{"Structid", "mq.tm.structid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "TM structid", HFILL}},
{&hf_mq_tm_StructID ,{"Structid", "mq.tm.structid", FT_STRING, STR_UNICODE, NULL, 0x0, "TM structid", HFILL}},
{&hf_mq_tm_version ,{"version.", "mq.tm.version", FT_UINT32, BASE_DEC, NULL, 0x0, "TM version", HFILL}},
{&hf_mq_tm_QName ,{"QName...", "mq.tm.qname", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "TM Queue Name", HFILL}},
{&hf_mq_tm_ProcessNme ,{"ProcName", "mq.tm.procname", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "TM Process Name", HFILL}},
{&hf_mq_tm_TriggerData,{"TrigData", "mq.tm.triggerdata", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "TM Trigger Data", HFILL}},
{&hf_mq_tm_QName ,{"QName...", "mq.tm.qname", FT_STRING, STR_UNICODE, NULL, 0x0, "TM Queue Name", HFILL}},
{&hf_mq_tm_ProcessNme ,{"ProcName", "mq.tm.procname", FT_STRING, STR_UNICODE, NULL, 0x0, "TM Process Name", HFILL}},
{&hf_mq_tm_TriggerData,{"TrigData", "mq.tm.triggerdata", FT_STRING, STR_UNICODE, NULL, 0x0, "TM Trigger Data", HFILL}},
{&hf_mq_tm_ApplType ,{"ApplType", "mq.tm.appltype", FT_UINT32, BASE_DEC | BASE_EXT_STRING, GET_VALS_EXTP(MQAT), 0x0, "TM Application Type", HFILL}},
{&hf_mq_tm_ApplId ,{"ApplId..", "mq.tm.applid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "TM Application ID", HFILL}},
{&hf_mq_tm_EnvData ,{"EnvData.", "mq.tm.envdaqta", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "TM Environment Data", HFILL}},
{&hf_mq_tm_UserData ,{"UserData.", "mq.t2.userdata", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "TM User Data", HFILL}},
{&hf_mq_tm_ApplId ,{"ApplId..", "mq.tm.applid", FT_STRING, STR_UNICODE, NULL, 0x0, "TM Application ID", HFILL}},
{&hf_mq_tm_EnvData ,{"EnvData.", "mq.tm.envdaqta", FT_STRING, STR_UNICODE, NULL, 0x0, "TM Environment Data", HFILL}},
{&hf_mq_tm_UserData ,{"UserData.", "mq.t2.userdata", FT_STRING, STR_UNICODE, NULL, 0x0, "TM User Data", HFILL}},
{&hf_mq_tmc2_StructID ,{"Structid", "mq.tmc2.structid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "TMC2 structid", HFILL}},
{&hf_mq_tmc2_version ,{"version.", "mq.tmc2.version", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "TMC2 version", HFILL}},
{&hf_mq_tmc2_QName ,{"QName...", "mq.tmc2.qname", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "TMC2 Queue Name", HFILL}},
{&hf_mq_tmc2_ProcessNme ,{"ProcName", "mq.tmc2.procname", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "TMC2 Process Name", HFILL}},
{&hf_mq_tmc2_TriggerData,{"TrigData", "mq.tmc2.triggerdata", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "TMC2 Trigger Data", HFILL}},
{&hf_mq_tmc2_ApplType ,{"ApplType", "mq.tmc2.appltype", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "TMC2 Application Type", HFILL}},
{&hf_mq_tmc2_ApplId ,{"ApplId..", "mq.tmc2.applid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "TMC2 Application ID", HFILL}},
{&hf_mq_tmc2_EnvData ,{"EnvData.", "mq.tmc2.envdaqta", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "TMC2 Environment Data", HFILL}},
{&hf_mq_tmc2_UserData ,{"UserData", "mq.tmc2.userdata", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "TMC2 User Data", HFILL}},
{&hf_mq_tmc2_QMgrName ,{"QMgrName", "mq.tmc2.qmgrname", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "TMC2 Queue Manager Name", HFILL}},
{&hf_mq_tmc2_StructID ,{"Structid", "mq.tmc2.structid", FT_STRING, STR_UNICODE, NULL, 0x0, "TMC2 structid", HFILL}},
{&hf_mq_tmc2_version ,{"version.", "mq.tmc2.version", FT_STRING, STR_UNICODE, NULL, 0x0, "TMC2 version", HFILL}},
{&hf_mq_tmc2_QName ,{"QName...", "mq.tmc2.qname", FT_STRING, STR_UNICODE, NULL, 0x0, "TMC2 Queue Name", HFILL}},
{&hf_mq_tmc2_ProcessNme ,{"ProcName", "mq.tmc2.procname", FT_STRING, STR_UNICODE, NULL, 0x0, "TMC2 Process Name", HFILL}},
{&hf_mq_tmc2_TriggerData,{"TrigData", "mq.tmc2.triggerdata", FT_STRING, STR_UNICODE, NULL, 0x0, "TMC2 Trigger Data", HFILL}},
{&hf_mq_tmc2_ApplType ,{"ApplType", "mq.tmc2.appltype", FT_STRING, STR_UNICODE, NULL, 0x0, "TMC2 Application Type", HFILL}},
{&hf_mq_tmc2_ApplId ,{"ApplId..", "mq.tmc2.applid", FT_STRING, STR_UNICODE, NULL, 0x0, "TMC2 Application ID", HFILL}},
{&hf_mq_tmc2_EnvData ,{"EnvData.", "mq.tmc2.envdaqta", FT_STRING, STR_UNICODE, NULL, 0x0, "TMC2 Environment Data", HFILL}},
{&hf_mq_tmc2_UserData ,{"UserData", "mq.tmc2.userdata", FT_STRING, STR_UNICODE, NULL, 0x0, "TMC2 User Data", HFILL}},
{&hf_mq_tmc2_QMgrName ,{"QMgrName", "mq.tmc2.qmgrname", FT_STRING, STR_UNICODE, NULL, 0x0, "TMC2 Queue Manager Name", HFILL}},
{ &hf_mq_cih_returncode , {"ReturnCode...", "mq.cih.returncode" , FT_UINT32 , BASE_HEX_DEC, NULL, 0x0, "Return Code", HFILL }},
{ &hf_mq_cih_compcode , {"ComplCode....", "mq.cih.compcode" , FT_UINT32 , BASE_HEX_DEC, NULL, 0x0, "Completion Code", HFILL }},
@ -4394,33 +4393,33 @@ void proto_register_mq(void)
{ &hf_mq_cih_converstask , {"ConversTask..", "mq.cih.converstask" , FT_UINT32 , BASE_DEC , VALS(GET_VALSV(ConvTaskOpt)), 0x0, "Conversational Task", HFILL }},
{ &hf_mq_cih_taskendstatus, {"TaskEndStatus", "mq.cih.taskendstatus", FT_UINT32 , BASE_DEC , VALS(GET_VALSV(TaskEndStatus)), 0x0, "Status at End of Task", HFILL }},
{ &hf_mq_cih_bridgefactokn, {"BridgeFacTokn", "mq.cih.bridgefactokn", FT_BYTES , BASE_NONE, NULL, 0x0, "Bridge facility token", HFILL }},
{ &hf_mq_cih_function , {"Function.....", "mq.cih.function" , FT_STRINGZ, STR_UNICODE, NULL, 0x0, "MQ call name or CICS EIBFN function", HFILL }},
{ &hf_mq_cih_abendcode , {"AbendCode....", "mq.cih.abendcode" , FT_STRINGZ, STR_UNICODE, NULL, 0x0, "Abend Code", HFILL }},
{ &hf_mq_cih_authenticator, {"Authenticator", "mq.cih.authenticator", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "Password or Passcode", HFILL }},
{ &hf_mq_cih_reserved , {"Reserved.....", "mq.cih.reserved" , FT_STRINGZ, STR_UNICODE, NULL, 0x0, "Reserved", HFILL }},
{ &hf_mq_cih_replytofmt , {"ReplyToFormat", "mq.cih.replytofmt" , FT_STRINGZ, STR_UNICODE, NULL, 0x0, "Reply To Format", HFILL }},
{ &hf_mq_cih_remotesysid , {"RemoteSysId..", "mq.cih.remotesysid" , FT_STRINGZ, STR_UNICODE, NULL, 0x0, "Remote System Id", HFILL }},
{ &hf_mq_cih_remotetransid, {"RemoteTransId", "mq.cih.remotetransid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "Remote Transaction Id", HFILL }},
{ &hf_mq_cih_transactionid, {"TransactionId", "mq.cih.transactionid", FT_STRINGZ, STR_UNICODE, NULL, 0x0, "Transaction to attach", HFILL }},
{ &hf_mq_cih_facilitylike , {"FacilityLike.", "mq.cih.facilitylike" , FT_STRINGZ, STR_UNICODE, NULL, 0x0, "Terminal emulated attributes", HFILL }},
{ &hf_mq_cih_attentionid , {"AttentionID..", "mq.cih.attentionid" , FT_STRINGZ, STR_UNICODE, NULL, 0x0, "Attention Id (AID) Key", HFILL }},
{ &hf_mq_cih_startcode , {"StartCode....", "mq.cih.startcode" , FT_STRINGZ, STR_UNICODE, NULL, 0x0, "Transaction Start Code", HFILL }},
{ &hf_mq_cih_cancelcode , {"CancelCode...", "mq.cih.cancelcode" , FT_STRINGZ, STR_UNICODE, NULL, 0x0, "Abend transaction code", HFILL }},
{ &hf_mq_cih_nexttransid , {"NextTransId..", "mq.cih.nexttransid" , FT_STRINGZ, STR_UNICODE, NULL, 0x0, "Next transaction to attach", HFILL }},
{ &hf_mq_cih_reserved2 , {"Reserved3....", "mq.cih.reserved2" , FT_STRINGZ, STR_UNICODE, NULL, 0x0, "Reserved 2", HFILL }},
{ &hf_mq_cih_reserved3 , {"Reserved3....", "mq.cih.reserved3" , FT_STRINGZ, STR_UNICODE, NULL, 0x0, "Reserved 3", HFILL }},
{ &hf_mq_cih_function , {"Function.....", "mq.cih.function" , FT_STRING, STR_UNICODE, NULL, 0x0, "MQ call name or CICS EIBFN function", HFILL }},
{ &hf_mq_cih_abendcode , {"AbendCode....", "mq.cih.abendcode" , FT_STRING, STR_UNICODE, NULL, 0x0, "Abend Code", HFILL }},
{ &hf_mq_cih_authenticator, {"Authenticator", "mq.cih.authenticator", FT_STRING, STR_UNICODE, NULL, 0x0, "Password or Passcode", HFILL }},
{ &hf_mq_cih_reserved , {"Reserved.....", "mq.cih.reserved" , FT_STRING, STR_UNICODE, NULL, 0x0, "Reserved", HFILL }},
{ &hf_mq_cih_replytofmt , {"ReplyToFormat", "mq.cih.replytofmt" , FT_STRING, STR_UNICODE, NULL, 0x0, "Reply To Format", HFILL }},
{ &hf_mq_cih_remotesysid , {"RemoteSysId..", "mq.cih.remotesysid" , FT_STRING, STR_UNICODE, NULL, 0x0, "Remote System Id", HFILL }},
{ &hf_mq_cih_remotetransid, {"RemoteTransId", "mq.cih.remotetransid", FT_STRING, STR_UNICODE, NULL, 0x0, "Remote Transaction Id", HFILL }},
{ &hf_mq_cih_transactionid, {"TransactionId", "mq.cih.transactionid", FT_STRING, STR_UNICODE, NULL, 0x0, "Transaction to attach", HFILL }},
{ &hf_mq_cih_facilitylike , {"FacilityLike.", "mq.cih.facilitylike" , FT_STRING, STR_UNICODE, NULL, 0x0, "Terminal emulated attributes", HFILL }},
{ &hf_mq_cih_attentionid , {"AttentionID..", "mq.cih.attentionid" , FT_STRING, STR_UNICODE, NULL, 0x0, "Attention Id (AID) Key", HFILL }},
{ &hf_mq_cih_startcode , {"StartCode....", "mq.cih.startcode" , FT_STRING, STR_UNICODE, NULL, 0x0, "Transaction Start Code", HFILL }},
{ &hf_mq_cih_cancelcode , {"CancelCode...", "mq.cih.cancelcode" , FT_STRING, STR_UNICODE, NULL, 0x0, "Abend transaction code", HFILL }},
{ &hf_mq_cih_nexttransid , {"NextTransId..", "mq.cih.nexttransid" , FT_STRING, STR_UNICODE, NULL, 0x0, "Next transaction to attach", HFILL }},
{ &hf_mq_cih_reserved2 , {"Reserved3....", "mq.cih.reserved2" , FT_STRING, STR_UNICODE, NULL, 0x0, "Reserved 2", HFILL }},
{ &hf_mq_cih_reserved3 , {"Reserved3....", "mq.cih.reserved3" , FT_STRING, STR_UNICODE, NULL, 0x0, "Reserved 3", HFILL }},
{ &hf_mq_cih_cursorpos , {"CursorPos....", "mq.cih.cursorpos" , FT_UINT32 , BASE_DEC_HEX, NULL, 0x0, "Cursor Posiution", HFILL }},
{ &hf_mq_cih_erroroffset , {"ErrorOffset..", "mq.cih.erroroffset" , FT_UINT32 , BASE_DEC_HEX, NULL, 0x0, "Offset of error in message", HFILL }},
{ &hf_mq_cih_inputitem , {"InputItem....", "mq.cih.inputitem" , FT_UINT32 , BASE_DEC_HEX, NULL, 0x0, "Input Item", HFILL }},
{ &hf_mq_cih_reserved4 , {"Reserved4....", "mq.cih.reserved4" , FT_STRINGZ, STR_UNICODE, NULL, 0x0, "Reserved 4", HFILL }},
{ &hf_mq_cih_reserved4 , {"Reserved4....", "mq.cih.reserved4" , FT_STRING, STR_UNICODE, NULL, 0x0, "Reserved 4", HFILL }},
{ &hf_mq_rfh_ccsid , {"NmeValCCSID", "mq.rfh.ccsid" , FT_INT32 , BASE_DEC | BASE_RANGE_STRING, RVALS(GET_VALRV(ccsid)), 0x0, "RFH NameValue CCSID", HFILL }},
{ &hf_mq_rfh_length , {"Len." , "mq.rfh.length" , FT_UINT32 , BASE_DEC , NULL, 0x0, "RFH NameValue Length", HFILL }},
{ &hf_mq_rfh_string , {"Val." , "mq.rfh.string" , FT_STRINGZ, STR_UNICODE, NULL, 0x0, "RFH NameValue", HFILL }},
{ &hf_mq_rfh_string , {"Val." , "mq.rfh.string" , FT_STRING, STR_UNICODE, NULL, 0x0, "RFH NameValue", HFILL }},
{ &hf_mq_rmh_flags_last , {"LAST", "mq.rmh.flags.last", FT_BOOLEAN, 32, TFS(&tfs_set_notset), MQ_MQRMHF_LAST, "MQ RMH LAST", HFILL }},
{ &hf_mq_rmh_objecttype , {"ObjectType...", "mq.rmh.objecttype" , FT_STRINGZ, STR_UNICODE, NULL, 0x0, "Object Type", HFILL }},
{ &hf_mq_rmh_objecttype , {"ObjectType...", "mq.rmh.objecttype" , FT_STRING, STR_UNICODE, NULL, 0x0, "Object Type", HFILL }},
{ &hf_mq_rmh_objectinstid , {"ObjectInstId.", "mq.rmh.objectinstid" , FT_BYTES , BASE_NONE, NULL, 0x0, "Object Instance Identifier", HFILL }},
{ &hf_mq_rmh_srcenvlen , {"SrcEnvLen....", "mq.rmh.srcenvlen" , FT_UINT32 , BASE_DEC , NULL, 0x0, "Length of source environment data", HFILL }},
{ &hf_mq_rmh_srcenvofs , {"SrcEnvOfs....", "mq.rmh.srcenvofs" , FT_UINT32 , BASE_DEC_HEX, NULL, 0x0, "Offset of source environment data", HFILL }},
@ -4434,10 +4433,10 @@ void proto_register_mq(void)
{ &hf_mq_rmh_datalogicofsl, {"DataLogicOfsL", "mq.rmh.datalogicofsl", FT_UINT32 , BASE_DEC_HEX, NULL, 0x0, "Low offset of bulk data", HFILL }},
{ &hf_mq_rmh_datalogicofsh, {"DataLogicOfsH", "mq.rmh.datalogicofsh", FT_UINT32 , BASE_DEC_HEX, NULL, 0x0, "High offset of bulk data", HFILL }},
{ &hf_mq_wih_servicename , {"ServiceName..", "mq.wih.servicename" , FT_STRINGZ, STR_UNICODE, NULL, 0x0, "Service Name", HFILL }},
{ &hf_mq_wih_servicestep , {"ServiceStep..", "mq.wih.servicestep" , FT_STRINGZ, STR_UNICODE, NULL, 0x0, "Service Step Name", HFILL }},
{ &hf_mq_wih_servicename , {"ServiceName..", "mq.wih.servicename" , FT_STRING, STR_UNICODE, NULL, 0x0, "Service Name", HFILL }},
{ &hf_mq_wih_servicestep , {"ServiceStep..", "mq.wih.servicestep" , FT_STRING, STR_UNICODE, NULL, 0x0, "Service Step Name", HFILL }},
{ &hf_mq_wih_msgtoken , {"MsgToken.....", "mq.wih.msgtoken" , FT_BYTES , BASE_NONE, NULL, 0x0, "Message Token", HFILL }},
{ &hf_mq_wih_reserved , {"Reserved.....", "mq.wih.reserved" , FT_STRINGZ, STR_UNICODE, NULL, 0x0, "Reserved", HFILL }},
{ &hf_mq_wih_reserved , {"Reserved.....", "mq.wih.reserved" , FT_STRING, STR_UNICODE, NULL, 0x0, "Reserved", HFILL }},
};
static gint *ett[] =