X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnet%2Fcommunicator.h;h=b98f488ff3f63ef64016c6a22d23e4aaf188a93c;hb=1ccb251524403a7318908e076c4f805bd3927247;hp=63114fd9ba18cd09caa2124cca6b2119b6e1a7e8;hpb=df1b7561be0d4a57e964c783c01060c54864ec60;p=libs%2Fnet.git

diff --git a/source/net/communicator.h b/source/net/communicator.h
index 63114fd..b98f488 100644
--- a/source/net/communicator.h
+++ b/source/net/communicator.h
@@ -1,6 +1,8 @@
 #ifndef MSP_NET_COMMUNICATOR_H_
 #define MSP_NET_COMMUNICATOR_H_
 
+#include <msp/core/except.h>
+#include <msp/core/noncopyable.h>
 #include <sigc++/signal.h>
 #include "protocol.h"
 
@@ -9,22 +11,20 @@ namespace Net {
 
 class StreamSocket;
 
-class sequence_error: public std::logic_error
+class sequence_error: public invalid_state
 {
 public:
-	sequence_error(const std::string &w): std::logic_error(w) { }
-	virtual ~sequence_error() throw() { }
+	sequence_error(const std::string &w): invalid_state(w) { }
 };
 
 class incompatible_protocol: public std::runtime_error
 {
 public:
 	incompatible_protocol(const std::string &w): std::runtime_error(w) { }
-	virtual ~incompatible_protocol() throw() { }
 };
 
 
-class Communicator
+class Communicator: public NonCopyable
 {
 public:
 	sigc::signal<void> signal_handshake_done;
@@ -34,13 +34,13 @@ private:
 	StreamSocket &socket;
 	const Protocol &protocol;
 	ReceiverBase &receiver;
-	int handshake_status;
-	unsigned buf_size;
-	char *in_buf;
-	char *in_begin;
-	char *in_end;
-	char *out_buf;
-	bool good;
+	int handshake_status = 0;
+	std::size_t buf_size = 65536;
+	char *in_buf = nullptr;
+	char *in_begin = nullptr;
+	char *in_end = nullptr;
+	char *out_buf = nullptr;
+	bool good = true;
 
 public:
 	Communicator(StreamSocket &, const Protocol &, ReceiverBase &);
@@ -53,7 +53,7 @@ public:
 	void send(const P &);
 
 private:
-	void send_data(unsigned);
+	void send_data(std::size_t);
 
 	void data_available();
 	bool receive_packet(const Protocol &, ReceiverBase &);