aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2016-01-02 22:43:55 -0500
committerMichael Mann <mmann78@netscape.net>2016-01-03 15:24:33 +0000
commit6e60dffc106c8140c04176809923fc68609f2486 (patch)
treea98af94b591532188e0e74608a14c94d3cbacae1 /epan
parent5dd1401291f3ce8b2ff39f9af409348027b940dc (diff)
Pass SslPacketInfo structure directly to SSL tap instead of having listeners get it themselves anyway.
Change-Id: I3817d12e473b67e26159e1562a08169e91f51d46 Reviewed-on: https://code.wireshark.org/review/13019 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-ssl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c
index 46032fb92e..9a310b4f54 100644
--- a/epan/dissectors/packet-ssl.c
+++ b/epan/dissectors/packet-ssl.c
@@ -777,7 +777,7 @@ dissect_ssl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
if (need_desegmentation) {
ssl_debug_printf(" need_desegmentation: offset = %d, reported_length_remaining = %d\n",
offset, tvb_reported_length_remaining(tvb, offset));
- tap_queue_packet(ssl_tap, pinfo, GINT_TO_POINTER(proto_ssl));
+ tap_queue_packet(ssl_tap, pinfo, p_get_proto_data(wmem_file_scope(), pinfo, proto_ssl, 0));
return tvb_captured_length(tvb);
}
@@ -789,7 +789,7 @@ dissect_ssl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
ssl_debug_flush();
- tap_queue_packet(ssl_tap, pinfo, GINT_TO_POINTER(proto_ssl));
+ tap_queue_packet(ssl_tap, pinfo, p_get_proto_data(wmem_file_scope(), pinfo, proto_ssl, 0));
return tvb_captured_length(tvb);
}