redis/hiredis
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use getaddrinfo(3) in redisContextConnectTcp.

Browse Source 
Change redisContextConnectTcp() function to use getaddrinfo(3) to
perform address resolution, socket creation and connection. Resolved
addresses are limited to those reachable by the AF_INET family.
This commit is contained in:
Geoff Garside 2011-06-17 19:26:46 +01:00
parent b4664b41c7
commit 3afe2585de
1 changed files with 43 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
net.c
View File

@ -187,50 +187,56 @@ int redisContextSetTimeout(redisContext *c, struct timeval tv) {
} }
int redisContextConnectTcp(redisContext *c, const char *addr, int port, struct timeval *timeout) { int redisContextConnectTcp(redisContext *c, const char *addr, int port, struct timeval *timeout) {
int s; int s, rv;
char _port[6]; /* strlen("65535"); */
struct addrinfo hints, *servinfo, *p;
int blocking = (c->flags & REDIS_BLOCK); int blocking = (c->flags & REDIS_BLOCK);
struct sockaddr_in sa;
if ((s = redisCreateSocket(c,AF_INET)) < 0) snprintf(_port, 6, "%d", port);
return REDIS_ERR; memset(&hints,0,sizeof(hints));
if (redisSetBlocking(c,s,0) != REDIS_OK) hints.ai_family = AF_INET;
hints.ai_socktype = SOCK_STREAM;
if ((rv = getaddrinfo(addr,_port,&hints,&servinfo)) != 0) {
__redisSetError(c,REDIS_ERR_OTHER,gai_strerror(rv));
return REDIS_ERR; return REDIS_ERR;
}
for (p = servinfo; p != NULL; p = p->ai_next) {
if ((s = socket(p->ai_family,p->ai_socktype,p->ai_protocol)) == -1)
continue;
sa.sin_family = AF_INET; if (redisSetBlocking(c,s,0) != REDIS_OK)
sa.sin_port = htons(port); goto error;
if (inet_aton(addr, &sa.sin_addr) == 0) { if (connect(s,p->ai_addr,p->ai_addrlen) == -1) {
struct hostent *he; if (errno == EINPROGRESS && !blocking) {
/* This is ok. */
he = gethostbyname(addr); } else {
if (he == NULL) { if (redisContextWaitReady(c,s,timeout) != REDIS_OK)
char buf[128]; goto error;
snprintf(buf,sizeof(buf),"Can't resolve: %s", addr); }
__redisSetError(c,REDIS_ERR_OTHER,buf);
close(s);
return REDIS_ERR;
} }
memcpy(&sa.sin_addr, he->h_addr, sizeof(struct in_addr)); if (blocking && redisSetBlocking(c,s,1) != REDIS_OK)
goto error;
if (redisSetTcpNoDelay(c,s) != REDIS_OK)
goto error;
c->fd = s;
c->flags |= REDIS_CONNECTED;
rv = REDIS_OK;
goto end;
}
if (p == NULL) {
char buf[128];
snprintf(buf,sizeof(buf),"Can't create socket: %s",strerror(errno));
__redisSetError(c,REDIS_ERR_OTHER,buf);
goto error;
} }
if (connect(s, (struct sockaddr*)&sa, sizeof(sa)) == -1) { error:
if (errno == EINPROGRESS && !blocking) { rv = REDIS_ERR;
/* This is ok. */ end:
} else { freeaddrinfo(servinfo);
if (redisContextWaitReady(c,s,timeout) != REDIS_OK) return rv; // Need to return REDIS_OK if alright
return REDIS_ERR;
}
}
/* Reset socket to be blocking after connect(2). */
if (blocking && redisSetBlocking(c,s,1) != REDIS_OK)
return REDIS_ERR;
if (redisSetTcpNoDelay(c,s) != REDIS_OK)
return REDIS_ERR;
c->fd = s;
c->flags |= REDIS_CONNECTED;
return REDIS_OK;
} }
int redisContextConnectUnix(redisContext *c, const char *path, struct timeval *timeout) { int redisContextConnectUnix(redisContext *c, const char *path, struct timeval *timeout) {