Refactor most of Communicator::send to be in the .cpp file

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

diff --git a/source/net/communicator.cpp b/source/net/communicator.cpp
index c9b277d3748de137381b0df792d5230b0e8e0c62..92279c24e642bc7c6f9c2b80eba60f69d1b9c8a2 100644 (file)
--- a/source/net/communicator.cpp
+++ b/source/net/communicator.cpp
@@ -1,5 +1,8 @@
 #include <cstring>
 #include "communicator.h"
+#include "streamsocket.h"
+
+using namespace std;
 
 namespace {
 
@@ -80,14 +83,35 @@ 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)
                return;
 
-       in_end += socket.read(in_end, in_buf+buf_size-in_end);
        try
        {
+               in_end += socket.read(in_end, in_buf+buf_size-in_end);
+
                bool more = true;
                while(more)
                {
@@ -114,10 +138,12 @@ void Communicator::data_available()
                        }
                }
        }
-       catch(...)
+       catch(const exception &e)
        {
                good = false;
-               throw;
+               if(signal_error.empty())
+                       throw;
+               signal_error.emit(e);
        }
 }
 
@@ -128,7 +154,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
@@ -150,7 +176,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);
 }