osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From robionekenobi: "packet-mq adapted" 

See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9367
      especially comments 8,9,12,13

Patch: https://bugs.wireshark.org/bugzilla/attachment.cgi?id=12014

From me: Remove several uses of DEF_VALSEXT macro
         since the above patch removed the definition.

(It seems that Microsoft C expands undefined macros as null;
 GCC complains).


svn path=/trunk/; revision=53101
This commit is contained in:
Bill Meier 2013-11-06 15:28:23 +00:00
parent 22760b2d2a
commit c4efddd7d2
3 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
epan/dissectors/packet-mq-base.c
View File

@ -84,7 +84,7 @@ DEF_VALRB(ccsid)
DEF_VALR3(MQCCSI_1 ,MQCCSI_65535, ""),
DEF_VALRE;
DEF_VALSXB(mqat)
DEF_VALSBX(mqat)
DEF_VALS1(MQAT_UNKNOWN ),
DEF_VALS1(MQAT_NO_CONTEXT ),
DEF_VALS1(MQAT_CICS ),
@ -122,14 +122,14 @@ DEF_VALSXB(mqat)
DEF_VALS1(MQAT_UNKNOWN ),
DEF_VALSE;
DEF_VALSXB(mqcc)
DEF_VALSBX(mqcc)
DEF_VALS1(MQCC_OK ),
DEF_VALS1(MQCC_WARNING),
DEF_VALS1(MQCC_FAILED ),
DEF_VALS1(MQCC_UNKNOWN),
DEF_VALSE;
DEF_VALSXB(mqrc)
DEF_VALSBX(mqrc)
DEF_VALS1(MQRC_NONE ),
DEF_VALS1(MQRC_ALIAS_BASE_Q_TYPE_ERROR ),
DEF_VALS1(MQRC_ALREADY_CONNECTED ),
@ -967,7 +967,7 @@ DEF_VALSXB(mqrc)
DEF_VALS1(MQRC_XR_NOT_AVAILABLE ),
DEF_VALSE;
DEF_VALSXB(selector)
DEF_VALSBX(selector)
DEF_VALS1(MQIA_APPL_TYPE ),
DEF_VALS1(MQIA_CODED_CHAR_SET_ID ),
DEF_VALS1(MQIA_CURRENT_Q_DEPTH ),
@ -1298,9 +1298,8 @@ DEF_VALSXB(selector)
DEF_VALS1(MQCA_XR_SSL_CIPHER_SUITES ),
DEF_VALS1(MQCA_CLUS_CHL_NAME ),
DEF_VALSE;
DEF_VALSEXT(selector);
DEF_VALSXB(mqcmd)
DEF_VALSBX(mqcmd)
DEF_VALS1(MQCMD_NONE ),
DEF_VALS1(MQCMD_CHANGE_Q_MGR ),
DEF_VALS1(MQCMD_INQUIRE_Q_MGR ),
@ -1492,10 +1491,9 @@ DEF_VALSXB(mqcmd)
DEF_VALS1(MQCMD_RESET_CF_STRUC ),
DEF_VALS1(MQCMD_INQUIRE_XR_CAPABILITY ),
DEF_VALSE;
DEF_VALSEXT(mqcmd);
/* Types of Structure */
DEF_VALSXB(mqcft)
DEF_VALSBX(mqcft)
DEF_VALS1(MQCFT_NONE ),
DEF_VALS1(MQCFT_COMMAND ),
DEF_VALS1(MQCFT_RESPONSE ),
@ -1523,7 +1521,7 @@ DEF_VALSXB(mqcft)
DEF_VALS1(MQCFT_APP_ACTIVITY ),
DEF_VALSE;
DEF_VALSXB(objtype)
DEF_VALSBX(objtype)
DEF_VALS1(MQOT_NONE ),
DEF_VALS1(MQOT_Q ),
DEF_VALS1(MQOT_NAMELIST ),
@ -1562,7 +1560,7 @@ DEF_VALSB(AuthInfoType)
DEF_VALS1(MQAIT_OCSP),
DEF_VALSE;
DEF_VALSXB(FilterOP)
DEF_VALSBX(FilterOP)
DEF_VALS1(MQCFOP_LESS ),
DEF_VALS1(MQCFOP_EQUAL ),
DEF_VALS1(MQCFOP_GREATER ),
@ -1997,7 +1995,7 @@ DEF_VALSB(ApplType)
DEF_VALS1(MQAT_SYSTEM_EXTENSION ),
DEF_VALSE;
DEF_VALSXB(PrmTyp)
DEF_VALSBX(PrmTyp)
DEF_VALS1(MQCFT_NONE ),
DEF_VALS1(MQCFT_COMMAND ),
DEF_VALS1(MQCFT_RESPONSE ),
@ -2222,7 +2220,7 @@ DEF_VALSB(CtlOpt)
DEF_VALSE;
#endif
DEF_VALSXB(PrmId)
DEF_VALSBX(PrmId)
DEF_VALS1(MQBACF_ACCOUNTING_TOKEN ),
DEF_VALS1(MQBACF_CF_LEID ),
DEF_VALS1(MQBACF_CONNECTION_ID ),
@ -5109,7 +5107,7 @@ DEF_VALSB(SyncpointAvailability)
DEF_VALS1(MQSP_NOT_AVAILABLE),
DEF_VALSE;
DEF_VALSXB(MQCFINT_Parse)
DEF_VALSBX(MQCFINT_Parse)
DEF_VALS2(MQIACF_ASYNC_STATE ,GET_VALSP(AsynchronousStateValues)),
DEF_VALS2(MQIACF_CHLAUTH_TYPE ,GET_VALSP(ChlauthType)),
DEF_VALS2(MQIACF_CLUSTER_Q_MGR_ATTRS ,GET_VALSP(PrmId)),

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

