X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.cpp;h=5f155c0a699a7723fc0aac09083de1df2eb78aee;hp=f47de543e2b69a1350138ab0cb3c0f979fe07484;hb=6861e5c337ba300c61d8b64a3837bb43458caa3f;hpb=286d8e26057bda2f472bbefbb7792ff2ca9f1b65

diff --git a/server.cpp b/server.cpp
index f47de54..5f155c0 100644
--- a/server.cpp
+++ b/server.cpp
@@ -69,7 +69,8 @@ Stream::~Stream()
 }
 
 Stream::Stream(const StreamProto &serialized)
-	: header(serialized.header()),
+	: stream_id(serialized.stream_id()),
+	  header(serialized.header()),
 	  data(new char[BACKLOG_SIZE]),
 	  data_size(serialized.data_size())
 {
@@ -83,6 +84,7 @@ StreamProto Stream::serialize() const
 	serialized.set_header(header);
 	serialized.set_data(string(data, data + BACKLOG_SIZE));
 	serialized.set_data_size(data_size);
+	serialized.set_stream_id(stream_id);
 	return serialized;
 }
 
@@ -97,6 +99,11 @@ Server::Server()
 	}
 }
 
+Server::~Server()
+{
+	close(epoll_fd);
+}
+
 void Server::run()
 {
 	should_stop = false;
@@ -189,12 +196,40 @@ void Server::add_client(int sock)
 		exit(1);
 	}
 }
-	
+
+void Server::add_client_from_serialized(const ClientProto &client)
+{
+	MutexLock lock(&mutex);
+	clients.insert(make_pair(client.sock(), Client(client)));
+
+	// Start listening on data from this socket.
+	epoll_event ev;
+	if (client.state() == Client::READING_REQUEST) {
+		ev.events = EPOLLIN | EPOLLRDHUP;
+	} else {
+		// If we don't have more data for this client, we'll be putting it into
+		// the sleeping array again soon.
+		ev.events = EPOLLOUT | EPOLLRDHUP;
+	}
+	ev.data.u64 = 0;  // Keep Valgrind happy.
+	ev.data.fd = client.sock();
+	if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, client.sock(), &ev) == -1) {
+		perror("epoll_ctl(EPOLL_CTL_ADD)");
+		exit(1);
+	}
+}
+
 void Server::add_stream(const string &stream_id)
 {
 	MutexLock lock(&mutex);
 	streams.insert(make_pair(stream_id, new Stream(stream_id)));
 }
+
+void Server::add_stream_from_serialized(const StreamProto &stream)
+{
+	MutexLock lock(&mutex);
+	streams.insert(make_pair(stream.stream_id(), new Stream(stream)));
+}
 	
 void Server::set_header(const string &stream_id, const string &header)
 {