void
EncodeServerFinder::start_accept ()
{
- auto socket = make_shared<Socket>();
+ _accept_socket = make_shared<Socket>();
+
_listen_acceptor->async_accept (
- socket->socket(),
- boost::bind(&EncodeServerFinder::handle_accept, this, boost::asio::placeholders::error, socket)
+ _accept_socket->socket(),
+ boost::bind(&EncodeServerFinder::handle_accept, this, boost::asio::placeholders::error)
);
}
void
-EncodeServerFinder::handle_accept (boost::system::error_code ec, shared_ptr<Socket> socket)
+EncodeServerFinder::handle_accept (boost::system::error_code ec)
{
if (ec) {
start_accept ();
return;
}
- uint32_t length;
- socket->read (reinterpret_cast<uint8_t*>(&length), sizeof(uint32_t));
- length = ntohl (length);
+ string server_available;
- scoped_array<char> buffer(new char[length]);
- socket->read (reinterpret_cast<uint8_t*>(buffer.get()), length);
+ try {
+ uint32_t length;
+ _accept_socket->read (reinterpret_cast<uint8_t*>(&length), sizeof(uint32_t));
+ length = ntohl (length);
+
+ scoped_array<char> buffer(new char[length]);
+ _accept_socket->read (reinterpret_cast<uint8_t*>(buffer.get()), length);
+ server_available = buffer.get();
+ } catch (NetworkError&) {
+ /* Maybe the server went away; let's just try again */
+ start_accept();
+ return;
+ }
- string s (buffer.get());
auto xml = make_shared<cxml::Document>("ServerAvailable");
- xml->read_string (s);
-
- auto const ip = socket->socket().remote_endpoint().address().to_string();
- auto 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));
- {
- boost::mutex::scoped_lock lm (_servers_mutex);
- _servers.push_back (sd);
+ xml->read_string(server_available);
+
+ auto const ip = _accept_socket->socket().remote_endpoint().address().to_string();
+ bool changed = false;
+ {
+ boost::mutex::scoped_lock lm (_servers_mutex);
+ auto i = _servers.begin();
+ while (i != _servers.end() && i->host_name() != ip) {
+ ++i;
}
- emit (boost::bind(boost::ref (ServersListChanged)));
- }
- start_accept ();
-}
-
-
-optional<list<EncodeServerDescription>::iterator>
-EncodeServerFinder::server_found (string ip)
-{
- boost::mutex::scoped_lock lm (_servers_mutex);
- auto i = _servers.begin();
- while (i != _servers.end() && i->host_name() != ip) {
- ++i;
+ if (i != _servers.end()) {
+ i->set_seen();
+ } else {
+ EncodeServerDescription sd (ip, xml->number_child<int>("Threads"), xml->optional_number_child<int>("Version").get_value_or(0));
+ _servers.push_back (sd);
+ changed = true;
+ }
}
- if (i != _servers.end()) {
- return i;
+ if (changed) {
+ emit (boost::bind(boost::ref (ServersListChanged)));
}
- return {};
+ start_accept ();
}