X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=config.cpp;h=d47bfec0fbb72fc4fe668939805ad54d7249d861;hp=ec9a0e14dc65eb8debf599ae09ab6fa115b52c05;hb=adbeb2f8972672ed1059509662d006df47762228;hpb=3ce04a3c410c5836394417b19e70f2a95bc8a5e7 diff --git a/config.cpp b/config.cpp index ec9a0e1..d47bfec 100644 --- a/config.cpp +++ b/config.cpp @@ -26,7 +26,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; } @@ -189,12 +189,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 +207,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()) { @@ -223,6 +235,87 @@ 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) { @@ -269,6 +362,8 @@ bool parse_config(const string &filename, Config *config) return false; } + config->daemonize = false; + if (!fetch_config_int(lines, "num_servers", &config->num_servers)) { log(ERROR, "Missing 'num_servers' statement in config file."); return false; @@ -285,12 +380,15 @@ bool parse_config(const string &filename, Config *config) if (has_stats_interval && !has_stats_file) { 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)) { @@ -300,10 +398,16 @@ 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 { log(ERROR, "Unknown configuration keyword '%s'.", line.keyword.c_str());