diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2014-03-01 10:42:48 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2014-03-01 10:42:48 +0000 |
| commit | 2b6ac135fa7071290289741c9e35747bb9f1012f (patch) | |
| tree | 037507c43ac097fb2cd5850bbd57f25a553e20e8 /lib/server/ServerTLS.h | |
| parent | 2ef0a9aa8cd3cd4dcfa0cd9d2014051832c52e8a (diff) | |
Make Protocol take control of the socket object passed in.
We pass a std::auto_ptr<SocketStream> to every Protocol subclass when we
construct it, and it takes control of this object. This reduces the risk of:
* accidentally reusing the same SocketStream for multiple Protocols
(it happened to me in testbackupstore);
* holding onto a reference to the SocketStream;
* allowing a locally-scoped SocketStream to go out of scope and be released
while still being referenced by a live Protocol.
Diffstat (limited to 'lib/server/ServerTLS.h')
| -rw-r--r-- | lib/server/ServerTLS.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/server/ServerTLS.h b/lib/server/ServerTLS.h index a74a671e..20e55964 100644 --- a/lib/server/ServerTLS.h +++ b/lib/server/ServerTLS.h @@ -59,11 +59,11 @@ public: ForkToHandleRequests>::Run2(rChildExit); } - virtual void HandleConnection(SocketStreamTLS &rStream) + virtual void HandleConnection(std::auto_ptr<SocketStreamTLS> apStream) { - rStream.Handshake(mContext, true /* is server */); + apStream->Handshake(mContext, true /* is server */); // this-> in next line required to build under some gcc versions - this->Connection(rStream); + this->Connection(apStream); } private: |