Some largely cosmetic touch-up

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

diff --git a/source/net/communicator.cpp b/source/net/communicator.cpp
index 92279c24e642bc7c6f9c2b80eba60f69d1b9c8a2..051e45a14bbb4f33d262429df400fe4f6b6b60dd 100644 (file)
--- a/source/net/communicator.cpp
+++ b/source/net/communicator.cpp
@@ -10,7 +10,7 @@ using namespace Msp::Net;
 
 struct Handshake
 {
-       unsigned hash;
+       Msp::UInt64 hash;
 };
 
 
@@ -30,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 &);
 };
 
@@ -116,24 +116,23 @@ void Communicator::data_available()
                while(more)
                {
                        if(handshake_status==2)
-                       {
                                more = receive_packet(protocol, receiver);
-                       }
                        else
                        {
                                HandshakeProtocol hsproto;
                                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");
                                }
                        }
                }