From 73ae8558c17a486a694f49dede5a6febed99e9e5 Mon Sep 17 00:00:00 2001 From: antirez Date: Thu, 11 Jul 2013 16:38:30 +0200 Subject: [PATCH] Sentinel: embed IPv6 address into [] when naming slave/sentinel instance. --- src/sentinel.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/sentinel.c b/src/sentinel.c index 62473b5c..659de29b 100644 --- a/src/sentinel.c +++ b/src/sentinel.c @@ -835,7 +835,9 @@ sentinelRedisInstance *createSentinelRedisInstance(char *name, int flags, char * /* For slaves and sentinel we use ip:port as name. */ if (flags & (SRI_SLAVE|SRI_SENTINEL)) { - snprintf(slavename,sizeof(slavename),"%s:%d",hostname,port); + snprintf(slavename,sizeof(slavename), + strchr(hostname,':') ? "[%s]:%d" : "%s:%d", + hostname,port); name = slavename; } @@ -943,7 +945,9 @@ sentinelRedisInstance *sentinelRedisInstanceLookupSlave( sentinelRedisInstance *slave; redisAssert(ri->flags & SRI_MASTER); - key = sdscatprintf(sdsempty(),"%s:%d",ip,port); + key = sdscatprintf(sdsempty(), + strchr(ip,':') ? "[%s]:%d" : "%s:%d", + ip,port); slave = dictFetchValue(ri->slaves,key); sdsfree(key); return slave;