aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-dop.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2014-06-20 21:35:40 -0400
committerMichael Mann <mmann78@netscape.net>2014-06-22 21:08:21 +0000
commit9356d5c689fa911b0b13d4b2a0cd6e9208d60f6d (patch)
treef3265efe4137c8a09995b448bf0c4bcdecf4e5a9 /epan/dissectors/packet-dop.c
parent2c0214efff7b3421355e42ee7f3075c2f3181d3e (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-dop.c')
-rw-r--r--epan/dissectors/packet-dop.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c
index 2aa0fb5ed9..def700ece0 100644
--- a/epan/dissectors/packet-dop.c
+++ b/epan/dissectors/packet-dop.c
@@ -2029,13 +2029,12 @@ call_dop_oid_callback(const char *base_string, tvbuff_t *tvb, int offset, packet
if (dissector_try_string(dop_dissector_table, binding_param, tvb, pinfo, tree, data)) {
offset = tvb_reported_length (tvb);
} else {
- proto_item *item=NULL;
- proto_tree *next_tree=NULL;
+ proto_item *item;
+ proto_tree *next_tree;
+
+ next_tree = proto_tree_add_subtree_format(tree, tvb, 0, -1, ett_dop_unknown, &item,
+ "Dissector for parameter %s OID:%s not implemented. Contact Wireshark developers if you want this supported", base_string, binding_type ? binding_type : "<empty>");
- item = proto_tree_add_text(tree, tvb, 0, tvb_length_remaining(tvb, offset), "Dissector for parameter %s OID:%s not implemented. Contact Wireshark developers if you want this supported", base_string, binding_type ? binding_type : "<empty>");
- if (item) {
- next_tree = proto_item_add_subtree(item, ett_dop_unknown);
- }
offset = dissect_unknown_ber(pinfo, tvb, offset, next_tree);
expert_add_info(pinfo, item, &ei_dop_unknown_binding_parameter);
}
@@ -2933,7 +2932,7 @@ void proto_register_dop(void) {
NULL, HFILL }},
/*--- End of included file: packet-dop-hfarr.c ---*/
-#line 240 "../../asn1/dop/packet-dop-template.c"
+#line 239 "../../asn1/dop/packet-dop-template.c"
};
/* List of subtrees */
@@ -3012,7 +3011,7 @@ void proto_register_dop(void) {
&ett_dop_GrantsAndDenials,
/*--- End of included file: packet-dop-ettarr.c ---*/
-#line 247 "../../asn1/dop/packet-dop-template.c"
+#line 246 "../../asn1/dop/packet-dop-template.c"
};
static ei_register_info ei[] = {
@@ -3075,7 +3074,7 @@ void proto_reg_handoff_dop(void) {
/*--- End of included file: packet-dop-dis-tab.c ---*/
-#line 287 "../../asn1/dop/packet-dop-template.c"
+#line 286 "../../asn1/dop/packet-dop-template.c"
/* APPLICATION CONTEXT */
oid_add_from_string("id-ac-directory-operational-binding-management","2.5.3.3");