diff options
author | antirez <antirez@gmail.com> | 2013-07-11 11:39:03 +0200 |
---|---|---|
committer | antirez <antirez@gmail.com> | 2013-07-11 11:48:13 +0200 |
commit | 06919b3f86b1c821eb1a53d4e1d7c74c78fe00e1 (patch) | |
tree | af809f2fc3140545438f923d24898166c6d7af63 | |
parent | 253e796a59c68a0ccc57c156cfa61f97e97afad6 (diff) |
Minimal IPv6 support.
redisContextConnectTcp() is now able to use IPv6 addresses if there is
no IPv4 address found resolving the specified hostname.
-rw-r--r-- | net.c | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -255,9 +255,17 @@ int redisContextConnectTcp(redisContext *c, const char *addr, int port, const st hints.ai_family = AF_INET; hints.ai_socktype = SOCK_STREAM; + /* Try with IPv6 if no IPv4 address was found. We do it in this order since + * in a Redis client you can't afford to test if you have IPv6 connectivity + * as this would add latency to every connect. Otherwise a more sensible + * route could be: Use IPv6 if both addresses are available and there is IPv6 + * connectivity. */ if ((rv = getaddrinfo(addr,_port,&hints,&servinfo)) != 0) { - __redisSetError(c,REDIS_ERR_OTHER,gai_strerror(rv)); - return REDIS_ERR; + hints.ai_family = AF_INET6; + if ((rv = getaddrinfo(addr,_port,&hints,&servinfo)) != 0) { + __redisSetError(c,REDIS_ERR_OTHER,gai_strerror(rv)); + return REDIS_ERR; + } } for (p = servinfo; p != NULL; p = p->ai_next) { if ((s = socket(p->ai_family,p->ai_socktype,p->ai_protocol)) == -1) |