fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-07 01:51:05 +00:00
Code Issues Projects Releases Wiki Activity

Remove some redundant code

Browse Source 
Function nodeIp2String in cluster.c is exactly
anetPeerToString with a pre-extracted fd.
This commit is contained in:
Matt Stancliff 2014-02-26 18:02:55 -05:00 committed by antirez
parent 59cf0b1902
commit d2040ab9b1
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/cluster.c
View File

@ -1021,21 +1021,8 @@ void clusterProcessGossipSection(clusterMsg *hdr, clusterLink *link) {
/* IP -> string conversion. 'buf' is supposed to at least be 46 bytes. */ /* IP -> string conversion. 'buf' is supposed to at least be 46 bytes. */
void nodeIp2String(char *buf, clusterLink *link) { void nodeIp2String(char *buf, clusterLink *link) {
struct sockaddr_storage sa; anetPeerToString(link->fd, buf, REDIS_CLUSTER_IPLEN, NULL);
socklen_t salen = sizeof(sa);
if (getpeername(link->fd, (struct sockaddr*) &sa, &salen) == -1)
redisPanic("getpeername() failed.");
if (sa.ss_family == AF_INET) {
struct sockaddr_in *s = (struct sockaddr_in *)&sa;
inet_ntop(AF_INET,(void*)&(s->sin_addr),buf,REDIS_CLUSTER_IPLEN);
} else {
struct sockaddr_in6 *s = (struct sockaddr_in6 *)&sa;
inet_ntop(AF_INET6,(void*)&(s->sin6_addr),buf,REDIS_CLUSTER_IPLEN);
} }
}
/* Update the node address to the IP address that can be extracted /* Update the node address to the IP address that can be extracted
* from link->fd, and at the specified port. * from link->fd, and at the specified port.