X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.cpp;h=0b399e4893d25727cff6e3b723426758d89229c3;hp=25da16cba4c341e0c07b8d06eb4239a63a0f476c;hb=eb33692c9edee93e0883cd9f980d48dc7e17d801;hpb=cfe0df3728d8155fb03688f6db69e00971e23685;ds=sidebyside

diff --git a/server.cpp b/server.cpp
index 25da16c..0b399e4 100644
--- a/server.cpp
+++ b/server.cpp
@@ -94,13 +94,15 @@ void Server::add_client(int sock)
 	
 void Server::add_stream(const string &stream_id)
 {
-	// TODO
+	MutexLock lock(&mutex);
+	streams.insert(make_pair(stream_id, Stream()));
 }
 	
 void Server::set_header(const string &stream_id, const string &header)
 {
-	// TODO
-	printf("got header! %lu bytes\n", header.size());
+	MutexLock lock(&mutex);
+	assert(streams.count(stream_id) != 0);
+	streams[stream_id].header = header;
 }
 	
 void Server::add_data(const string &stream_id, const char *data, size_t bytes)
@@ -155,23 +157,62 @@ void Server::process_client(Client *client)
 			return;
 		}
 
-		client->state = Client::SENDING_HEADER;
-
-		epoll_event ev;
-		ev.events = EPOLLOUT | EPOLLRDHUP;
-		ev.data.fd = client->sock;
+		parse_request(client);
+		break;
+	}
+	case Client::SENDING_HEADER: {
+		int ret = write(client->sock,
+		                client->header.data() + client->header_bytes_sent,
+		                client->header.size() - client->header_bytes_sent);
+		if (ret == -1) {
+			perror("write");
+			close_client(client);
+			return;
+		}
+		
+		client->header_bytes_sent += ret;
+		assert(client->header_bytes_sent <= client->header.size());
 
-		if (epoll_ctl(epoll_fd, EPOLL_CTL_MOD, client->sock, &ev) == -1) {
-			perror("epoll_ctl(EPOLL_CTL_MOD)");
-			exit(1);
+		if (client->header_bytes_sent < client->header.size()) {
+			// We haven't sent all yet. Fine; we'll do that later.
+			return;
 		}
-		break;
+
+		// We're done sending the header! Clear the entire header to release some memory.
+		client->header.clear();
+
+		// Start sending from the end. In other words, we won't send any of the backlog,
+		// but we'll start sending immediately as we get data.
+		client->state = Client::SENDING_DATA;
+		client->bytes_sent = streams[client->stream_id].data_size;
 	}
 	default:
 		// TODO
 		assert(false);
 	}
 }
+
+void Server::parse_request(Client *client)
+{
+	// TODO: Actually parse the request. :-)
+	client->stream_id = "stream";
+
+	// Construct the header.
+	client->header = "HTTP/1.0 200 OK\r\nContent-type: todo/fixme\r\n\r\n" +
+		streams[client->stream_id].header;
+
+	// Switch states.
+	client->state = Client::SENDING_HEADER;
+
+	epoll_event ev;
+	ev.events = EPOLLOUT | EPOLLRDHUP;
+	ev.data.fd = client->sock;
+
+	if (epoll_ctl(epoll_fd, EPOLL_CTL_MOD, client->sock, &ev) == -1) {
+		perror("epoll_ctl(EPOLL_CTL_MOD)");
+		exit(1);
+	}
+}
 	
 void Server::close_client(Client *client)
 {