X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=serverpool.cpp;h=4684d8c63267d4af225f55eeab61b401829f00b1;hp=be47aa99139c17e4048cc82a9b6becac369e8348;hb=0eac9253f23925734e256c63081e157c68c70704;hpb=8cdf715a5a6320a0b8c1152a28c40bc0dd86676b

diff --git a/serverpool.cpp b/serverpool.cpp
index be47aa9..4684d8c 100644
--- a/serverpool.cpp
+++ b/serverpool.cpp
@@ -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 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));
+	udp_streams.push_back(new UDPStream(dst, pacing_rate, ttl, multicast_iface_index));
 	return num_http_streams + udp_streams.size() - 1;
 }
 
@@ -147,7 +147,7 @@ void ServerPool::set_header(int stream_index, const string &http_header, const s
 	}
 }
 
-void ServerPool::add_data(int stream_index, const char *data, size_t bytes)
+void ServerPool::add_data(int stream_index, const char *data, size_t bytes, StreamStartSuitability suitable_for_stream_start)
 {
 	assert(stream_index >= 0 && stream_index < ssize_t(num_http_streams + udp_streams.size()));
 
@@ -159,7 +159,7 @@ void ServerPool::add_data(int stream_index, const char *data, size_t bytes)
 
 	// HTTP stream.
 	for (int i = 0; i < num_servers; ++i) {
-		servers[i].add_data_deferred(stream_index, data, bytes);
+		servers[i].add_data_deferred(stream_index, data, bytes, suitable_for_stream_start);
 	}
 }
 
@@ -187,10 +187,10 @@ vector<ClientStats> ServerPool::get_client_stats() const
 	return ret;
 }
 	
-void ServerPool::set_mark_pool(int stream_index, MarkPool *mark_pool)
+void ServerPool::set_pacing_rate(int stream_index, uint32_t pacing_rate)
 {
 	for (int i = 0; i < num_servers; ++i) {
-		servers[i].set_mark_pool(stream_index, mark_pool);
+		servers[i].set_pacing_rate(stream_index, pacing_rate);
 	}	
 }