Mercurial > dovecot > core-2.2
changeset 11448:bdb46ba87203 HEAD
Added support for [] around ipv6 addresses everywhere.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Tue, 01 Jun 2010 18:35:48 +0100 |
parents | 484eb8f1f074 |
children | 9952cbe2f839 |
files | src/config/old-set-parser.c src/lib/network.c src/master/service.c |
diffstat | 3 files changed, 24 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/config/old-set-parser.c Tue Jun 01 17:51:50 2010 +0100 +++ b/src/config/old-set-parser.c Tue Jun 01 18:35:48 2010 +0100 @@ -215,6 +215,7 @@ for (; *addrs != NULL; addrs++) { if (strcmp(*addrs, "*") != 0 && strcmp(*addrs, "::") != 0 && + strcmp(*addrs, "[::]") != 0 && !is_ipv4_address(*addrs) && !is_ipv6_address(*addrs)) return TRUE;
--- a/src/lib/network.c Tue Jun 01 17:51:50 2010 +0100 +++ b/src/lib/network.c Tue Jun 01 18:35:48 2010 +0100 @@ -678,11 +678,22 @@ int net_addr2ip(const char *addr, struct ip_addr *ip) { + int ret; + if (strchr(addr, ':') != NULL) { /* IPv6 */ ip->family = AF_INET6; #ifdef HAVE_IPV6 - if (inet_pton(AF_INET6, addr, &ip->u.ip6) == 0) + T_BEGIN { + if (addr[0] == '[') { + /* allow [ipv6 addr] */ + unsigned int len = strlen(addr); + if (addr[len-1] == ']') + addr = t_strndup(addr+1, len-2); + } + ret = inet_pton(AF_INET6, addr, &ip->u.ip6); + } T_END; + if (ret == 0) return -1; #else ip->u.ip4.s_addr = 0; @@ -785,9 +796,18 @@ bool is_ipv6_address(const char *addr) { + bool have_prefix = FALSE; + + if (*addr == '[') { + have_prefix = TRUE; + addr++; + } while (*addr != '\0') { - if (*addr != ':' && !i_isxdigit(*addr)) + if (*addr != ':' && !i_isxdigit(*addr)) { + if (have_prefix && *addr == ']' && addr[1] == '\0') + break; return FALSE; + } addr++; }
--- a/src/master/service.c Tue Jun 01 17:51:50 2010 +0100 +++ b/src/master/service.c Tue Jun 01 18:35:48 2010 +0100 @@ -70,7 +70,7 @@ return 0; } - if (strcmp(address, "::") == 0) { + if (strcmp(address, "::") == 0 || strcmp(address, "[::]") == 0) { /* IPv6 any */ ip_list = t_new(struct ip_addr, 1); net_get_ip_any6(ip_list);