X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fserver_finder.cc;h=35ce9e1a16e8686b51cae35f34783a6ef459946a;hb=bf193143624df4cf3a49c99bda1955484051c722;hp=14cb3af5999ac5ff7ccb434d39371addcbb18a6d;hpb=5e4f001bf32e3cdf65efa34803d70e6c1c00c66b;p=dcpomatic.git

diff --git a/src/lib/server_finder.cc b/src/lib/server_finder.cc
index 14cb3af59..35ce9e1a1 100644
--- a/src/lib/server_finder.cc
+++ b/src/lib/server_finder.cc
@@ -26,6 +26,8 @@
 #include "cross.h"
 #include "ui_signaller.h"
 
+#include "i18n.h"
+
 using std::string;
 using std::list;
 using std::vector;
@@ -102,24 +104,36 @@ void
 ServerFinder::listen_thread ()
 try
 {
+	using namespace boost::asio::ip;
+
+	boost::asio::io_service io_service;
+	boost::scoped_ptr<tcp::acceptor> acceptor;
+	try {
+		acceptor.reset (new tcp::acceptor (io_service, tcp::endpoint (tcp::v4(), Config::instance()->server_port_base() + 1)));
+	} catch (...) {
+		boost::throw_exception (NetworkError (_("Could not listen for remote encode servers.  Perhaps another instance of DCP-o-matic is running.")));
+	}
+
 	while (true) {
-		shared_ptr<Socket> sock (new Socket (60));
+		tcp::socket socket (io_service);
+		acceptor->accept (socket);
 
-		try {
-			sock->accept (Config::instance()->server_port_base() + 1);
-		} catch (std::exception& e) {
-			continue;
-		}
+		/* XXX: these reads should have timeouts, otherwise we will stop finding servers
+		   if one dies during this conversation
+		*/
+
+		uint32_t length = 0;
+		boost::asio::read (socket, boost::asio::buffer (&length, sizeof (uint32_t)));
+		length = ntohl (length);
 
-		uint32_t length = sock->read_uint32 ();
 		scoped_array<char> buffer (new char[length]);
-		sock->read (reinterpret_cast<uint8_t*> (buffer.get()), length);
+		boost::asio::read (socket, boost::asio::buffer (reinterpret_cast<uint8_t*> (buffer.get ()), length));
 		
 		string s (buffer.get());
 		shared_ptr<cxml::Document> xml (new cxml::Document ("ServerAvailable"));
 		xml->read_string (s);
-
-		string const ip = sock->socket().remote_endpoint().address().to_string ();
+		
+		string const ip = socket.remote_endpoint().address().to_string ();
 		if (!server_found (ip)) {
 			ServerDescription sd (ip, xml->number_child<int> ("Threads"));
 			_servers.push_back (sd);