X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=main.cpp;h=194ffc7fa97c77fcdc13d9872a234141bb762cb3;hp=3f36f32da35ab493c5ba987dccf18b751dc6b92d;hb=f2530dbb8415f9e7cc0f2d4b45741120c95e8a05;hpb=4ec6a7f04455b023d3ca91d4e84a19993ec4d34e

diff --git a/main.cpp b/main.cpp
index 3f36f32..194ffc7 100644
--- a/main.cpp
+++ b/main.cpp
@@ -23,6 +23,7 @@
 #include "input_stats.h"
 #include "log.h"
 #include "markpool.h"
+#include "sa_compare.h"
 #include "serverpool.h"
 #include "state.pb.h"
 #include "stats.h"
@@ -80,27 +81,28 @@ CubemapStateProto collect_state(const timeval &serialize_start,
 // Find all port statements in the configuration file, and create acceptors for htem.
 vector<Acceptor *> create_acceptors(
 	const Config &config,
-	map<int, Acceptor *> *deserialized_acceptors)
+	map<sockaddr_in6, Acceptor *, Sockaddr6Compare> *deserialized_acceptors)
 {
 	vector<Acceptor *> acceptors;
 	for (unsigned i = 0; i < config.acceptors.size(); ++i) {
 		const AcceptorConfig &acceptor_config = config.acceptors[i];
 		Acceptor *acceptor = NULL;
-		map<int, Acceptor *>::iterator deserialized_acceptor_it =
-			deserialized_acceptors->find(acceptor_config.port);
+		map<sockaddr_in6, Acceptor *, Sockaddr6Compare>::iterator deserialized_acceptor_it =
+			deserialized_acceptors->find(acceptor_config.addr);
 		if (deserialized_acceptor_it != deserialized_acceptors->end()) {
 			acceptor = deserialized_acceptor_it->second;
 			deserialized_acceptors->erase(deserialized_acceptor_it);
 		} else {
-			int server_sock = create_server_socket(acceptor_config.port, TCP_SOCKET);
-			acceptor = new Acceptor(server_sock, acceptor_config.port);
+			int server_sock = create_server_socket(acceptor_config.addr, TCP_SOCKET);
+			acceptor = new Acceptor(server_sock, acceptor_config.addr);
 		}
 		acceptor->run();
 		acceptors.push_back(acceptor);
 	}
 
 	// Close all acceptors that are no longer in the configuration file.
-	for (map<int, Acceptor *>::iterator acceptor_it = deserialized_acceptors->begin();
+	for (map<sockaddr_in6, Acceptor *, Sockaddr6Compare>::iterator
+	         acceptor_it = deserialized_acceptors->begin();
 	     acceptor_it != deserialized_acceptors->end();
 	     ++acceptor_it) {
 		acceptor_it->second->close_socket();
@@ -184,6 +186,8 @@ void create_streams(const Config &config,
 			servers->set_mark_pool(stream_index, mark_pools[stream_config.mark_pool]);
 		}
 
+		servers->set_pacing_rate(stream_index, stream_config.pacing_rate);
+
 		string src = stream_config.src;
 		if (!src.empty()) {
 			multimap<string, InputWithRefcount>::iterator input_it = inputs->find(src);
@@ -212,7 +216,7 @@ void create_streams(const Config &config,
 		if (udpstream_config.mark_pool != -1) {
 			mark_pool = mark_pools[udpstream_config.mark_pool];
 		}
-		int stream_index = servers->add_udpstream(udpstream_config.dst, mark_pool);
+		int stream_index = servers->add_udpstream(udpstream_config.dst, mark_pool, udpstream_config.pacing_rate);
 
 		string src = udpstream_config.src;
 		if (!src.empty()) {
@@ -384,7 +388,7 @@ start:
 	CubemapStateProto loaded_state;
 	struct timeval serialize_start;
 	set<string> deserialized_urls;
-	map<int, Acceptor *> deserialized_acceptors;
+	map<sockaddr_in6, Acceptor *, Sockaddr6Compare> deserialized_acceptors;
 	multimap<string, InputWithRefcount> inputs;  // multimap due to older versions without deduplication.
 	if (state_fd != -1) {
 		log(INFO, "Deserializing state from previous process...");
@@ -401,6 +405,7 @@ start:
 		serialize_start.tv_usec = loaded_state.serialize_start_usec();
 
 		// Deserialize the streams.
+		map<string, string> stream_headers_for_url;  // See below.
 		for (int i = 0; i < loaded_state.streams_size(); ++i) {
 			const StreamProto &stream = loaded_state.streams(i);
 
@@ -423,21 +428,35 @@ start:
 
 				servers->add_stream_from_serialized(stream, data_fds);
 				deserialized_urls.insert(stream.url());
+
+				stream_headers_for_url.insert(make_pair(stream.url(), stream.stream_header()));
 			}
 		}
 
 		// Deserialize the inputs. Note that we don't actually add them to any stream yet.
 		for (int i = 0; i < loaded_state.inputs_size(); ++i) {
+			InputProto serialized_input = loaded_state.inputs(i);
+
+			// Older versions did not store the stream header in the input,
+			// only in each stream. We need to have the stream header in the
+			// input as well, in case we create a new stream reusing the same input.
+			// Thus, we put it into place here if it's missing.
+			if (!serialized_input.has_stream_header() &&
+			    stream_headers_for_url.count(serialized_input.url()) != 0) {
+				serialized_input.set_stream_header(stream_headers_for_url[serialized_input.url()]);
+			}
+
 			InputWithRefcount iwr;
-			iwr.input = create_input(loaded_state.inputs(i));
+			iwr.input = create_input(serialized_input);
 			iwr.refcount = 0;
-			inputs.insert(make_pair(loaded_state.inputs(i).url(), iwr));
+			inputs.insert(make_pair(serialized_input.url(), iwr));
 		} 
 
 		// Deserialize the acceptors.
 		for (int i = 0; i < loaded_state.acceptors_size(); ++i) {
+			sockaddr_in6 sin6 = ExtractAddressFromAcceptorProto(loaded_state.acceptors(i));
 			deserialized_acceptors.insert(make_pair(
-				loaded_state.acceptors(i).port(),
+				sin6,
 				new Acceptor(loaded_state.acceptors(i))));
 		}