X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=config.cpp;h=e7c9c844d1ab4ffd5f24cd9f7fcf493b2f8ecf8e;hp=77acf6dd61cac95c6a4792446a42bc99ff6def29;hb=f2530dbb8415f9e7cc0f2d4b45741120c95e8a05;hpb=a313e4c7a3c0c453d4dffd317fc143f1f4a7f8ba diff --git a/config.cpp b/config.cpp index 77acf6d..e7c9c84 100644 --- a/config.cpp +++ b/config.cpp @@ -1,13 +1,17 @@ +#include #include #include +#include #include #include #include +#include #include #include #include #include +#include "acceptor.h" #include "config.h" #include "log.h" #include "parse.h" @@ -116,13 +120,81 @@ bool parse_port(const ConfigLine &line, Config *config) 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) { - log(ERROR, "port %d is out of range (must be [1,65536>).", 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; } @@ -189,12 +261,12 @@ bool parse_stream(const ConfigLine &line, Config *config) } 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()) { log(WARNING, "stream '%s' has no src= attribute, clients will not get any data.", - stream.stream_id.c_str()); + stream.url.c_str()); } else { stream.src = src_it->second; // TODO: Verify that the URL is parseable? @@ -207,6 +279,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()) { @@ -219,10 +303,108 @@ 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) { @@ -285,23 +467,43 @@ 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) { - log(WARNING, "'stats_interval' given, but no 'stats_file'. No statistics will be written."); + 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;