/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ DCP-o-matic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
+
#include "server.h"
#include "dcpomatic_socket.h"
+
#include "i18n.h"
-using boost::shared_ptr;
-Server::Server (int port)
+using std::make_shared;
+using std::shared_ptr;
+
+
+Server::Server (int port, int timeout)
: _terminate (false)
, _acceptor (_io_service, boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), port))
+ , _timeout (timeout)
{
}
+
Server::~Server ()
{
- boost::mutex::scoped_lock lm (_mutex);
- _terminate = true;
- _io_service.stop ();
+ {
+ boost::mutex::scoped_lock lm (_mutex);
+ _terminate = true;
+ }
+
+ _acceptor.close ();
+ stop ();
}
+
void
Server::run ()
{
_io_service.run ();
}
+
void
Server::start_accept ()
{
}
}
- shared_ptr<Socket> socket (new Socket);
+ auto socket = make_shared<Socket>(_timeout);
_acceptor.async_accept (socket->socket (), boost::bind (&Server::handle_accept, this, socket, boost::asio::placeholders::error));
}
+
void
Server::handle_accept (shared_ptr<Socket> socket, boost::system::error_code const & error)
{
handle (socket);
start_accept ();
}
+
+
+void
+Server::stop ()
+{
+ _io_service.stop ();
+}