X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnet%2Fcommunicator.cpp;h=f77ada2159d427788a74a414285aaa67a3ad1ee4;hb=e900bb4a8fe086fac55ffe51c75915be0003c5e4;hp=c473d53a7e06a5ead67d4e8ca76cdbd826cc478d;hpb=2fbfce0c327c852d33c6713af646abf07b241108;p=libs%2Fnet.git diff --git a/source/net/communicator.cpp b/source/net/communicator.cpp index c473d53..f77ada2 100644 --- a/source/net/communicator.cpp +++ b/source/net/communicator.cpp @@ -1,6 +1,5 @@ #include #include "communicator.h" -#include "protocol_impl.h" #include "streamsocket.h" using namespace std; @@ -31,18 +30,13 @@ HandshakeProtocol::HandshakeProtocol(): class HandshakeReceiver: public PacketReceiver { private: - uint64_t hash; + uint64_t hash = 0; public: - HandshakeReceiver(); uint64_t get_hash() const { return hash; } - virtual void receive(const Handshake &); + 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)); }