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 /asn1/ros | |
| 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 'asn1/ros')
| -rw-r--r-- | asn1/ros/packet-ros-template.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/asn1/ros/packet-ros-template.c b/asn1/ros/packet-ros-template.c index 17097d1363..4f1b79114d 100644 --- a/asn1/ros/packet-ros-template.c +++ b/asn1/ros/packet-ros-template.c @@ -210,8 +210,11 @@ call_ros_oid_callback(const char *oid, tvbuff_t *tvb, int offset, packet_info *p if(!ros_try_string(oid, next_tvb, pinfo, tree, session) && !dissector_try_string(ros_oid_dissector_table, oid, next_tvb, pinfo, tree, session)){ - proto_item *item=proto_tree_add_text(tree, next_tvb, 0, tvb_length_remaining(tvb, offset), "ROS: 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_ros_unknown); + proto_item *item; + proto_tree *next_tree; + + next_tree = proto_tree_add_subtree_format(tree, next_tvb, 0, -1, ett_ros_unknown, &item, + "ROS: Dissector for OID:%s not implemented. Contact Wireshark developers if you want this supported", oid); expert_add_info_format(pinfo, item, &ei_ros_dissector_oid_not_implemented, "ROS: Dissector for OID %s not implemented", oid); @@ -420,14 +423,10 @@ dissect_ros(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* da old_offset=offset; offset=dissect_ros_ROS(FALSE, tvb, offset, &asn1_ctx , tree, -1); if(offset == old_offset){ - item = proto_tree_add_text(tree, tvb, offset, -1,"Unknown ROS PDU"); - - if(item){ - expert_add_info(pinfo, item, &ei_ros_unknown_ros_pdu); - next_tree=proto_item_add_subtree(item, ett_ros_unknown); - dissect_unknown_ber(pinfo, tvb, offset, next_tree); - } + next_tree = proto_tree_add_subtree(tree, tvb, offset, -1, ett_ros_unknown, &item, "Unknown ROS PDU"); + expert_add_info(pinfo, item, &ei_ros_unknown_ros_pdu); + dissect_unknown_ber(pinfo, tvb, offset, next_tree); break; } } |