From e6dac92931a62b6045815d2868aafb7017616562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Mon, 20 Sep 2010 12:49:52 +0000 Subject: Put Abort reason in info column. svn path=/trunk/; revision=34159 --- asn1/pres/packet-pres-template.c | 5 ++--- asn1/pres/pres.cnf | 10 ++++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'asn1/pres') 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 -- cgit v1.2.3