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

fixed initServer failed if no IPV4 or no IPV6

Browse Source
This commit is contained in:
Allan 2013-07-25 15:28:33 +08:00
parent 1e7cff23b3
commit cba7a4e69a
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/redis.c
View File

@ -1403,6 +1403,7 @@ void adjustOpenFilesLimit(void) {
void initServer() { void initServer() {
int j; int j;
int ip_count;
signal(SIGHUP, SIG_IGN); signal(SIGHUP, SIG_IGN);
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
@ -1434,12 +1435,18 @@ void initServer() {
if (server.bindaddr_count == 0) server.bindaddr[0] = NULL; if (server.bindaddr_count == 0) server.bindaddr[0] = NULL;
for (j = 0; j < server.bindaddr_count || j == 0; j++) { for (j = 0; j < server.bindaddr_count || j == 0; j++) {
if (server.bindaddr[j] == NULL) { if (server.bindaddr[j] == NULL) {
/* Bind * for both IPv6 and IPv4. */ /* Bind * for both IPv6 and IPv4.
server.ipfd[server.ipfd_count] = anetTcp6Server(server.neterr,server.port,NULL); * Should consider that someone only has IPV6 and someone only get IPV4 */
if (server.ipfd[server.ipfd_count] != ANET_ERR) server.ipfd_count++; ip_count = 0;
server.ipfd[ip_count] = anetTcp6Server(server.neterr,server.port,NULL);
if (server.ipfd[ip_count] != ANET_ERR) ip_count++;
server.ipfd[server.ipfd_count] = anetTcpServer(server.neterr,server.port,NULL); server.ipfd[ip_count] = anetTcpServer(server.neterr,server.port,NULL);
if(server.ipfd[ip_count] != ANET_ERR ) ip_count++;
/* It should be ip_count plus one
* because out of this branch, the server.ipfd_count would increase */
server.ipfd_count = ip_count - 1;
} else if (strchr(server.bindaddr[j],':')) { } else if (strchr(server.bindaddr[j],':')) {
/* Bind IPv6 address. */ /* Bind IPv6 address. */