mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-29 11:06:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ipc: Unlink on exit, not before start.

Browse source
This commit is contained in:
Ryan Pavlik 2020-05-07 16:50:57 -05:00
parent acbac4f1a6
commit c4f8c7fdf7
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/xrt/ipc/ipc_server.h
View file

@ -159,6 +159,9 @@ struct ipc_server
//! Were we launched by socket activation, instead of explicitly?
bool launched_by_socket;
//! The socket filename we bound to, if any.
char *socket_filename;
bool print_debug;
bool print_spew;

10
src/xrt/ipc/ipc_server_process.c
View file

@ -36,6 +36,7 @@
#include <fcntl.h>
#include <errno.h>
#include <stdio.h>
#include <string.h>
#ifdef XRT_HAVE_SYSTEMD
#include <systemd/sd-daemon.h>
@ -75,6 +76,12 @@ teardown_all(struct ipc_server *s)
// Close socket on exit
close(s->listen_socket);
s->listen_socket = -1;
if (!s->launched_by_socket && s->socket_filename) {
// Unlink it too, but only if we bound it.
unlink(s->socket_filename);
free(s->socket_filename);
s->socket_filename = NULL;
}
}
}
@ -214,13 +221,14 @@ create_listen_socket(struct ipc_server *s, int *out_fd)
addr.sun_family = AF_UNIX;
strcpy(addr.sun_path, IPC_MSG_SOCK_FILE);
unlink(IPC_MSG_SOCK_FILE);
ret = bind(fd, (struct sockaddr *)&addr, sizeof(addr));
if (ret < 0) {
close(fd);
return ret;
}
// Save for later
s->socket_filename = strdup(IPC_MSG_SOCK_FILE);
ret = listen(fd, IPC_MAX_CLIENTS);
if (ret < 0) {