X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fserver_finder.cc;h=b4b400b523edb1cf0f525f40b547df7462a671ae;hb=04bd447fd8960625bda5081cbac235b848d7631f;hp=a51aecd978dce72c47a1adf9eccdeaea17ac0f99;hpb=d99ca0a95e61b53105f765497bc465a7420e7a47;p=dcpomatic.git diff --git a/src/lib/server_finder.cc b/src/lib/server_finder.cc index a51aecd97..b4b400b52 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,20 +17,25 @@ */ -#include #include "server_finder.h" #include "exceptions.h" #include "util.h" #include "config.h" #include "cross.h" -#include "ui_signaller.h" +#include "dcpomatic_socket.h" +#include "raw_convert.h" +#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; @@ -38,13 +43,26 @@ ServerFinder::ServerFinder () : _disabled (false) , _broadcast_thread (0) , _listen_thread (0) + , _stop (false) { _broadcast_thread = new boost::thread (boost::bind (&ServerFinder::broadcast_thread, this)); _listen_thread = new boost::thread (boost::bind (&ServerFinder::listen_thread, this)); } +ServerFinder::~ServerFinder () +{ + _stop = true; + + _broadcast_thread->interrupt (); + _broadcast_thread->join (); + + _listen_io_service.stop (); + _listen_thread->join (); +} + void ServerFinder::broadcast_thread () +try { boost::system::error_code error; boost::asio::io_service io_service; @@ -59,73 +77,122 @@ ServerFinder::broadcast_thread () string const data = DCPOMATIC_HELLO; - while (1) { + while (!_stop) { 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 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); + 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 (...) { } } - - dcpomatic_sleep (10); + + try { + boost::thread::sleep (boost::get_system_time() + boost::posix_time::seconds (10)); + } catch (boost::thread_interrupted& e) { + return; + } } } +catch (...) +{ + store_current (); +} void ServerFinder::listen_thread () -{ - while (1) { - shared_ptr sock (new Socket (10)); +try { + using namespace boost::asio::ip; - try { - sock->accept (Config::instance()->server_port_base() + 1); - } catch (std::exception& e) { - continue; - } - - 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); + 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."))); + } - boost::mutex::scoped_lock lm (_mutex); + start_accept (); + _listen_io_service.run (); +} +catch (...) +{ + store_current (); +} - string const ip = sock->socket().remote_endpoint().address().to_string (); - list::const_iterator i = _servers.begin(); - while (i != _servers.end() && i->host_name() != ip) { - ++i; - } +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) + ); +} - if (i == _servers.end ()) { - ServerDescription sd (ip, xml->number_child ("Threads")); +void +ServerFinder::handle_accept (boost::system::error_code ec, shared_ptr socket) +{ + 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)) { + ServerDescription sd (ip, xml->number_child ("Threads")); + { + boost::mutex::scoped_lock lm (_mutex); _servers.push_back (sd); - ui_signaller->emit (boost::bind (boost::ref (ServerFound), sd)); } + emit (boost::bind (boost::ref (ServerFound), sd)); } + + start_accept (); } -void -ServerFinder::connect (boost::function fn) +bool +ServerFinder::server_found (string ip) const { - if (_disabled) { - return; + boost::mutex::scoped_lock lm (_mutex); + list::const_iterator i = _servers.begin(); + while (i != _servers.end() && i->host_name() != ip) { + ++i; } - + + return i != _servers.end (); +} + +boost::signals2::connection +ServerFinder::connect (boost::function fn) +{ boost::mutex::scoped_lock lm (_mutex); /* Emit the current list of servers */ @@ -133,7 +200,7 @@ ServerFinder::connect (boost::function fn) fn (*i); } - ServerFound.connect (fn); + return ServerFound.connect (fn); } ServerFinder* @@ -146,5 +213,9 @@ ServerFinder::instance () return _instance; } - - +void +ServerFinder::drop () +{ + delete _instance; + _instance = 0; +}