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

diff --git a/source/net/communicator.cpp b/source/net/communicator.cpp
index 07a8494..3ac62d7 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;
 };
 
 
@@ -24,25 +23,20 @@ public:
 HandshakeProtocol::HandshakeProtocol():
 	Protocol(0x7F00)
 {
-	add<Handshake>()(&Handshake::hash);
+	add<Handshake>(&Handshake::hash);
 }
 
 
 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;
@@ -58,13 +52,10 @@ Communicator::Communicator(StreamSocket &s, const Protocol &p, ReceiverBase &r):
 	socket(s),
 	protocol(p),
 	receiver(r),
-	handshake_status(0),
-	buf_size(65536),
 	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));
 }