X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=config.cpp;h=919f21256bd650655985fd9873ec61dcb65f5a8b;hp=5a1fdd9ba367e13be0dec4ac4014b56624598ae1;hb=0f36a8f674788a6ee10ff54ae72619b384c62b9d;hpb=20e85bd6901355cc40a6cfb4c0deb7232d9aa63f

diff --git a/config.cpp b/config.cpp
index 5a1fdd9..919f212 100644
--- a/config.cpp
+++ b/config.cpp
@@ -7,15 +7,16 @@
 #include <string.h>
 #include <net/if.h>
 #include <sys/socket.h>
-#include <map>
 #include <string>
 #include <utility>
+#include <unordered_map>
 #include <vector>
 
 #include "tlse.h"
 
 #include "acceptor.h"
 #include "config.h"
+#include "input.h"
 #include "log.h"
 #include "parse.h"
 
@@ -26,7 +27,7 @@ using namespace std;
 struct ConfigLine {
 	string keyword;
 	vector<string> arguments;
-	map<string, string> parameters;
+	unordered_map<string, string> parameters;
 };
 
 namespace {
@@ -211,7 +212,7 @@ bool load_file_to_string(const string &filename, size_t max_size, string *conten
 	return true;
 }
 
-bool parse_tls_parameters(const map<string, string> &parameters, AcceptorConfig *acceptor)
+bool parse_tls_parameters(const unordered_map<string, string> &parameters, AcceptorConfig *acceptor)
 {
 	bool has_cert = false, has_key = false;
 
@@ -326,12 +327,21 @@ bool parse_stream(const ConfigLine &line, Config *config)
 	stream.url = line.arguments[0];
 
 	const auto src_it = line.parameters.find("src");
+	bool input_is_udp = false;
 	if (src_it == line.parameters.end()) {
 		log(WARNING, "stream '%s' has no src= attribute, clients will not get any data.",
 		        stream.url.c_str());
 	} else {
 		stream.src = src_it->second;
-		// TODO: Verify that the URL is parseable?
+
+		string protocol, user, host, port, path;
+		if (!parse_url(stream.src, &protocol, &user, &host, &port, &path)) {
+			log(ERROR, "could not parse URL '%s'", stream.src.c_str());
+			return false;
+		}
+		if (protocol == "udp") {
+			input_is_udp = true;
+		}
 	}
 
 	const auto backlog_it = line.parameters.find("backlog_size");
@@ -362,13 +372,18 @@ bool parse_stream(const ConfigLine &line, Config *config)
 
 	// Parse input encoding.
 	const auto src_encoding_parm_it = line.parameters.find("src_encoding");
-	if (src_encoding_parm_it == line.parameters.end() ||
-	    src_encoding_parm_it->second == "metacube") {
+	if (src_encoding_parm_it == line.parameters.end()) {
+		stream.src_encoding = input_is_udp ? StreamConfig::STREAM_ENCODING_RAW : StreamConfig::STREAM_ENCODING_METACUBE;
+	} else if (src_encoding_parm_it->second == "metacube") {
+		if (input_is_udp) {
+			log(ERROR, "UDP streams cannot have Metacube input");
+			return false;
+		}
 		stream.src_encoding = StreamConfig::STREAM_ENCODING_METACUBE;
 	} else if (src_encoding_parm_it->second == "raw") {
 		stream.src_encoding = StreamConfig::STREAM_ENCODING_RAW;
 	} else {
-		log(ERROR, "Parameter 'src_encoding' must be either 'raw' or 'metacube' (default)");
+		log(ERROR, "Parameter 'src_encoding' must be either 'raw' (default for UDP) or 'metacube' (default for HTTP)");
 		return false;
 	}