X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=config.cpp;h=cb16cbc33e06f7d1032d2b8d13f20379b20c262a;hp=c5547bda4f5d62ef155ffa4cf1381819658c90f4;hb=74cd48ffef90d7d0752e37a4515e4ecfb68f7c9d;hpb=8f44468bfe4a1d1607b0ab7044c3071605ae1fa7

diff --git a/config.cpp b/config.cpp
index c5547bd..cb16cbc 100644
--- a/config.cpp
+++ b/config.cpp
@@ -1,8 +1,11 @@
+#include <arpa/inet.h>
 #include <assert.h>
 #include <ctype.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/socket.h>
 #include <map>
 #include <string>
 #include <utility>
@@ -189,12 +192,12 @@ bool parse_stream(const ConfigLine &line, Config *config)
 	}
 
 	StreamConfig stream;
-	stream.stream_id = line.arguments[0];
+	stream.url = line.arguments[0];
 
 	map<string, string>::const_iterator src_it = line.parameters.find("src");
 	if (src_it == line.parameters.end()) {
 		log(WARNING, "stream '%s' has no src= attribute, clients will not get any data.",
-		        stream.stream_id.c_str());
+		        stream.url.c_str());
 	} else {
 		stream.src = src_it->second;
 		// TODO: Verify that the URL is parseable?
@@ -235,6 +238,87 @@ bool parse_stream(const ConfigLine &line, Config *config)
 	return true;
 }
 
+bool parse_udpstream(const ConfigLine &line, Config *config)
+{
+	if (line.arguments.size() != 1) {
+		log(ERROR, "'udpstream' takes exactly one argument");
+		return false;
+	}
+
+	UDPStreamConfig udpstream;
+
+	string hostport = line.arguments[0];
+
+	// See if the argument if on the type [ipv6addr]:port.
+	if (!hostport.empty() && hostport[0] == '[') {
+		size_t split = hostport.find("]:");
+		if (split == string::npos) {
+			log(ERROR, "udpstream destination '%s' is malformed; must be either [ipv6addr]:port or ipv4addr:port");
+			return false;
+		}
+
+		string host(hostport.begin() + 1, hostport.begin() + split);
+		string port = hostport.substr(split + 2);
+
+		udpstream.dst.sin6_family = AF_INET6;
+		if (inet_pton(AF_INET6, host.c_str(), &udpstream.dst.sin6_addr) != 1) {
+			log(ERROR, "udpstream destination host '%s' is not a valid IPv6 address");
+			return false;
+		}
+
+		udpstream.dst.sin6_port = htons(atoi(port.c_str()));  // TODO: Verify validity.
+	} else {
+		// OK, then it must be ipv4addr:port.
+		size_t split = hostport.find(":");
+		if (split == string::npos) {
+			log(ERROR, "udpstream destination '%s' is malformed; must be either [ipv6addr]:port or ipv4addr:port");
+			return false;
+		}
+
+		string host(hostport.begin(), hostport.begin() + split);
+		string port = hostport.substr(split + 1);
+
+		// Parse to an IPv4 address, then construct a mapped-v4 address from that.
+		in_addr addr4;
+
+		if (inet_pton(AF_INET, host.c_str(), &addr4) != 1) {
+			log(ERROR, "udpstream destination host '%s' is not a valid IPv4 address");
+			return false;
+		}
+
+		udpstream.dst.sin6_family = AF_INET6;
+		udpstream.dst.sin6_addr.s6_addr32[0] = 0;
+		udpstream.dst.sin6_addr.s6_addr32[1] = 0;
+		udpstream.dst.sin6_addr.s6_addr32[2] = htonl(0xffff);
+		udpstream.dst.sin6_addr.s6_addr32[3] = addr4.s_addr;
+		udpstream.dst.sin6_port = htons(atoi(port.c_str()));  // TODO: Verify validity.
+	}
+
+	map<string, string>::const_iterator src_it = line.parameters.find("src");
+	if (src_it == line.parameters.end()) {
+		// This is pretty meaningless, but OK, consistency is good.
+		log(WARNING, "udpstream to %s has no src= attribute, clients will not get any data.",
+		        hostport.c_str());
+	} else {
+		udpstream.src = src_it->second;
+		// 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);
+	}
+
+	config->udpstreams.push_back(udpstream);
+	return true;
+}
 bool parse_error_log(const ConfigLine &line, Config *config)
 {
 	if (line.arguments.size() != 0) {
@@ -297,7 +381,14 @@ bool parse_config(const string &filename, Config *config)
 	bool has_stats_file = fetch_config_string(lines, "stats_file", &config->stats_file);
 	bool has_stats_interval = fetch_config_int(lines, "stats_interval", &config->stats_interval);
 	if (has_stats_interval && !has_stats_file) {
-		log(WARNING, "'stats_interval' given, but no 'stats_file'. No statistics will be written.");
+		log(WARNING, "'stats_interval' given, but no 'stats_file'. No client statistics will be written.");
+	}
+
+	config->input_stats_interval = 60;
+	bool has_input_stats_file = fetch_config_string(lines, "input_stats_file", &config->input_stats_file);
+	bool has_input_stats_interval = fetch_config_int(lines, "input_stats_interval", &config->input_stats_interval);
+	if (has_input_stats_interval && !has_input_stats_file) {
+		log(WARNING, "'input_stats_interval' given, but no 'input_stats_file'. No input statistics will be written.");
 	}
 	
 	fetch_config_string(lines, "access_log", &config->access_log_file);
@@ -307,6 +398,8 @@ bool parse_config(const string &filename, Config *config)
 		if (line.keyword == "num_servers" ||
 		    line.keyword == "stats_file" ||
 		    line.keyword == "stats_interval" ||
+		    line.keyword == "input_stats_file" ||
+		    line.keyword == "input_stats_interval" ||
 		    line.keyword == "access_log") {
 			// Already taken care of, above.
 		} else if (line.keyword == "port") {
@@ -317,6 +410,10 @@ bool parse_config(const string &filename, Config *config)
 			if (!parse_stream(line, config)) {
 				return false;
 			}
+		} else if (line.keyword == "udpstream") {
+			if (!parse_udpstream(line, config)) {
+				return false;
+			}
 		} else if (line.keyword == "error_log") {
 			if (!parse_error_log(line, config)) {
 				return false;