diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2010-08-24 15:09:11 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2010-08-24 15:09:11 +0000 |
| commit | 1a5f73299eba57ce1d626280c593f6c20e893f62 (patch) | |
| tree | b331e3d6f634d4856b35f6474d12b168f63c96f2 /epan | |
| parent | 8b6c6a3dbf26eae64c23cfbfcd002573588fee5b (diff) | |
Display octet string fragments for RTSE segment data.
svn path=/trunk/; revision=33911
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-rtse.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c index 64128dd638..f51e18f282 100644 --- a/epan/dissectors/packet-rtse.c +++ b/epan/dissectors/packet-rtse.c @@ -121,7 +121,8 @@ static gint ett_rtse_unknown = -1; static GHashTable *rtse_segment_table = NULL; static GHashTable *rtse_reassembled_table = NULL; - + +static int hf_rtse_segment_data = -1; static int hf_rtse_fragments = -1; static int hf_rtse_fragment = -1; static int hf_rtse_fragment_overlap = -1; @@ -729,7 +730,7 @@ dissect_rtse_RTSE_apdus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset /*--- End of included file: packet-rtse-fn.c ---*/ -#line 182 "packet-rtse-template.c" +#line 183 "packet-rtse-template.c" /* * Dissect RTSE PDUs inside a PPDU. @@ -794,12 +795,11 @@ dissect_rtse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } if (rtse_reassemble && session->spdu_type == SES_DATA_TRANSFER) { /* strip off the OCTET STRING encoding - including any CONSTRUCTED OCTET STRING */ - dissect_ber_octet_string(FALSE, &asn1_ctx, NULL, tvb, offset, 0, &data_tvb); + dissect_ber_octet_string(FALSE, &asn1_ctx, tree, tvb, offset, hf_rtse_segment_data, &data_tvb); if (data_tvb) { fragment_length = tvb_length_remaining (data_tvb, 0); - proto_tree_add_text(tree, data_tvb, 0, (fragment_length) ? -1 : 0, - "RTSE segment data (%u byte%s)", fragment_length, + proto_item_append_text(asn1_ctx.created_item, " (%u byte%s)", fragment_length, plurality(fragment_length, "", "s")); frag_msg = fragment_add_seq_next (data_tvb, 0, pinfo, rtse_id, rtse_segment_table, @@ -865,6 +865,9 @@ void proto_register_rtse(void) { static hf_register_info hf[] = { /* Fragment entries */ + { &hf_rtse_segment_data, + { "RTSE segment data", "rtse.segment", FT_NONE, BASE_NONE, + NULL, 0x00, NULL, HFILL } }, { &hf_rtse_fragments, { "RTSE fragments", "rtse.fragments", FT_NONE, BASE_NONE, NULL, 0x00, "Message fragments", HFILL } }, @@ -997,7 +1000,7 @@ void proto_register_rtse(void) { NULL, HFILL }}, /*--- End of included file: packet-rtse-hfarr.c ---*/ -#line 349 "packet-rtse-template.c" +#line 352 "packet-rtse-template.c" }; /* List of subtrees */ @@ -1019,7 +1022,7 @@ void proto_register_rtse(void) { &ett_rtse_CallingSSuserReference, /*--- End of included file: packet-rtse-ettarr.c ---*/ -#line 358 "packet-rtse-template.c" +#line 361 "packet-rtse-template.c" }; module_t *rtse_module; |