osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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
This commit is contained in:
Michael Mann 2013-11-10 17:17:18 +00:00
parent c2e0f82443
commit d5d8c3c359
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asn1/ros/packet-ros-template.c
View File

@ -388,7 +388,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.");
@ -417,8 +417,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);

8
epan/dissectors/packet-ros.c
View File

@ -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[] = {