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

diff --git a/src/lib/server_finder.cc b/src/lib/server_finder.cc
index a51aecd97..637103591 100644
--- a/src/lib/server_finder.cc
+++ b/src/lib/server_finder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 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
@@ -18,6 +18,7 @@
 */
 
 #include <libcxml/cxml.h>
+#include <dcp/raw_convert.h>
 #include "server_finder.h"
 #include "exceptions.h"
 #include "util.h"
@@ -26,11 +27,12 @@
 #include "ui_signaller.h"
 
 using std::string;
-using std::stringstream;
 using std::list;
 using std::vector;
+using std::cout;
 using boost::shared_ptr;
 using boost::scoped_array;
+using dcp::raw_convert;
 
 ServerFinder* ServerFinder::_instance = 0;
 
@@ -45,6 +47,7 @@ ServerFinder::ServerFinder ()
 
 void
 ServerFinder::broadcast_thread ()
+try
 {
 	boost::system::error_code error;
 	boost::asio::io_service io_service;
@@ -59,19 +62,27 @@ ServerFinder::broadcast_thread ()
 
 	string const data = DCPOMATIC_HELLO;
 	
-	while (1) {
+	while (true) {
 		if (Config::instance()->use_any_servers ()) {
 			/* Broadcast to look for servers */
-			boost::asio::ip::udp::endpoint end_point (boost::asio::ip::address_v4::broadcast(), Config::instance()->server_port_base() + 1);
-			socket.send_to (boost::asio::buffer (data.c_str(), data.size() + 1), end_point);
+			try {
+				boost::asio::ip::udp::endpoint end_point (boost::asio::ip::address_v4::broadcast(), Config::instance()->server_port_base() + 1);
+				socket.send_to (boost::asio::buffer (data.c_str(), data.size() + 1), end_point);
+			} catch (...) {
+
+			}
 		}
 
 		/* Query our `definite' servers (if there are any) */
 		vector<string> servers = Config::instance()->servers ();
 		for (vector<string>::const_iterator i = servers.begin(); i != servers.end(); ++i) {
+			if (server_found (*i)) {
+				/* Don't bother asking a server that we already know about */
+				continue;
+			}
 			try {
 				boost::asio::ip::udp::resolver resolver (io_service);
-				boost::asio::ip::udp::resolver::query query (*i);
+				boost::asio::ip::udp::resolver::query query (*i, raw_convert<string> (Config::instance()->server_port_base() + 1));
 				boost::asio::ip::udp::endpoint end_point (*resolver.resolve (query));
 				socket.send_to (boost::asio::buffer (data.c_str(), data.size() + 1), end_point);
 			} catch (...) {
@@ -82,42 +93,63 @@ ServerFinder::broadcast_thread ()
 		dcpomatic_sleep (10);
 	}
 }
+catch (...)
+{
+	store_current ();
+}
 
 void
 ServerFinder::listen_thread ()
+try
 {
-	while (1) {
-		shared_ptr<Socket> sock (new Socket (10));
+	using namespace boost::asio::ip;
 
-		try {
-			sock->accept (Config::instance()->server_port_base() + 1);
-		} catch (std::exception& e) {
-			continue;
-		}
+	boost::asio::io_service io_service;
+	tcp::acceptor acceptor (io_service, tcp::endpoint (tcp::v4(), Config::instance()->server_port_base() + 1));
 
-		uint32_t length = sock->read_uint32 ();
-		scoped_array<char> buffer (new char[length]);
-		sock->read (reinterpret_cast<uint8_t*> (buffer.get()), length);
-		
-		stringstream s (buffer.get());
-		shared_ptr<cxml::Document> xml (new cxml::Document ("ServerAvailable"));
-		xml->read_stream (s);
+	while (true) {
+		tcp::socket socket (io_service);
+		acceptor.accept (socket);
 
-		boost::mutex::scoped_lock lm (_mutex);
+		/* XXX: these reads should have timeouts, otherwise we will stop finding servers
+		   if one dies during this conversation
+		*/
 
-		string const ip = sock->socket().remote_endpoint().address().to_string ();
-		list<ServerDescription>::const_iterator i = _servers.begin();
-		while (i != _servers.end() && i->host_name() != ip) {
-			++i;
-		}
+		uint32_t length = 0;
+		boost::asio::read (socket, boost::asio::buffer (&length, sizeof (uint32_t)));
+		length = ntohl (length);
 
-		if (i == _servers.end ()) {
+		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));
 		}
 	}
 }
+catch (...)
+{
+	store_current ();
+}
+
+bool
+ServerFinder::server_found (string ip) const
+{
+	boost::mutex::scoped_lock lm (_mutex);
+	list<ServerDescription>::const_iterator i = _servers.begin();
+	while (i != _servers.end() && i->host_name() != ip) {
+		++i;
+	}
+
+	return i != _servers.end ();
+}
 
 void
 ServerFinder::connect (boost::function<void (ServerDescription)> fn)