Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-22 05:27:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[porthole] added receive timeout to allow for clean shutdown

Browse Source
This commit is contained in:
Geoffrey McRae 2019-11-04 23:24:34 +11:00
parent df2a3b6151
commit 75cea21cfc
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
porthole/src/linux/client.c
View File

@ -31,6 +31,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <pthread.h> #include <pthread.h>
#include <errno.h>
typedef struct typedef struct
{ {
@ -102,6 +103,9 @@ bool porthole_client_open(
return false; return false;
} }
struct timeval tv = { .tv_sec = 1, .tv_usec = 0 };
setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, (const char *)&tv, sizeof(tv));
struct sockaddr_un addr = { .sun_family = AF_UNIX }; struct sockaddr_un addr = { .sun_family = AF_UNIX };
strncpy(addr.sun_path, socket_path, sizeof(addr.sun_path)-1); strncpy(addr.sun_path, socket_path, sizeof(addr.sun_path)-1);
@ -182,6 +186,9 @@ static void * porthole_socket_thread(void * opaque)
if (recvmsg(handle->socket, &msghdr, 0) < 0) if (recvmsg(handle->socket, &msghdr, 0) < 0)
{ {
if (errno == EAGAIN || errno == EWOULDBLOCK)
continue;
DEBUG_ERROR("Failed to recieve the message"); DEBUG_ERROR("Failed to recieve the message");
if (handle->discon_cb) if (handle->discon_cb)
handle->discon_cb(); handle->discon_cb();