Restore original streams when terminating TLS
In theory we could return to communicate without TLS after a
shutdown. It also makes sure the connection object isn't left
completely without streams.
diff --git a/common/rfb/CSecurityTLS.cxx b/common/rfb/CSecurityTLS.cxx
index 7ca01d5..e1a31f7 100644
--- a/common/rfb/CSecurityTLS.cxx
+++ b/common/rfb/CSecurityTLS.cxx
@@ -69,7 +69,7 @@
CSecurityTLS::CSecurityTLS(CConnection* cc, bool _anon)
: CSecurity(cc), session(NULL), anon_cred(NULL), cert_cred(NULL),
- anon(_anon), tlsis(NULL), tlsos(NULL)
+ anon(_anon), tlsis(NULL), tlsos(NULL), rawis(NULL), rawos(NULL)
{
cafile = X509CA.getData();
crlfile = X509CRL.getData();
@@ -116,6 +116,12 @@
cert_cred = 0;
}
+ if (rawis && rawos) {
+ cc->setStreams(rawis, rawos);
+ rawis = NULL;
+ rawos = NULL;
+ }
+
if (tlsis) {
delete tlsis;
tlsis = NULL;
@@ -174,6 +180,9 @@
// for GnuTLS
tlsis = new rdr::TLSInStream(is, session);
tlsos = new rdr::TLSOutStream(os, session);
+
+ rawis = is;
+ rawos = os;
}
int err;