Use SharedPtr references to Interfaces to keep things sane.

Fix double register when using GUI with a remote engine.
Avoid signal when writing to dead socket by using send with MSG_NOSIGNAL.


git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4336 a436a847-0d15-0410-975c-d299462d15a1

1 files changed, 13 insertions, 7 deletions

diff --git a/src/socket/SocketServer.hpp b/src/socket/SocketServer.hpp
index 8ea0f445..55434030 100644
--- a/src/socket/SocketServer.hpp
+++ b/src/socket/SocketServer.hpp
@@ -34,17 +34,23 @@ public:
 	             SharedPtr<Socket> sock)
 		: Server::EventWriter(engine)
 		, SocketReader(world, *this, sock)
-		, _writer(*world.lv2_uri_map().get(),
-		          *world.uris().get(),
-		          sock->uri(),
-		          sock)
+		, _engine(engine)
+		, _writer(new SocketWriter(*world.lv2_uri_map().get(),
+		                           *world.uris().get(),
+		                           sock->uri(),
+		                           sock))
 	{
-		set_respondee(&_writer);
-		engine.register_client(sock->uri(), &_writer);
+		set_respondee(_writer);
+		engine.register_client(_writer->uri(), _writer);
+	}
+
+	~SocketServer() {
+		_engine.unregister_client(_writer->uri());
 	}
 
 private:
-	SocketWriter _writer;
+	Server::Engine&         _engine;
+	SharedPtr<SocketWriter> _writer;
 };
 
 }  // namespace Ingen