diff options
author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2006-08-21 13:44:37 +0000 |
---|---|---|
committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2006-08-21 13:44:37 +0000 |
commit | 93c3a4026b781bb8e6916e87f0d205243f372d3d (patch) | |
tree | d7e55b02d0718bdbd338d6e05467fcedabb26d24 | |
parent | ce1ae65e12e996ad4a4911d4fd827f88b008a69e (diff) |
prettify the MMS dissector by at least putting the pdu name in the info column
svn path=/trunk/; revision=18975
-rw-r--r-- | asn1/mms/mms.cnf | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-mms.c | 12 |
2 files changed, 23 insertions, 1 deletions
diff --git a/asn1/mms/mms.cnf b/asn1/mms/mms.cnf index ed14a90a56..6e7e89b7ef 100644 --- a/asn1/mms/mms.cnf +++ b/asn1/mms/mms.cnf @@ -30,3 +30,15 @@ MMSpdu #.FN_BODY ApplicationReference/ae-invocation-id offset=dissect_acse_AE_invocation_identifier(FALSE, tvb, offset, pinfo, tree, hf_mms_ae_invocation_id); + +#.FN_BODY MMSpdu + gint branch_taken; + + offset = dissect_ber_choice(pinfo, tree, tvb, offset, + MMSpdu_choice, hf_index, ett_mms_MMSpdu, + &branch_taken); + + if(check_col(pinfo->cinfo, COL_INFO)) + col_append_fstr(pinfo->cinfo, COL_INFO, "%%s ", val_to_str(branch_taken, mms_MMSpdu_vals, "Unknown")); + + diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c index deeb662c86..70312212a7 100644 --- a/epan/dissectors/packet-mms.c +++ b/epan/dissectors/packet-mms.c @@ -3928,6 +3928,7 @@ dissect_mms_T_ae_invocation_id(gboolean implicit_tag _U_, tvbuff_t *tvb, int off offset=dissect_acse_AE_invocation_identifier(FALSE, tvb, offset, pinfo, tree, hf_mms_ae_invocation_id); + return offset; } static int dissect_ae_invocation_id(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { @@ -9562,9 +9563,18 @@ static const ber_choice_t MMSpdu_choice[] = { int dissect_mms_MMSpdu(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { +#line 35 "mms.cnf" + gint branch_taken; + offset = dissect_ber_choice(pinfo, tree, tvb, offset, MMSpdu_choice, hf_index, ett_mms_MMSpdu, - NULL); + &branch_taken); + + if(check_col(pinfo->cinfo, COL_INFO)) + col_append_fstr(pinfo->cinfo, COL_INFO, "%s ", val_to_str(branch_taken, mms_MMSpdu_vals, "Unknown")); + + + return offset; } |