X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=config.cpp;h=405033868f65f8c804cff3570e4e384dbf198d94;hp=b6ad99bee05b329d288f5fcd20d190d26015e05f;hb=9abb89bcf7940e2ada9d708f86a218a56334f68d;hpb=aeda7b341454f243ff8a3d742222c24bf75c338d

diff --git a/config.cpp b/config.cpp
index b6ad99b..4050338 100644
--- a/config.cpp
+++ b/config.cpp
@@ -1,24 +1,33 @@
+#include <assert.h>
+#include <ctype.h>
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
-#include <ctype.h>
-#include <assert.h>
-#include <vector>
+#include <string.h>
+#include <map>
 #include <string>
+#include <utility>
+#include <vector>
 
 #include "config.h"
+#include "log.h"
 #include "parse.h"
 
 using namespace std;
 
-vector<ConfigLine> parse_config(const string &filename)
-{
-	vector<ConfigLine> ret;
+#define DEFAULT_BACKLOG_SIZE 1048576
 
+struct ConfigLine {
+	string keyword;
+	vector<string> arguments;
+	map<string, string> parameters;
+};
+
+bool read_config(const string &filename, vector<ConfigLine> *lines)
+{
 	FILE *fp = fopen(filename.c_str(), "r");
 	if (fp == NULL) {
-		perror(filename.c_str());
-		exit(1);
+		log_perror(filename.c_str());
+		return false;
 	}
 
 	char buf[4096];
@@ -59,68 +68,267 @@ vector<ConfigLine> parse_config(const string &filename)
 			}
 		}
 
-		ret.push_back(line);
+		lines->push_back(line);
 	}
 
 	fclose(fp);
-	return ret;
+	return true;
 }
 
-string fetch_config_string(const vector<ConfigLine> &config, const string &keyword,
-                           ParameterType parameter_type, const string &default_value)
+bool fetch_config_string(const vector<ConfigLine> &config, const string &keyword, string *value)
 {
-	assert(parameter_type == PARAMATER_MANDATORY || parameter_type == PARAMETER_OPTIONAL);
 	for (unsigned i = 0; i < config.size(); ++i) {
 		if (config[i].keyword != keyword) {
 			continue;
 		}
 		if (config[i].parameters.size() > 0 ||
 		    config[i].arguments.size() != 1) {
-			fprintf(stderr, "ERROR: '%s' takes one argument and no parameters\n", keyword.c_str());
-			exit(1);
+			log(ERROR, "'%s' takes one argument and no parameters", keyword.c_str());
+			return false;
 		}
-		return config[i].arguments[0];
-	}
-	if (parameter_type == PARAMATER_MANDATORY) {
-		fprintf(stderr, "ERROR: Missing '%s' statement in config file.\n",
-			keyword.c_str());
-		exit(1);
-	} else {
-		return default_value;
+		*value = config[i].arguments[0];
+		return true;
 	}
+	return false;
 }
 
-int fetch_config_int(const std::vector<ConfigLine> &config, const std::string &keyword,
-                     int min_limit, int max_limit,
-                     ParameterType parameter_type, int default_value)
+bool fetch_config_int(const vector<ConfigLine> &config, const string &keyword, int *value)
 {
-	assert(parameter_type == PARAMATER_MANDATORY || parameter_type == PARAMETER_OPTIONAL);
-	bool value_found = false;
-	int value = -1;
 	for (unsigned i = 0; i < config.size(); ++i) {
 		if (config[i].keyword != keyword) {
 			continue;
 		}
 		if (config[i].parameters.size() > 0 ||
 		    config[i].arguments.size() != 1) {
-			fprintf(stderr, "ERROR: '%s' takes one argument and no parameters\n", keyword.c_str());
-			exit(1);
+			log(ERROR, "'%s' takes one argument and no parameters", keyword.c_str());
+			return false;
+		}
+		*value = atoi(config[i].arguments[0].c_str());  // TODO: verify int validity.
+		return true;
+	}
+	return false;
+}
+
+bool parse_port(const ConfigLine &line, Config *config)
+{
+	if (line.arguments.size() != 1) {
+		log(ERROR, "'port' takes exactly one argument");
+		return false;
+	}
+
+	AcceptorConfig acceptor;
+	acceptor.port = atoi(line.arguments[0].c_str());
+	if (acceptor.port < 1 || acceptor.port >= 65536) {
+		log(ERROR, "port %d is out of range (must be [1,65536>).", acceptor.port);
+		return false;
+	}
+
+	config->acceptors.push_back(acceptor);
+	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) {
+		log(ERROR, "'stream' takes exactly one argument");
+		return false;
+	}
+
+	StreamConfig stream;
+	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.url.c_str());
+	} else {
+		stream.src = src_it->second;
+		// TODO: Verify that the URL is parseable?
+	}
+
+	map<string, string>::const_iterator backlog_it = line.parameters.find("backlog_size");
+	if (backlog_it == line.parameters.end()) {
+		stream.backlog_size = DEFAULT_BACKLOG_SIZE;
+	} else {
+		stream.backlog_size = atoi(backlog_it->second.c_str());
+	}
+
+	// Parse encoding.
+	map<string, string>::const_iterator encoding_parm_it = line.parameters.find("encoding");
+	if (encoding_parm_it == line.parameters.end() ||
+	    encoding_parm_it->second == "raw") {
+		stream.encoding = StreamConfig::STREAM_ENCODING_RAW;
+	} else if (encoding_parm_it->second == "metacube") {
+		stream.encoding = StreamConfig::STREAM_ENCODING_METACUBE;
+	} else {
+		log(ERROR, "Parameter 'encoding' must be either 'raw' (default) or 'metacube'");
+		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;
 		}
