X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=config.cpp;h=f474f8c495f2cd07c624bd87a9e7a0f4d58f3f6c;hp=f5182aac1512e9b8307ac57d16ada0b639260257;hb=0eac9253f23925734e256c63081e157c68c70704;hpb=ce0d42a14da5686366d0c73fa9b152e90619ff91 diff --git a/config.cpp b/config.cpp index f5182aa..f474f8c 100644 --- a/config.cpp +++ b/config.cpp @@ -5,12 +5,14 @@ #include #include #include +#include #include #include #include #include #include +#include "acceptor.h" #include "config.h" #include "log.h" #include "parse.h" @@ -25,6 +27,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"); @@ -74,7 +133,10 @@ bool read_config(const string &filename, vector *lines) lines->push_back(line); } - fclose(fp); + if (fclose(fp) == EOF) { + log_perror(filename.c_str()); + return false; + } return true; } @@ -119,69 +181,32 @@ bool parse_port(const ConfigLine &line, Config *config) 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); + 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.addr = CreateAnyAddress(port); + config->acceptors.push_back(acceptor); return true; } -int allocate_mark_pool(int from, int to, Config *config) +bool parse_listen(const ConfigLine &line, Config *config) { - int pool_index = -1; - - // Reuse mark pools if an identical one exists. - // Otherwise, check if we're overlapping some other mark pool. - for (size_t i = 0; i < config->mark_pools.size(); ++i) { - const MarkPoolConfig &pool = config->mark_pools[i]; - if (from == pool.from && to == pool.to) { - pool_index = i; - } else if ((from >= pool.from && from < pool.to) || - (to >= pool.from && to < pool.to)) { - 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); - } + if (line.arguments.size() != 1) { + log(ERROR, "'listen' takes exactly one argument"); + return false; } - if (pool_index != -1) { - return pool_index; + AcceptorConfig acceptor; + if (!parse_hostport(line.arguments[0], &acceptor.addr)) { + return false; } - - // No match to existing pools. - MarkPoolConfig pool; - pool.from = from; - pool.to = to; - config->mark_pools.push_back(pool); - - return config->mark_pools.size() - 1; -} - -bool parse_mark_pool(const string &mark_str, int *from, int *to) -{ - size_t split = mark_str.find_first_of('-'); - if (split == string::npos) { - log(ERROR, "Invalid mark specification '%s' (expected 'X-Y').", - mark_str.c_str()); - return false; - } - - string from_str(mark_str.begin(), mark_str.begin() + split); - string to_str(mark_str.begin() + split + 1, mark_str.end()); - *from = atoi(from_str.c_str()); - *to = atoi(to_str.c_str()); - - if (*from <= 0 || *from >= 65536 || *to <= 0 || *to >= 65536) { - log(ERROR, "Mark pool range %d-%d is outside legal range [1,65536>.", - *from, *to); - return false; - } - - return true; + config->acceptors.push_back(acceptor); + return true; } bool parse_stream(const ConfigLine &line, Config *config) @@ -222,18 +247,6 @@ bool parse_stream(const ConfigLine &line, Config *config) return false; } - // Parse marks, if so desired. - map::const_iterator mark_parm_it = line.parameters.find("mark"); - if (mark_parm_it == line.parameters.end()) { - stream.mark_pool = -1; - } else { - int from, to; - if (!parse_mark_pool(mark_parm_it->second, &from, &to)) { - return false; - } - 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()) { @@ -256,50 +269,8 @@ bool parse_udpstream(const ConfigLine &line, Config *config) 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. + if (!parse_hostport(hostport, &udpstream.dst)) { + return false; } map::const_iterator src_it = line.parameters.find("src"); @@ -312,18 +283,6 @@ bool parse_udpstream(const ConfigLine &line, Config *config) // 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()) { @@ -332,6 +291,26 @@ bool parse_udpstream(const ConfigLine &line, Config *config) udpstream.pacing_rate = atoi(pacing_rate_it->second.c_str()) * 1024 / 8; } + // Parse the TTL. The same value is used for unicast and multicast. + map::const_iterator ttl_it = line.parameters.find("ttl"); + if (ttl_it == line.parameters.end()) { + udpstream.ttl = -1; + } else { + udpstream.ttl = atoi(ttl_it->second.c_str()); + } + + // Parse the multicast interface index. + map::const_iterator multicast_iface_it = line.parameters.find("multicast_output_interface"); + if (multicast_iface_it == line.parameters.end()) { + udpstream.multicast_iface_index = -1; + } else { + udpstream.multicast_iface_index = if_nametoindex(multicast_iface_it->second.c_str()); + if (udpstream.multicast_iface_index == 0) { + log(ERROR, "Interface '%s' does not exist", multicast_iface_it->second.c_str()); + return false; + } + } + config->udpstreams.push_back(udpstream); return true; } @@ -375,6 +354,8 @@ bool parse_error_log(const ConfigLine &line, Config *config) return true; } +} // namespace + bool parse_config(const string &filename, Config *config) { vector lines; @@ -423,6 +404,10 @@ bool parse_config(const string &filename, Config *config) 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;