X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcpomatic_socket.h;h=7dff979e0d36b07e29bc211057a54b9cae16ef16;hb=HEAD;hp=82ca5ff694bac96d0605553e36ecf89d9c3597ba;hpb=bfe277e664a03ec47cd6bee7e1b1e4aca6eb38e6;p=dcpomatic.git

diff --git a/src/lib/dcpomatic_socket.h b/src/lib/dcpomatic_socket.h
index 82ca5ff69..7dff979e0 100644
--- a/src/lib/dcpomatic_socket.h
+++ b/src/lib/dcpomatic_socket.h
@@ -1,23 +1,26 @@
 /*
     Copyright (C) 2012-2015 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 "digester.h"
 #include <boost/asio.hpp>
+#include <boost/scoped_ptr.hpp>
 
 /** @class Socket
  *  @brief A class to wrap a boost::asio::ip::tcp::socket with some things
@@ -26,31 +29,64 @@
  *  This class wraps some things that I could not work out how to do easily with boost;
  *  most notably, sync read/write calls with timeouts.
  */
-class Socket : public boost::noncopyable
+class Socket
 {
 public:
-	Socket (int timeout = 30);
+	explicit Socket (int timeout = 30);
+
+	Socket (Socket const&) = delete;
+	Socket& operator= (Socket const&) = delete;
 
 	/** @return Our underlying socket */
 	boost::asio::ip::tcp::socket& socket () {
 		return _socket;
 	}
 
+	void set_send_buffer_size (int size);
 	void connect (boost::asio::ip::tcp::endpoint);
 
 	void write (uint32_t n);
 	void write (uint8_t const * data, int size);
-	
+
 	void read (uint8_t* data, int size);
 	uint32_t read_uint32 ();
-	
+
+	class ReadDigestScope
+	{
+	public:
+		ReadDigestScope (std::shared_ptr<Socket> socket);
+		bool check ();
+	private:
+		std::weak_ptr<Socket> _socket;
+	};
+
+	/** After one of these is created everything that is sent from the socket will be
+	 *  added to a digest.  When the DigestScope is destroyed the digest will be sent
+	 *  from the socket.
+	 */
+	class WriteDigestScope
+	{
+	public:
+		WriteDigestScope (std::shared_ptr<Socket> socket);
+		~WriteDigestScope ();
+	private:
+		std::weak_ptr<Socket> _socket;
+	};
+
 private:
-	void check ();
+	friend class DigestScope;
 
-	Socket (Socket const &);
+	void check ();
+	void start_read_digest ();
+	bool check_read_digest ();
+	void start_write_digest ();
+	void finish_write_digest ();
 
 	boost::asio::io_service _io_service;
 	boost::asio::deadline_timer _deadline;
 	boost::asio::ip::tcp::socket _socket;
 	int _timeout;
+	boost::scoped_ptr<Digester> _read_digester;
+	boost::scoped_ptr<Digester> _write_digester;
+	boost::optional<int> _send_buffer_size;
 };