osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

packet-mq: Fix a wrong offset+Add value in val_str 

fixed an offset error for mqmo in gmo
Added value in comment when defining val_str

Change-Id: Ie29f65f96d2ffb96c0cc0623346432f1f8380168
Reviewed-on: https://code.wireshark.org/review/25604
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Robert Grange 2018-02-05 00:09:47 +01:00 committed by Pascal Quantin
parent 0420088e9f
commit 746511d5ba
1 changed files with 136 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

275
epan/dissectors/packet-mq.c
View File

@ -1042,36 +1042,36 @@ static guint32 mq_AsyMsgTot;
static reassembly_table mq_reassembly_table;
DEF_VALSB(notifcode)
DEF_VALS2(NC_GET_INHIBITED , "GET_INHIBITED"),
DEF_VALS2(NC_GET_ALLOWED , "GET_ALLOWED"),
DEF_VALS2(NC_CONN_STATE , "CONN_STATE"),
DEF_VALS2(NC_CONN_STATE_REPLY , "CONN_STATE_REPLY"),
DEF_VALS2(NC_Q_STATE , "Q_STATE"),
DEF_VALS2(NC_Q_STATE_REPLY , "Q_STATE_REPLY"),
DEF_VALS2(NC_QM_QUIESCING , "QM_QUIESCING"),
DEF_VALS2(NC_TXN_ALLOWED , "TXN_ALLOWED"),
DEF_VALS2(NC_TXN_REVOKE , "TXN_REVOKE"),
DEF_VALS2(NC_TXN_REVOKE_REPLY , "TXN_REVOKE_REPLY"),
DEF_VALS2(NC_CHECK_MSG , "CHECK_MSG"),
DEF_VALS2(NC_BROWSE_FIRST , "BROWSE_FIRST"),
DEF_VALS2(NC_MESSAGE_TOO_LARGE , "MESSAGE_TOO_LARGE"),
DEF_VALS2(NC_STREAMING_FAILURE , "STREAMING_FAILURE"),
DEF_VALS2(NC_CLIENT_ASYNC_EMPTY, "CLIENT_ASYNC_EMPTY"),
DEF_VALS2(NC_STREAMING_TXN_PAUSED, "STREAMING_TXN_PAUSED"),
DEF_VALS2(NC_RECONNECTION_COMPLETE, "RECONNECTION_COMPLETE"),
/* 1*/ DEF_VALS2(NC_GET_INHIBITED , "GET_INHIBITED"),
/* 2*/ DEF_VALS2(NC_GET_ALLOWED , "GET_ALLOWED"),
/* 3*/ DEF_VALS2(NC_CONN_STATE , "CONN_STATE"),
/* 4*/ DEF_VALS2(NC_CONN_STATE_REPLY , "CONN_STATE_REPLY"),
/* 5*/ DEF_VALS2(NC_Q_STATE , "Q_STATE"),
/* 6*/ DEF_VALS2(NC_Q_STATE_REPLY , "Q_STATE_REPLY"),
/* 7*/ DEF_VALS2(NC_QM_QUIESCING , "QM_QUIESCING"),
/* 8*/ DEF_VALS2(NC_TXN_ALLOWED , "TXN_ALLOWED"),
/* 9*/ DEF_VALS2(NC_TXN_REVOKE , "TXN_REVOKE"),
/* 10*/ DEF_VALS2(NC_TXN_REVOKE_REPLY , "TXN_REVOKE_REPLY"),
/* 11*/ DEF_VALS2(NC_CHECK_MSG , "CHECK_MSG"),
/* 12*/ DEF_VALS2(NC_BROWSE_FIRST , "BROWSE_FIRST"),
/* 13*/ DEF_VALS2(NC_MESSAGE_TOO_LARGE , "MESSAGE_TOO_LARGE"),
/* 14*/ DEF_VALS2(NC_STREAMING_FAILURE , "STREAMING_FAILURE"),
/* 15*/ DEF_VALS2(NC_CLIENT_ASYNC_EMPTY, "CLIENT_ASYNC_EMPTY"),
/* 16*/ DEF_VALS2(NC_STREAMING_TXN_PAUSED, "STREAMING_TXN_PAUSED"),
/* 17*/ DEF_VALS2(NC_RECONNECTION_COMPLETE, "RECONNECTION_COMPLETE"),
DEF_VALSE;
DEF_VALSB(spi_verbs)
DEF_VALS2(SPI_QUERY , "QUERY"),
DEF_VALS2(SPI_PUT , "PUT"),
DEF_VALS2(SPI_GET , "GET"),
DEF_VALS2(SPI_ACTIVATE, "ACTIVATE"),
DEF_VALS2(SPI_OPEN , "OPEN"),
/* 1*/ DEF_VALS2(SPI_QUERY , "QUERY"),
/* 2*/ DEF_VALS2(SPI_PUT , "PUT"),
/* 3*/ DEF_VALS2(SPI_GET , "GET"),
/* 4*/ DEF_VALS2(SPI_ACTIVATE, "ACTIVATE"),
/* 12*/ DEF_VALS2(SPI_OPEN , "OPEN"),
DEF_VALSE;
DEF_VALSB(spi_activate)
DEF_VALS2(SPI_ACTIVATE_ENABLE , "ENABLE"),
DEF_VALS2(SPI_ACTIVATE_DISABLE, "DISABLE"),
/* 1*/ DEF_VALS2(SPI_ACTIVATE_ENABLE , "ENABLE"),
/* 2*/ DEF_VALS2(SPI_ACTIVATE_DISABLE, "DISABLE"),
DEF_VALSE;
DEF_VALSB(status)
@ -1181,132 +1181,130 @@ DEF_VALSE;
DEF_VALS_EXTB(opcode);
DEF_VALSB(xaer)
DEF_VALS2(XA_RBROLLBACK , "XA_RBROLLBACK"),
DEF_VALS2(XA_RBCOMMFAIL , "XA_RBCOMMFAIL"),
DEF_VALS2(XA_RBDEADLOCK , "XA_RBDEADLOCK"),
DEF_VALS2(XA_RBINTEGRITY, "XA_RBINTEGRITY"),
DEF_VALS2(XA_RBOTHER , "XA_RBOTHER"),
DEF_VALS2(XA_RBPROTO , "XA_RBPROTO"),
DEF_VALS2(XA_RBTIMEOUT , "XA_RBTIMEOUT"),
DEF_VALS2(XA_RBTRANSIENT, "XA_RBTRANSIENT"),
DEF_VALS2(XA_NOMIGRATE , "XA_NOMIGRATE"),
DEF_VALS2(XA_HEURHAZ , "XA_HEURHAZ"),
DEF_VALS2(XA_HEURCOM , "XA_HEURCOM"),
DEF_VALS2(XA_HEURRB , "XA_HEURRB"),
DEF_VALS2(XA_HEURMIX , "XA_HEURMIX"),
DEF_VALS2(XA_RETRY , "XA_RETRY"),
DEF_VALS2(XA_RDONLY , "XA_RDONLY"),
DEF_VALS2(XA_OK , "XA_OK"),
DEF_VALS2(XAER_ASYNC , "XAER_ASYNC"),
DEF_VALS2(XAER_RMERR , "XAER_RMERR"),
DEF_VALS2(XAER_NOTA , "XAER_NOTA"),
DEF_VALS2(XAER_INVAL , "XAER_INVAL"),
DEF_VALS2(XAER_PROTO , "XAER_PROTO"),
DEF_VALS2(XAER_RMFAIL , "XAER_RMFAIL"),
DEF_VALS2(XAER_DUPID , "XAER_DUPID"),
DEF_VALS2(XAER_OUTSIDE , "XAER_OUTSIDE"),
/* 0*/ DEF_VALS2(XA_OK, "XA_OK"),
/* 3*/ DEF_VALS2(XA_RDONLY, "XA_RDONLY"),
/* 4*/ DEF_VALS2(XA_RETRY, "XA_RETRY"),
/* 5*/ DEF_VALS2(XA_HEURMIX, "XA_HEURMIX"),
/* 6*/ DEF_VALS2(XA_HEURRB, "XA_HEURRB"),
/* 7*/ DEF_VALS2(XA_HEURCOM, "XA_HEURCOM"),
/* 8*/ DEF_VALS2(XA_HEURHAZ, "XA_HEURHAZ"),
/* 9*/ DEF_VALS2(XA_NOMIGRATE, "XA_NOMIGRATE"),
/* 100*/ DEF_VALS2(XA_RBROLLBACK, "XA_RBROLLBACK"),
/* 101*/ DEF_VALS2(XA_RBCOMMFAIL, "XA_RBCOMMFAIL"),
/* 102*/ DEF_VALS2(XA_RBDEADLOCK, "XA_RBDEADLOCK"),
/* 103*/ DEF_VALS2(XA_RBINTEGRITY, "XA_RBINTEGRITY"),
/* 104*/ DEF_VALS2(XA_RBOTHER, "XA_RBOTHER"),
/* 105*/ DEF_VALS2(XA_RBPROTO, "XA_RBPROTO"),
/* 106*/ DEF_VALS2(XA_RBTIMEOUT, "XA_RBTIMEOUT"),
/* 107*/ DEF_VALS2(XA_RBTRANSIENT, "XA_RBTRANSIENT"),
/* -9*/ DEF_VALS2(XAER_OUTSIDE, "XAER_OUTSIDE"),
/* -8*/ DEF_VALS2(XAER_DUPID, "XAER_DUPID"),
/* -7*/ DEF_VALS2(XAER_RMFAIL, "XAER_RMFAIL"),
/* -6*/ DEF_VALS2(XAER_PROTO, "XAER_PROTO"),
/* -5*/ DEF_VALS2(XAER_INVAL, "XAER_INVAL"),
/* -4*/ DEF_VALS2(XAER_NOTA, "XAER_NOTA"),
/* -3*/ DEF_VALS2(XAER_RMERR, "XAER_RMERR"),
/* -2*/ DEF_VALS2(XAER_ASYNC, "XAER_ASYNC"),
DEF_VALSE;
DEF_VALSB(StructID)
DEF_VALS2(STRUCTID_CAUT , MQ_TEXT_CAUT),
DEF_VALS2(STRUCTID_CIH , MQ_TEXT_CIH),
DEF_VALS2(STRUCTID_DH , MQ_TEXT_DH),
DEF_VALS2(STRUCTID_DLH , MQ_TEXT_DLH),
DEF_VALS2(STRUCTID_FCNO , MQ_TEXT_FCNO),
DEF_VALS2(STRUCTID_FOPA , MQ_TEXT_FOPA),
DEF_VALS2(STRUCTID_GMO , MQ_TEXT_GMO),
DEF_VALS2(STRUCTID_ID , MQ_TEXT_ID),
DEF_VALS2(STRUCTID_IIH , MQ_TEXT_IIH),
DEF_VALS2(STRUCTID_LPOO , MQ_TEXT_LPOO),
DEF_VALS2(STRUCTID_MD , MQ_TEXT_MD),
DEF_VALS2(STRUCTID_MDE , MQ_TEXT_MDE),
DEF_VALS2(STRUCTID_MSH , MQ_TEXT_MSH),
DEF_VALS2(STRUCTID_OD , MQ_TEXT_OD),
DEF_VALS2(STRUCTID_PMO , MQ_TEXT_PMO),
DEF_VALS2(STRUCTID_RFH , MQ_TEXT_RFH),
DEF_VALS2(STRUCTID_RMH , MQ_TEXT_RMH),
DEF_VALS2(STRUCTID_SPAI , MQ_TEXT_SPAI),
DEF_VALS2(STRUCTID_SPAO , MQ_TEXT_SPAO),
DEF_VALS2(STRUCTID_SPAU , MQ_TEXT_SPAU),
DEF_VALS2(STRUCTID_SPGI , MQ_TEXT_SPGI),
DEF_VALS2(STRUCTID_SPGO , MQ_TEXT_SPGO),
DEF_VALS2(STRUCTID_SPGU , MQ_TEXT_SPGU),
DEF_VALS2(STRUCTID_SPOI , MQ_TEXT_SPOI),
DEF_VALS2(STRUCTID_SPOO , MQ_TEXT_SPOO),
DEF_VALS2(STRUCTID_SPOU , MQ_TEXT_SPOU),
DEF_VALS2(STRUCTID_SPPI , MQ_TEXT_SPPI),
DEF_VALS2(STRUCTID_SPPO , MQ_TEXT_SPPO),
DEF_VALS2(STRUCTID_SPPU , MQ_TEXT_SPPU),
DEF_VALS2(STRUCTID_SPQI , MQ_TEXT_SPQI),
DEF_VALS2(STRUCTID_SPQO , MQ_TEXT_SPQO),
DEF_VALS2(STRUCTID_SPQU , MQ_TEXT_SPQU),
DEF_VALS2(STRUCTID_TM , MQ_TEXT_TM),
DEF_VALS2(STRUCTID_TMC2 , MQ_TEXT_TMC2),
/* CAUT*/ DEF_VALS2(STRUCTID_CAUT, MQ_TEXT_CAUT),
/* CIH */ DEF_VALS2(STRUCTID_CIH , MQ_TEXT_CIH),
/* DH */ DEF_VALS2(STRUCTID_DH , MQ_TEXT_DH),
/* DLH */ DEF_VALS2(STRUCTID_DLH , MQ_TEXT_DLH),
/* FCNO*/ DEF_VALS2(STRUCTID_FCNO, MQ_TEXT_FCNO),
/* FOPA*/ DEF_VALS2(STRUCTID_FOPA, MQ_TEXT_FOPA),
/* GMO */ DEF_VALS2(STRUCTID_GMO , MQ_TEXT_GMO),
/* ID */ DEF_VALS2(STRUCTID_ID , MQ_TEXT_ID),
/* IIH */ DEF_VALS2(STRUCTID_IIH , MQ_TEXT_IIH),
/* LPOO*/ DEF_VALS2(STRUCTID_LPOO, MQ_TEXT_LPOO),
/* MD */ DEF_VALS2(STRUCTID_MD , MQ_TEXT_MD),
/* MDE */ DEF_VALS2(STRUCTID_MDE , MQ_TEXT_MDE),
/* MSH */ DEF_VALS2(STRUCTID_MSH , MQ_TEXT_MSH),
/* OD */ DEF_VALS2(STRUCTID_OD , MQ_TEXT_OD),
/* PMO */ DEF_VALS2(STRUCTID_PMO , MQ_TEXT_PMO),
/* RFH */ DEF_VALS2(STRUCTID_RFH , MQ_TEXT_RFH),
/* RMH */ DEF_VALS2(STRUCTID_RMH , MQ_TEXT_RMH),
/* SPAI*/ DEF_VALS2(STRUCTID_SPAI, MQ_TEXT_SPAI),
/* SPAO*/ DEF_VALS2(STRUCTID_SPAO, MQ_TEXT_SPAO),
/* SPAU*/ DEF_VALS2(STRUCTID_SPAU, MQ_TEXT_SPAU),
/* SPGI*/ DEF_VALS2(STRUCTID_SPGI, MQ_TEXT_SPGI),
/* SPGO*/ DEF_VALS2(STRUCTID_SPGO, MQ_TEXT_SPGO),
/* SPGU*/ DEF_VALS2(STRUCTID_SPGU, MQ_TEXT_SPGU),
/* SPOI*/ DEF_VALS2(STRUCTID_SPOI, MQ_TEXT_SPOI),
/* SPOO*/ DEF_VALS2(STRUCTID_SPOO, MQ_TEXT_SPOO),
/* SPOU*/ DEF_VALS2(STRUCTID_SPOU, MQ_TEXT_SPOU),
/* SPPI*/ DEF_VALS2(STRUCTID_SPPI, MQ_TEXT_SPPI),
/* SPPO*/ DEF_VALS2(STRUCTID_SPPO, MQ_TEXT_SPPO),
/* SPPU*/ DEF_VALS2(STRUCTID_SPPU, MQ_TEXT_SPPU),
/* SPQI*/ DEF_VALS2(STRUCTID_SPQI, MQ_TEXT_SPQI),
/* SPQO*/ DEF_VALS2(STRUCTID_SPQO, MQ_TEXT_SPQO),
/* SPQU*/ DEF_VALS2(STRUCTID_SPQU, MQ_TEXT_SPQU),
/* TM */ DEF_VALS2(STRUCTID_TM , MQ_TEXT_TM),
/* TMC2*/ DEF_VALS2(STRUCTID_TMC2, MQ_TEXT_TMC2),
/* TSH */ DEF_VALS2(STRUCTID_TSH , MQ_TEXT_TSH),
/* TSHC*/ DEF_VALS2(STRUCTID_TSHC, MQ_TEXT_TSHC),
/* TSHM*/ DEF_VALS2(STRUCTID_TSHM, MQ_TEXT_TSHM),
/* UID */ DEF_VALS2(STRUCTID_UID , MQ_TEXT_UID),
/* WIH */ DEF_VALS2(STRUCTID_WIH , MQ_TEXT_WIH),
/* XQH */ DEF_VALS2(STRUCTID_XQH , MQ_TEXT_XQH),
DEF_VALS2(STRUCTID_TSH , MQ_TEXT_TSH),
DEF_VALS2(STRUCTID_TSHC , MQ_TEXT_TSHC),
DEF_VALS2(STRUCTID_TSHM , MQ_TEXT_TSHM),
DEF_VALS2(STRUCTID_UID , MQ_TEXT_UID),
DEF_VALS2(STRUCTID_WIH , MQ_TEXT_WIH),
DEF_VALS2(STRUCTID_XQH , MQ_TEXT_XQH),
DEF_VALS2(STRUCTID_CAUT_EBCDIC, MQ_TEXT_CAUT),
DEF_VALS2(STRUCTID_CIH_EBCDIC , MQ_TEXT_CIH),
DEF_VALS2(STRUCTID_DH_EBCDIC , MQ_TEXT_DH),
DEF_VALS2(STRUCTID_DLH_EBCDIC , MQ_TEXT_DLH),
DEF_VALS2(STRUCTID_FCNO_EBCDIC, MQ_TEXT_FCNO),
DEF_VALS2(STRUCTID_FOPA_EBCDIC, MQ_TEXT_FOPA),
DEF_VALS2(STRUCTID_GMO_EBCDIC , MQ_TEXT_GMO),
DEF_VALS2(STRUCTID_ID_EBCDIC , MQ_TEXT_ID),
DEF_VALS2(STRUCTID_IIH_EBCDIC , MQ_TEXT_IIH),
DEF_VALS2(STRUCTID_LPOO_EBCDIC, MQ_TEXT_LPOO),
DEF_VALS2(STRUCTID_MD_EBCDIC , MQ_TEXT_MD),
DEF_VALS2(STRUCTID_MDE_EBCDIC , MQ_TEXT_MDE),
DEF_VALS2(STRUCTID_OD_EBCDIC , MQ_TEXT_OD),
DEF_VALS2(STRUCTID_PMO_EBCDIC , MQ_TEXT_PMO),
DEF_VALS2(STRUCTID_RFH_EBCDIC , MQ_TEXT_RFH),
DEF_VALS2(STRUCTID_RMH_EBCDIC , MQ_TEXT_RMH),
DEF_VALS2(STRUCTID_SPAI_EBCDIC, MQ_TEXT_SPAI),
DEF_VALS2(STRUCTID_SPAO_EBCDIC, MQ_TEXT_SPAO),
DEF_VALS2(STRUCTID_SPAU_EBCDIC, MQ_TEXT_SPAU),
DEF_VALS2(STRUCTID_SPGI_EBCDIC, MQ_TEXT_SPGI),
DEF_VALS2(STRUCTID_SPGO_EBCDIC, MQ_TEXT_SPGO),
DEF_VALS2(STRUCTID_SPGU_EBCDIC, MQ_TEXT_SPGU),
DEF_VALS2(STRUCTID_SPOI_EBCDIC, MQ_TEXT_SPOI),
DEF_VALS2(STRUCTID_SPOO_EBCDIC, MQ_TEXT_SPOO),
DEF_VALS2(STRUCTID_SPOU_EBCDIC, MQ_TEXT_SPOU),
DEF_VALS2(STRUCTID_SPPI_EBCDIC, MQ_TEXT_SPPI),
DEF_VALS2(STRUCTID_SPPO_EBCDIC, MQ_TEXT_SPPO),
DEF_VALS2(STRUCTID_SPPU_EBCDIC, MQ_TEXT_SPPU),
DEF_VALS2(STRUCTID_SPQI_EBCDIC, MQ_TEXT_SPQI),
DEF_VALS2(STRUCTID_SPQO_EBCDIC, MQ_TEXT_SPQO),
DEF_VALS2(STRUCTID_SPQU_EBCDIC, MQ_TEXT_SPQU),
DEF_VALS2(STRUCTID_TM_EBCDIC , MQ_TEXT_TM),
DEF_VALS2(STRUCTID_TMC2_EBCDIC, MQ_TEXT_TMC2),
DEF_VALS2(STRUCTID_TSH_EBCDIC , MQ_TEXT_TSH),
DEF_VALS2(STRUCTID_TSHC_EBCDIC, MQ_TEXT_TSHC),
DEF_VALS2(STRUCTID_TSHM_EBCDIC, MQ_TEXT_TSHM),
DEF_VALS2(STRUCTID_UID_EBCDIC , MQ_TEXT_UID),
DEF_VALS2(STRUCTID_WIH_EBCDIC , MQ_TEXT_WIH),
DEF_VALS2(STRUCTID_XQH_EBCDIC , MQ_TEXT_XQH),
/* CAUT*/ DEF_VALS2(STRUCTID_CAUT_EBCDIC, MQ_TEXT_CAUT),
/* CIH */ DEF_VALS2(STRUCTID_CIH_EBCDIC , MQ_TEXT_CIH),
/* DH */ DEF_VALS2(STRUCTID_DH_EBCDIC , MQ_TEXT_DH),
/* DLH */ DEF_VALS2(STRUCTID_DLH_EBCDIC , MQ_TEXT_DLH),
/* FCNO*/ DEF_VALS2(STRUCTID_FCNO_EBCDIC, MQ_TEXT_FCNO),
/* FOPA*/ DEF_VALS2(STRUCTID_FOPA_EBCDIC, MQ_TEXT_FOPA),
/* GMO */ DEF_VALS2(STRUCTID_GMO_EBCDIC , MQ_TEXT_GMO),
/* ID */ DEF_VALS2(STRUCTID_ID_EBCDIC , MQ_TEXT_ID),
/* IIH */ DEF_VALS2(STRUCTID_IIH_EBCDIC , MQ_TEXT_IIH),
/* LPOO*/ DEF_VALS2(STRUCTID_LPOO_EBCDIC, MQ_TEXT_LPOO),
/* MD */ DEF_VALS2(STRUCTID_MD_EBCDIC , MQ_TEXT_MD),
/* MDE */ DEF_VALS2(STRUCTID_MDE_EBCDIC , MQ_TEXT_MDE),
/* OD */ DEF_VALS2(STRUCTID_OD_EBCDIC , MQ_TEXT_OD),
/* PMO */ DEF_VALS2(STRUCTID_PMO_EBCDIC , MQ_TEXT_PMO),
/* RFH */ DEF_VALS2(STRUCTID_RFH_EBCDIC , MQ_TEXT_RFH),
/* RMH */ DEF_VALS2(STRUCTID_RMH_EBCDIC , MQ_TEXT_RMH),
/* SPAI*/ DEF_VALS2(STRUCTID_SPAI_EBCDIC, MQ_TEXT_SPAI),
/* SPAO*/ DEF_VALS2(STRUCTID_SPAO_EBCDIC, MQ_TEXT_SPAO),
/* SPAU*/ DEF_VALS2(STRUCTID_SPAU_EBCDIC, MQ_TEXT_SPAU),
/* SPGI*/ DEF_VALS2(STRUCTID_SPGI_EBCDIC, MQ_TEXT_SPGI),
/* SPGO*/ DEF_VALS2(STRUCTID_SPGO_EBCDIC, MQ_TEXT_SPGO),
/* SPGU*/ DEF_VALS2(STRUCTID_SPGU_EBCDIC, MQ_TEXT_SPGU),
/* SPOI*/ DEF_VALS2(STRUCTID_SPOI_EBCDIC, MQ_TEXT_SPOI),
/* SPOO*/ DEF_VALS2(STRUCTID_SPOO_EBCDIC, MQ_TEXT_SPOO),
/* SPOU*/ DEF_VALS2(STRUCTID_SPOU_EBCDIC, MQ_TEXT_SPOU),
/* SPPI*/ DEF_VALS2(STRUCTID_SPPI_EBCDIC, MQ_TEXT_SPPI),
/* SPPO*/ DEF_VALS2(STRUCTID_SPPO_EBCDIC, MQ_TEXT_SPPO),
/* SPPU*/ DEF_VALS2(STRUCTID_SPPU_EBCDIC, MQ_TEXT_SPPU),
/* SPQI*/ DEF_VALS2(STRUCTID_SPQI_EBCDIC, MQ_TEXT_SPQI),
/* SPQO*/ DEF_VALS2(STRUCTID_SPQO_EBCDIC, MQ_TEXT_SPQO),
/* SPQU*/ DEF_VALS2(STRUCTID_SPQU_EBCDIC, MQ_TEXT_SPQU),
/* TM */ DEF_VALS2(STRUCTID_TM_EBCDIC , MQ_TEXT_TM),
/* TMC2*/ DEF_VALS2(STRUCTID_TMC2_EBCDIC, MQ_TEXT_TMC2),
/* TSH */ DEF_VALS2(STRUCTID_TSH_EBCDIC , MQ_TEXT_TSH),
/* TSHC*/ DEF_VALS2(STRUCTID_TSHC_EBCDIC, MQ_TEXT_TSHC),
/* TSHM*/ DEF_VALS2(STRUCTID_TSHM_EBCDIC, MQ_TEXT_TSHM),
/* UID */ DEF_VALS2(STRUCTID_UID_EBCDIC , MQ_TEXT_UID),
/* WIH */ DEF_VALS2(STRUCTID_WIH_EBCDIC , MQ_TEXT_WIH),
/* XQH */ DEF_VALS2(STRUCTID_XQH_EBCDIC , MQ_TEXT_XQH),
DEF_VALSE;
DEF_VALS_EXTB(StructID);
DEF_VALSB(byteorder)
DEF_VALS2(LITTLE_ENDIAN, "Little endian"),
DEF_VALS2(BIG_ENDIAN , "Big endian"),
/* 1*/ DEF_VALS2(BIG_ENDIAN , "Big endian"),
/* 2*/ DEF_VALS2(LITTLE_ENDIAN, "Little endian"),
DEF_VALSE;
DEF_VALSB(conn_options)
DEF_VALS2(CONN_OPTION , "MQCONN"),
DEF_VALS2(CONNX_OPTION, "MQCONNX"),
/* 1*/ DEF_VALS2(CONN_OPTION , "MQCONN"),
/* 3*/ DEF_VALS2(CONNX_OPTION, "MQCONNX"),
DEF_VALSE;
DEF_VALSB(sidtype)
DEF_VALS1(MQSIDT_NONE),
DEF_VALS1(MQSIDT_NT_SECURITY_ID),
DEF_VALS1(MQSIDT_WAS_SECURITY_ID),
/* 0*/ DEF_VALS1(MQSIDT_NONE),
/* 1*/ DEF_VALS1(MQSIDT_NT_SECURITY_ID),
/* 2*/ DEF_VALS1(MQSIDT_WAS_SECURITY_ID),
DEF_VALSE;
static gint dissect_mq_encoding(proto_tree *tree, int hfindex, tvbuff_t *tvb, const gint start, gint length, const guint encoding)
@ -1543,7 +1541,7 @@ static gint dissect_mq_charv(tvbuff_t *tvb, proto_tree *tree, gint offset, gint
proto_tree_add_item(mq_tree_sub, hf_mq_charv_vsbufsize, tvb, offset + 8, 4, p_mq_parm->mq_int_enc);
proto_tree_add_item(mq_tree_sub, hf_mq_charv_vslength , tvb, offset + 12, 4, p_mq_parm->mq_int_enc);
proto_tree_add_item(mq_tree_sub, hf_mq_charv_vsccsid , tvb, offset + 16, 4, p_mq_parm->mq_int_enc);
proto_tree_add_item(mq_tree_sub, hf_mq_charv_vsvalue , tvb, oStr, lStr, (eStr == 500) ? ENC_EBCDIC : ENC_ASCII);
proto_tree_add_item(mq_tree_sub, hf_mq_charv_vsvalue , tvb, oStr, lStr, IS_EBCDIC(eStr) ? ENC_EBCDIC : ENC_ASCII);
return 20;
}
@ -1687,8 +1685,7 @@ static gint dissect_mq_gmo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
if (iVersion >= 2)
{
/*proto_tree_add_item(mq_tree, hf_mq_gmo_matchoptions, tvb, offset + 72, 4, ENC_BIG_ENDIAN);*/
dissect_mq_MQMO(tvb, mq_tree, offset + 8, ett_mq_gmo_matchoption, p_mq_parm);
dissect_mq_MQMO(tvb, mq_tree, offset + 72, ett_mq_gmo_matchoption, p_mq_parm);
proto_tree_add_item(mq_tree, hf_mq_gmo_groupstatus , tvb, offset + 76, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(mq_tree, hf_mq_gmo_segmstatus , tvb, offset + 77, 1, ENC_BIG_ENDIAN);