diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-11-10 17:17:18 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-11-10 17:17:18 +0000 |
| commit | d5d8c3c359a6ca0fb352796c65441fed87335698 (patch) | |
| tree | da273a9e5c3ccb95ee2be7beb3f2648c5b90226e /epan/dissectors/packet-ros.c | |
| parent | c2e0f82443d16de77f4e771646b2269fc28323d1 (diff) | |
| download | wireshark-d5d8c3c359a6ca0fb352796c65441fed87335698.tar.gz | |
context is not being passed to dissector, not through pinfo->private_data so check data parameter, not pinfo->private_data.
svn path=/trunk/; revision=53236
Diffstat (limited to 'epan/dissectors/packet-ros.c')
| -rw-r--r-- | epan/dissectors/packet-ros.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c index 4d5236d661..5048da771a 100644 --- a/epan/dissectors/packet-ros.c +++ b/epan/dissectors/packet-ros.c @@ -1024,7 +1024,7 @@ dissect_ros(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* da top_tree=parent_tree; /* do we have application context from the acse dissector? */ - if( !pinfo->private_data ){ + if( !data){ if(parent_tree){ proto_tree_add_text(parent_tree, tvb, offset, -1, "Internal error:can't get application context from ACSE dissector."); @@ -1053,8 +1053,6 @@ dissect_ros(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* da ros_info_items = ros_info; } - /* pinfo->private_data = ros_info; */ - item = proto_tree_add_item(parent_tree, proto_ros, tvb, 0, -1, ENC_NA); tree = proto_item_add_subtree(item, ett_ros); @@ -1235,7 +1233,7 @@ void proto_register_ros(void) { "OBJECT_IDENTIFIER", HFILL }}, /*--- End of included file: packet-ros-hfarr.c ---*/ -#line 490 "../../asn1/ros/packet-ros-template.c" +#line 488 "../../asn1/ros/packet-ros-template.c" }; /* List of subtrees */ @@ -1256,7 +1254,7 @@ void proto_register_ros(void) { &ett_ros_Code, /*--- End of included file: packet-ros-ettarr.c ---*/ -#line 497 "../../asn1/ros/packet-ros-template.c" +#line 495 "../../asn1/ros/packet-ros-template.c" }; static ei_register_info ei[] = { |