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

Update anetTcpAccept & anetPeerToString calls.

Browse Source 
Add the additional ip buffer length argument to function calls of
anetTcpAccept and anetPeerToString in network.c and cluster.c
This commit is contained in:
Geoff Garside 2011-06-17 19:54:17 +01:00 committed by antirez
parent ef839f9006
commit f5494a427e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cluster.c
View File

@ -310,7 +310,7 @@ void clusterAcceptHandler(aeEventLoop *el, int fd, void *privdata, int mask) {
REDIS_NOTUSED(mask); REDIS_NOTUSED(mask);
REDIS_NOTUSED(privdata); REDIS_NOTUSED(privdata);
cfd = anetTcpAccept(server.neterr, fd, cip, &cport); cfd = anetTcpAccept(server.neterr, fd, cip, sizeof(cip), &cport);
if (cfd == AE_ERR) { if (cfd == AE_ERR) {
redisLog(REDIS_VERBOSE,"Accepting cluster node: %s", server.neterr); redisLog(REDIS_VERBOSE,"Accepting cluster node: %s", server.neterr);
return; return;

6
src/networking.c
View File

@ -557,7 +557,7 @@ void acceptTcpHandler(aeEventLoop *el, int fd, void *privdata, int mask) {
REDIS_NOTUSED(mask); REDIS_NOTUSED(mask);
REDIS_NOTUSED(privdata); REDIS_NOTUSED(privdata);
cfd = anetTcpAccept(server.neterr, fd, cip, &cport); cfd = anetTcpAccept(server.neterr, fd, cip, sizeof(cip), &cport);
if (cfd == AE_ERR) { if (cfd == AE_ERR) {
redisLog(REDIS_WARNING,"Accepting client connection: %s", server.neterr); redisLog(REDIS_WARNING,"Accepting client connection: %s", server.neterr);
return; return;
@ -1133,7 +1133,7 @@ sds getClientInfoString(redisClient *client) {
int emask; int emask;
if (!(client->flags & REDIS_UNIX_SOCKET)) if (!(client->flags & REDIS_UNIX_SOCKET))
anetPeerToString(client->fd,ip,&port); anetPeerToString(client->fd,ip,sizeof(ip),&port);
p = flags; p = flags;
if (client->flags & REDIS_SLAVE) { if (client->flags & REDIS_SLAVE) {
if (client->flags & REDIS_MONITOR) if (client->flags & REDIS_MONITOR)
@ -1214,7 +1214,7 @@ void clientCommand(redisClient *c) {
int port; int port;
client = listNodeValue(ln); client = listNodeValue(ln);
if (anetPeerToString(client->fd,ip,&port) == -1) continue; if (anetPeerToString(client->fd,ip,sizeof(ip),&port) == -1) continue;
snprintf(addr,sizeof(addr),"%s:%d",ip,port); snprintf(addr,sizeof(addr),"%s:%d",ip,port);
if (strcmp(addr,c->argv[2]->ptr) == 0) { if (strcmp(addr,c->argv[2]->ptr) == 0) {
addReply(c,shared.ok); addReply(c,shared.ok);