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.

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/server/TcpNice.h b/lib/server/TcpNice.h
index e2027749..4381df42 100644
--- a/lib/server/TcpNice.h
+++ b/lib/server/TcpNice.h
@@ -83,7 +83,7 @@ private:
 //
 // --------------------------------------------------------------------------
 
-class NiceSocketStream : public IOStream
+class NiceSocketStream : public SocketStream
 {
 private:
 	std::auto_ptr<SocketStream> mapSocket;
@@ -166,6 +166,10 @@ public:
 	}
 	virtual void SetEnabled(bool enabled);
 
+	off_t GetBytesRead() const { return mapSocket->GetBytesRead(); }
+	off_t GetBytesWritten() const { return mapSocket->GetBytesWritten(); }
+	void ResetCounters() { mapSocket->ResetCounters(); }
+
 private:
 	NiceSocketStream(const NiceSocketStream &rToCopy) 
 	{ /* do not call */ }