X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=main.cpp;h=2080d73e82fc75acb066ad36b44cee93d1956cac;hb=1dfa45f9af3f885a50d2bef384ea89b0a4cf17c5;hp=5ba79f95a6baa30cddd1d9f6c085274ff455f487;hpb=5cc8cd703a637e276c2595953878fd9561592bfa;p=cubemap

diff --git a/main.cpp b/main.cpp
index 5ba79f9..2080d73 100644
--- a/main.cpp
+++ b/main.cpp
@@ -10,6 +10,7 @@
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <unistd.h>
+#include <algorithm>
 #include <map>
 #include <set>
 #include <string>
@@ -37,6 +38,18 @@ ServerPool *servers = NULL;
 volatile bool hupped = false;
 volatile bool stopped = false;
 
+namespace {
+
+struct OrderByConnectionTime {
+	bool operator() (const ClientProto &a, const ClientProto &b) const {
+		if (a.connect_time_sec() != b.connect_time_sec())
+			return a.connect_time_sec() < b.connect_time_sec();
+		return a.connect_time_nsec() < b.connect_time_nsec();
+	}
+};
+
+}  // namespace
+
 struct InputWithRefcount {
 	Input *input;
 	int refcount;
@@ -166,6 +179,7 @@ void create_streams(const Config &config,
 		if (deserialized_urls.count(stream_config.url) == 0) {
 			stream_index = servers->add_stream(stream_config.url,
 			                                   stream_config.backlog_size,
+			                                   stream_config.prebuffering_bytes,
 			                                   Stream::Encoding(stream_config.encoding));
 		} else {
 			stream_index = servers->lookup_stream_by_url(stream_config.url);
@@ -201,7 +215,11 @@ void create_streams(const Config &config,
 	// UDP streams.
 	for (unsigned i = 0; i < config.udpstreams.size(); ++i) {
 		const UDPStreamConfig &udpstream_config = config.udpstreams[i];
-		int stream_index = servers->add_udpstream(udpstream_config.dst, udpstream_config.pacing_rate);
+		int stream_index = servers->add_udpstream(
+			udpstream_config.dst,
+			udpstream_config.pacing_rate,
+			udpstream_config.ttl,
+			udpstream_config.multicast_iface_index);
 
 		string src = udpstream_config.src;
 		if (!src.empty()) {
@@ -424,7 +442,7 @@ start:
 
 		// Deserialize the acceptors.
 		for (int i = 0; i < loaded_state.acceptors_size(); ++i) {
-			sockaddr_in6 sin6 = ExtractAddressFromAcceptorProto(loaded_state.acceptors(i));
+			sockaddr_in6 sin6 = extract_address_from_acceptor_proto(loaded_state.acceptors(i));
 			deserialized_acceptors.insert(make_pair(
 				sin6,
 				new Acceptor(loaded_state.acceptors(i))));
@@ -439,9 +457,33 @@ start:
 	// Find all streams in the configuration file, create them, and connect to the inputs.
 	create_streams(config, deserialized_urls, &inputs);
 	vector<Acceptor *> acceptors = create_acceptors(config, &deserialized_acceptors);
+
+	// Convert old-style timestamps to new-style timestamps for all clients;
+	// this simplifies the sort below.
+	{
+		timespec now_monotonic;
+		if (clock_gettime(CLOCK_MONOTONIC_COARSE, &now_monotonic) == -1) {
+			log(ERROR, "clock_gettime(CLOCK_MONOTONIC_COARSE) failed.");
+			exit(1);
+		}
+		long delta_sec = now_monotonic.tv_sec - time(NULL);
+
+		for (int i = 0; i < loaded_state.clients_size(); ++i) {
+			ClientProto* client = loaded_state.mutable_clients(i);
+			if (client->has_connect_time_old()) {
+				client->set_connect_time_sec(client->connect_time_old() + delta_sec);
+				client->set_connect_time_nsec(now_monotonic.tv_nsec);
+				client->clear_connect_time_old();
+			}
+		}
+	}
 	
 	// Put back the existing clients. It doesn't matter which server we
-	// allocate them to, so just do round-robin.
+	// allocate them to, so just do round-robin. However, we need to sort them
+	// by connection time first, since add_client_serialized() expects that.
+	sort(loaded_state.mutable_clients()->begin(),
+	     loaded_state.mutable_clients()->end(),
+	     OrderByConnectionTime());
 	for (int i = 0; i < loaded_state.clients_size(); ++i) {
 		if (deleted_urls.count(loaded_state.clients(i).url()) != 0) {
 			safe_close(loaded_state.clients(i).sock());