X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=config.cpp;h=57bf10a7f0ddc038f892a4e08b62706341d98842;hp=3122cc568de0514f9386ad7844b3ffc478cee052;hb=b08dc2a81825a298a03f2dee2ae7dd7045e72739;hpb=43295b9f228a5b2d2b602f22a9728720138214ef

diff --git a/config.cpp b/config.cpp
index 3122cc5..57bf10a 100644
--- a/config.cpp
+++ b/config.cpp
@@ -132,7 +132,10 @@ bool read_config(const string &filename, vector<ConfigLine> *lines)
 		lines->push_back(line);
 	}
 
-	fclose(fp);
+	if (fclose(fp) == EOF) {
+		log_perror(filename.c_str());
+		return false;
+	}
 	return true;
 }
 
@@ -205,60 +208,6 @@ bool parse_listen(const ConfigLine &line, Config *config)
 	return true;
 }
 
-int allocate_mark_pool(int from, int to, Config *config)
-{
-	int pool_index = -1;	
-
-	// Reuse mark pools if an identical one exists.
-	// Otherwise, check if we're overlapping some other mark pool.
-	for (size_t i = 0; i < config->mark_pools.size(); ++i) {
-		const MarkPoolConfig &pool = config->mark_pools[i];
-		if (from == pool.from && to == pool.to) {
-			pool_index = i;
-		} else if ((from >= pool.from && from < pool.to) ||
-		           (to >= pool.from && to < pool.to)) {
-			log(WARNING, "Mark pool %d-%d partially overlaps with %d-%d, you may get duplicate marks."
-			             "Mark pools must either be completely disjunct, or completely overlapping.",
-				     from, to, pool.from, pool.to);
-		}
-	}
-
-	if (pool_index != -1) {
-		return pool_index;
-	}
-
-	// No match to existing pools.
-	MarkPoolConfig pool;
-	pool.from = from;
-	pool.to = to;
-	config->mark_pools.push_back(pool);
-
-	return config->mark_pools.size() - 1;
-}
-
-bool parse_mark_pool(const string &mark_str, int *from, int *to)
-{
-        size_t split = mark_str.find_first_of('-');
-        if (split == string::npos) {
-                log(ERROR, "Invalid mark specification '%s' (expected 'X-Y').",
-                        mark_str.c_str());
-                return false;
-        }
-
-        string from_str(mark_str.begin(), mark_str.begin() + split);
-        string to_str(mark_str.begin() + split + 1, mark_str.end());
-        *from = atoi(from_str.c_str());
-        *to = atoi(to_str.c_str());
-
-        if (*from <= 0 || *from >= 65536 || *to <= 0 || *to >= 65536) {
-                log(ERROR, "Mark pool range %d-%d is outside legal range [1,65536>.",
-                        *from, *to);
-                return false;
-        }
-
-        return true;
-}
-
 bool parse_stream(const ConfigLine &line, Config *config)
 {
 	if (line.arguments.size() != 1) {
@@ -297,18 +246,6 @@ bool parse_stream(const ConfigLine &line, Config *config)
 		return false;
 	}
 
-	// Parse marks, if so desired.
-	map<string, string>::const_iterator mark_parm_it = line.parameters.find("mark");
-	if (mark_parm_it == line.parameters.end()) {
-		stream.mark_pool = -1;
-	} else {
-		int from, to;
-		if (!parse_mark_pool(mark_parm_it->second, &from, &to)) {
-			return false;
-		}
-		stream.mark_pool = allocate_mark_pool(from, to, config);
-	}
-
 	// Parse the pacing rate, converting from kilobits to bytes as needed.
 	map<string, string>::const_iterator pacing_rate_it = line.parameters.find("pacing_rate_kbit");
 	if (pacing_rate_it == line.parameters.end()) {
@@ -331,7 +268,7 @@ bool parse_udpstream(const ConfigLine &line, Config *config)
 	UDPStreamConfig udpstream;
 
 	string hostport = line.arguments[0];
-	if (!parse_hostport(line.arguments[0], &udpstream.dst)) {
+	if (!parse_hostport(hostport, &udpstream.dst)) {
 		return false;
 	}
 
@@ -345,18 +282,6 @@ bool parse_udpstream(const ConfigLine &line, Config *config)
 		// TODO: Verify that the URL is parseable?
 	}
 
-	// Parse marks, if so desired.
-	map<string, string>::const_iterator mark_parm_it = line.parameters.find("mark");
-	if (mark_parm_it == line.parameters.end()) {
-		udpstream.mark_pool = -1;
-	} else {
-		int from, to;
-		if (!parse_mark_pool(mark_parm_it->second, &from, &to)) {
-			return false;
-		}
-		udpstream.mark_pool = allocate_mark_pool(from, to, config);
-	}
-
 	// Parse the pacing rate, converting from kilobits to bytes as needed.
 	map<string, string>::const_iterator pacing_rate_it = line.parameters.find("pacing_rate_kbit");
 	if (pacing_rate_it == line.parameters.end()) {
@@ -365,6 +290,14 @@ bool parse_udpstream(const ConfigLine &line, Config *config)
 		udpstream.pacing_rate = atoi(pacing_rate_it->second.c_str()) * 1024 / 8;
 	}
 
+	// Parse the TTL. The same value is used for unicast and multicast.
+	map<string, string>::const_iterator ttl_it = line.parameters.find("ttl");
+	if (ttl_it == line.parameters.end()) {
+		udpstream.ttl = -1;
+	} else {
+		udpstream.ttl = atoi(ttl_it->second.c_str());
+	}
+
 	config->udpstreams.push_back(udpstream);
 	return true;
 }