X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnet%2Fcommunicator.cpp;h=05ef0ea86e0f4e9a6f6710864537a800e61ff663;hb=f97f21c17f24e1d426e5b5863676071a5809b185;hp=22a79631d9a214741fdbf71721d8e6322986ea4e;hpb=8248f2912454229f4ded72b8fb4db3e76ea3ad15;p=libs%2Fnet.git

diff --git a/source/net/communicator.cpp b/source/net/communicator.cpp
index 22a7963..05ef0ea 100644
--- a/source/net/communicator.cpp
+++ b/source/net/communicator.cpp
@@ -1,6 +1,5 @@
 #include <cstring>
 #include "communicator.h"
-#include "protocol_impl.h"
 #include "streamsocket.h"
 
 using namespace std;
@@ -11,7 +10,7 @@ using namespace Msp::Net;
 
 struct Handshake
 {
-	Msp::UInt64 hash;
+	uint64_t hash;
 };
 
 
@@ -31,12 +30,12 @@ HandshakeProtocol::HandshakeProtocol():
 class HandshakeReceiver: public PacketReceiver<Handshake>
 {
 private:
-	Msp::UInt64 hash;
+	uint64_t hash;
 
 public:
 	HandshakeReceiver();
-	Msp::UInt64 get_hash() const { return hash; }
-	virtual void receive(const Handshake &);
+	uint64_t get_hash() const { return hash; }
+	void receive(const Handshake &) override;
 };
 
 HandshakeReceiver::HandshakeReceiver():
@@ -84,7 +83,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");
@@ -161,7 +160,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 +175,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);
 }