X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=serverpool.h;h=9cac26e47133f270e91c040afa3091420433f387;hp=d257a86c48f7dc1186c12f3e285cce3371f5af28;hb=ed218ece51e5be77fd8bd8f014b5f05708e4be5b;hpb=16a03b9858752fae9e81af261821a2a22855fde3

diff --git a/serverpool.h b/serverpool.h
index d257a86..9cac26e 100644
--- a/serverpool.h
+++ b/serverpool.h
@@ -2,6 +2,7 @@
 #define _SERVERPOOL_H 1
 
 #include <stddef.h>
+#include <memory>
 #include <string>
 #include <vector>
 
@@ -20,17 +21,27 @@ 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, Acceptor *acceptor);
-	void add_client_from_serialized(const ClientProto &client);
+	void add_client_from_serialized(const ClientProto &client, const std::vector<std::shared_ptr<const std::string>> &short_responses);
+
+	// Picks a srever (round-robin) and adds the given HLS zombie to it.
+	void add_hls_zombie_from_serialized(const HLSZombieProto &client);
 
 	// 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);
+	int add_stream(const std::string &url,
+	               const std::string &hls_url,
+	               size_t backlog_size,
+	               size_t prebuffering_bytes,
+	               Stream::Encoding encoding,
+	               Stream::Encoding src_encoding,
+                       unsigned hls_frag_duration,
+                       size_t hls_backlog_margin,
+                       const std::string &allow_origin);
 	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);
@@ -42,7 +53,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, uint16_t metacube_flags);
+	void add_data(int stream_index, const char *data, size_t bytes, uint16_t metacube_flags, const RationalPTS &pts);
 
 	// Sets the max pacing rate for all the servers.
 	void set_pacing_rate(int stream_index, uint32_t pacing_rate);
@@ -59,6 +70,20 @@ public:
 	// Changes the given stream's input encoding type on all the servers.
 	void set_src_encoding(int stream_index, Stream::Encoding encoding);
 
+	// Changes the given stream's maximum HLS fragment duration (in seconds) on all the servers.
+	void set_hls_frag_duration(int stream_index, unsigned hls_frag_duration);
+
+	// Changes the given stream's backlog margin for HLS fragments (in bytes) on all the servers.
+	void set_hls_backlog_margin(int stream_index, size_t hls_backlog_margin);
+
+	// Changes the given stream's CORS header on all the servers.
+	void set_allow_origin(int stream_index, const std::string &allow_origin);
+
+	// Register the given stream under the given URL on all the servers.
+	// Used only for deserialized streams (for new ones, we do this registration
+	// in add_stream()).
+	void register_hls_url(int stream_index, const std::string &hls_url);
+
 	// Adds the given gen204 endpoint to all the servers.
 	void add_gen204(const std::string &url, const std::string &allow_origin);
 
@@ -73,17 +98,18 @@ public:
 	void stop();
 
 	std::vector<ClientStats> get_client_stats() const;
+	std::vector<HLSZombie> get_hls_zombies() 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 &);
 };