RPJosh
/
wayvnc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Harden wayvncctl --reconnect 

Required so wayvncctl doesn't exit unexpectedly especially on freebsd.

Signed-off-by: Jim Ramsay <i.am@jimramsay.com>
pull/237/head
Jim Ramsay 2023-02-26 15:11:26 -05:00
parent e3ea6652f0
commit 88f0571dc3
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/ctl-client.c
View File

@ -618,14 +618,26 @@ static int ctl_client_register_for_events(struct ctl_client* self,
} }
static int ctl_client_reconnect_event_loop(struct ctl_client* self, static int ctl_client_reconnect_event_loop(struct ctl_client* self,
struct jsonipc_request* request, int timeout) struct jsonipc_request* request)
{ {
if (ctl_client_connect(self, timeout) != 0) if (ctl_client_connect(self, -1) != 0)
return -1; return -1;
return ctl_client_register_for_events(self, request); return ctl_client_register_for_events(self, request);
} }
static int block_until_reconnect(struct ctl_client* self,
struct jsonipc_request* request)
{
while (ctl_client_reconnect_event_loop(self, request) != 0)
if (usleep(50000) == -1) {
DEBUG("Interrupted waiting for the IPC socket");
return -1;
}
return 0;
}
static int ctl_client_event_loop(struct ctl_client* self, static int ctl_client_event_loop(struct ctl_client* self,
struct jsonipc_request* request) struct jsonipc_request* request)
{ {
@ -642,8 +654,8 @@ static int ctl_client_event_loop(struct ctl_client* self,
if (errno == ECONNRESET) { if (errno == ECONNRESET) {
send_shutdown_event(self); send_shutdown_event(self);
if (self->flags & CTL_CLIENT_RECONNECT && if (self->flags & CTL_CLIENT_RECONNECT &&
ctl_client_reconnect_event_loop( block_until_reconnect(
self, request, -1) == 0) self, request) == 0)
continue; continue;
} }
break; break;