X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcpomatic_socket.cc;h=16f01f39c23e8c0a1e411209a17a23349100386c;hb=3b932abd0c7634483911e1d5361e12b2d094ae6f;hp=bc8f596a7fefbf30c043cbc80b6647ac50384137;hpb=f213fd833a840fc97e3875979ae7dc7cbbc883b1;p=dcpomatic.git

diff --git a/src/lib/dcpomatic_socket.cc b/src/lib/dcpomatic_socket.cc
index bc8f596a7..16f01f39c 100644
--- a/src/lib/dcpomatic_socket.cc
+++ b/src/lib/dcpomatic_socket.cc
@@ -28,27 +28,17 @@
 Socket::Socket (int timeout)
 	: _deadline (_io_service)
 	, _socket (_io_service)
-	, _acceptor (0)
 	, _timeout (timeout)
 {
 	_deadline.expires_at (boost::posix_time::pos_infin);
 	check ();
 }
 
-Socket::~Socket ()
-{
-	delete _acceptor;
-}
-
 void
 Socket::check ()
 {
 	if (_deadline.expires_at() <= boost::asio::deadline_timer::traits_type::now ()) {
-		if (_acceptor) {
-			_acceptor->cancel ();
-		} else {
-			_socket.close ();
-		}
+		_socket.close ();
 		_deadline.expires_at (boost::posix_time::pos_infin);
 	}
 
@@ -77,26 +67,6 @@ Socket::connect (boost::asio::ip::tcp::endpoint endpoint)
 	}
 }
 
-void
-Socket::accept (int port)
-{
-	_acceptor = new boost::asio::ip::tcp::acceptor (_io_service, boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), port));
-	
-	_deadline.expires_from_now (boost::posix_time::seconds (_timeout));
-	boost::system::error_code ec = boost::asio::error::would_block;
-	_acceptor->async_accept (_socket, boost::lambda::var(ec) = boost::lambda::_1);
-	do {
-		_io_service.run_one ();
-	} while (ec == boost::asio::error::would_block);
-
-	delete _acceptor;
-	_acceptor = 0;
-	
-	if (ec) {
-		throw NetworkError (String::compose (_("error during async_accept (%1)"), ec.value ()));
-	}
-}
-
 /** Blocking write.
  *  @param data Buffer to write.
  *  @param size Number of bytes to write.
@@ -108,7 +78,7 @@ Socket::write (uint8_t const * data, int size)
 	boost::system::error_code ec = boost::asio::error::would_block;
 
 	boost::asio::async_write (_socket, boost::asio::buffer (data, size), boost::lambda::var(ec) = boost::lambda::_1);
-	
+
 	do {
 		_io_service.run_one ();
 	} while (ec == boost::asio::error::would_block);
@@ -140,7 +110,7 @@ Socket::read (uint8_t* data, int size)
 	do {
 		_io_service.run_one ();
 	} while (ec == boost::asio::error::would_block);
-	
+
 	if (ec) {
 		throw NetworkError (String::compose (_("error during async_read (%1)"), ec.value ()));
 	}