X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=config.cpp;h=57bf10a7f0ddc038f892a4e08b62706341d98842;hp=e7c9c844d1ab4ffd5f24cd9f7fcf493b2f8ecf8e;hb=b08dc2a81825a298a03f2dee2ae7dd7045e72739;hpb=f2530dbb8415f9e7cc0f2d4b45741120c95e8a05 diff --git a/config.cpp b/config.cpp index e7c9c84..57bf10a 100644 --- a/config.cpp +++ b/config.cpp @@ -26,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"); @@ -75,7 +132,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; } @@ -140,119 +200,14 @@ bool parse_listen(const ConfigLine &line, Config *config) 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); + if (!parse_hostport(line.arguments[0], &acceptor.addr)) { return false; } - acceptor.addr.sin6_port = ntohs(port); - config->acceptors.push_back(acceptor); return true; } -int allocate_mark_pool(int from, int to, 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 (pool_index != -1) { - return pool_index; - } - - // 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; -} - bool parse_stream(const ConfigLine &line, Config *config) { if (line.arguments.size() != 1) { @@ -291,18 +246,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()) { @@ -325,50 +268,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"); @@ -381,18 +282,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()) { @@ -401,6 +290,14 @@ 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()); + } + config->udpstreams.push_back(udpstream); return true; } @@ -444,6 +341,8 @@ bool parse_error_log(const ConfigLine &line, Config *config) return true; } +} // namespace + bool parse_config(const string &filename, Config *config) { vector lines;