X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=config.cpp;h=e7c9c844d1ab4ffd5f24cd9f7fcf493b2f8ecf8e;hp=489711363482149c5b0f8d89621dc2c294c2b81a;hb=f2530dbb8415f9e7cc0f2d4b45741120c95e8a05;hpb=2c6cd9718a5baf5a2ed5be73ec3c525d4873f45a diff --git a/config.cpp b/config.cpp index 4897113..e7c9c84 100644 --- a/config.cpp +++ b/config.cpp @@ -1,18 +1,25 @@ +#include +#include +#include +#include #include -#include #include -#include -#include -#include +#include +#include #include -#include #include +#include +#include +#include "acceptor.h" #include "config.h" +#include "log.h" #include "parse.h" using namespace std; +#define DEFAULT_BACKLOG_SIZE 1048576 + struct ConfigLine { string keyword; vector arguments; @@ -23,7 +30,7 @@ bool read_config(const string &filename, vector *lines) { FILE *fp = fopen(filename.c_str(), "r"); if (fp == NULL) { - perror(filename.c_str()); + log_perror(filename.c_str()); return false; } @@ -80,7 +87,7 @@ bool fetch_config_string(const vector &config, const string &keyword } 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()); + log(ERROR, "'%s' takes one argument and no parameters", keyword.c_str()); return false; } *value = config[i].arguments[0]; @@ -97,7 +104,7 @@ bool fetch_config_int(const vector &config, const string &keyword, i } 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()); + 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. @@ -109,16 +116,84 @@ bool fetch_config_int(const vector &config, const string &keyword, i bool parse_port(const ConfigLine &line, Config *config) { if (line.arguments.size() != 1) { - fprintf(stderr, "ERROR: 'port' takes exactly one argument\n"); + log(ERROR, "'port' takes exactly one argument"); + return false; + } + + int port = atoi(line.arguments[0].c_str()); + if (port < 1 || port >= 65536) { + log(ERROR, "port %d is out of range (must be [1,65536>).", port); 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); + acceptor.addr = CreateAnyAddress(port); + + config->acceptors.push_back(acceptor); + return true; +} + +bool parse_listen(const ConfigLine &line, Config *config) +{ + if (line.arguments.size() != 1) { + log(ERROR, "'listen' takes exactly one argument"); + return false; + } + + string addr_string = line.arguments[0]; + if (addr_string.empty()) { + // Actually, this should never happen. + log(ERROR, "'listen' argument cannot be empty"); + return false; + } + + string port_string; + + AcceptorConfig acceptor; + memset(&acceptor.addr, 0, sizeof(acceptor.addr)); + acceptor.addr.sin6_family = AF_INET6; + if (addr_string[0] == '[') { + // IPv6 address: [addr]:port. + size_t addr_end = addr_string.find("]:"); + if (addr_end == string::npos) { + log(ERROR, "IPv6 address '%s' should be on form [address]:port", addr_string.c_str()); + return false; + } + + string addr_only = addr_string.substr(1, addr_end - 1); + if (inet_pton(AF_INET6, addr_only.c_str(), &acceptor.addr.sin6_addr) != 1) { + log(ERROR, "Invalid IPv6 address '%s'", addr_only.c_str()); + return false; + } + + port_string = addr_string.substr(addr_end + 2); + } else { + // IPv4 address: addr:port. + size_t addr_end = addr_string.find(":"); + if (addr_end == string::npos) { + log(ERROR, "IPv4 address '%s' should be on form address:port", addr_string.c_str()); + return false; + } + + in_addr addr4; + string addr_only = addr_string.substr(0, addr_end); + if (inet_pton(AF_INET, addr_only.c_str(), &addr4) != 1) { + log(ERROR, "Invalid IPv4 address '%s'", addr_only.c_str()); + return false; + } + + // Convert to a v4-mapped address. + acceptor.addr.sin6_addr.s6_addr32[2] = htonl(0xffff); + acceptor.addr.sin6_addr.s6_addr32[3] = addr4.s_addr; + port_string = addr_string.substr(addr_end + 1); + } + + int port = atoi(port_string.c_str()); + if (port < 1 || port >= 65536) { + log(ERROR, "port %d is out of range (must be [1,65536>).", port); return false; } + acceptor.addr.sin6_port = ntohs(port); config->acceptors.push_back(acceptor); return true; @@ -136,9 +211,9 @@ int allocate_mark_pool(int from, int to, Config *config) 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"); + 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); } } @@ -159,7 +234,7 @@ 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", + log(ERROR, "Invalid mark specification '%s' (expected 'X-Y').", mark_str.c_str()); return false; } @@ -170,7 +245,7 @@ bool parse_mark_pool(const string &mark_str, int *from, int *to) *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", + log(ERROR, "Mark pool range %d-%d is outside legal range [1,65536>.", *from, *to); return false; } @@ -181,22 +256,41 @@ bool parse_mark_pool(const string &mark_str, int *from, int *to) bool parse_stream(const ConfigLine &line, Config *config) { if (line.arguments.size() != 1) { - fprintf(stderr, "ERROR: 'stream' takes exactly one argument\n"); + log(ERROR, "'stream' takes exactly one argument"); return false; } StreamConfig stream; - stream.stream_id = line.arguments[0]; + stream.url = 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()); + 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::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::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::const_iterator mark_parm_it = line.parameters.find("mark"); if (mark_parm_it == line.parameters.end()) { @@ -209,10 +303,147 @@ bool parse_stream(const ConfigLine &line, Config *config) stream.mark_pool = allocate_mark_pool(from, to, config); } + // Parse the pacing rate, converting from kilobits to bytes as needed. + map::const_iterator 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; + } + config->streams.push_back(stream); 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::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::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); + } + + // Parse the pacing rate, converting from kilobits to bytes as needed. + map::const_iterator pacing_rate_it = line.parameters.find("pacing_rate_kbit"); + if (pacing_rate_it == line.parameters.end()) { + udpstream.pacing_rate = ~0U; + } else { + udpstream.pacing_rate = atoi(pacing_rate_it->second.c_str()) * 1024 / 8; + } + + config->udpstreams.push_back(udpstream); + 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; + } + + LogConfig log_config; + map::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::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; + } + log_config.filename = filename_it->second; + } + + config->log_destinations.push_back(log_config); + return true; +} + bool parse_config(const string &filename, Config *config) { vector lines; @@ -220,12 +451,14 @@ bool parse_config(const string &filename, Config *config) return false; } + config->daemonize = false; + if (!fetch_config_int(lines, "num_servers", &config->num_servers)) { - fprintf(stderr, "ERROR: Missing 'num_servers' statement in config file.\n"); + log(ERROR, "Missing 'num_servers' statement in config file."); 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); + log(ERROR, "'num_servers' is %d, needs to be in [1, 20000>.", config->num_servers); return false; } @@ -234,25 +467,51 @@ 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) { - fprintf(stderr, "WARNING: 'stats_interval' given, but no 'stats_file'. No statistics will be written.\n"); + 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); + 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 == "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") { if (!parse_port(line, config)) { return false; } + } else if (line.keyword == "listen") { + if (!parse_listen(line, config)) { + return false; + } } else if (line.keyword == "stream") { 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; + } + } else if (line.keyword == "daemonize") { + config->daemonize = true; } else { - fprintf(stderr, "ERROR: Unknown configuration keyword '%s'.\n", + log(ERROR, "Unknown configuration keyword '%s'.", line.keyword.c_str()); return false; }