caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 00:28:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use getaddrinfo(3) in a anetTcpServer.

Browse Source 
Change anetTcpServer() function to use getaddrinfo(3) to perform
address resolution, socket creation and binding. Resolved addresses
are limited to those reachable by the AF_INET address family.
This commit is contained in:
Geoff Garside 2011-06-17 01:49:21 +01:00 committed by antirez
parent 0e01ce1b13
commit e0cb24351c
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/anet.c
View File

@ -362,23 +362,37 @@ static int anetListen(char *err, int s, struct sockaddr *sa, socklen_t len) {
int anetTcpServer(char *err, int port, char *bindaddr) int anetTcpServer(char *err, int port, char *bindaddr)
{ {
int s; int s, rv;
struct sockaddr_in sa; char _port[6]; /* strlen("65535") */
struct addrinfo hints, *servinfo, *p;
if ((s = anetCreateSocket(err,AF_INET)) == ANET_ERR) snprintf(_port,6,"%d",port);
return ANET_ERR; memset(&hints,0,sizeof(hints));
hints.ai_family = AF_INET;
hints.ai_socktype = SOCK_STREAM;
hints.ai_flags = AI_PASSIVE; /* No effect if bindaddr != NULL */
memset(&sa,0,sizeof(sa)); if ((rv = getaddrinfo(bindaddr,_port,&hints,&servinfo)) != 0) {
sa.sin_family = AF_INET; anetSetError(err, "%s", gai_strerror(rv));
sa.sin_port = htons(port);
sa.sin_addr.s_addr = htonl(INADDR_ANY);
if (bindaddr && inet_aton(bindaddr, &sa.sin_addr) == 0) {
anetSetError(err, "invalid bind address");
close(s);
return ANET_ERR; return ANET_ERR;
} }
if (anetListen(err,s,(struct sockaddr*)&sa,sizeof(sa)) == ANET_ERR) for (p = servinfo; p != NULL; p = p->ai_next) {
return ANET_ERR; if ((s = socket(p->ai_family,p->ai_socktype,p->ai_protocol)) == -1)
continue;
if (anetListen(err,s,p->ai_addr,p->ai_addrlen) == ANET_ERR)
goto error; /* could continue here? */
goto end;
}
if (p == NULL) {
anetSetError(err, "unable to bind socket");
goto error;
}
error:
s = ANET_ERR;
end:
freeaddrinfo(servinfo);
return s; return s;
} }