stephenseo/obs-studio-plugin-unix-socket-control
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions

WIP: Set nonblocking on server's socket handle

Browse source 
Still untested.
This commit is contained in:
Stephen Seo 2023-08-12 22:26:48 +09:00
parent 4a4fc63b46
commit cfdeceb638
1 changed files with 58 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/socket.c
View file

@ -8,6 +8,8 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <threads.h> #include <threads.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h>
#include <errno.h>
// obs-studio includes // obs-studio includes
#include <obs-frontend-api.h> #include <obs-frontend-api.h>
@ -15,6 +17,9 @@
int unix_socket_handler_thread_function(void *ud) { int unix_socket_handler_thread_function(void *ud) {
UnixSocketHandler *handler = (UnixSocketHandler*)ud; UnixSocketHandler *handler = (UnixSocketHandler*)ud;
struct timespec duration;
duration.tv_sec = 0;
duration.tv_nsec = 10000000;
int ret; int ret;
int data_socket; int data_socket;
char buffer[8]; char buffer[8];
@ -24,20 +29,36 @@ int unix_socket_handler_thread_function(void *ud) {
mtx_lock(handler->mutex); mtx_lock(handler->mutex);
if ((handler->ccflags & 1) != 0) { if ((handler->ccflags & 1) != 0) {
mtx_unlock(handler->mutex); mtx_unlock(handler->mutex);
break; return 0;
} }
mtx_unlock(handler->mutex); mtx_unlock(handler->mutex);
data_socket = accept(handler->socket_descriptor, 0, 0); data_socket = accept(handler->socket_descriptor, 0, 0);
if (data_socket == -1) { if (data_socket == -1) {
if (errno == EAGAIN || errno == EWOULDBLOCK) {
thrd_sleep(&duration, 0);
continue;
}
// Error. TODO handle this. // Error. TODO handle this.
break; break;
} }
memset(ret_buffer, 0, sizeof(ret_buffer)); memset(ret_buffer, 0, sizeof(ret_buffer));
while (1) {
mtx_lock(handler->mutex);
if ((handler->ccflags & 1) != 0) {
mtx_unlock(handler->mutex);
close(data_socket);
return 0;
}
mtx_unlock(handler->mutex);
ret = read(data_socket, buffer, sizeof(buffer)); ret = read(data_socket, buffer, sizeof(buffer));
if (ret == -1) { if (ret == -1) {
if (errno == EAGAIN || errno == EWOULDBLOCK) {
thrd_sleep(&duration, 0);
continue;
}
// Error. TODO handle this. // Error. TODO handle this.
break; break;
} }
@ -63,6 +84,8 @@ int unix_socket_handler_thread_function(void *ud) {
ret_buffer[1] |= 2; ret_buffer[1] |= 2;
} }
} }
break;
}
ret = write(data_socket, ret_buffer, sizeof(ret_buffer)); ret = write(data_socket, ret_buffer, sizeof(ret_buffer));
if (ret == -1) { if (ret == -1) {
@ -88,12 +111,20 @@ void init_unix_socket_handler(UnixSocketHandler *handler) {
return; return;
} }
int ret = fcntl(handler->socket_descriptor, F_SETFL, O_NONBLOCK, 1);
if (ret != -1) {
close(handler->socket_descriptor);
handler->socket_descriptor = -1;
handler->flags = 0xFFFFFFFFFFFFFFFF;
return;
}
handler->name.sun_family = AF_UNIX; handler->name.sun_family = AF_UNIX;
strncpy(handler->name.sun_path, strncpy(handler->name.sun_path,
UNIX_SOCKET_HANDLER_SOCKET_NAME, UNIX_SOCKET_HANDLER_SOCKET_NAME,
sizeof(handler->name.sun_path) - 1); sizeof(handler->name.sun_path) - 1);
int ret = bind(handler->socket_descriptor, ret = bind(handler->socket_descriptor,
(const struct sockaddr*) &handler->name, (const struct sockaddr*) &handler->name,
sizeof(handler->name)); sizeof(handler->name));
if (ret == -1) { if (ret == -1) {