diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-06-20 21:35:40 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-06-22 21:08:21 +0000 |
| commit | 9356d5c689fa911b0b13d4b2a0cd6e9208d60f6d (patch) | |
| tree | f3265efe4137c8a09995b448bf0c4bcdecf4e5a9 /epan/dissectors/packet-rtse.c | |
| parent | 2c0214efff7b3421355e42ee7f3075c2f3181d3e (diff) | |
convert to proto_tree_add_subtree[_format] for ASN.1 dissectors
Change-Id: I753ca95e2e1b38bad2c09955317e648c525e40ef
Reviewed-on: https://code.wireshark.org/review/2509
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-rtse.c')
| -rw-r--r-- | epan/dissectors/packet-rtse.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c index 5d91a18587..fbe377b952 100644 --- a/epan/dissectors/packet-rtse.c +++ b/epan/dissectors/packet-rtse.c @@ -6,7 +6,7 @@ /* Input file: packet-rtse-template.c */ #line 1 "../../asn1/rtse/packet-rtse-template.c" -/* packet-rtse_asn1.c +/* packet-rtse-template.c * Routines for RTSE packet dissection * Graeme Lunt 2005 * @@ -197,8 +197,10 @@ call_rtse_oid_callback(const char *oid, tvbuff_t *tvb, int offset, packet_info * next_tvb = tvb_new_subset_remaining(tvb, offset); if(!dissector_try_string(rtse_oid_dissector_table, oid, next_tvb, pinfo, tree, data)){ - proto_item *item=proto_tree_add_text(tree, next_tvb, 0, tvb_captured_length_remaining(tvb, offset), "RTSE: Dissector for OID:%s not implemented. Contact Wireshark developers if you want this supported", oid); - proto_tree *next_tree=proto_item_add_subtree(item, ett_rtse_unknown); + proto_item *item; + proto_tree *next_tree; + next_tree = proto_tree_add_subtree_format(tree, next_tvb, 0, -1, ett_rtse_unknown, &item, + "RTSE: Dissector for OID:%s not implemented. Contact Wireshark developers if you want this supported", oid); expert_add_info_format(pinfo, item, &ei_rtse_dissector_oid_not_implemented, "RTSE: Dissector for OID %s not implemented", oid); @@ -727,7 +729,7 @@ dissect_rtse_RTSE_apdus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset /*--- End of included file: packet-rtse-fn.c ---*/ -#line 185 "../../asn1/rtse/packet-rtse-template.c" +#line 187 "../../asn1/rtse/packet-rtse-template.c" /* * Dissect RTSE PDUs inside a PPDU. @@ -831,10 +833,9 @@ dissect_rtse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d old_offset=offset; offset=dissect_rtse_RTSE_apdus(TRUE, tvb, offset, &asn1_ctx, tree, -1); if(offset == old_offset){ - item = proto_tree_add_text(tree, tvb, offset, -1, "Unknown RTSE PDU"); - + next_tree = proto_tree_add_subtree(tree, tvb, offset, -1, + ett_rtse_unknown, &item, "Unknown RTSE PDU"); expert_add_info (pinfo, item, &ei_rtse_unknown_rtse_pdu); - next_tree=proto_item_add_subtree(item, ett_rtse_unknown); dissect_unknown_ber(pinfo, tvb, offset, next_tree); break; } @@ -995,7 +996,7 @@ void proto_register_rtse(void) { NULL, HFILL }}, /*--- End of included file: packet-rtse-hfarr.c ---*/ -#line 352 "../../asn1/rtse/packet-rtse-template.c" +#line 353 "../../asn1/rtse/packet-rtse-template.c" }; /* List of subtrees */ @@ -1017,7 +1018,7 @@ void proto_register_rtse(void) { &ett_rtse_CallingSSuserReference, /*--- End of included file: packet-rtse-ettarr.c ---*/ -#line 361 "../../asn1/rtse/packet-rtse-template.c" +#line 362 "../../asn1/rtse/packet-rtse-template.c" }; static ei_register_info ei[] = { |