X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=serverpool.h;h=d257a86c48f7dc1186c12f3e285cce3371f5af28;hb=16a03b9858752fae9e81af261821a2a22855fde3;hp=8fa46e2493be3ce0796593d4ec31a628f0d01127;hpb=0eac9253f23925734e256c63081e157c68c70704;p=cubemap

diff --git a/serverpool.h b/serverpool.h
index 8fa46e2..d257a86 100644
--- a/serverpool.h
+++ b/serverpool.h
@@ -10,6 +10,7 @@
 #include "stream.h"
 #include "udpstream.h"
 
+class Acceptor;
 class Server;
 class UDPStream;
 struct ClientStats;
@@ -25,11 +26,11 @@ public:
 	CubemapStateProto serialize();
 
 	// Picks a server (round-robin) and allocates the given client to it.
-	void add_client(int sock);
+	void add_client(int sock, Acceptor *acceptor);
 	void add_client_from_serialized(const ClientProto &client);
 
 	// Adds the given stream to all the servers. Returns the stream index.
-	int add_stream(const std::string &url, size_t backlog_size, Stream::Encoding encoding);
+	int add_stream(const std::string &url, size_t backlog_size, size_t prebuffering_bytes, Stream::Encoding encoding, Stream::Encoding src_encoding);
 	int add_stream_from_serialized(const StreamProto &stream, const std::vector<int> &data_fds);
 	void delete_stream(const std::string &url);
 	int add_udpstream(const sockaddr_in6 &dst, int pacing_rate, int ttl, int multicast_iface_index);
@@ -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);
@@ -49,9 +50,22 @@ public:
 	// Changes the given stream's backlog size on all the servers.
 	void set_backlog_size(int stream_index, size_t new_size);
 
-	// Changes the given stream's encoding type on all the servers.
+	// Changes the given stream's amount of forced prebuffering on all the servers.
+	void set_prebuffering_bytes(int stream_index, size_t new_amount);
+
+	// Changes the given stream's output encoding type on all the servers.
 	void set_encoding(int stream_index, Stream::Encoding encoding);
 
+	// Changes the given stream's input encoding type on all the servers.
+	void set_src_encoding(int stream_index, Stream::Encoding encoding);
+
+	// 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();