From eb503df011140380ae57f5d93d533bf162c2f8fd Mon Sep 17 00:00:00 2001 From: Tomas Kukosa Date: Wed, 8 Sep 2010 09:02:16 +0000 Subject: Do not report undecoded message to expert info for ReturnResult without result filed svn path=/trunk/; revision=34076 --- epan/dissectors/packet-q932-ros.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'epan/dissectors/packet-q932-ros.c') diff --git a/epan/dissectors/packet-q932-ros.c b/epan/dissectors/packet-q932-ros.c index 076f2f862c..99abc58478 100644 --- a/epan/dissectors/packet-q932-ros.c +++ b/epan/dissectors/packet-q932-ros.c @@ -364,12 +364,13 @@ dissect_q932_ros_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int dissector_handle_t res_handle = NULL; const gchar *descr = ""; + actx->rose_ctx->d.code = -1; res_next_tvb = NULL; offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, ReturnResult_sequence, hf_index, ett_q932_ros_ReturnResult); -#line 12 "ros-res.cnf" +#line 13 "ros-res.cnf" actx->rose_ctx->d.pdu = 2; if ((actx->rose_ctx->d.code == 0) && actx->rose_ctx->res_local_dissector_table) { @@ -397,13 +398,15 @@ dissect_q932_ros_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int if (actx->rose_ctx->fillin_ptr) g_strlcat(actx->rose_ctx->fillin_ptr, descr, actx->rose_ctx->fillin_buf_size); - if (!res_next_tvb) { /* empty result */ - res_next_tvb = tvb_new_subset(tvb, (actx->encoding==ASN1_ENC_PER)?offset>>3:offset, 0, 0); - } - actx->pinfo->private_data = actx->rose_ctx; - call_dissector((res_handle)?res_handle:data_handle, res_next_tvb, actx->pinfo, tree); - if (!res_handle) { - expert_add_info_format(actx->pinfo, tree, PI_UNDECODED, PI_WARN, "Undecoded %s", descr); + if (actx->rose_ctx->d.code != -1) { + if (!res_next_tvb) { /* empty result */ + res_next_tvb = tvb_new_subset(tvb, (actx->encoding==ASN1_ENC_PER)?offset>>3:offset, 0, 0); + } + actx->pinfo->private_data = actx->rose_ctx; + call_dissector((res_handle)?res_handle:data_handle, res_next_tvb, actx->pinfo, tree); + if (!res_handle) { + expert_add_info_format(actx->pinfo, tree, PI_UNDECODED, PI_WARN, "Undecoded %s", descr); + } } return offset; -- cgit v1.2.3