osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Show Abort source in info column. 

svn path=/trunk/; revision=34202
This commit is contained in:
Stig Bjørlykke 2010-09-23 07:39:38 +00:00
parent de68ad3066
commit c403378c36
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
asn1/acse/acse.cnf
View File

@ -122,7 +122,19 @@ PDV-list/presentation-data-values/octet-aligned pDVList_octet_aligned
if(reason != -1)
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%%s)", val_to_str(reason, acse_Release_response_reason_vals, "reason(%%d)"));
#.FN_BODY ABRT-apdu
col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Abort");
%(DEFAULT_BODY)s
#.FN_BODY ABRT-source VAL_PTR=&source
int source = -1;
%(DEFAULT_BODY)s
if(source != -1)
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%%s)", val_to_str(source, acse_ABRT_source_vals, "source(%%d)"));
#.FIELD_ATTR
Association-data/_item NAME = "Association-data"

22
epan/dissectors/packet-acse.c
View File

@ -1273,7 +1273,6 @@ dissect_acse_Release_response_reason(gboolean implicit_tag _U_, tvbuff_t *tvb _U
return offset;
}
@ -1320,8 +1319,17 @@ 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_) {
offset = dissect_ber_constrained_integer(implicit_tag, actx, tree, tvb, offset,
0U, 1U, hf_index, NULL);
#line 131 "acse.cnf"
int source = -1;
offset = dissect_ber_constrained_integer(implicit_tag, actx, tree, tvb, offset,
0U, 1U, hf_index, &source);
if(source != -1)
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%s)", val_to_str(source, acse_ABRT_source_vals, "source(%d)"));
return offset;
}
@ -1368,9 +1376,15 @@ 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_) {
offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset,
#line 126 "acse.cnf"
col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Abort");
offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset,
hf_index, BER_CLASS_APP, 4, TRUE, dissect_acse_ABRT_apdu_U);
return offset;
}