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, 5 deletions

diff --git a/lib/server/ServerStream.h b/lib/server/ServerStream.h
index a9b56169..8bb52b5b 100644
--- a/lib/server/ServerStream.h
+++ b/lib/server/ServerStream.h
@@ -286,7 +286,7 @@ public:
 								#endif
 								
 								// The derived class does some server magic with the connection
-								HandleConnection(*connection);
+								HandleConnection(connection);
 								// Since rChildExit == true, the forked process will call _exit() on return from this fn
 								return;
 			
@@ -305,7 +305,7 @@ public:
 						#endif // !WIN32
 							// Just handle in this process
 							SetProcessTitle("handling");
-							HandleConnection(*connection);
+							HandleConnection(connection);
 							SetProcessTitle("idle");										
 						#ifndef WIN32
 						}
@@ -377,12 +377,12 @@ public:
 	}
 	#endif
 
-	virtual void HandleConnection(StreamType &rStream)
+	virtual void HandleConnection(std::auto_ptr<StreamType> apStream)
 	{
-		Connection(rStream);
+		Connection(apStream);
 	}
 
-	virtual void Connection(StreamType &rStream) = 0;
+	virtual void Connection(std::auto_ptr<StreamType> apStream) = 0;
 	
 protected:
 	// For checking code in derived classes -- use if you have an algorithm which