MirrorSave
/
pigpio
mirror of https://github.com/joan2937/pigpio
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'keepalive' of https://github.com/guymcswain/pigpio into guymcswain-keepalive

This commit is contained in:
joan 2018-10-21 09:28:53 +01:00
parent 06c74e759c 7708dcb364
commit f0beff07ea
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pigpio.c
View File

@ -7012,6 +7012,8 @@ static void *pthSocketThreadHandler(void *fdC)
close(sock);
DBG(DBG_ALWAYS, "Socket %d closed", sock);
return 0;
}
@ -7075,10 +7077,23 @@ static void * pthSocketThread(void *x)
if (addrAllowed((struct sockaddr *)&client))
{
DBG(DBG_ALWAYS, "Connection accepted on socket %d", fdC);
sock = malloc(sizeof(int));
*sock = fdC;
/* Enable tcp_keepalive */
int optval = 1;
socklen_t optlen = sizeof(optval);
if (setsockopt(fdC, SOL_SOCKET, SO_KEEPALIVE, &optval, optlen) < 0) {
DBG(0, "setsockopt() fail, closing socket %d", fdC);
close(fdC);
}
DBG(DBG_ALWAYS, "SO_KEEPALIVE enabled on socket %d\n", fdC);
if (pthread_create
(&thr, &attr, pthSocketThreadHandler, (void*) sock) < 0)
SOFT_ERROR((void*)PI_INIT_FAILED,
@ -7086,6 +7101,7 @@ static void * pthSocketThread(void *x)
}
else
{
DBG(DBG_ALWAYS, "Connection rejected, closing");
close(fdC);
}
}
@ -8186,6 +8202,8 @@ int initInitialise(void)
}
server6.sin6_port = htons(port);
int opt;
setsockopt(fdSock, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt));
if (bind(fdSock,(struct sockaddr *)&server6, sizeof(server6)) < 0)
SOFT_ERROR(PI_INIT_FAILED, "bind to port %d failed (%m)", port);
}
@ -8197,7 +8215,11 @@ int initInitialise(void)
if (fdSock == -1)
SOFT_ERROR(PI_INIT_FAILED, "socket failed (%m)");
else
{
int opt;
setsockopt(fdSock, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt));
}
server.sin_family = AF_INET;
if (gpioCfg.ifFlags & PI_LOCALHOST_SOCK_IF)
{