X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fserver_finder.cc;h=de90e0d5c1380ee85d6429bf8c591f94c9f95dc6;hb=2d5b8cdde08044d323aa7193dfac6c9f8bca7131;hp=56f52b7fc292d9510d0b77a0264ca68ef8fede41;hpb=59602b67d0637817a156b7bd0fc05f96fe41dee5;p=dcpomatic.git

diff --git a/src/lib/server_finder.cc b/src/lib/server_finder.cc
index 56f52b7fc..de90e0d5c 100644
--- a/src/lib/server_finder.cc
+++ b/src/lib/server_finder.cc
@@ -28,13 +28,17 @@
 using std::string;
 using std::stringstream;
 using std::list;
+using std::vector;
+using std::cout;
 using boost::shared_ptr;
 using boost::scoped_array;
+using boost::lexical_cast;
 
 ServerFinder* ServerFinder::_instance = 0;
 
 ServerFinder::ServerFinder ()
-	: _broadcast_thread (0)
+	: _disabled (false)
+	, _broadcast_thread (0)
 	, _listen_thread (0)
 {
 	_broadcast_thread = new boost::thread (boost::bind (&ServerFinder::broadcast_thread, this));
@@ -54,12 +58,33 @@ ServerFinder::broadcast_thread ()
 
         socket.set_option (boost::asio::ip::udp::socket::reuse_address (true));
         socket.set_option (boost::asio::socket_base::broadcast (true));
-	
-        boost::asio::ip::udp::endpoint end_point (boost::asio::ip::address_v4::broadcast(), Config::instance()->server_port_base() + 1);            
 
+	string const data = DCPOMATIC_HELLO;
+	
 	while (1) {
-		string const data = DCPOMATIC_HELLO;
-		socket.send_to (boost::asio::buffer (data.c_str(), data.size() + 1), end_point);
+		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);
+		}
+
+		/* 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, lexical_cast<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 (...) {
+
+			}
+		}
+		
 		dcpomatic_sleep (10);
 	}
 }
@@ -84,15 +109,8 @@ ServerFinder::listen_thread ()
 		shared_ptr<cxml::Document> xml (new cxml::Document ("ServerAvailable"));
 		xml->read_stream (s);
 
-		boost::mutex::scoped_lock lm (_mutex);
-
 		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;
-		}
-
-		if (i == _servers.end ()) {
+		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));
@@ -100,9 +118,25 @@ ServerFinder::listen_thread ()
 	}
 }
 
+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)
 {
+	if (_disabled) {
+		return;
+	}
+	
 	boost::mutex::scoped_lock lm (_mutex);
 
 	/* Emit the current list of servers */