-		value_found = true;
-		value = atoi(config[i].arguments[0].c_str());  // TODO: verify int validity.
+		stream.mark_pool = allocate_mark_pool(from, to, config);
+	}
+
+	config->streams.push_back(stream);
+	return true;
+}
+
+bool parse_error_log(const ConfigLine &line, Config *config)
+{
+	if (line.arguments.size() != 0) {
+		log(ERROR, "'error_log' takes no arguments (only parameters type= and filename=)");
+		return false;
 	}
-	if (!value_found) {
-		if (parameter_type == PARAMETER_OPTIONAL) {
-			return default_value;
+
+	LogConfig log_config;
+	map<string, string>::const_iterator type_it = line.parameters.find("type");
+	if (type_it == line.parameters.end()) {
+		log(ERROR, "'error_log' has no type= parameter");
+		return false; 
+	}
+
+	string type = type_it->second;
+	if (type == "file") {
+		log_config.type = LogConfig::LOG_TYPE_FILE;
+	} else if (type == "syslog") {
+		log_config.type = LogConfig::LOG_TYPE_SYSLOG;
+	} else if (type == "console") {
+		log_config.type = LogConfig::LOG_TYPE_CONSOLE;
+	} else {
+		log(ERROR, "Unknown log type '%s'", type.c_str());
+		return false; 
+	}
+
+	if (log_config.type == LogConfig::LOG_TYPE_FILE) {
+		map<string, string>::const_iterator filename_it = line.parameters.find("filename");
+		if (filename_it == line.parameters.end()) {
+			log(ERROR, "error_log type 'file' with no filename= parameter");
+			return false; 
 		}
-		fprintf(stderr, "ERROR: Missing '%s' statement in config file.\n",
-			keyword.c_str());
-		exit(1);
+		log_config.filename = filename_it->second;
+	}
+
+	config->log_destinations.push_back(log_config);
+	return true;
+}
+
+bool parse_config(const string &filename, Config *config)
+{
+	vector<ConfigLine> lines;
+	if (!read_config(filename, &lines)) {
+		return false;
+	}
+
+	config->daemonize = false;
+
+	if (!fetch_config_int(lines, "num_servers", &config->num_servers)) {
+		log(ERROR, "Missing 'num_servers' statement in config file.");
+		return false;
+	}
+	if (config->num_servers < 1 || config->num_servers >= 20000) {  // Insanely high max limit.
+		log(ERROR, "'num_servers' is %d, needs to be in [1, 20000>.", config->num_servers);
+		return false;
 	}
-	if (value < min_limit || value > max_limit) {
-		fprintf(stderr, "ERROR: '%s' is set to %d, must be in [%d,%d]\n",
-			keyword.c_str(), value, min_limit, max_limit);
-		exit(1);
+
+        // See if the user wants stats.
+	config->stats_interval = 60;
+	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.");
+	}
+	
+	fetch_config_string(lines, "access_log", &config->access_log_file);
+
+	for (size_t i = 0; i < lines.size(); ++i) {
+		const ConfigLine &line = lines[i];
+		if (line.keyword == "num_servers" ||
+		    line.keyword == "stats_file" ||
+		    line.keyword == "stats_interval" ||
+		    line.keyword == "access_log") {
+			// Already taken care of, above.
+		} else if (line.keyword == "port") {
+			if (!parse_port(line, config)) {
+				return false;
+			}
+		} else if (line.keyword == "stream") {
+			if (!parse_stream(line, config)) {
+				return false;
+			}
+		} else if (line.keyword == "error_log") {
+			if (!parse_error_log(line, config)) {
+				return false;
+			}
+		} else if (line.keyword == "daemonize") {
+			config->daemonize = true;
+		} else {
+			log(ERROR, "Unknown configuration keyword '%s'.",
+			        line.keyword.c_str());
+			return false;
+		}
 	}
-	return value;
+
+	return true;
 }