X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fserver_finder.cc;h=ac4651657872418b7aa56f9aaedfa91e595599f9;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=6371035910f6baba9e253790f356e164362f642a;hpb=12efbd5938f08eb445b43f539fa4f27aa5caccfb;p=dcpomatic.git

diff --git a/src/lib/server_finder.cc b/src/lib/server_finder.cc
index 637103591..ac4651657 100644
--- a/src/lib/server_finder.cc
+++ b/src/lib/server_finder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,14 +17,17 @@
 
 */
 
-#include <libcxml/cxml.h>
-#include <dcp/raw_convert.h>
 #include "server_finder.h"
 #include "exceptions.h"
 #include "util.h"
 #include "config.h"
 #include "cross.h"
-#include "ui_signaller.h"
+#include "dcpomatic_socket.h"
+#include "raw_convert.h"
+#include <libcxml/cxml.h>
+#include <boost/lambda/lambda.hpp>
+
+#include "i18n.h"
 
 using std::string;
 using std::list;
@@ -32,7 +35,7 @@ using std::vector;
 using std::cout;
 using boost::shared_ptr;
 using boost::scoped_array;
-using dcp::raw_convert;
+using boost::weak_ptr;
 
 ServerFinder* ServerFinder::_instance = 0;
 
@@ -40,11 +43,23 @@ ServerFinder::ServerFinder ()
 	: _disabled (false)
 	, _broadcast_thread (0)
 	, _listen_thread (0)
+	, _stop (false)
 {
 	_broadcast_thread = new boost::thread (boost::bind (&ServerFinder::broadcast_thread, this));
 	_listen_thread = new boost::thread (boost::bind (&ServerFinder::listen_thread, this));
 }
 
+ServerFinder::~ServerFinder ()
+{
+	_stop = true;
+
+	_broadcast_thread->interrupt ();
+	_broadcast_thread->join ();
+
+	_listen_io_service.stop ();
+	_listen_thread->join ();
+}
+
 void
 ServerFinder::broadcast_thread ()
 try
@@ -61,8 +76,8 @@ try
         socket.set_option (boost::asio::socket_base::broadcast (true));
 
 	string const data = DCPOMATIC_HELLO;
-	
-	while (true) {
+
+	while (!_stop) {
 		if (Config::instance()->use_any_servers ()) {
 			/* Broadcast to look for servers */
 			try {
@@ -89,8 +104,12 @@ try
 
 			}
 		}
-		
-		dcpomatic_sleep (10);
+
+		try {
+			boost::thread::sleep (boost::get_system_time() + boost::posix_time::seconds (10));
+		} catch (boost::thread_interrupted& e) {
+			return;
+		}
 	}
 }
 catch (...)
@@ -100,45 +119,65 @@ catch (...)
 
 void
 ServerFinder::listen_thread ()
-try
-{
+try {
 	using namespace boost::asio::ip;
 
-	boost::asio::io_service io_service;
-	tcp::acceptor acceptor (io_service, tcp::endpoint (tcp::v4(), Config::instance()->server_port_base() + 1));
-
-	while (true) {
-		tcp::socket socket (io_service);
-		acceptor.accept (socket);
-
-		/* 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);
-
-		scoped_array<char> buffer (new char[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 = socket.remote_endpoint().address().to_string ();
-		if (!server_found (ip)) {
-			ServerDescription sd (ip, xml->number_child<int> ("Threads"));
-			_servers.push_back (sd);
-			ui_signaller->emit (boost::bind (boost::ref (ServerFound), sd));
-		}
+	try {
+		_listen_acceptor.reset (new tcp::acceptor (_listen_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.")));
 	}
+
+	start_accept ();
+	_listen_io_service.run ();
 }
 catch (...)
 {
 	store_current ();
 }
 
+void
+ServerFinder::start_accept ()
+{
+	shared_ptr<Socket> socket (new Socket ());
+	_listen_acceptor->async_accept (
+		socket->socket(),
+		boost::bind (&ServerFinder::handle_accept, this, boost::asio::placeholders::error, socket)
+		);
+}
+
+void
+ServerFinder::handle_accept (boost::system::error_code ec, shared_ptr<Socket> socket)
+{
+	if (ec) {
+		start_accept ();
+		return;
+	}
+
+	uint32_t length;
+	socket->read (reinterpret_cast<uint8_t*> (&length), sizeof (uint32_t));
+	length = ntohl (length);
+
+	scoped_array<char> buffer (new char[length]);
+	socket->read (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 = socket->socket().remote_endpoint().address().to_string ();
+	if (!server_found (ip) && xml->optional_number_child<int>("Version").get_value_or (0) == SERVER_LINK_VERSION) {
+		ServerDescription sd (ip, xml->number_child<int> ("Threads"));
+		{
+			boost::mutex::scoped_lock lm (_mutex);
+			_servers.push_back (sd);
+		}
+		emit (boost::bind (boost::ref (ServerFound), sd));
+	}
+
+	start_accept ();
+}
+
 bool
 ServerFinder::server_found (string ip) const
 {
@@ -151,13 +190,9 @@ ServerFinder::server_found (string ip) const
 	return i != _servers.end ();
 }
 
-void
+boost::signals2::connection
 ServerFinder::connect (boost::function<void (ServerDescription)> fn)
 {
-	if (_disabled) {
-		return;
-	}
-	
 	boost::mutex::scoped_lock lm (_mutex);
 
 	/* Emit the current list of servers */
@@ -165,7 +200,7 @@ ServerFinder::connect (boost::function<void (ServerDescription)> fn)
 		fn (*i);
 	}
 
-	ServerFound.connect (fn);
+	return ServerFound.connect (fn);
 }
 
 ServerFinder*
@@ -178,5 +213,9 @@ ServerFinder::instance ()
 	return _instance;
 }
 
-	
-       
+void
+ServerFinder::drop ()
+{
+	delete _instance;
+	_instance = 0;
+}