diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2014-01-27 09:55:46 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2014-01-27 09:55:46 +0000 |
| commit | fbaff1f081f5f8ca7632b8d8b85e5db46f476d47 (patch) | |
| tree | 9fdd52690bcb60dcbd9d6dc43bc0c7451af27435 | |
| parent | face757db3169f8f9964c7fd31250cf67c6764cb (diff) | |
Add back the fix from revision 54693.
svn path=/trunk/; revision=54976
| -rw-r--r-- | asn1/rtse/packet-rtse-template.c | 3 | ||||
| -rw-r--r-- | epan/dissectors/packet-rtse.c | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/asn1/rtse/packet-rtse-template.c b/asn1/rtse/packet-rtse-template.c index 83717116d1..6375ab2932 100644 --- a/asn1/rtse/packet-rtse-template.c +++ b/asn1/rtse/packet-rtse-template.c @@ -272,6 +272,9 @@ dissect_rtse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d /* ROS won't do this for us */ session->ros_op = (ROS_OP_INVOKE | ROS_OP_ARGUMENT); /*offset=*/dissect_ber_external_type(FALSE, tree, next_tvb, 0, &asn1_ctx, -1, call_rtse_external_type_callback); + top_tree = NULL; + /* Return other than 0 to indicate that we handled this packet */ + return 1; } else { offset = tvb_length (tvb); } diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c index 77cbdaf18a..d1ffd97472 100644 --- a/epan/dissectors/packet-rtse.c +++ b/epan/dissectors/packet-rtse.c @@ -828,6 +828,9 @@ dissect_rtse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d /* ROS won't do this for us */ session->ros_op = (ROS_OP_INVOKE | ROS_OP_ARGUMENT); /*offset=*/dissect_ber_external_type(FALSE, tree, next_tvb, 0, &asn1_ctx, -1, call_rtse_external_type_callback); + top_tree = NULL; + /* Return other than 0 to indicate that we handled this packet */ + return 1; } else { offset = tvb_length (tvb); } @@ -1004,7 +1007,7 @@ void proto_register_rtse(void) { NULL, HFILL }}, /*--- End of included file: packet-rtse-hfarr.c ---*/ -#line 351 "../../asn1/rtse/packet-rtse-template.c" +#line 354 "../../asn1/rtse/packet-rtse-template.c" }; /* List of subtrees */ @@ -1026,7 +1029,7 @@ void proto_register_rtse(void) { &ett_rtse_CallingSSuserReference, /*--- End of included file: packet-rtse-ettarr.c ---*/ -#line 360 "../../asn1/rtse/packet-rtse-template.c" +#line 363 "../../asn1/rtse/packet-rtse-template.c" }; static ei_register_info ei[] = { |