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;
}
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
diff --git a/common/rdr/TLSOutStream.cxx b/common/rdr/TLSOutStream.cxx
index d577ccc..ec21670 100644
--- a/common/rdr/TLSOutStream.cxx
+++ b/common/rdr/TLSOutStream.cxx
@@ -36,10 +36,11 @@
enum { DEFAULT_BUF_SIZE = 16384 };
-ssize_t rdr::gnutls_OutStream_push(gnutls_transport_ptr str, const void* data,
+ssize_t TLSOutStream::push(gnutls_transport_ptr str, const void* data,
size_t size)
{
- OutStream* out = (OutStream*) str;
+ TLSOutStream* self= (TLSOutStream*) str;
+ OutStream *out = self->out;
try {
out->writeBytes(data, size);
@@ -55,8 +56,14 @@
TLSOutStream::TLSOutStream(OutStream* _out, gnutls_session _session)
: session(_session), out(_out), bufSize(DEFAULT_BUF_SIZE), offset(0)
{
+ gnutls_transport_ptr recv, send;
+
ptr = start = new U8[bufSize];
end = start + bufSize;
+
+ gnutls_transport_set_push_function(session, push);
+ gnutls_transport_get_ptr2(session, &recv, &send);
+ gnutls_transport_set_ptr2(session, recv, this);
}
TLSOutStream::~TLSOutStream()
@@ -67,6 +74,8 @@
} catch (Exception&) {
}
#endif
+ gnutls_transport_set_push_function(session, NULL);
+
delete [] start;
}
diff --git a/common/rdr/TLSOutStream.h b/common/rdr/TLSOutStream.h
index 5eb512e..a291f42 100644
--- a/common/rdr/TLSOutStream.h
+++ b/common/rdr/TLSOutStream.h
@@ -43,6 +43,7 @@
private:
int writeTLS(const U8* data, int length);
+ static ssize_t push(gnutls_transport_ptr str, const void* data, size_t size);
gnutls_session session;
OutStream* out;
@@ -50,8 +51,6 @@
U8* start;
int offset;
};
-
- ssize_t gnutls_OutStream_push(gnutls_transport_ptr, const void*, size_t);
};
#endif