X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=serverpool.h;h=61676281840f070bd2c70a722dd92f2a92b9d327;hp=e52aee8acf6ac92db9001dfbd72e12aa473c61af;hb=061988af511f42da3cd584b4d983177504ddc177;hpb=6544fa0ec3f3a501bcb89ea977756911bd7f3ebd

diff --git a/serverpool.h b/serverpool.h
index e52aee8..6167628 100644
--- a/serverpool.h
+++ b/serverpool.h
@@ -2,6 +2,7 @@
 #define _SERVERPOOL_H 1
 
 #include <stddef.h>
+#include <memory>
 #include <string>
 #include <vector>
 
@@ -10,6 +11,7 @@
 #include "stream.h"
 #include "udpstream.h"
 
+class Acceptor;
 class Server;
 class UDPStream;
 struct ClientStats;
@@ -19,14 +21,13 @@ struct sockaddr_in6;
 class ServerPool {
 public:
 	ServerPool(int num_servers);
-	~ServerPool();
 
 	// Fills streams() and clients().
 	CubemapStateProto serialize();
 
 	// Picks a server (round-robin) and allocates the given client to it.
-	void add_client(int sock);
-	void add_client_from_serialized(const ClientProto &client);
+	void add_client(int sock, Acceptor *acceptor);
+	void add_client_from_serialized(const ClientProto &client, const std::vector<std::shared_ptr<const std::string>> &short_responses);
 
 	// Adds the given stream to all the servers. Returns the stream index.
 	int add_stream(const std::string &url, size_t backlog_size, size_t prebuffering_bytes, Stream::Encoding encoding, Stream::Encoding src_encoding);
@@ -41,7 +42,7 @@ public:
 	void set_header(int stream_index,
 	                const std::string &http_header,
 	                const std::string &stream_header);
-	void add_data(int stream_index, const char *data, size_t bytes, StreamStartSuitability suitable_for_stream_start);
+	void add_data(int stream_index, const char *data, size_t bytes, uint16_t metacube_flags);
 
 	// Sets the max pacing rate for all the servers.
 	void set_pacing_rate(int stream_index, uint32_t pacing_rate);
@@ -61,6 +62,10 @@ public:
 	// Adds the given gen204 endpoint to all the servers.
 	void add_gen204(const std::string &url, const std::string &allow_origin);
 
+	// Prepares all the servers for accepting TLS connections from the given acceptor.
+	// (They need a private context, since the contexts are not definde to be thread-safe.)
+	void create_tls_context_for_acceptor(const Acceptor *acceptor);
+
 	// Starts all the servers.
 	void run();
 
@@ -70,15 +75,15 @@ public:
 	std::vector<ClientStats> get_client_stats() const;
 
 private:
-	Server *servers;
-	int num_servers, clients_added;
+	std::unique_ptr<Server[]> servers;
+	int num_servers, clients_added = 0;
 
 	// Our indexing is currently rather primitive; every stream_index in
 	// [0, num_http_streams) maps to a HTTP stream (of which every Server
 	// has exactly one copy), and after that, it's mapping directly into
 	// <udp_streams>.
-	int num_http_streams;
-	std::vector<UDPStream *> udp_streams;
+	int num_http_streams = 0;
+	std::vector<std::unique_ptr<UDPStream>> udp_streams;
 
 	ServerPool(const ServerPool &);
 };