X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=config.cpp;h=f17302a4e92c4b136a2d1c182d8aef4ff313c8dd;hp=bcd86a9c2cb0101aeea3f4cc1141c6d902b8e5d4;hb=8cdf715a5a6320a0b8c1152a28c40bc0dd86676b;hpb=488f28bf7070f44469a006ed4a9d4c423788d175 diff --git a/config.cpp b/config.cpp index bcd86a9..f17302a 100644 --- a/config.cpp +++ b/config.cpp @@ -1,14 +1,18 @@ +#include #include #include +#include #include #include #include +#include #include #include #include #include #include "config.h" +#include "log.h" #include "parse.h" using namespace std; @@ -25,7 +29,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; } @@ -82,7 +86,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]; @@ -99,7 +103,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. @@ -111,14 +115,14 @@ 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; } 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); + log(ERROR, "port %d is out of range (must be [1,65536>).", acceptor.port); return false; } @@ -138,9 +142,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); } } @@ -161,7 +165,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; } @@ -172,7 +176,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; } @@ -183,17 +187,17 @@ 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? @@ -206,6 +210,18 @@ bool parse_stream(const ConfigLine &line, Config *config) 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()) { @@ -222,6 +238,126 @@ bool parse_stream(const ConfigLine &line, Config *config) 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); + } + + 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; @@ -229,12 +365,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; } @@ -243,14 +381,17 @@ 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 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 == "access_log") { // Already taken care of, above. } else if (line.keyword == "port") { if (!parse_port(line, config)) { @@ -260,8 +401,18 @@ bool parse_config(const string &filename, Config *config) 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; }