- string const ip = socket->socket().remote_endpoint().address().to_string ();
- if (!server_found (ip) && xml->optional_number_child<int>("Version").get_value_or (0) == SERVER_LINK_VERSION) {
- EncodeServerDescription sd (ip, xml->number_child<int> ("Threads"));
- {
- boost::mutex::scoped_lock lm (_servers_mutex);
+ 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;
+ }
+
+ auto xml = make_shared<cxml::Document>("ServerAvailable");
+ 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;
+ }
+
+ 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));