X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fserver_finder.cc;h=4b532f98129d4f70386040d9dfc182761973312f;hb=1858190cff2f960f3d1f0a5cc02c69da86088f5b;hp=c0b554eeef84883faab4415649aabab840b29a95;hpb=d98bdad019ba9be5d800dece0414d7a080609027;p=dcpomatic.git diff --git a/src/lib/server_finder.cc b/src/lib/server_finder.cc index c0b554eee..4b532f981 100644 --- a/src/lib/server_finder.cc +++ b/src/lib/server_finder.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2015 Carl Hetherington 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 @@ -17,48 +17,64 @@ */ -#include #include "server_finder.h" #include "exceptions.h" #include "util.h" #include "config.h" #include "cross.h" -#include "ui_signaller.h" +#include "server_description.h" +#include "dcpomatic_socket.h" +#include "raw_convert.h" +#include +#include +#include + +#include "i18n.h" using std::string; -using std::stringstream; +using std::list; +using std::vector; +using std::cout; using boost::shared_ptr; using boost::scoped_array; +using boost::weak_ptr; + +ServerFinder* ServerFinder::_instance = 0; ServerFinder::ServerFinder () - : _broadcast_thread (0) + : _disabled (false) + , _search_thread (0) , _listen_thread (0) - , _terminate (false) + , _stop (false) { - _broadcast_thread = new boost::thread (boost::bind (&ServerFinder::broadcast_thread, this)); + Config::instance()->Changed.connect (boost::bind (&ServerFinder::config_changed, this, _1)); +} + +void +ServerFinder::start () +{ + _search_thread = new boost::thread (boost::bind (&ServerFinder::search_thread, this)); _listen_thread = new boost::thread (boost::bind (&ServerFinder::listen_thread, this)); } ServerFinder::~ServerFinder () { - { - boost::mutex::scoped_lock lm (_mutex); - _terminate = true; - } - - if (_broadcast_thread && _broadcast_thread->joinable ()) { - _broadcast_thread->join (); + _stop = true; + + _search_condition.notify_all (); + if (_search_thread) { + _search_thread->join (); } - delete _broadcast_thread; - if (_listen_thread && _listen_thread->joinable ()) { + _listen_io_service.stop (); + if (_listen_thread) { _listen_thread->join (); } - delete _listen_thread; } void -ServerFinder::broadcast_thread () +ServerFinder::search_thread () +try { boost::system::error_code error; boost::asio::io_service io_service; @@ -70,55 +86,159 @@ ServerFinder::broadcast_thread () socket.set_option (boost::asio::ip::udp::socket::reuse_address (true)); socket.set_option (boost::asio::socket_base::broadcast (true)); - - boost::asio::ip::udp::endpoint end_point (boost::asio::ip::address_v4::broadcast(), Config::instance()->server_port_base() + 1); - - while (1) { - boost::mutex::scoped_lock lm (_mutex); - if (_terminate) { - socket.close (error); - return; + + string const data = DCPOMATIC_HELLO; + + while (!_stop) { + if (Config::instance()->use_any_servers ()) { + /* Broadcast to look for servers */ + 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 (...) { + + } } - - string data = DCPOMATIC_HELLO; - socket.send_to (boost::asio::buffer (data.c_str(), data.size() + 1), end_point); - lm.unlock (); - dcpomatic_sleep (10); + /* Query our `definite' servers (if there are any) */ + vector servers = Config::instance()->servers (); + for (vector::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, raw_convert (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 (...) { + + } + } + + boost::mutex::scoped_lock lm (_search_condition_mutex); + _search_condition.timed_wait (lm, boost::get_system_time() + boost::posix_time::seconds (10)); } } +catch (...) +{ + store_current (); +} void ServerFinder::listen_thread () +try { + using namespace boost::asio::ip; + + try { + _listen_acceptor.reset (new tcp::acceptor (_listen_io_service, tcp::endpoint (tcp::v4(), Config::instance()->server_port_base() + 1))); + } catch (...) { + boost::throw_exception (NetworkError (_("Could not listen for remote encode servers. Perhaps another instance of DCP-o-matic is running."))); + } + + start_accept (); + _listen_io_service.run (); +} +catch (...) +{ + store_current (); +} + +void +ServerFinder::start_accept () +{ + shared_ptr socket (new Socket ()); + _listen_acceptor->async_accept ( + socket->socket(), + boost::bind (&ServerFinder::handle_accept, this, boost::asio::placeholders::error, socket) + ); +} + +void +ServerFinder::handle_accept (boost::system::error_code ec, shared_ptr socket) { - while (1) { + if (ec) { + start_accept (); + return; + } + + uint32_t length; + socket->read (reinterpret_cast (&length), sizeof (uint32_t)); + length = ntohl (length); + + scoped_array buffer (new char[length]); + socket->read (reinterpret_cast (buffer.get()), length); + + string s (buffer.get()); + shared_ptr xml (new cxml::Document ("ServerAvailable")); + xml->read_string (s); + + string const ip = socket->socket().remote_endpoint().address().to_string (); + if (!server_found (ip) && xml->optional_number_child("Version").get_value_or (0) == SERVER_LINK_VERSION) { + ServerDescription sd (ip, xml->number_child ("Threads")); { - /* See if we need to stop */ - boost::mutex::scoped_lock lm (_mutex); - if (_terminate) { - return; - } + boost::mutex::scoped_lock lm (_servers_mutex); + _servers.push_back (sd); } + emit (boost::bind (boost::ref (ServersListChanged))); + } - shared_ptr sock (new Socket (10)); + start_accept (); +} - try { - sock->accept (Config::instance()->server_port_base() + 1); - } catch (std::exception& e) { - continue; - } +bool +ServerFinder::server_found (string ip) const +{ + boost::mutex::scoped_lock lm (_servers_mutex); + list::const_iterator i = _servers.begin(); + while (i != _servers.end() && i->host_name() != ip) { + ++i; + } + + return i != _servers.end (); +} - uint32_t length = sock->read_uint32 (); - scoped_array buffer (new char[length]); - sock->read (reinterpret_cast (buffer.get()), length); - - stringstream s (buffer.get()); - shared_ptr xml (new cxml::Document ("ServerAvailable")); - xml->read_stream (s); - - ui_signaller->emit (boost::bind (boost::ref (ServerFound), ServerDescription ( - sock->socket().remote_endpoint().address().to_string (), - xml->number_child ("Threads") - ))); +ServerFinder* +ServerFinder::instance () +{ + if (!_instance) { + _instance = new ServerFinder (); + _instance->start (); } + + return _instance; +} + +void +ServerFinder::drop () +{ + delete _instance; + _instance = 0; +} + +list +ServerFinder::servers () const +{ + boost::mutex::scoped_lock lm (_servers_mutex); + return _servers; +} + +void +ServerFinder::config_changed (Config::Property what) +{ + if (what == Config::USE_ANY_SERVERS || what == Config::SERVERS) { + { + boost::mutex::scoped_lock lm (_servers_mutex); + _servers.clear (); + } + ServersListChanged (); + search_now (); + } +} + +void +ServerFinder::search_now () +{ + _search_condition.notify_all (); }