X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=serverpool.h;h=9a8e171e36ff620637695bf99e6a980a2d5f41a9;hp=84a201fb6fb2aea2748cad988e1254fe80e662ac;hb=8cdf715a5a6320a0b8c1152a28c40bc0dd86676b;hpb=8f44468bfe4a1d1607b0ab7044c3071605ae1fa7

diff --git a/serverpool.h b/serverpool.h
index 84a201f..9a8e171 100644
--- a/serverpool.h
+++ b/serverpool.h
@@ -7,10 +7,14 @@
 
 #include "server.h"
 #include "state.pb.h"
+#include "stream.h"
+#include "udpstream.h"
 
 class MarkPool;
 class Server;
+class UDPStream;
 struct ClientStats;
+struct sockaddr_in6;
 
 // Provides services such as load-balancing between a number of Server instances.
 class ServerPool {
@@ -25,24 +29,28 @@ public:
 	void add_client(int sock);
 	void add_client_from_serialized(const ClientProto &client);
 
-	// Adds the given stream to all the servers.
-	void add_stream(const std::string &stream_id, size_t backlog_size, Stream::Encoding encoding);
-	void add_stream_from_serialized(const StreamProto &stream);
+	// 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_from_serialized(const StreamProto &stream, const std::vector<int> &data_fds);
+	int add_udpstream(const sockaddr_in6 &dst, MarkPool *mark_pool);
+
+	// Returns the stream index for the given URL (e.g. /foo.ts). Returns -1 on failure.
+	int lookup_stream_by_url(const std::string &url) const;
 
 	// Adds the given data to all the servers.
-	void set_header(const std::string &stream_id,
+	void set_header(int stream_index,
 	                const std::string &http_header,
 	                const std::string &stream_header);
-	void add_data(const std::string &stream_id, const char *data, size_t bytes);
+	void add_data(int stream_index, const char *data, size_t bytes);
 
 	// Connects the given stream to the given mark pool for all the servers.
-	void set_mark_pool(const std::string &stream_id, MarkPool *mark_pool);
+	void set_mark_pool(int stream_index, MarkPool *mark_pool);
 
 	// Changes the given stream's backlog size on all the servers.
-	void set_backlog_size(const std::string &stream_id, size_t new_size);
+	void set_backlog_size(int stream_index, size_t new_size);
 
 	// Changes the given stream's encoding type on all the servers.
-	void set_encoding(const std::string &stream_id, Stream::Encoding encoding);
+	void set_encoding(int stream_index, Stream::Encoding encoding);
 
 	// Starts all the servers.
 	void run();
@@ -56,6 +64,13 @@ private:
 	Server *servers;
 	int num_servers, clients_added;
 
+	// 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;
+
 	ServerPool(const ServerPool &);
 };