Maarrk/tio
1
0
Fork 0
mirror of https://github.com/tio/tio.git synced 2026-05-01 14:57:59 +02:00
Code Issues Projects Releases 1 Packages Wiki Activity Actions

Handle stale unix socket file

Browse source 
Delete existing unix socket file if it is tested to be stale, meaning no
one is listening on it.
This commit is contained in:
Martin Lund 2022-09-11 11:20:23 +02:00
parent 0afcef807b
commit 8188bb5b76
1 changed files with 47 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/socket.c
View file

@ -78,6 +78,44 @@ static void socket_exit(void)
}
}
static bool socket_stale(const char *path)
{
struct sockaddr_un addr;
bool stale = false;
int sockfd;
/* Test if socket file exists */
if (access(path, F_OK) == 0)
{
/* Create test socket */
sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
if (sockfd < 0)
{
tio_warning_printf("Failure opening socket (%s)", strerror(errno));
return false;
}
/* Prepare address */
addr.sun_family = AF_UNIX;
strncpy(addr.sun_path, path, sizeof(addr.sun_path) - 1);
/* Perform connect to test if socket is active */
if (connect(sockfd, (struct sockaddr *) &addr, sizeof(struct sockaddr_un)) == -1)
{
if (errno == ECONNREFUSED)
{
// No one is listening on socket file
stale = true;
}
}
/* Cleanup */
close(sockfd);
}
return stale;
}
void socket_configure(void)
{
struct sockaddr_un sockaddr_unix = {};
@ -136,7 +174,7 @@ void socket_configure(void)
tio_error_printf("%s: Invalid socket scheme, must be prefixed with 'unix:', 'inet:', or 'inet6:'", option.socket);
exit(EXIT_FAILURE);
}
/* Configure socket */
switch (socket_family)
@ -146,6 +184,14 @@ void socket_configure(void)
strncpy(sockaddr_unix.sun_path, socket_filename(), sizeof(sockaddr_unix.sun_path) - 1);
sockaddr_p = (struct sockaddr *) &sockaddr_unix;
socklen = sizeof(sockaddr_unix);
/* Test for stale unix socket file */
if (socket_stale(socket_filename()))
{
tio_printf("Cleaning up old socket file");
unlink(socket_filename());
}
break;
case AF_INET: