X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=main.cpp;h=14f6323ae01cf1ca821adbcf9a93bfed43ab304d;hp=194ffc7fa97c77fcdc13d9872a234141bb762cb3;hb=0eac9253f23925734e256c63081e157c68c70704;hpb=f2530dbb8415f9e7cc0f2d4b45741120c95e8a05

diff --git a/main.cpp b/main.cpp
index 194ffc7..14f6323 100644
--- a/main.cpp
+++ b/main.cpp
@@ -22,7 +22,6 @@
 #include "input.h"
 #include "input_stats.h"
 #include "log.h"
-#include "markpool.h"
 #include "sa_compare.h"
 #include "serverpool.h"
 #include "state.pb.h"
@@ -35,7 +34,6 @@ using namespace std;
 
 AccessLogThread *access_log = NULL;
 ServerPool *servers = NULL;
-vector<MarkPool *> mark_pools;
 volatile bool hupped = false;
 volatile bool stopped = false;
 
@@ -151,11 +149,6 @@ void create_streams(const Config &config,
                     const set<string> &deserialized_urls,
                     multimap<string, InputWithRefcount> *inputs)
 {
-	for (unsigned i = 0; i < config.mark_pools.size(); ++i) {
-		const MarkPoolConfig &mp_config = config.mark_pools[i];
-		mark_pools.push_back(new MarkPool(mp_config.from, mp_config.to));
-	}
-
 	// HTTP streams.
 	set<string> expecting_urls = deserialized_urls;
 	for (unsigned i = 0; i < config.streams.size(); ++i) {
@@ -182,10 +175,6 @@ void create_streams(const Config &config,
 			                      Stream::Encoding(stream_config.encoding));
 		}
 
-		if (stream_config.mark_pool != -1) {
-			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;
@@ -212,11 +201,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];
-		MarkPool *mark_pool = NULL;
-		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, 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()) {
@@ -338,7 +327,7 @@ int main(int argc, char **argv)
 	char argv0_canon[PATH_MAX];
 	char config_filename_canon[PATH_MAX];
 
-	if (realpath(argv[0], argv0_canon) == NULL) {
+	if (realpath("/proc/self/exe", argv0_canon) == NULL) {
 		log_perror(argv[0]);
 		exit(1);
 	}
@@ -393,7 +382,7 @@ start:
 	if (state_fd != -1) {
 		log(INFO, "Deserializing state from previous process...");
 		string serialized;
-		if (!read_tempfile(state_fd, &serialized)) {
+		if (!read_tempfile_and_close(state_fd, &serialized)) {
 			exit(1);
 		}
 		if (!loaded_state.ParseFromString(serialized)) {
@@ -420,12 +409,6 @@ start:
 					data_fds.push_back(stream.data_fds(j));
 				}
 
-				// Older versions stored the data once in the protobuf instead of
-				// sending around file descriptors.
-				if (data_fds.empty() && stream.has_data()) {
-					data_fds.push_back(make_tempfile(stream.data()));
-				}
-
 				servers->add_stream_from_serialized(stream, data_fds);
 				deserialized_urls.insert(stream.url());
 
@@ -437,15 +420,6 @@ start:
 		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(serialized_input);
 			iwr.refcount = 0;
@@ -471,8 +445,7 @@ start:
 	vector<Acceptor *> acceptors = create_acceptors(config, &deserialized_acceptors);
 	
 	// Put back the existing clients. It doesn't matter which server we
-	// allocate them to, so just do round-robin. However, we need to add
-	// them after the mark pools have been set up.
+	// allocate them to, so just do round-robin.
 	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());
@@ -569,11 +542,6 @@ start:
 	}
 	delete servers;
 
-	for (unsigned i = 0; i < mark_pools.size(); ++i) {
-		delete mark_pools[i];
-	}
-	mark_pools.clear();
-
 	access_log->stop();
 	delete access_log;
 	shut_down_logging();