X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnet%2Fcommunicator.h;h=822b16ef998dbd706d1ea1617950175d488496ca;hb=3ab65d35cfd696002e09768a38f98e6a2e1ade81;hp=62521ee8926346fed24dabccc9a7af3189efff39;hpb=6df110603b3a1248f52741e9d68d0bd032171b60;p=libs%2Fnet.git

diff --git a/source/net/communicator.h b/source/net/communicator.h
index 62521ee..822b16e 100644
--- a/source/net/communicator.h
+++ b/source/net/communicator.h
@@ -1,6 +1,7 @@
 #ifndef MSP_NET_COMMUNICATOR_H_
 #define MSP_NET_COMMUNICATOR_H_
 
+#include <msp/core/except.h>
 #include <sigc++/signal.h>
 #include "protocol.h"
 
@@ -9,10 +10,10 @@ 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) { }
+	sequence_error(const std::string &w): invalid_state(w) { }
 };
 
 class incompatible_protocol: public std::runtime_error
@@ -32,13 +33,13 @@ private:
 	StreamSocket &socket;
 	const Protocol &protocol;
 	ReceiverBase &receiver;
-	int handshake_status;
-	std::size_t 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 &);