/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2020 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 "dcpomatic_socket.h"
#include "compose.hpp"
#include "exceptions.h"
+#include "dcpomatic_assert.h"
#include <boost/bind.hpp>
#include <boost/lambda/lambda.hpp>
+#include <iostream>
#include "i18n.h"
+using boost::shared_ptr;
+using boost::weak_ptr;
+
+/** @param timeout Timeout in seconds */
Socket::Socket (int timeout)
: _deadline (_io_service)
, _socket (_io_service)
- , _acceptor (0)
, _timeout (timeout)
{
_deadline.expires_at (boost::posix_time::pos_infin);
check ();
}
-Socket::~Socket ()
-{
- delete _acceptor;
-}
-
void
Socket::check ()
{
if (_deadline.expires_at() <= boost::asio::deadline_timer::traits_type::now ()) {
- if (_acceptor) {
- _acceptor->cancel ();
- } else {
- _socket.close ();
- }
+ _socket.close ();
_deadline.expires_at (boost::posix_time::pos_infin);
}
}
}
-void
-Socket::accept (int port)
-{
- _acceptor = new boost::asio::ip::tcp::acceptor (_io_service, boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), port));
-
- _deadline.expires_from_now (boost::posix_time::seconds (_timeout));
- boost::system::error_code ec = boost::asio::error::would_block;
- _acceptor->async_accept (_socket, boost::lambda::var(ec) = boost::lambda::_1);
- do {
- _io_service.run_one ();
- } while (ec == boost::asio::error::would_block);
-
- delete _acceptor;
- _acceptor = 0;
-
- if (ec) {
- throw NetworkError (String::compose (_("error during async_accept (%1)"), ec.value ()));
- }
-}
-
/** Blocking write.
* @param data Buffer to write.
* @param size Number of bytes to write.
boost::system::error_code ec = boost::asio::error::would_block;
boost::asio::async_write (_socket, boost::asio::buffer (data, size), boost::lambda::var(ec) = boost::lambda::_1);
-
+
do {
_io_service.run_one ();
} while (ec == boost::asio::error::would_block);
if (ec) {
throw NetworkError (String::compose (_("error during async_write (%1)"), ec.value ()));
}
+
+ if (_write_digester) {
+ _write_digester->add (data, static_cast<size_t>(size));
+ }
}
void
do {
_io_service.run_one ();
} while (ec == boost::asio::error::would_block);
-
+
if (ec) {
throw NetworkError (String::compose (_("error during async_read (%1)"), ec.value ()));
}
+
+ if (_read_digester) {
+ _read_digester->add (data, static_cast<size_t>(size));
+ }
}
uint32_t
return ntohl (v);
}
+
+void
+Socket::start_read_digest ()
+{
+ DCPOMATIC_ASSERT (!_read_digester);
+ _read_digester.reset (new Digester());
+}
+
+void
+Socket::start_write_digest ()
+{
+ DCPOMATIC_ASSERT (!_write_digester);
+ _write_digester.reset (new Digester());
+}
+
+
+Socket::ReadDigestScope::ReadDigestScope (shared_ptr<Socket> socket)
+ : _socket (socket)
+{
+ socket->start_read_digest ();
+}
+
+
+bool
+Socket::ReadDigestScope::check ()
+{
+ shared_ptr<Socket> sp = _socket.lock ();
+ if (!sp) {
+ return false;
+ }
+
+ return sp->check_read_digest ();
+}
+
+
+Socket::WriteDigestScope::WriteDigestScope (shared_ptr<Socket> socket)
+ : _socket (socket)
+{
+ socket->start_write_digest ();
+}
+
+
+Socket::WriteDigestScope::~WriteDigestScope ()
+{
+ shared_ptr<Socket> sp = _socket.lock ();
+ if (sp) {
+ try {
+ sp->finish_write_digest ();
+ } catch (...) {
+ /* If we can't write our digest, something bad has happened
+ * so let's just let it happen.
+ */
+ }
+ }
+}
+
+
+bool
+Socket::check_read_digest ()
+{
+ DCPOMATIC_ASSERT (_read_digester);
+ int const size = _read_digester->size ();
+
+ uint8_t ref[size];
+ _read_digester->get (ref);
+
+ /* Make sure _read_digester is gone before we call read() so that the digest
+ * isn't itself digested.
+ */
+ _read_digester.reset ();
+
+ uint8_t actual[size];
+ read (actual, size);
+
+ return memcmp(ref, actual, size) == 0;
+}
+
+void
+Socket::finish_write_digest ()
+{
+ DCPOMATIC_ASSERT (_write_digester);
+ int const size = _write_digester->size();
+
+ uint8_t buffer[size];
+ _write_digester->get (buffer);
+
+ /* Make sure _write_digester is gone before we call write() so that the digest
+ * isn't itself digested.
+ */
+ _write_digester.reset ();
+
+ write (buffer, size);
+}
+
projects / dcpomatic.git / blobdiff