aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/pres
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2010-09-20 12:49:52 +0000
committerStig Bjørlykke <stig@bjorlykke.org>2010-09-20 12:49:52 +0000
commite6dac92931a62b6045815d2868aafb7017616562 (patch)
treeeb15e85a230fe80cba068cac43478c653446354f /asn1/pres
parentb08297d7ef8b6932dd87dc80004df1f3a7704dcd (diff)
Put Abort reason in info column.
svn path=/trunk/; revision=34159
Diffstat (limited to 'asn1/pres')
-rw-r--r--asn1/pres/packet-pres-template.c5
-rw-r--r--asn1/pres/pres.cnf10
2 files changed, 12 insertions, 3 deletions
diff --git a/asn1/pres/packet-pres-template.c b/asn1/pres/packet-pres-template.c
index 0454591f13..12423b39e4 100644
--- a/asn1/pres/packet-pres-template.c
+++ b/asn1/pres/packet-pres-template.c
@@ -260,9 +260,8 @@ dissect_ppdu(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
/* get type of tag */
s_type = tvb_get_guint8(tvb, offset);
/* set up type of PPDU */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO,
- val_to_str(session->spdu_type, ses_vals, "Unknown PPDU type (0x%02x)"));
+ col_add_str(pinfo->cinfo, COL_INFO,
+ val_to_str(session->spdu_type, ses_vals, "Unknown PPDU type (0x%02x)"));
if (tree){
ti = proto_tree_add_item(tree, proto_pres, tvb, offset, -1, FALSE);
pres_tree = proto_item_add_subtree(ti, ett_pres);
diff --git a/asn1/pres/pres.cnf b/asn1/pres/pres.cnf
index 8ba9278ca6..cf6c6a6171 100644
--- a/asn1/pres/pres.cnf
+++ b/asn1/pres/pres.cnf
@@ -87,6 +87,16 @@ CPR-PPDU/normal-mode-parameters/provider-reason cPR_PPDU__provider-reason
proto_item_append_text(actx->created_item, " (%%s)", name);
}
+#.FN_PARS Abort-reason
+ VAL_PTR = &reason
+
+#.FN_BODY Abort-reason
+ guint32 reason;
+
+ %(DEFAULT_BODY)s
+
+ col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%%s)", val_to_str(reason, pres_Abort_reason_vals, "unknown: %%d"));
+
#.FN_HDR Context-list/_item
abstract_syntax_name_oid=NULL;
#.END