Acutally implement Protocol::get_hash

[libs/net.git] / source / net / communicator.cpp

diff --git a/source/net/communicator.cpp b/source/net/communicator.cpp
index 618e8b45e9e295f01fc4948ef19daecd56f51242..07c3be4f6b1d7c25623a957217a98f5bccea21a6 100644 (file)
--- a/source/net/communicator.cpp
+++ b/source/net/communicator.cpp
@@ -1,5 +1,6 @@
 #include <cstring>
 #include "communicator.h"
+#include "streamsocket.h"
 
 using namespace std;
 
@@ -9,7 +10,7 @@ using namespace Msp::Net;
 
 struct Handshake
 {
-       unsigned hash;
+       Msp::UInt64 hash;
 };
 
 
@@ -29,11 +30,11 @@ HandshakeProtocol::HandshakeProtocol():
 class HandshakeReceiver: public PacketReceiver<Handshake>
 {
 private:
-       unsigned hash;
+       Msp::UInt64 hash;
 
 public:
        HandshakeReceiver();
-       unsigned get_hash() const { return hash; }
+       Msp::UInt64 get_hash() const { return hash; }
        virtual void receive(const Handshake &);
 };
 
@@ -82,6 +83,26 @@ void Communicator::initiate_handshake()
        handshake_status = 1;
 }
 
+void Communicator::send_data(unsigned size)
+{
+       if(!good)
+               throw sequence_error("connection aborted");
+       if(handshake_status!=2)
+               throw sequence_error("handshake incomplete");
+
+       try
+       {
+               socket.write(out_buf, size);
+       }
+       catch(const std::exception &e)
+       {
+               good = false;
+               if(signal_error.empty())
+                       throw;
+               signal_error.emit(e);
+       }
+}
+
 void Communicator::data_available()
 {
        if(!good)
@@ -104,15 +125,16 @@ void Communicator::data_available()
                                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");
                                }
                        }
                }
@@ -133,7 +155,7 @@ bool Communicator::receive_packet(const Protocol &proto, ReceiverBase &recv)
        {
                char *pkt = in_begin;
                in_begin += psz;
-               proto.disassemble(recv, pkt, psz);
+               proto.dispatch(recv, pkt, psz);
                return true;
        }
        else
@@ -155,7 +177,7 @@ void Communicator::send_handshake()
        shake.hash = protocol.get_hash();
 
        HandshakeProtocol hsproto;
-       unsigned size = hsproto.assemble(shake, out_buf, buf_size);
+       unsigned size = hsproto.serialize(shake, out_buf, buf_size);
        socket.write(out_buf, size);
 }