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

diff --git a/source/net/communicator.h b/source/net/communicator.h
index 8530db1..822b16e 100644
--- a/source/net/communicator.h
+++ b/source/net/communicator.h
@@ -1,17 +1,25 @@
 #ifndef MSP_NET_COMMUNICATOR_H_
 #define MSP_NET_COMMUNICATOR_H_
 
+#include <msp/core/except.h>
+#include <sigc++/signal.h>
 #include "protocol.h"
-#include "streamsocket.h"
 
 namespace Msp {
 namespace Net {
 
-class sequence_error: public std::logic_error
+class StreamSocket;
+
+class sequence_error: public invalid_state
+{
+public:
+	sequence_error(const std::string &w): invalid_state(w) { }
+};
+
+class incompatible_protocol: public std::runtime_error
 {
 public:
-	sequence_error(const std::string &w): std::logic_error(w) { }
-	virtual ~sequence_error() throw() { }
+	incompatible_protocol(const std::string &w): std::runtime_error(w) { }
 };
 
 
@@ -19,18 +27,19 @@ class Communicator
 {
 public:
 	sigc::signal<void> signal_handshake_done;
+	sigc::signal<void, const std::exception &> signal_error;
 
 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 &);
@@ -40,22 +49,22 @@ public:
 	bool is_handshake_done() const { return handshake_status==2; }
 
 	template<typename P>
-	void send(const P &pkt)
-	{
-		if(!good)
-			throw sequence_error("connection aborted");
-		if(handshake_status!=2)
-			throw sequence_error("handshaking not done");
-		unsigned size = protocol.assemble(pkt, out_buf, buf_size);
-		socket.write(out_buf, size);
-	}
+	void send(const P &);
 
 private:
+	void send_data(std::size_t);
+
 	void data_available();
 	bool receive_packet(const Protocol &, ReceiverBase &);
 	void send_handshake();
 };
 
+template<typename P>
+void Communicator::send(const P &pkt)
+{
+	send_data(protocol.serialize(pkt, out_buf, buf_size));
+}
+
 } // namespace Net
 } // namespace Msp