X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.cpp;h=093899939b4d832be6dd28a8a3e8966d46efa650;hp=288224cc287dff9480b5443fd83453a9bba6d88b;hb=c2080e598ec887ac7b087dbc287c42a14881d667;hpb=ce0d42a14da5686366d0c73fa9b152e90619ff91

diff --git a/server.cpp b/server.cpp
index 288224c..0938999 100644
--- a/server.cpp
+++ b/server.cpp
@@ -252,19 +252,6 @@ void Server::set_header(int stream_index, const string &http_header, const strin
 	assert(stream_index >= 0 && stream_index < ssize_t(streams.size()));
 	streams[stream_index]->http_header = http_header;
 	streams[stream_index]->stream_header = stream_header;
-
-	// If there are clients we haven't sent anything to yet, we should give
-	// them the header, so push back into the SENDING_HEADER state.
-	for (map<int, Client>::iterator client_it = clients.begin();
-	     client_it != clients.end();
-	     ++client_it) {
-		Client *client = &client_it->second;
-		if (client->state == Client::WAITING_FOR_KEYFRAME ||
-		    (client->state == Client::SENDING_DATA &&
-		     client->stream_pos == 0)) {
-			construct_header(client);
-		}
-	}
 }
 	
 void Server::set_mark_pool(int stream_index, MarkPool *mark_pool)
@@ -482,6 +469,9 @@ sending_data_again:
 void Server::skip_lost_data(Client *client)
 {
 	Stream *stream = client->stream;
+	if (stream == NULL) {
+		return;
+	}
 	size_t bytes_to_send = stream->bytes_received - client->stream_pos;
 	if (bytes_to_send > stream->backlog_size) {
 		size_t bytes_lost = bytes_to_send - stream->backlog_size;
@@ -525,8 +515,13 @@ int Server::parse_request(Client *client)
 		return 404;  // Not found.
 	}
 
+	Stream *stream = streams[url_map_it->second];
+	if (stream->http_header.empty()) {
+		return 503;  // Service unavailable.
+	}
+
 	client->url = request_tokens[1];
-	client->stream = streams[url_map_it->second];
+	client->stream = stream;
 	if (client->stream->mark_pool != NULL) {
 		client->fwmark = client->stream->mark_pool->get_mark();
 	} else {
@@ -538,7 +533,7 @@ int Server::parse_request(Client *client)
 		}
 	}
 	if (setsockopt(client->sock, SOL_SOCKET, SO_MAX_PACING_RATE, &client->stream->pacing_rate, sizeof(client->stream->pacing_rate)) == -1) {
-		if (client->stream->pacing_rate != 0) {
+		if (client->stream->pacing_rate != ~0U) {
 			log_perror("setsockopt(SO_MAX_PACING_RATE)");
 		}
 	}