X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencode_server_finder.cc;h=6cdd8ce3cc11adb05062c9fd8fdc8744588e33b5;hb=96f7dd41a2c8627bc1ea0d24d84142eb04b4ffef;hp=1234dcd529daa847445f8be7df3bdc2d51d48fbb;hpb=ed0b3ee0c5a0ba11d3a1a1dfee8e71238bcab4bd;p=dcpomatic.git

diff --git a/src/lib/encode_server_finder.cc b/src/lib/encode_server_finder.cc
index 1234dcd52..6cdd8ce3c 100644
--- a/src/lib/encode_server_finder.cc
+++ b/src/lib/encode_server_finder.cc
@@ -39,6 +39,7 @@ using std::cout;
 using boost::shared_ptr;
 using boost::scoped_array;
 using boost::weak_ptr;
+using boost::optional;
 using dcp::raw_convert;
 
 EncodeServerFinder* EncodeServerFinder::_instance = 0;
@@ -98,8 +99,7 @@ EncodeServerFinder::stop ()
 	_listen_thread = 0;
 
 	boost::mutex::scoped_lock lm (_servers_mutex);
-	_good_servers.clear ();
-	_bad_servers.clear ();
+	_servers.clear ();
 }
 
 void
@@ -118,6 +118,7 @@ try
         socket.set_option (boost::asio::socket_base::broadcast (true));
 
 	string const data = DCPOMATIC_HELLO;
+	int const interval = 10;
 
 	while (!_stop) {
 		if (Config::instance()->use_any_servers ()) {
@@ -147,8 +148,31 @@ try
 			}
 		}
 
+		/* Discard servers that we haven't seen for a while */
+		bool removed = false;
+		{
+			boost::mutex::scoped_lock lm (_servers_mutex);
+
+			list<EncodeServerDescription>::iterator i = _servers.begin();
+			while (i != _servers.end()) {
+				if (i->last_seen_seconds() > 2 * interval) {
+					list<EncodeServerDescription>::iterator j = i;
+					++j;
+					_servers.erase (i);
+					i = j;
+					removed = true;
+				} else {
+					++i;
+				}
+			}
+		}
+
+		if (removed) {
+			emit (boost::bind (boost::ref (ServersListChanged)));
+		}
+
 		boost::mutex::scoped_lock lm (_search_condition_mutex);
-		_search_condition.timed_wait (lm, boost::get_system_time() + boost::posix_time::seconds (10));
+		_search_condition.timed_wait (lm, boost::get_system_time() + boost::posix_time::seconds (interval));
 	}
 }
 catch (...)
@@ -207,14 +231,14 @@ EncodeServerFinder::handle_accept (boost::system::error_code ec, shared_ptr<Sock
 	xml->read_string (s);
 
 	string const ip = socket->socket().remote_endpoint().address().to_string ();
-	if (!server_found (ip)) {
+	optional<list<EncodeServerDescription>::iterator> found = server_found (ip);
+	if (found) {
+		(*found)->set_seen ();
+	} else {
 		EncodeServerDescription sd (ip, xml->number_child<int>("Threads"), xml->optional_number_child<int>("Version").get_value_or(0));
-		if (sd.link_version() == SERVER_LINK_VERSION) {
-			boost::mutex::scoped_lock lm (_servers_mutex);
-			_good_servers.push_back (sd);
-		} else {
+		{
 			boost::mutex::scoped_lock lm (_servers_mutex);
-			_bad_servers.push_back (sd);
+			_servers.push_back (sd);
 		}
 		emit (boost::bind (boost::ref (ServersListChanged)));
 	}
@@ -222,25 +246,20 @@ EncodeServerFinder::handle_accept (boost::system::error_code ec, shared_ptr<Sock
 	start_accept ();
 }
 
-bool
-EncodeServerFinder::server_found (string ip) const
+optional<list<EncodeServerDescription>::iterator>
+EncodeServerFinder::server_found (string ip)
 {
 	boost::mutex::scoped_lock lm (_servers_mutex);
-	list<EncodeServerDescription>::const_iterator i = _good_servers.begin();
-	while (i != _good_servers.end() && i->host_name() != ip) {
+	list<EncodeServerDescription>::iterator i = _servers.begin();
+	while (i != _servers.end() && i->host_name() != ip) {
 		++i;
 	}
 
-	if (i != _good_servers.end()) {
-		return true;
+	if (i != _servers.end()) {
+		return i;
 	}
 
-	i = _bad_servers.begin();
-	while (i != _bad_servers.end() && i->host_name() != ip) {
-		++i;
-	}
-
-	return i != _bad_servers.end ();
+	return optional<list<EncodeServerDescription>::iterator>();
 }
 
 EncodeServerFinder*
@@ -262,17 +281,10 @@ EncodeServerFinder::drop ()
 }
 
 list<EncodeServerDescription>
-EncodeServerFinder::good_servers () const
-{
-	boost::mutex::scoped_lock lm (_servers_mutex);
-	return _good_servers;
-}
-
-list<EncodeServerDescription>
-EncodeServerFinder::bad_servers () const
+EncodeServerFinder::servers () const
 {
 	boost::mutex::scoped_lock lm (_servers_mutex);
-	return _bad_servers;
+	return _servers;
 }
 
 void
@@ -281,8 +293,7 @@ EncodeServerFinder::config_changed (Config::Property what)
 	if (what == Config::USE_ANY_SERVERS || what == Config::SERVERS) {
 		{
 			boost::mutex::scoped_lock lm (_servers_mutex);
-			_good_servers.clear ();
-			_bad_servers.clear ();
+			_servers.clear ();
 		}
 		ServersListChanged ();
 		_search_condition.notify_all ();