From e89aee2c29f02d8a2044c97fc5cdd4be6eb34ef0 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 8 Oct 2014 16:55:52 +0100
Subject: [PATCH] Use accept() properly when reading replies to server request
 broadcasts. Without this, some replies were being lost.

---
 ChangeLog                |  5 +++++
 src/lib/server.cc        |  3 +++
 src/lib/server_finder.cc | 28 ++++++++++++++++++----------
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6c40e1de2..047628602 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-08  c.hetherington  <cth@carlh.net>
+
+	* Make server finding more reliable when
+	there are more than a few servers.
+
 2014-10-08  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.74.2 released.
diff --git a/src/lib/server.cc b/src/lib/server.cc
index 9591be188..9428ba611 100644
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -247,6 +247,9 @@ Server::broadcast_received ()
 		root->add_child("Threads")->add_child_text (raw_convert<string> (_worker_threads.size ()));
 		string xml = doc.write_to_string ("UTF-8");
 
+		if (_verbose) {
+			cout << "Offering services to master " << _broadcast.send_endpoint.address().to_string () << "\n";
+		}
 		shared_ptr<Socket> socket (new Socket);
 		try {
 			socket->connect (boost::asio::ip::tcp::endpoint (_broadcast.send_endpoint.address(), Config::instance()->server_port_base() + 1));
diff --git a/src/lib/server_finder.cc b/src/lib/server_finder.cc
index 744a65f59..58ad61bf9 100644
--- a/src/lib/server_finder.cc
+++ b/src/lib/server_finder.cc
@@ -102,24 +102,32 @@ void
 ServerFinder::listen_thread ()
 try
 {
+	using namespace boost::asio::ip;
+
+	boost::asio::io_service io_service;
+	tcp::acceptor acceptor (io_service, tcp::endpoint (tcp::v4(), Config::instance()->server_port_base() + 1));
+
 	while (true) {
-		shared_ptr<Socket> sock (new Socket (60));
+		tcp::socket socket (io_service);
+		acceptor.accept (socket);
 
-		try {
-			sock->accept (Config::instance()->server_port_base() + 1);
-		} catch (std::exception& e) {
-			continue;
-		}
+		/* XXX: does this deadline work with synchronous reads? */
+
+		boost::asio::deadline_timer deadline (io_service);
+		deadline.expires_from_now (boost::posix_time::seconds (10));
+
+		uint32_t length = 0;
+		boost::asio::read (socket, boost::asio::buffer (&length, sizeof (uint32_t)));
+		length = ntohl (length);
 
-		uint32_t length = sock->read_uint32 ();
 		scoped_array<char> buffer (new char[length]);
-		sock->read (reinterpret_cast<uint8_t*> (buffer.get()), length);
+		boost::asio::read (socket, boost::asio::buffer (reinterpret_cast<uint8_t*> (buffer.get ()), length));
 		
 		string s (buffer.get());
 		shared_ptr<cxml::Document> xml (new cxml::Document ("ServerAvailable"));
 		xml->read_string (s);
-
-		string const ip = sock->socket().remote_endpoint().address().to_string ();
+		
+		string const ip = socket.remote_endpoint().address().to_string ();
 		if (!server_found (ip)) {
 			ServerDescription sd (ip, xml->number_child<int> ("Threads"));
 			_servers.push_back (sd);
-- 
2.30.2