X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.h;h=7d94e17b76fa811fb8e98c927bafd81e4c265fb0;hp=99009600a46f0401a325ced52e04f542c57b602f;hb=99646561978d4ed5be73f90441c5f64c4d64a0dc;hpb=6d062eab70fd6528219545846e6c19c1cad35a3d

diff --git a/server.h b/server.h
index 9900960..7d94e17 100644
--- a/server.h
+++ b/server.h
@@ -77,6 +77,7 @@ private:
 class Server {
 public:
 	Server();
+	~Server();
 
 	// Start a new thread that handles clients.
 	void run();
@@ -87,7 +88,11 @@ public:
 	CubemapStateProto serialize() const;
 
 	void add_client(int sock);
+	void add_client_from_serialized(const ClientProto &client);
+
 	void add_stream(const std::string &stream_id);
+	void add_stream_from_serialized(const StreamProto &stream);
+
 	void set_header(const std::string &stream_id, const std::string &header);
 	void add_data(const std::string &stream_id, const char *data, size_t bytes);
 
@@ -126,10 +131,13 @@ private:
 	// Close a given client socket, and clean up after it.
 	void close_client(Client *client);
 
-	// Parse the HTTP request, construct the header, and set the client into
-	// the SENDING_HEADER state.
+	// Parse the HTTP request.
 	void parse_request(Client *client);
 
+	// Construct the HTTP header, and set the client into
+	// the SENDING_HEADER state.
+	void construct_header(Client *client);
+
 	// Put client to sleep, since there is no more data for it; we will on
 	// longer listen on POLLOUT until we get more data. Also, it will be put
 	// in the list of clients to wake up when we do.