Refactor the TLS code so that the push/pull functions are aware of their
containing stream object. This is in preparation for supporting GnuTLS 3.x.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4921 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/common/rdr/TLSInStream.cxx b/common/rdr/TLSInStream.cxx
index ddc9991..e553085 100644
--- a/common/rdr/TLSInStream.cxx
+++ b/common/rdr/TLSInStream.cxx
@@ -36,10 +36,10 @@
enum { DEFAULT_BUF_SIZE = 16384 };
-ssize_t rdr::gnutls_InStream_pull(gnutls_transport_ptr str, void* data,
- size_t size)
+ssize_t TLSInStream::pull(gnutls_transport_ptr str, void* data, size_t size)
{
- InStream* in= (InStream*) str;
+ TLSInStream* self= (TLSInStream*) str;
+ InStream *in = self->in;
try {
if (!in->check(1, 1, false)) {
@@ -63,11 +63,19 @@
TLSInStream::TLSInStream(InStream* _in, gnutls_session _session)
: session(_session), in(_in), bufSize(DEFAULT_BUF_SIZE), offset(0)
{
+ gnutls_transport_ptr recv, send;
+
ptr = end = start = new U8[bufSize];
+
+ gnutls_transport_set_pull_function(session, pull);
+ gnutls_transport_get_ptr2(session, &recv, &send);
+ gnutls_transport_set_ptr2(session, this, send);
}
TLSInStream::~TLSInStream()
{
+ gnutls_transport_set_pull_function(session, NULL);
+
delete[] start;
}