X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.cpp;h=69615e705aba182b9fbbf168c56ea5c78931695c;hp=6dcddf0b4431e983909e012cb863636f6ccab635;hb=1d995a9b2f2d56fb66192b8404c9f5591af9ff75;hpb=771355dc2b3ac9d076482148a03591debb97f62e

diff --git a/server.cpp b/server.cpp
index 6dcddf0..69615e7 100644
--- a/server.cpp
+++ b/server.cpp
@@ -18,16 +18,42 @@
 #include "metacube.h"
 #include "server.h"
 #include "mutexlock.h"
+#include "state.pb.h"
 
 using namespace std;
 
 Client::Client(int sock)
-	: state(Client::READING_REQUEST),
+	: sock(sock),
+	  state(Client::READING_REQUEST),
 	  header_bytes_sent(0),
 	  bytes_sent(0)
 {
 	request.reserve(1024);
 }
+	
+Client::Client(const ClientProto &serialized)
+	: sock(serialized.sock()),
+	  state(State(serialized.state())),
+	  request(serialized.request()),
+	  stream_id(serialized.stream_id()),
+	  header(serialized.header()),
+	  header_bytes_sent(serialized.header_bytes_sent()),
+	  bytes_sent(serialized.bytes_sent())
+{
+}
+
+ClientProto Client::serialize() const
+{
+	ClientProto serialized;
+	serialized.set_sock(sock);
+	serialized.set_state(state);
+	serialized.set_request(request);
+	serialized.set_stream_id(stream_id);
+	serialized.set_header(header);
+	serialized.set_header_bytes_sent(serialized.header_bytes_sent());
+	serialized.set_bytes_sent(bytes_sent);
+	return serialized;
+}
 
 Server::Server()
 {