fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-19 09:00:51 +00:00
Code Issues Projects Releases Wiki Activity

Update clusterCommand to handle AF_INET6 addresses

Browse Source 
Changes the sockaddr_in to a sockaddr_storage. Attempts to convert the
IP address into an AF_INET or AF_INET6 before returning an "Invalid IP
address" error. Handles converting the sockaddr from either AF_INET or
AF_INET6 back into a string for storage in the clusterNode ip field.
This commit is contained in:
Geoff Garside 2011-06-18 19:21:43 +01:00 committed by antirez
parent 5be83eecac
commit e6bf4c2676
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/cluster.c
View File

@ -2075,11 +2075,12 @@ void clusterCommand(redisClient *c) {
if (!strcasecmp(c->argv[1]->ptr,"meet") && c->argc == 4) { if (!strcasecmp(c->argv[1]->ptr,"meet") && c->argc == 4) {
/* CLUSTER MEET <ip> <port> */ /* CLUSTER MEET <ip> <port> */
clusterNode *n; clusterNode *n;
struct sockaddr_in sa; struct sockaddr_storage sa;
long port; long port;
/* Perform sanity checks on IP/port */ /* Perform sanity checks on IP/port */
if (inet_pton(AF_INET,c->argv[0]->ptr,&(sa.sin_addr)) == 0) { if ((inet_pton(AF_INET,c->argv[0]->ptr,&(((struct sockaddr_in *)&sa)->sin_addr)) ||
inet_pton(AF_INET6,c->argv[0]->ptr,&(((struct sockaddr_in6 *)&sa)->sin6_addr))) == 0) {
addReplyError(c,"Invalid IP address in MEET"); addReplyError(c,"Invalid IP address in MEET");
return; return;
} }
@ -2093,7 +2094,9 @@ void clusterCommand(redisClient *c) {
/* Finally add the node to the cluster with a random name, this /* Finally add the node to the cluster with a random name, this
* will get fixed in the first handshake (ping/pong). */ * will get fixed in the first handshake (ping/pong). */
n = createClusterNode(NULL,REDIS_NODE_HANDSHAKE|REDIS_NODE_MEET); n = createClusterNode(NULL,REDIS_NODE_HANDSHAKE|REDIS_NODE_MEET);
inet_ntop(sa.sin_family,(void*)&(sa.sin_addr),n->ip,REDIS_CLUSTER_IPLEN); sa.ss_family == AF_INET ?
inet_ntop(AF_INET,(void*)&(((struct sockaddr_in *)&sa)->sin_addr),n->ip,REDIS_CLUSTER_IPLEN) :
inet_ntop(AF_INET6,(void*)&(((struct sockaddr_in6 *)&sa)->sin6_addr),n->ip,REDIS_CLUSTER_IPLEN);
n->port = port; n->port = port;
clusterAddNode(n); clusterAddNode(n);
addReply(c,shared.ok); addReply(c,shared.ok);