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

packet-mq: Fix after change 25009 

Fix for unused variable mq_MQPRI_vals
Fix test when displaying unique MQ Segment (vs multi MQ segment)
Changed my name in AUTHORS

Change-Id: I8ffa5523dbf8469d2814d2a90348eea61a05823a
Reviewed-on: https://code.wireshark.org/review/25106
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
This commit is contained in:
Robert Grange 2018-01-02 10:17:09 +01:00 committed by Stig Bjørlykke
parent 3d846aceab
commit ea60ed427e
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AUTHORS
View File

@ -3571,7 +3571,7 @@ Ishraq Ibne Ashraf <ishraq[AT]tinkerforge.com> {
tfp (Tinkerforge) dissector
}
RobiOneKenobi <robionekenobi[AT]bluewin.ch> {
Robert Grange <robionekenobi[AT]bluewin.ch> {
IBM WebSphere MQ protocol dissector enhancements
}

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

@ -1183,10 +1183,12 @@ DEF_VALSB(SubscriptionDestinationClass)
DEF_VALSE;
#endif
#if 0
DEF_VALSB(MQRU_PUBLISH)
/* 1*/ DEF_VALS1(MQRU_PUBLISH_ON_REQUEST),
/* 2*/ DEF_VALS1(MQRU_PUBLISH_ALL),
DEF_VALSE;
#endif
#if 0
DEF_VALSB(TimeUnits)
@ -1282,7 +1284,6 @@ DEF_VALSB(ConnInfoType)
/* 1113*/ DEF_VALS1(MQIACF_CONN_INFO_ALL),
DEF_VALSE;
#if 0
DEF_VALSB(MQPRI)
/* -3*/ DEF_VALS1(MQPRI_PRIORITY_AS_PUBLISHED),
/* -2*/ DEF_VALS1(MQPRI_PRIORITY_AS_PARENT),
@ -1298,7 +1299,6 @@ DEF_VALSB(MQPRI)
/* 8*/ DEF_VALS1(8),
/* 9*/ DEF_VALS1(9),
DEF_VALSE;
#endif
DEF_VALSB(MQPSPROP)
/* 0*/ DEF_VALS1(MQPSPROP_NONE),
@ -4471,6 +4471,7 @@ DEF_VALSB(MQCFINT_Parse)
/* 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)),
/* 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)),
@ -4650,7 +4651,7 @@ DEF_VALSB(MQCFINT_Parse)
/* 1271*/ DEF_VALS2(MQIACF_PUBSUB_PROPERTIES, GET_VALSP(MQPSPROP)),
/* 1274*/ DEF_VALS2(MQIACF_DURABLE_SUBSCRIPTION, GET_VALSP(MQSUB_DURABLE)),
/* 1280*/ DEF_VALS2(MQIACF_REQUEST_ONLY, GET_VALSP(MQSUB_DURABLE)),
/* 1283*/ DEF_VALS2(MQIACF_PUB_PRIORITY, GET_VALSP(MQRU_PUBLISH)),
/* 1283*/ DEF_VALS2(MQIACF_PUB_PRIORITY, GET_VALSP(MQPRI)),
/* 1289*/ DEF_VALS2(MQIACF_SUB_TYPE, GET_VALSP(MQSUBTYPE)),
/* 1300*/ DEF_VALS2(MQIACF_RETAINED_PUBLICATION, GET_VALSP(MQQSO)),
/* 1302*/ DEF_VALS2(MQIACF_TOPIC_STATUS_TYPE, GET_VALSP(PrmId)),

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

@ -981,6 +981,8 @@ static gboolean mq_reassembly = TRUE;
static gboolean mq_in_reassembly = FALSE;
static guint32 mq_AsyMsgRsn;
static guint32 mq_AsyMsgAct;
static guint32 mq_AsyMsgTot;
static reassembly_table mq_reassembly_table;
@ -3897,6 +3899,8 @@ static int reassemble_mq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
if (iSegmIndex == 0)
{
mq_AsyMsgRsn = tvb_get_guint32(tvb, iHdrL + 24, iEnco);
mq_AsyMsgAct = tvb_get_guint32(tvb, iHdrL + 28, iEnco);
mq_AsyMsgTot = tvb_get_guint32(tvb, iHdrL + 32, iEnco);
uStrL = tvb_get_guint8(tvb, iHdrL + 54);
uPadL = ((((2+1+uStrL)/4)+1)*4)-(2+1+uStrL);
}
@ -3931,8 +3935,12 @@ static int reassemble_mq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
{
proto_item *ti = proto_tree_add_item(tree, proto_mq, tvb, 0, -1, ENC_NA);
proto_item_append_text(ti, " [%s of a Reassembled MQ Segment]",
val_to_str_ext(iOpcd, GET_VALS_EXTP(opcode), "Unknown (0x%02x)"));
if (fd_head && !fd_head->next && mq_AsyMsgAct == mq_AsyMsgTot)
proto_item_append_text(ti, " [%s of a Full MQ Segment]",
val_to_str_ext(iOpcd, GET_VALS_EXTP(opcode), "Unknown (0x%02x)"));
else
proto_item_append_text(ti, " [%s of a Reassembled MQ Segment]",
val_to_str_ext(iOpcd, GET_VALS_EXTP(opcode), "Unknown (0x%02x)"));
dissect_mq_addCR_colinfo(pinfo, &mq_parm);
proto_item_append_text(ti, " Hdl=0x%04x GlbMsgIdx=%d, SegIdx=%d, SegLen=%d",
iHdl, iGlbMsgIdx, iSegmIndex, iSegLength);