From a2be950c5a14872570e6ba4fb0ba30c89edc660c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Wed, 9 Jun 2010 14:27:09 +0000 Subject: [PATCH] Print correct RLRE reason in Info column. Dump RLRQ/RLRE text in Info column even when having no reason code. svn path=/trunk/; revision=33178 --- asn1/acse/acse.cnf | 13 +++++++++++-- epan/dissectors/packet-acse.c | 25 ++++++++++++++++++------- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/asn1/acse/acse.cnf b/asn1/acse/acse.cnf index 2a0ed548ce..fff5f44d65 100644 --- a/asn1/acse/acse.cnf +++ b/asn1/acse/acse.cnf @@ -90,6 +90,11 @@ PDV-list/presentation-data-values/octet-aligned pDVList_octet_aligned #.FN_BODY EXTERNALt/_untag/encoding/octet-aligned offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, top_tree ? top_tree : tree); +#.FN_BODY RLRQ-apdu + col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Release-Request"); + + %(DEFAULT_BODY)s + #.FN_PARS Release-request-reason VAL_PTR=&reason @@ -99,8 +104,12 @@ PDV-list/presentation-data-values/octet-aligned pDVList_octet_aligned %(DEFAULT_BODY)s if(reason != -1) - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Release-Request (%%s)", val_to_str(reason, acse_Release_request_reason_vals, "reason(%%d)")); + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%%s)", val_to_str(reason, acse_Release_request_reason_vals, "reason(%%d)")); +#.FN_BODY RLRE-apdu + col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Release-Response"); + + %(DEFAULT_BODY)s #.FN_PARS Release-response-reason VAL_PTR=&reason @@ -111,7 +120,7 @@ PDV-list/presentation-data-values/octet-aligned pDVList_octet_aligned %(DEFAULT_BODY)s if(reason != -1) - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Release-Response (%%s)", val_to_str(reason, acse_Release_request_reason_vals, "reason(%%d)")); + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%%s)", val_to_str(reason, acse_Release_response_reason_vals, "reason(%%d)")); #.FIELD_ATTR diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c index 5187f85464..8580346c0f 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -1202,7 +1202,7 @@ static const value_string acse_Release_request_reason_vals[] = { static int dissect_acse_Release_request_reason(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 97 "acse.cnf" +#line 102 "acse.cnf" int reason = -1; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -1210,8 +1210,7 @@ dissect_acse_Release_request_reason(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ if(reason != -1) - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Release-Request (%s)", val_to_str(reason, acse_Release_request_reason_vals, "reason(%d)")); - + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%s)", val_to_str(reason, acse_Release_request_reason_vals, "reason(%d)")); @@ -1239,9 +1238,15 @@ dissect_acse_RLRQ_apdu_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_acse_RLRQ_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, +#line 94 "acse.cnf" + col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Release-Request"); + + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, hf_index, BER_CLASS_APP, 2, TRUE, dissect_acse_RLRQ_apdu_U); + + + return offset; } @@ -1256,7 +1261,7 @@ static const value_string acse_Release_response_reason_vals[] = { static int dissect_acse_Release_response_reason(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 109 "acse.cnf" +#line 118 "acse.cnf" int reason = -1; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -1264,7 +1269,7 @@ dissect_acse_Release_response_reason(gboolean implicit_tag _U_, tvbuff_t *tvb _U if(reason != -1) - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Release-Response (%s)", val_to_str(reason, acse_Release_request_reason_vals, "reason(%d)")); + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%s)", val_to_str(reason, acse_Release_response_reason_vals, "reason(%d)")); @@ -1293,9 +1298,15 @@ dissect_acse_RLRE_apdu_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_acse_RLRE_apdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, +#line 110 "acse.cnf" + col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Release-Response"); + + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, hf_index, BER_CLASS_APP, 3, TRUE, dissect_acse_RLRE_apdu_U); + + + return offset; }