diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2007-07-12 15:34:21 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2007-07-12 15:34:21 +0000 |
| commit | df2472cb419b5d6dcede50cf9986b1901fd96526 (patch) | |
| tree | ca8709804c1a421dc073b65d9535c617786ebcb6 /epan/dissectors/packet-ssl.c | |
| parent | 28af8a4c0273a1c9c0c9dc2706f13f31ef2ba484 (diff) | |
Undo part of rev 21460: go back to passing proto_ssl to the tap (since apparently follow ssl stream uses it) but now cast it using GINT_TO_POINTER so as to avoid a warning (seen on 64-bit Redhat AS4) about casting to a pointer from an integer of different size. It does not appear that there is a DTLS tap (which is the other thing changed in 21460).
svn path=/trunk/; revision=22289
Diffstat (limited to 'epan/dissectors/packet-ssl.c')
| -rw-r--r-- | epan/dissectors/packet-ssl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index 05a7d72351..89df39120e 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -707,7 +707,7 @@ dissect_ssl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_INFO)) col_set_fence(pinfo->cinfo, COL_INFO); - tap_queue_packet(ssl_tap, pinfo, NULL); + tap_queue_packet(ssl_tap, pinfo, GINT_TO_POINTER(proto_ssl)); } static gint |