summaryrefslogtreecommitdiff
path: root/cpp/src/IceSSL/SChannelTransceiverI.h
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/IceSSL/SChannelTransceiverI.h')
-rw-r--r--cpp/src/IceSSL/SChannelTransceiverI.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/cpp/src/IceSSL/SChannelTransceiverI.h b/cpp/src/IceSSL/SChannelTransceiverI.h
index b9d96b47eea..dc9d8030b61 100644
--- a/cpp/src/IceSSL/SChannelTransceiverI.h
+++ b/cpp/src/IceSSL/SChannelTransceiverI.h
@@ -43,7 +43,7 @@ namespace IceSSL
class ConnectorI;
class AcceptorI;
-class TransceiverI : public IceInternal::Transceiver, public IceInternal::WSTransceiverDelegate
+class TransceiverI : public IceInternal::Transceiver
{
public:
@@ -68,17 +68,14 @@ public:
virtual std::string toString() const;
virtual std::string toDetailedString() const;
virtual Ice::ConnectionInfoPtr getInfo() const;
- virtual Ice::ConnectionInfoPtr getWSInfo(const Ice::HeaderDict&) const;
virtual void checkSendSize(const IceInternal::Buffer&);
virtual void setBufferSize(int rcvSize, int sndSize);
private:
- TransceiverI(const InstancePtr&, const IceInternal::StreamSocketPtr&, const std::string&, bool);
+ TransceiverI(const InstancePtr&, const IceInternal::TransceiverPtr&, const std::string&, bool);
virtual ~TransceiverI();
- void fillConnectionInfo(const ConnectionInfoPtr&, std::vector<CertificatePtr>&) const;
-
IceInternal::SocketOperation sslHandshake();
size_t decryptMessage(IceInternal::Buffer&);
@@ -92,6 +89,7 @@ private:
enum State
{
+ StateNotInitialized,
StateHandshakeNotStarted,
StateHandshakeReadContinue,
StateHandshakeWriteContinue,
@@ -103,7 +101,7 @@ private:
const std::string _host;
const std::string _adapterName;
const bool _incoming;
- const IceInternal::StreamSocketPtr _stream;
+ const IceInternal::TransceiverPtr _delegate;
State _state;
//