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.h b/common/rdr/TLSInStream.h
index 7fad6fa..65a783c 100644
--- a/common/rdr/TLSInStream.h
+++ b/common/rdr/TLSInStream.h
@@ -41,6 +41,7 @@
private:
int overrun(int itemSize, int nItems, bool wait);
int readTLS(U8* buf, int len, bool wait);
+ static ssize_t pull(gnutls_transport_ptr str, void* data, size_t size);
gnutls_session session;
InStream* in;
@@ -48,9 +49,6 @@
int offset;
U8* start;
};
-
- ssize_t gnutls_InStream_pull(gnutls_transport_ptr,void*, size_t);
-
};
#endif