/*
- 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
*/
#include <libcxml/cxml.h>
+#include <dcp/raw_convert.h>
#include "server_finder.h"
#include "exceptions.h"
#include "util.h"
#include "ui_signaller.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 dcp::raw_convert;
+
+ServerFinder* ServerFinder::_instance = 0;
ServerFinder::ServerFinder ()
- : _broadcast_thread (0)
+ : _disabled (false)
+ , _broadcast_thread (0)
, _listen_thread (0)
- , _terminate (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 ()
-{
- {
- boost::mutex::scoped_lock lm (_mutex);
- _terminate = true;
- }
-
- if (_broadcast_thread && _broadcast_thread->joinable ()) {
- _broadcast_thread->join ();
- }
- delete _broadcast_thread;
-
- if (_listen_thread && _listen_thread->joinable ()) {
- _listen_thread->join ();
- }
- delete _listen_thread;
-}
-
void
ServerFinder::broadcast_thread ()
+try
{
boost::system::error_code error;
boost::asio::io_service io_service;
socket.set_option (boost::asio::ip::udp::socket::reuse_address (true));
socket.set_option (boost::asio::socket_base::broadcast (true));
+
+ string const data = DCPOMATIC_HELLO;
- boost::asio::ip::udp::endpoint end_point (boost::asio::ip::address_v4::broadcast(), Config::instance()->server_port_base() + 1);
+ while (true) {
+ 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 (...) {
- while (1) {
- boost::mutex::scoped_lock lm (_mutex);
- if (_terminate) {
- socket.close (error);
- return;
+ }
}
-
- string data = DCPOMATIC_HELLO;
- socket.send_to (boost::asio::buffer (data.c_str(), data.size() + 1), end_point);
- lm.unlock ();
+ /* 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, 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 (...) {
+
+ }
+ }
+
dcpomatic_sleep (10);
}
}
+catch (...)
+{
+ store_current ();
+}
void
ServerFinder::listen_thread ()
+try
{
- while (1) {
- {
- /* See if we need to stop */
- boost::mutex::scoped_lock lm (_mutex);
- if (_terminate) {
- return;
- }
- }
-
- shared_ptr<Socket> sock (new Socket (10));
+ while (true) {
+ shared_ptr<Socket> sock (new Socket (60));
try {
sock->accept (Config::instance()->server_port_base() + 1);
scoped_array<char> buffer (new char[length]);
sock->read (reinterpret_cast<uint8_t*> (buffer.get()), length);
- stringstream s (buffer.get());
+ string s (buffer.get());
shared_ptr<cxml::Document> xml (new cxml::Document ("ServerAvailable"));
- xml->read_stream (s);
+ xml->read_string (s);
+
+ string const ip = sock->socket().remote_endpoint().address().to_string ();
+ 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 ();
+}
- ui_signaller->emit (boost::bind (boost::ref (ServerFound), ServerDescription (
- sock->socket().remote_endpoint().address().to_string (),
- xml->number_child<int> ("Threads")
- )));
+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)
+{
+ if (_disabled) {
+ return;
+ }
+
+ boost::mutex::scoped_lock lm (_mutex);
+
+ /* Emit the current list of servers */
+ for (list<ServerDescription>::iterator i = _servers.begin(); i != _servers.end(); ++i) {
+ fn (*i);
+ }
+
+ ServerFound.connect (fn);
+}
+
+ServerFinder*
+ServerFinder::instance ()
+{
+ if (!_instance) {
+ _instance = new ServerFinder ();
+ }
+
+ return _instance;
+}
+
+
+
projects / dcpomatic.git / blobdiff