X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=serverpool.cpp;h=85561278e6222995f7f863ed48e6a03424597686;hb=3b73724f08274a2c5a435d6a834bc10fcf3db41b;hp=2c663fbce37dd3d4e851a05de866bc7ceb9fb7e6;hpb=6544fa0ec3f3a501bcb89ea977756911bd7f3ebd;p=cubemap

diff --git a/serverpool.cpp b/serverpool.cpp
index 2c663fb..8556127 100644
--- a/serverpool.cpp
+++ b/serverpool.cpp
@@ -26,8 +26,8 @@ ServerPool::~ServerPool()
 {
 	delete[] servers;
 
-	for (size_t i = 0; i < udp_streams.size(); ++i) {
-		delete udp_streams[i];
+	for (UDPStream *udp_stream : udp_streams) {
+		delete udp_stream;
 	}
 }
 	
@@ -49,17 +49,17 @@ CubemapStateProto ServerPool::serialize()
 				state.mutable_streams(j)->add_data_fds(local_state.streams(j).data_fds(0));
 			}
 		}
-		for (int j = 0; j < local_state.clients_size(); ++j) {
-			state.add_clients()->MergeFrom(local_state.clients(j));
+		for (const ClientProto &client : local_state.clients()) {
+			state.add_clients()->MergeFrom(client);
 		}
         }
 
 	return state;
 }
 
-void ServerPool::add_client(int sock)
+void ServerPool::add_client(int sock, Acceptor *acceptor)
 {
-	servers[clients_added++ % num_servers].add_client_deferred(sock);
+	servers[clients_added++ % num_servers].add_client_deferred(sock, acceptor);
 }
 
 void ServerPool::add_client_from_serialized(const ClientProto &client)
@@ -147,7 +147,7 @@ void ServerPool::set_header(int stream_index, const string &http_header, const s
 	}
 }
 
-void ServerPool::add_data(int stream_index, const char *data, size_t bytes, StreamStartSuitability suitable_for_stream_start)
+void ServerPool::add_data(int stream_index, const char *data, size_t bytes, uint16_t metacube_flags)
 {
 	assert(stream_index >= 0 && stream_index < ssize_t(num_http_streams + udp_streams.size()));
 
@@ -159,7 +159,7 @@ void ServerPool::add_data(int stream_index, const char *data, size_t bytes, Stre
 
 	// HTTP stream.
 	for (int i = 0; i < num_servers; ++i) {
-		servers[i].add_data_deferred(stream_index, data, bytes, suitable_for_stream_start);
+		servers[i].add_data_deferred(stream_index, data, bytes, metacube_flags);
 	}
 }
 
@@ -170,6 +170,13 @@ void ServerPool::add_gen204(const std::string &url, const std::string &allow_ori
 	}
 }
 
+void ServerPool::create_tls_context_for_acceptor(const Acceptor *acceptor)
+{
+	for (int i = 0; i < num_servers; ++i) {
+		servers[i].create_tls_context_for_acceptor(acceptor);
+	}
+}
+
 void ServerPool::run()
 {
 	for (int i = 0; i < num_servers; ++i) {