X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=config.cpp;h=489711363482149c5b0f8d89621dc2c294c2b81a;hp=b6ad99bee05b329d288f5fcd20d190d26015e05f;hb=2c6cd9718a5baf5a2ed5be73ec3c525d4873f45a;hpb=3845193b930d998630bb53b8d4f05a2b54aefd83 diff --git a/config.cpp b/config.cpp index b6ad99b..4897113 100644 --- a/config.cpp +++ b/config.cpp @@ -1,8 +1,10 @@ #include #include #include +#include #include #include +#include #include #include @@ -11,14 +13,18 @@ using namespace std; -vector parse_config(const string &filename) -{ - vector ret; +struct ConfigLine { + string keyword; + vector arguments; + map parameters; +}; +bool read_config(const string &filename, vector *lines) +{ FILE *fp = fopen(filename.c_str(), "r"); if (fp == NULL) { perror(filename.c_str()); - exit(1); + return false; } char buf[4096]; @@ -59,17 +65,15 @@ vector 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 &config, const string &keyword, - ParameterType parameter_type, const string &default_value) +bool fetch_config_string(const vector &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; @@ -77,26 +81,16 @@ string fetch_config_string(const vector &config, const string &keywo 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); + 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 &config, const std::string &keyword, - int min_limit, int max_limit, - ParameterType parameter_type, int default_value) +bool fetch_config_int(const vector &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; @@ -104,23 +98,165 @@ int fetch_config_int(const std::vector &config, const std::string &k 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); + 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) { + fprintf(stderr, "ERROR: 'port' takes exactly one argument\n"); + return false; + } + + AcceptorConfig acceptor; + acceptor.port = atoi(line.arguments[0].c_str()); + if (acceptor.port < 1 || acceptor.port >= 65536) { + fprintf(stderr, "ERROR: port %d is out of range (must be [1,65536>).\n", 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)) { + fprintf(stderr, "WARNING: Mark pool %d-%d partially overlaps with %d-%d, you may get duplicate marks.\n", + from, to, pool.from, pool.to); + fprintf(stderr, " Mark pools must either be completely disjunct, or completely overlapping.\n"); } - value_found = true; - value = atoi(config[i].arguments[0].c_str()); // TODO: verify int validity. } - if (!value_found) { - if (parameter_type == PARAMETER_OPTIONAL) { - return default_value; + + 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) { + fprintf(stderr, "ERROR: Invalid mark specification '%s' (expected 'X-Y').\n", + 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) { + fprintf(stderr, "ERROR: Mark pool range %d-%d is outside legal range [1,65536>.\n", + *from, *to); + return false; + } + + return true; +} + +bool parse_stream(const ConfigLine &line, Config *config) +{ + if (line.arguments.size() != 1) { + fprintf(stderr, "ERROR: 'stream' takes exactly one argument\n"); + return false; + } + + StreamConfig stream; + stream.stream_id = line.arguments[0]; + + map::const_iterator src_it = line.parameters.find("src"); + if (src_it == line.parameters.end()) { + fprintf(stderr, "WARNING: stream '%s' has no src= attribute, clients will not get any data.\n", + stream.stream_id.c_str()); + } else { + stream.src = src_it->second; + // TODO: Verify that the URL is parseable? + } + + // Parse marks, if so desired. + map::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; } - fprintf(stderr, "ERROR: Missing '%s' statement in config file.\n", - keyword.c_str()); - exit(1); + stream.mark_pool = allocate_mark_pool(from, to, config); + } + + config->streams.push_back(stream); + return true; +} + +bool parse_config(const string &filename, Config *config) +{ + vector lines; + if (!read_config(filename, &lines)) { + 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); + + if (!fetch_config_int(lines, "num_servers", &config->num_servers)) { + fprintf(stderr, "ERROR: Missing 'num_servers' statement in config file.\n"); + return false; + } + if (config->num_servers < 1 || config->num_servers >= 20000) { // Insanely high max limit. + fprintf(stderr, "ERROR: 'num_servers' is %d, needs to be in [1, 20000>.\n", config->num_servers); + return false; + } + + // 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) { + fprintf(stderr, "WARNING: 'stats_interval' given, but no 'stats_file'. No statistics will be written.\n"); } - return value; + + 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") { + // 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 { + fprintf(stderr, "ERROR: Unknown configuration keyword '%s'.\n", + line.keyword.c_str()); + return false; + } + } + + return true; }