diff options
| -rw-r--r-- | asn1/acse/acse.cnf | 10 | ||||
| -rw-r--r-- | epan/dissectors/packet-acse.c | 28 |
2 files changed, 30 insertions, 8 deletions
diff --git a/asn1/acse/acse.cnf b/asn1/acse/acse.cnf index 8f47416b56..4fe7f342ea 100644 --- a/asn1/acse/acse.cnf +++ b/asn1/acse/acse.cnf @@ -90,6 +90,16 @@ 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 AARQ-apdu + col_append_fstr(actx->pinfo->cinfo, COL_INFO, "A-Associate-Request"); + + %(DEFAULT_BODY)s + +#.FN_BODY AARE-apdu + col_append_fstr(actx->pinfo->cinfo, COL_INFO, "A-Associate-Response"); + + %(DEFAULT_BODY)s + #.FN_BODY RLRQ-apdu col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Release-Request"); diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c index f2b3db57da..5491e4bd76 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -959,9 +959,15 @@ dissect_acse_AARQ_apdu_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_acse_AARQ_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, "A-Associate-Request"); + + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, hf_index, BER_CLASS_APP, 0, TRUE, dissect_acse_AARQ_apdu_U); + + + return offset; } @@ -1185,9 +1191,15 @@ dissect_acse_AARE_apdu_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_acse_AARE_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 99 "acse.cnf" + col_append_fstr(actx->pinfo->cinfo, COL_INFO, "A-Associate-Response"); + + offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, hf_index, BER_CLASS_APP, 1, TRUE, dissect_acse_AARE_apdu_U); + + + return offset; } @@ -1202,7 +1214,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 102 "acse.cnf" +#line 112 "acse.cnf" int reason = -1; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -1238,7 +1250,7 @@ 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_) { -#line 94 "acse.cnf" +#line 104 "acse.cnf" col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Release-Request"); offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, @@ -1261,7 +1273,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 118 "acse.cnf" +#line 128 "acse.cnf" int reason = -1; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, @@ -1297,7 +1309,7 @@ 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_) { -#line 110 "acse.cnf" +#line 120 "acse.cnf" col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Release-Response"); offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, @@ -1319,7 +1331,7 @@ static const value_string acse_ABRT_source_vals[] = { static int dissect_acse_ABRT_source(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 131 "acse.cnf" +#line 141 "acse.cnf" int source = -1; offset = dissect_ber_constrained_integer(implicit_tag, actx, tree, tvb, offset, @@ -1376,7 +1388,7 @@ dissect_acse_ABRT_apdu_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_acse_ABRT_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_) { -#line 126 "acse.cnf" +#line 136 "acse.cnf" col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Abort"); offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset, |