Merge master.

[dcpomatic.git] / src / lib / server_finder.cc

diff --git a/src/lib/server_finder.cc b/src/lib/server_finder.cc
index a51aecd978dce72c47a1adf9eccdeaea17ac0f99..de8a3852c5cf45c0abd52faaf94b4f08ee24e94c 100644 (file)
--- a/src/lib/server_finder.cc
+++ b/src/lib/server_finder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
 */
 
 #include <libcxml/cxml.h>
+#include <dcp/raw_convert.h>
 #include "server_finder.h"
 #include "exceptions.h"
 #include "util.h"
@@ -29,8 +30,10 @@ using std::string;
 using std::stringstream;
 using std::list;
 using std::vector;
+using std::cout;
 using boost::shared_ptr;
 using boost::scoped_array;
+using dcp::raw_convert;
 
 ServerFinder* ServerFinder::_instance = 0;
 
@@ -45,6 +48,7 @@ ServerFinder::ServerFinder ()
 
 void
 ServerFinder::broadcast_thread ()
+try
 {
        boost::system::error_code error;
        boost::asio::io_service io_service;
@@ -59,19 +63,27 @@ ServerFinder::broadcast_thread ()
 
        string const data = DCPOMATIC_HELLO;
        
-       while (1) {
+       while (true) {
                if (Config::instance()->use_any_servers ()) {
                        /* Broadcast to look for servers */
-                       boost::asio::ip::udp::endpoint end_point (boost::asio::ip::address_v4::broadcast(), Config::instance()->server_port_base() + 1);
-                       socket.send_to (boost::asio::buffer (data.c_str(), data.size() + 1), end_point);
+                       try {
+                               boost::asio::ip::udp::endpoint end_point (boost::asio::ip::address_v4::broadcast(), Config::instance()->server_port_base() + 1);
+                               socket.send_to (boost::asio::buffer (data.c_str(), data.size() + 1), end_point);
+                       } catch (...) {
+
+                       }
                }
 
                /* Query our `definite' servers (if there are any) */
                vector<string> servers = Config::instance()->servers ();
                for (vector<string>::const_iterator i = servers.begin(); i != servers.end(); ++i) {
+                       if (server_found (*i)) {
+                               /* Don't bother asking a server that we already know about */
+                               continue;
+                       }
                        try {
                                boost::asio::ip::udp::resolver resolver (io_service);
-                               boost::asio::ip::udp::resolver::query query (*i);
+                               boost::asio::ip::udp::resolver::query query (*i, raw_convert<string> (Config::instance()->server_port_base() + 1));
                                boost::asio::ip::udp::endpoint end_point (*resolver.resolve (query));
                                socket.send_to (boost::asio::buffer (data.c_str(), data.size() + 1), end_point);
                        } catch (...) {
@@ -82,12 +94,17 @@ ServerFinder::broadcast_thread ()
                dcpomatic_sleep (10);
        }
 }
+catch (...)
+{
+       store_current ();
+}
 
 void
 ServerFinder::listen_thread ()
+try
 {
        while (1) {
-               shared_ptr<Socket> sock (new Socket (10));
+               shared_ptr<Socket> sock (new Socket (60));
 
                try {
                        sock->accept (Config::instance()->server_port_base() + 1);
@@ -103,21 +120,30 @@ ServerFinder::listen_thread ()
                shared_ptr<cxml::Document> xml (new cxml::Document ("ServerAvailable"));
                xml->read_stream (s);
 
-               boost::mutex::scoped_lock lm (_mutex);
-
                string const ip = sock->socket().remote_endpoint().address().to_string ();
-               list<ServerDescription>::const_iterator i = _servers.begin();
-               while (i != _servers.end() && i->host_name() != ip) {
-                       ++i;
-               }
-
-               if (i == _servers.end ()) {
+               if (!server_found (ip)) {
                        ServerDescription sd (ip, xml->number_child<int> ("Threads"));
                        _servers.push_back (sd);
                        ui_signaller->emit (boost::bind (boost::ref (ServerFound), sd));
                }
        }
 }
+catch (...)
+{
+       store_current ();
+}
+
+bool
+ServerFinder::server_found (string ip) const
+{
+       boost::mutex::scoped_lock lm (_mutex);
+       list<ServerDescription>::const_iterator i = _servers.begin();
+       while (i != _servers.end() && i->host_name() != ip) {
+               ++i;
+       }
+
+       return i != _servers.end ();
+}
 
 void
 ServerFinder::connect (boost::function<void (ServerDescription)> fn)