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

diff --git a/server.cpp b/server.cpp
index f5c117b..69615e7 100644
--- a/server.cpp
+++ b/server.cpp
@@ -18,9 +18,43 @@
 #include "metacube.h"
 #include "server.h"
 #include "mutexlock.h"
+#include "state.pb.h"
 
 using namespace std;
 
+Client::Client(int sock)
+	: 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()
 {
 	pthread_mutex_init(&mutex, NULL);
@@ -96,14 +130,7 @@ void Server::do_work()
 void Server::add_client(int sock)
 {
 	MutexLock lock(&mutex);
-	Client new_client;
-	new_client.sock = sock;
-	new_client.request.reserve(1024);
-	new_client.state = Client::READING_REQUEST;
-	new_client.header_bytes_sent = 0;
-	new_client.bytes_sent = 0;
-
-	clients.insert(make_pair(sock, new_client));
+	clients.insert(make_pair(sock, Client(sock)));
 
 	// Start listening on data from this socket.
 	epoll_event ev;