diff options
Diffstat (limited to 'cpp/src/Ice/SslConnectionOpenSSL.h')
-rw-r--r-- | cpp/src/Ice/SslConnectionOpenSSL.h | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/cpp/src/Ice/SslConnectionOpenSSL.h b/cpp/src/Ice/SslConnectionOpenSSL.h index 8c7e45774c0..929ca453c1d 100644 --- a/cpp/src/Ice/SslConnectionOpenSSL.h +++ b/cpp/src/Ice/SslConnectionOpenSSL.h @@ -27,7 +27,8 @@ namespace OpenSSL class SafeFlag { -public: +public:
+ SafeFlag(bool flagVal = false) { _flag = flagVal; @@ -71,6 +72,7 @@ public: } private: +
::IceUtil::Mutex _mutex; bool _flag; }; @@ -124,7 +126,7 @@ public: virtual void shutdown(); - virtual int read(IceInternal::Buffer&, int) = 0; + virtual int read(IceInternal::Buffer&, int); virtual int write(IceInternal::Buffer&, int) = 0; virtual int init(int timeout = 0) = 0; @@ -149,19 +151,12 @@ protected: int sslRead(char*, int); int sslWrite(char*, int); -// void protocolWrite(); - - int readInBuffer(IceInternal::Buffer&); - int select(int, bool);
int readSelect(int); int writeSelect(int); int readSSL(IceInternal::Buffer&, int); - // Retrieves errors from the OpenSSL library. -// std::string sslGetErrors(); - static void addConnection(SSL*, Connection*); static void removeConnection(SSL*); @@ -185,12 +180,6 @@ protected: int _lastError; - // TODO: Review this after a healthy stint of testing - // Buffer for application data that may be returned during handshake - // (probably won't contain anything, may be removed later). - ::IceInternal::Buffer _inBuffer; - ::IceUtil::Mutex _inBufferMutex; - ::IceUtil::Mutex _handshakeWaitMutex; // IceInternal::TraceLevelsPtr _traceLevels; |