X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fserver.cc;h=c1be5735e9bb0be7db25831ebab9f44641ec1f3c;hb=df811a0dd2772417496991b72fde0ef3304241d9;hp=09e0a4bd0524cf91c6a4db010859713bda2d081f;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/lib/server.cc b/src/lib/server.cc
index 09e0a4bd0..c1be5735e 100644
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,27 +18,39 @@
 
 */
 
+
 #include "server.h"
 #include "dcpomatic_socket.h"
 
+
 #include "i18n.h"
 
-using boost::shared_ptr;
 
-Server::Server (int port)
+using std::make_shared;
+using std::shared_ptr;
+
+
+Server::Server (int port, int timeout)
 	: _terminate (false)
 	, _acceptor (_io_service, boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), port))
+	, _timeout (timeout)
 {
 
 }
 
+
 Server::~Server ()
 {
-	boost::mutex::scoped_lock lm (_mutex);
-	_terminate = true;
-	_io_service.stop ();
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_terminate = true;
+	}
+
+	_acceptor.close ();
+	stop ();
 }
 
+
 void
 Server::run ()
 {
@@ -46,6 +58,7 @@ Server::run ()
 	_io_service.run ();
 }
 
+
 void
 Server::start_accept ()
 {
@@ -56,10 +69,11 @@ Server::start_accept ()
 		}
 	}
 
-	shared_ptr<Socket> socket (new Socket);
+	auto socket = make_shared<Socket>(_timeout);
 	_acceptor.async_accept (socket->socket (), boost::bind (&Server::handle_accept, this, socket, boost::asio::placeholders::error));
 }
 
+
 void
 Server::handle_accept (shared_ptr<Socket> socket, boost::system::error_code const & error)
 {
@@ -70,3 +84,10 @@ Server::handle_accept (shared_ptr<Socket> socket, boost::system::error_code cons
 	handle (socket);
 	start_accept ();
 }
+
+
+void
+Server::stop ()
+{
+	_io_service.stop ();
+}