diff options
| author | Pieter Noordhuis <pcnoordhuis@gmail.com> | 2013-07-11 08:58:05 -0700 |
|---|---|---|
| committer | Pieter Noordhuis <pcnoordhuis@gmail.com> | 2013-07-11 08:58:05 -0700 |
| commit | cc3ee4532533179c589d3f15feb0c76bed96cdb2 (patch) | |
| tree | af809f2fc3140545438f923d24898166c6d7af63 | |
| parent | fbf1bb648e2e71a354ff4a1c0db07be2b3673a8a (diff) | |
| parent | 06919b3f86b1c821eb1a53d4e1d7c74c78fe00e1 (diff) | |
Merge branch 'ipv6'
| -rw-r--r-- | examples/example.c | 6 | ||||
| -rw-r--r-- | net.c | 12 |
2 files changed, 14 insertions, 4 deletions
diff --git a/examples/example.c b/examples/example.c index c76451f..25226a8 100644 --- a/examples/example.c +++ b/examples/example.c @@ -4,13 +4,15 @@ #include <hiredis.h> -int main(void) { +int main(int argc, char **argv) { unsigned int j; redisContext *c; redisReply *reply; + const char *hostname = (argc > 1) ? argv[1] : "127.0.0.1"; + int port = (argc > 2) ? atoi(argv[2]) : 6379; struct timeval timeout = { 1, 500000 }; // 1.5 seconds - c = redisConnectWithTimeout((char*)"127.0.0.1", 6379, timeout); + c = redisConnectWithTimeout(hostname, port, timeout); if (c == NULL || c->err) { if (c) { printf("Connection error: %s\n", c->errstr); @@ -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) |