diff options
| author | Pierre Ossman <ossman@cendio.se> | 2012-07-03 14:43:38 +0000 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2012-07-03 14:43:38 +0000 |
| commit | fe48cd4d2427c0262cd58b30c74331a9fce756c7 (patch) | |
| tree | 453992f3361da2899981bbfe360f3cbfa0a56e5e /common/rdr/TLSInStream.h | |
| parent | ae60016b2aa97b7cf78dcb52a4ef8aa4ebb45a39 (diff) | |
| download | tigervnc-fe48cd4d2427c0262cd58b30c74331a9fce756c7.tar.gz tigervnc-fe48cd4d2427c0262cd58b30c74331a9fce756c7.zip | |
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
Diffstat (limited to 'common/rdr/TLSInStream.h')
| -rw-r--r-- | common/rdr/TLSInStream.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/common/rdr/TLSInStream.h b/common/rdr/TLSInStream.h index 7fad6fa5..65a783c8 100644 --- a/common/rdr/TLSInStream.h +++ b/common/rdr/TLSInStream.h @@ -41,6 +41,7 @@ namespace rdr { 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 @@ namespace rdr { int offset; U8* start; }; - - ssize_t gnutls_InStream_pull(gnutls_transport_ptr,void*, size_t); - }; #endif |