gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use inet_ntop(3) in nodeIp2String & clusterCommand

Browse Source 
Replace inet_ntoa(3) calls with the more future proof inet_ntop(3)
function which is capable of handling additional address families.
This commit is contained in:
Geoff Garside 2011-06-17 20:35:56 +01:00 committed by antirez
parent 8b2e90acec
commit c87105431c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cluster.c
View File

@ -758,7 +758,7 @@ void nodeIp2String(char *buf, clusterLink *link) {
if (getpeername(link->fd, (struct sockaddr*) &sa, &salen) == -1) if (getpeername(link->fd, (struct sockaddr*) &sa, &salen) == -1)
redisPanic("getpeername() failed."); redisPanic("getpeername() failed.");
strncpy(buf,inet_ntoa(sa.sin_addr),sizeof(link->node->ip)); inet_ntop(sa.sin_family,(void*)&(sa.sin_addr),buf,sizeof(link->node->ip));
} }
@ -2084,7 +2084,7 @@ 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);
strncpy(n->ip,inet_ntoa(sa.sin_addr),sizeof(n->ip)); inet_ntop(sa.sin_family,(void*)&(sa.sin_addr),n->ip,sizeof(n->ip));
n->port = port; n->port = port;
clusterAddNode(n); clusterAddNode(n);
addReply(c,shared.ok); addReply(c,shared.ok);