X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=config.cpp;h=21e17c988d7137b68b7b4c869fcffb077a3da3cf;hp=47118b48612e18bce0966c7bb696326532cf277e;hb=58dd753c464d917dc446e2cbb4c01fd750d4eb87;hpb=16a03b9858752fae9e81af261821a2a22855fde3 diff --git a/config.cpp b/config.cpp index 47118b4..21e17c9 100644 --- a/config.cpp +++ b/config.cpp @@ -7,9 +7,9 @@ #include #include #include -#include #include #include +#include #include #include "tlse.h" @@ -26,7 +26,7 @@ using namespace std; struct ConfigLine { string keyword; vector arguments; - map parameters; + unordered_map parameters; }; namespace { @@ -89,14 +89,14 @@ bool parse_hostport(const string &hostport, sockaddr_in6 *addr) bool read_config(const string &filename, vector *lines) { FILE *fp = fopen(filename.c_str(), "r"); - if (fp == NULL) { + if (fp == nullptr) { log_perror(filename.c_str()); return false; } char buf[4096]; while (!feof(fp)) { - if (fgets(buf, sizeof(buf), fp) == NULL) { + if (fgets(buf, sizeof(buf), fp) == nullptr) { break; } @@ -144,16 +144,16 @@ bool read_config(const string &filename, vector *lines) bool fetch_config_string(const vector &config, const string &keyword, string *value) { - for (unsigned i = 0; i < config.size(); ++i) { - if (config[i].keyword != keyword) { + for (const ConfigLine &line : config) { + if (line.keyword != keyword) { continue; } - if (config[i].parameters.size() > 0 || - config[i].arguments.size() != 1) { + if (line.parameters.size() > 0 || + line.arguments.size() != 1) { log(ERROR, "'%s' takes one argument and no parameters", keyword.c_str()); return false; } - *value = config[i].arguments[0]; + *value = line.arguments[0]; return true; } return false; @@ -161,16 +161,16 @@ bool fetch_config_string(const vector &config, const string &keyword bool fetch_config_int(const vector &config, const string &keyword, int *value) { - for (unsigned i = 0; i < config.size(); ++i) { - if (config[i].keyword != keyword) { + for (const ConfigLine &line : config) { + if (line.keyword != keyword) { continue; } - if (config[i].parameters.size() > 0 || - config[i].arguments.size() != 1) { + if (line.parameters.size() > 0 || + line.arguments.size() != 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. + *value = atoi(line.arguments[0].c_str()); // TODO: verify int validity. return true; } return false; @@ -181,7 +181,7 @@ bool load_file_to_string(const string &filename, size_t max_size, string *conten contents->clear(); FILE *fp = fopen(filename.c_str(), "r"); - if (fp == NULL) { + if (fp == nullptr) { log_perror(filename.c_str()); return false; } @@ -211,11 +211,11 @@ bool load_file_to_string(const string &filename, size_t max_size, string *conten return true; } -bool parse_tls_parameters(const map ¶meters, AcceptorConfig *acceptor) +bool parse_tls_parameters(const unordered_map ¶meters, AcceptorConfig *acceptor) { bool has_cert = false, has_key = false; - map::const_iterator tls_cert_it = parameters.find("tls_cert"); + auto tls_cert_it = parameters.find("tls_cert"); if (tls_cert_it != parameters.end()) { if (!load_file_to_string(tls_cert_it->second, 1048576, &acceptor->certificate_chain)) { return false; @@ -240,7 +240,7 @@ bool parse_tls_parameters(const map ¶meters, AcceptorConfig has_cert = true; } - map::const_iterator tls_key_it = parameters.find("tls_key"); + auto tls_key_it = parameters.find("tls_key"); if (tls_key_it != parameters.end()) { if (!load_file_to_string(tls_key_it->second, 1048576, &acceptor->private_key)) { return false; @@ -325,7 +325,7 @@ bool parse_stream(const ConfigLine &line, Config *config) StreamConfig stream; stream.url = line.arguments[0]; - map::const_iterator src_it = line.parameters.find("src"); + const auto 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()); @@ -334,14 +334,14 @@ bool parse_stream(const ConfigLine &line, Config *config) // TODO: Verify that the URL is parseable? } - map::const_iterator backlog_it = line.parameters.find("backlog_size"); + const auto 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()); } - map::const_iterator prebuffer_it = line.parameters.find("force_prebuffer"); + const auto prebuffer_it = line.parameters.find("force_prebuffer"); if (prebuffer_it == line.parameters.end()) { stream.prebuffering_bytes = 0; } else { @@ -349,7 +349,7 @@ bool parse_stream(const ConfigLine &line, Config *config) } // Parse output encoding. - map::const_iterator encoding_parm_it = line.parameters.find("encoding"); + const auto 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; @@ -361,7 +361,7 @@ bool parse_stream(const ConfigLine &line, Config *config) } // Parse input encoding. - map::const_iterator src_encoding_parm_it = line.parameters.find("src_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") { stream.src_encoding = StreamConfig::STREAM_ENCODING_METACUBE; @@ -373,13 +373,61 @@ bool parse_stream(const ConfigLine &line, Config *config) } // Parse the pacing rate, converting from kilobits to bytes as needed. - map::const_iterator pacing_rate_it = line.parameters.find("pacing_rate_kbit"); + const auto pacing_rate_it = line.parameters.find("pacing_rate_kbit"); if (pacing_rate_it == line.parameters.end()) { stream.pacing_rate = ~0U; } else { stream.pacing_rate = atoi(pacing_rate_it->second.c_str()) * 1024 / 8; } + // Parse the HLS URL, if any. + const auto hls_url_it = line.parameters.find("hls_playlist"); + if (hls_url_it != line.parameters.end()) { + stream.hls_url = hls_url_it->second; + if (stream.hls_url.empty()) { + log(ERROR, "Parameter 'hls_playlist' was given but empty"); + return false; + } + if (stream.encoding == StreamConfig::STREAM_ENCODING_METACUBE) { + log(ERROR, "HLS cannot be used with Metacube output"); + return false; + } + } + + // Parse the HLS fragment duration, if any. + const auto hls_frag_duration_it = line.parameters.find("hls_frag_duration"); + if (hls_frag_duration_it != line.parameters.end()) { + if (stream.hls_url.empty()) { + log(ERROR, "Parameter 'hls_frag_duration' given, but no 'hls_playlist' given"); + return false; + } + stream.hls_frag_duration = stoi(hls_frag_duration_it->second); + if (stream.hls_frag_duration <= 0) { + log(ERROR, "'hls_frag_duration' must be a strictly positive integer"); + return false; + } + } + + // Parse the HLS backlog margin, if any. + const auto hls_backlog_margin_it = line.parameters.find("hls_backlog_margin"); + if (hls_backlog_margin_it != line.parameters.end()) { + if (stream.hls_url.empty()) { + log(ERROR, "Parameter 'hls_backlog_margin' given, but no 'hls_playlist' given"); + return false; + } + stream.hls_backlog_margin = stoi(hls_backlog_margin_it->second); + if (stream.hls_backlog_margin < 0 || stream.hls_backlog_margin >= stream.backlog_size) { + log(ERROR, "'hls_backlog_margin' must be nonnegative, but less than the backlog size"); + return false; + } + } + + // Parse the CORS origin, if it exists. + const auto allow_origin_it = line.parameters.find("allow_origin"); + if (allow_origin_it != line.parameters.end()) { + stream.allow_origin = allow_origin_it->second; + } + config->streams.push_back(stream); return true; } @@ -398,7 +446,7 @@ bool parse_udpstream(const ConfigLine &line, Config *config) return false; } - map::const_iterator src_it = line.parameters.find("src"); + const auto 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.", @@ -409,7 +457,7 @@ bool parse_udpstream(const ConfigLine &line, Config *config) } // Parse the pacing rate, converting from kilobits to bytes as needed. - map::const_iterator pacing_rate_it = line.parameters.find("pacing_rate_kbit"); + const auto pacing_rate_it = line.parameters.find("pacing_rate_kbit"); if (pacing_rate_it == line.parameters.end()) { udpstream.pacing_rate = ~0U; } else { @@ -417,7 +465,7 @@ bool parse_udpstream(const ConfigLine &line, Config *config) } // Parse the TTL. The same value is used for unicast and multicast. - map::const_iterator ttl_it = line.parameters.find("ttl"); + const auto ttl_it = line.parameters.find("ttl"); if (ttl_it == line.parameters.end()) { udpstream.ttl = -1; } else { @@ -425,7 +473,7 @@ bool parse_udpstream(const ConfigLine &line, Config *config) } // Parse the multicast interface index. - map::const_iterator multicast_iface_it = line.parameters.find("multicast_output_interface"); + const auto multicast_iface_it = line.parameters.find("multicast_output_interface"); if (multicast_iface_it == line.parameters.end()) { udpstream.multicast_iface_index = -1; } else { @@ -451,7 +499,7 @@ bool parse_gen204(const ConfigLine &line, Config *config) gen204.url = line.arguments[0]; // Parse the CORS origin, if it exists. - map::const_iterator allow_origin_it = line.parameters.find("allow_origin"); + const auto allow_origin_it = line.parameters.find("allow_origin"); if (allow_origin_it != line.parameters.end()) { gen204.allow_origin = allow_origin_it->second; } @@ -468,7 +516,7 @@ bool parse_error_log(const ConfigLine &line, Config *config) } LogConfig log_config; - map::const_iterator type_it = line.parameters.find("type"); + const auto type_it = line.parameters.find("type"); if (type_it == line.parameters.end()) { log(ERROR, "'error_log' has no type= parameter"); return false; @@ -487,7 +535,7 @@ bool parse_error_log(const ConfigLine &line, Config *config) } if (log_config.type == LogConfig::LOG_TYPE_FILE) { - map::const_iterator filename_it = line.parameters.find("filename"); + const auto filename_it = line.parameters.find("filename"); if (filename_it == line.parameters.end()) { log(ERROR, "error_log type 'file' with no filename= parameter"); return false; @@ -536,8 +584,7 @@ bool parse_config(const string &filename, Config *config) fetch_config_string(lines, "access_log", &config->access_log_file); - for (size_t i = 0; i < lines.size(); ++i) { - const ConfigLine &line = lines[i]; + for (const ConfigLine &line : lines) { if (line.keyword == "num_servers" || line.keyword == "stats_file" || line.keyword == "stats_interval" ||