diff options
Diffstat (limited to 'src/lib/encode_server_finder.cc')
| -rw-r--r-- | src/lib/encode_server_finder.cc | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/src/lib/encode_server_finder.cc b/src/lib/encode_server_finder.cc index 200286fd9..e01019a8c 100644 --- a/src/lib/encode_server_finder.cc +++ b/src/lib/encode_server_finder.cc @@ -220,16 +220,24 @@ EncodeServerFinder::handle_accept (boost::system::error_code ec) return; } - uint32_t length; - _accept_socket->read (reinterpret_cast<uint8_t*>(&length), sizeof(uint32_t)); - length = ntohl (length); + string server_available; - scoped_array<char> buffer(new char[length]); - _accept_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); + xml->read_string(server_available); auto const ip = _accept_socket->socket().remote_endpoint().address().to_string(); bool changed = false; |