X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnet%2Fcommunicator.cpp;h=f77ada2159d427788a74a414285aaa67a3ad1ee4;hb=6625cf0e574406425c35d33110f8d99617e902df;hp=07c3be4f6b1d7c25623a957217a98f5bccea21a6;hpb=df1b7561be0d4a57e964c783c01060c54864ec60;p=libs%2Fnet.git

diff --git a/source/net/communicator.cpp b/source/net/communicator.cpp
index 07c3be4..f77ada2 100644
--- a/source/net/communicator.cpp
+++ b/source/net/communicator.cpp
@@ -10,7 +10,7 @@ using namespace Msp::Net;
 
 struct Handshake
 {
-	Msp::UInt64 hash;
+	uint64_t hash;
 };
 
 
@@ -30,18 +30,13 @@ HandshakeProtocol::HandshakeProtocol():
 class HandshakeReceiver: public PacketReceiver<Handshake>
 {
 private:
-	Msp::UInt64 hash;
+	uint64_t hash = 0;
 
 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():
-	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,9 +108,7 @@ void Communicator::data_available()
 		while(more)
 		{
 			if(handshake_status==2)
-			{
 				more = receive_packet(protocol, receiver);
-			}
 			else
 			{
 				HandshakeProtocol hsproto;
@@ -162,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;
@@ -177,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);
 }