X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=config.cpp;h=3122cc568de0514f9386ad7844b3ffc478cee052;hp=fad29a5361b7627eb442e0037c2595abcb2a55a7;hb=43295b9f228a5b2d2b602f22a9728720138214ef;hpb=136469d722a9986be6bbad68788619284919d876 diff --git a/config.cpp b/config.cpp index fad29a5..3122cc5 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" @@ -22,6 +26,63 @@ struct ConfigLine { map parameters; }; +namespace { + +bool parse_hostport(const string &hostport, sockaddr_in6 *addr) +{ + memset(addr, 0, sizeof(*addr)); + addr->sin6_family = AF_INET6; + + string port_string; + + // 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, "address '%s' is malformed; must be either [ipv6addr]:port or ipv4addr:port"); + return false; + } + + string host(hostport.begin() + 1, hostport.begin() + split); + port_string = hostport.substr(split + 2); + + if (inet_pton(AF_INET6, host.c_str(), &addr->sin6_addr) != 1) { + log(ERROR, "'%s' is not a valid IPv6 address"); + return false; + } + } else { + // OK, then it must be ipv4addr:port. + size_t split = hostport.find(":"); + if (split == string::npos) { + log(ERROR, "address '%s' is malformed; must be either [ipv6addr]:port or ipv4addr:port"); + return false; + } + + string host(hostport.begin(), hostport.begin() + split); + port_string = 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, "'%s' is not a valid IPv4 address"); + return false; + } + + addr->sin6_addr.s6_addr32[2] = htonl(0xffff); + addr->sin6_addr.s6_addr32[3] = addr4.s_addr; + } + + 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; + } + addr->sin6_port = ntohs(port); + + return true; +} + bool read_config(const string &filename, vector *lines) { FILE *fp = fopen(filename.c_str(), "r"); @@ -116,13 +177,30 @@ 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; } + AcceptorConfig acceptor; + if (!parse_hostport(line.arguments[0], &acceptor.addr)) { + return false; + } config->acceptors.push_back(acceptor); return true; } @@ -189,12 +267,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 +285,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 +309,66 @@ 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]; + if (!parse_hostport(line.arguments[0], &udpstream.dst)) { + return false; + } + + 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) { @@ -262,6 +408,8 @@ bool parse_error_log(const ConfigLine &line, Config *config) return true; } +} // namespace + bool parse_config(const string &filename, Config *config) { vector lines; @@ -285,7 +433,14 @@ 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); @@ -295,16 +450,26 @@ bool parse_config(const string &filename, Config *config) if (line.keyword == "num_servers" || line.keyword == "stats_file" || 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;