Remove a rather excessive log message.

[dcpomatic.git] / src / lib / dcpomatic_socket.cc

diff --git a/src/lib/dcpomatic_socket.cc b/src/lib/dcpomatic_socket.cc
index fa06918d420ce6fbc696d5c177f2ef2a2b52e1b8..8f8f639cc09be15f75e65c35b735abb69e5a303a 100644 (file)
--- a/src/lib/dcpomatic_socket.cc
+++ b/src/lib/dcpomatic_socket.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,15 +18,24 @@
 
 */
 
-#include "dcpomatic_socket.h"
+
 #include "compose.hpp"
+#include "dcpomatic_assert.h"
+#include "dcpomatic_log.h"
+#include "dcpomatic_socket.h"
 #include "exceptions.h"
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <iostream>
 
 #include "i18n.h"
 
+
+using std::shared_ptr;
+using std::weak_ptr;
+
+
+/** @param timeout Timeout in seconds */
 Socket::Socket (int timeout)
        : _deadline (_io_service)
        , _socket (_io_service)
@@ -47,6 +56,7 @@ Socket::check ()
        _deadline.async_wait (boost::bind (&Socket::check, this));
 }
 
+
 /** Blocking connect.
  *  @param endpoint End-point to connect to.
  */
@@ -67,8 +77,17 @@ Socket::connect (boost::asio::ip::tcp::endpoint endpoint)
        if (!_socket.is_open ()) {
                throw NetworkError (_("connect timed out"));
        }
+
+       if (_send_buffer_size) {
+               boost::asio::socket_base::send_buffer_size old_size;
+               _socket.get_option(old_size);
+
+               boost::asio::socket_base::send_buffer_size new_size(*_send_buffer_size);
+               _socket.set_option(new_size);
+       }
 }
 
+
 /** Blocking write.
  *  @param data Buffer to write.
  *  @param size Number of bytes to write.
@@ -88,8 +107,13 @@ Socket::write (uint8_t const * data, int size)
        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
 Socket::write (uint32_t v)
 {
@@ -97,6 +121,7 @@ Socket::write (uint32_t v)
        write (reinterpret_cast<uint8_t*> (&v), 4);
 }
 
+
 /** Blocking read.
  *  @param data Buffer to read to.
  *  @param size Number of bytes to read.
@@ -116,8 +141,13 @@ Socket::read (uint8_t* data, int size)
        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
 Socket::read_uint32 ()
 {
@@ -125,3 +155,107 @@ Socket::read_uint32 ()
        read (reinterpret_cast<uint8_t *> (&v), 4);
        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 ()
+{
+       auto 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 ()
+{
+       auto 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);
+}
+
+
+void
+Socket::set_send_buffer_size (int size)
+{
+       _send_buffer_size = size;
+}
+