X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=serverpool.cpp;h=c77c30ef85c262084a0d92ad862da38a4717ceb5;hp=1c99d4065ef50a39fe808ebcb72331a81d8e0856;hb=d0aad5446b9896e3ba15c8a50c345e185dc1631f;hpb=ce0d42a14da5686366d0c73fa9b152e90619ff91

diff --git a/serverpool.cpp b/serverpool.cpp
index 1c99d40..c77c30e 100644
--- a/serverpool.cpp
+++ b/serverpool.cpp
@@ -67,20 +67,20 @@ void ServerPool::add_client_from_serialized(const ClientProto &client)
 	servers[clients_added++ % num_servers].add_client_from_serialized(client);
 }
 
-int ServerPool::lookup_stream_by_url(const std::string &url) const
+int ServerPool::lookup_stream_by_url(const string &url) const
 {
 	assert(servers != NULL);
 	return servers[0].lookup_stream_by_url(url);
 }
 
-int ServerPool::add_stream(const string &url, size_t backlog_size, Stream::Encoding encoding)
+int ServerPool::add_stream(const string &url, size_t backlog_size, size_t prebuffering_bytes, Stream::Encoding encoding)
 {
 	// Adding more HTTP streams after UDP streams would cause the UDP stream
 	// indices to move around, which is obviously not good.
 	assert(udp_streams.empty());
 
 	for (int i = 0; i < num_servers; ++i) {
-		int stream_index = servers[i].add_stream(url, backlog_size, encoding);
+		int stream_index = servers[i].add_stream(url, backlog_size, prebuffering_bytes, encoding);
 		assert(stream_index == num_http_streams);
 	}
 	return num_http_streams++;
@@ -121,9 +121,9 @@ int ServerPool::add_stream_from_serialized(const StreamProto &stream, const vect
 	return num_http_streams++;
 }
 	
-int ServerPool::add_udpstream(const sockaddr_in6 &dst, MarkPool *mark_pool, int pacing_rate)
+int ServerPool::add_udpstream(const sockaddr_in6 &dst, int pacing_rate, int ttl, int multicast_iface_index)
 {
-	udp_streams.push_back(new UDPStream(dst, mark_pool, pacing_rate));
+	udp_streams.push_back(new UDPStream(dst, pacing_rate, ttl, multicast_iface_index));
 	return num_http_streams + udp_streams.size() - 1;
 }
 
@@ -163,6 +163,13 @@ void ServerPool::add_data(int stream_index, const char *data, size_t bytes, Stre
 	}
 }
 
+void ServerPool::add_gen204(const std::string &url, const std::string &allow_origin)
+{
+	for (int i = 0; i < num_servers; ++i) {
+		servers[i].add_gen204(url, allow_origin);
+	}
+}
+
 void ServerPool::run()
 {
 	for (int i = 0; i < num_servers; ++i) {
@@ -187,13 +194,6 @@ vector<ClientStats> ServerPool::get_client_stats() const
 	return ret;
 }
 	
-void ServerPool::set_mark_pool(int stream_index, MarkPool *mark_pool)
-{
-	for (int i = 0; i < num_servers; ++i) {
-		servers[i].set_mark_pool(stream_index, mark_pool);
-	}
-}
-
 void ServerPool::set_pacing_rate(int stream_index, uint32_t pacing_rate)
 {
 	for (int i = 0; i < num_servers; ++i) {
@@ -208,6 +208,13 @@ void ServerPool::set_backlog_size(int stream_index, size_t new_size)
 	}	
 }
 
+void ServerPool::set_prebuffering_bytes(int stream_index, size_t new_amount)
+{
+	for (int i = 0; i < num_servers; ++i) {
+		servers[i].set_prebuffering_bytes(stream_index, new_amount);
+	}
+}
+
 void ServerPool::set_encoding(int stream_index, Stream::Encoding encoding)
 {
 	for (int i = 0; i < num_servers; ++i) {