X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnet%2Fcommunicator.cpp;h=3ac62d7e4be0906f270582ddd2576f32b346a381;hb=1565dec0f4a86e4bda7095dd7415234f7c7a84e9;hp=92279c24e642bc7c6f9c2b80eba60f69d1b9c8a2;hpb=400f3e031834eee9d96dbd5cda25655102b75805;p=libs%2Fnet.git

diff --git a/source/net/communicator.cpp b/source/net/communicator.cpp
index 92279c2..3ac62d7 100644
--- a/source/net/communicator.cpp
+++ b/source/net/communicator.cpp
@@ -10,7 +10,7 @@ using namespace Msp::Net;
 
 struct Handshake
 {
-	unsigned hash;
+	uint64_t hash;
 };
 
 
@@ -23,25 +23,20 @@ public:
 HandshakeProtocol::HandshakeProtocol():
 	Protocol(0x7F00)
 {
-	add<Handshake>()(&Handshake::hash);
+	add<Handshake>(&Handshake::hash);
 }
 
 
 class HandshakeReceiver: public PacketReceiver<Handshake>
 {
 private:
-	unsigned hash;
+	uint64_t hash = 0;
 
 public:
-	HandshakeReceiver();
-	unsigned get_hash() const { return hash; }
-	virtual void receive(const Handshake &);
+	uint64_t get_hash() const { return hash; }
+	void receive(const Handshake &) override;
 };
 
-HandshakeReceiver::HandshakeReceiver():
-	hash(0)
-{ }
-
 void HandshakeReceiver::receive(const Handshake &shake)
 {
 	hash = shake.hash;
@@ -57,13 +52,10 @@ Communicator::Communicator(StreamSocket &s, const Protocol &p, ReceiverBase &r):
 	socket(s),
 	protocol(p),
 	receiver(r),
-	handshake_status(0),
-	buf_size(1024),
 	in_buf(new char[buf_size]),
 	in_begin(in_buf),
 	in_end(in_buf),
-	out_buf(new char[buf_size]),
-	good(true)
+	out_buf(new char[buf_size])
 {
 	socket.signal_data_available.connect(sigc::mem_fun(this, &Communicator::data_available));
 }
@@ -83,7 +75,7 @@ void Communicator::initiate_handshake()
 	handshake_status = 1;
 }
 
-void Communicator::send_data(unsigned size)
+void Communicator::send_data(size_t size)
 {
 	if(!good)
 		throw sequence_error("connection aborted");
@@ -116,24 +108,23 @@ void Communicator::data_available()
 		while(more)
 		{
 			if(handshake_status==2)
-			{
 				more = receive_packet(protocol, receiver);
-			}
 			else
 			{
 				HandshakeProtocol hsproto;
 				HandshakeReceiver hsrecv;
 				if((more = receive_packet(hsproto, hsrecv)))
 				{
+					if(handshake_status==0)
+						send_handshake();
+
 					if(hsrecv.get_hash()==protocol.get_hash())
 					{
-						if(handshake_status==0)
-							send_handshake();
 						handshake_status = 2;
 						signal_handshake_done.emit();
 					}
 					else
-						good = false;
+						throw incompatible_protocol("hash mismatch");
 				}
 			}
 		}
@@ -161,7 +152,7 @@ bool Communicator::receive_packet(const Protocol &proto, ReceiverBase &recv)
 	{
 		if(in_end==in_buf+buf_size)
 		{
-			unsigned used = in_end-in_begin;
+			size_t used = in_end-in_begin;
 			memmove(in_buf, in_begin, used);
 			in_begin = in_buf;
 			in_end = in_begin+used;
@@ -176,7 +167,7 @@ void Communicator::send_handshake()
 	shake.hash = protocol.get_hash();
 
 	HandshakeProtocol hsproto;
-	unsigned size = hsproto.serialize(shake, out_buf, buf_size);
+	size_t size = hsproto.serialize(shake, out_buf, buf_size);
 	socket.write(out_buf, size);
 }