From: Steinar H. Gunderson Date: Sun, 1 Dec 2013 00:27:50 +0000 (+0100) Subject: Fix some duplicated IP address parsing code. X-Git-Tag: 1.0.2~6 X-Git-Url: https://git.sesse.net/?p=cubemap;a=commitdiff_plain;h=43295b9f228a5b2d2b602f22a9728720138214ef;hp=9b5a1e6241a5281ddefea4d43ae82ef7cf9a6d32 Fix some duplicated IP address parsing code. --- diff --git a/config.cpp b/config.cpp index 224e34f..3122cc5 100644 --- a/config.cpp +++ b/config.cpp @@ -28,6 +28,61 @@ struct ConfigLine { 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"); @@ -142,61 +197,10 @@ 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; } @@ -327,50 +331,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(line.arguments[0], &udpstream.dst)) { + return false; } map::const_iterator src_it = line.parameters.find("src");