using boost::shared_ptr;
using boost::scoped_array;
using boost::weak_ptr;
+using boost::optional;
using dcp::raw_convert;
EncodeServerFinder* EncodeServerFinder::_instance = 0;
_listen_thread = 0;
boost::mutex::scoped_lock lm (_servers_mutex);
- _good_servers.clear ();
- _bad_servers.clear ();
+ _servers.clear ();
}
void
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 ()) {
}
}
+ /* Discard servers that we haven't seen for a while */
+ {
+ boost::mutex::scoped_lock lm (_servers_mutex);
+
+ bool removed = false;
+ 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 (...)
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);
- }
+ boost::mutex::scoped_lock lm (_servers_mutex);
+ _servers.push_back (sd);
emit (boost::bind (boost::ref (ServersListChanged)));
}
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*
}
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
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 ();