@ -1365,7 +1365,6 @@ DEF_VALSB(opcode)
DEF_VALS2(TST_XA_RECOVER_REPLY, "XA_RECOVER_REPLY"),
DEF_VALS2(TST_XA_COMPLETE_REPLY, "XA_COMPLETE_REPLY"),
DEF_VALSE;
DEF_VALSEXT(opcode);
DEF_VALSB(spi_verbs)
DEF_VALS2(SPI_QUERY, "QUERY"),
@ -2457,7 +2456,7 @@ static void dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (!mq_in_reassembly)
{
col_clear(pinfo->cinfo, COL_INFO);
col_append_sep_fstr(pinfo->cinfo, COL_INFO, " | ", "%-17s", val_to_str_ext(p_mq_parm->mq_opcode, &mq_opcode_vals_ext, "Unknown (0x%02x)"));
col_append_sep_fstr(pinfo->cinfo, COL_INFO, " | ", "%-17s", val_to_str(p_mq_parm->mq_opcode, mq_opcode_vals, "Unknown (0x%02x)"));
col_set_fence(pinfo->cinfo, COL_INFO);
}

22
epan/dissectors/packet-mq.h
View File

@ -33,22 +33,13 @@
#define GET_VALSP(F) (gchar *)GET_VALSV(F)
#define DEF_VALSB(A) static const value_string GET_VALSV(A)[] = \
{
#define DEF_VALSXB(A) const value_string GET_VALSV(A)[] = \
#define DEF_VALSBX(A) const value_string GET_VALSV(A)[] = \
{
#define DEF_VALS1(A) { (guint32)MQ_##A, #A }
#define DEF_VALS2(A,B) { (guint32)MQ_##A, B }
#define DEF_VALS1(A) { (guint32)MQ_##A, #A }
#define DEF_VALS2(A, B) { (guint32)MQ_##A, B }
#define DEF_VALSE \
{ 0, NULL } \
}
#define DEF_VALSEXT(A) DEF_VALSEXT1(GET_VALSV(A))
#define DEF_VALSEXT1(A) DEF_VALSEXT2(A)
#define DEF_VALSEXT2(A) value_string_ext A##_ext = VALUE_STRING_EXT_INIT(A)
#if 0
#define DEF_VALSEXTX(A) DEF_VALSEXTX1(GET_VALS(A))
#define DEF_VALSEXTX1(A) DEF_VALSEXTX2(A)
#define DEF_VALSEXTX2(A) extern value_string_ext A##_ext
#endif
/* | BASE_RANGE_STRING, GET_VALRV(RVALS(aaa)) */
#define GET_VALRV(A) mq_##A##_rvals
@ -56,14 +47,11 @@
#define GET_VALRP(F) (gchar *)GET_VALRV(F)
#define DEF_VALRB(A) const range_string GET_VALRV(A)[] = \
{
#define DEF_VALR1(A) { (guint32)MQ_##A, (guint32)MQ_##A, #A }
#define DEF_VALR3(A,B,C) { (guint32)MQ_##A, (guint32)MQ_##B, C }
#define DEF_VALR1(A) { (guint32)MQ_##A, (guint32)MQ_##A, #A }
#define DEF_VALR3(A, B, C) { (guint32)MQ_##A, (guint32)MQ_##B, C }
#define DEF_VALRE \
{ 0, 0, NULL } \
}
#if 0
#define DEF_VALREXTX(A) extern value_string_ext GET_VALRV(A)_ext
#endif
typedef struct _mq_ccsid_t
{