Mike Brady
83ae1d286b
If cleanup isn’t finished after one second, exit will occur unconditionally. Use the new exit handler for normal exit, for SIGINT and SIGTERM handling, for abnormal exit after fatal errors, and for handling quit requests from the D-Bus and MPRIS interfaces. When an unfixable error occurs without an installed unfixable error handler, unlock the mutex protecting Shairport Sync’s alsa backend to permit a clean exit. Fix a very low-level mutex-locking error that interfered with debugging. Simplify much mutex lock handling. Remove lots of old and unused code, variables and definitions. Update audio_sndio.c to remove some harmless compiler warnings. Undo adding two seconds for messages to be output before _Exit() on die() to allow messages to be output... Undo making die() exit unconditionally.
70 lines
2.5 KiB
C
70 lines
2.5 KiB
C
/*
|
|
* Network Utilities. This file is part of Shairport Sync.
|
|
* Copyright (c) Mike Brady 2026
|
|
* All rights reserved.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person
|
|
* obtaining a copy of this software and associated documentation
|
|
* files (the "Software"), to deal in the Software without
|
|
* restriction, including without limitation the rights to use,
|
|
* copy, modify, merge, publish, distribute, sublicense, and/or
|
|
* sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be
|
|
* included in all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
|
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
|
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
|
|
#include "network_utilities.h"
|
|
#include "common.h"
|
|
#include <errno.h>
|
|
#include <pthread.h>
|
|
#include <string.h>
|
|
|
|
int eintr_checked_accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen) {
|
|
int response;
|
|
do {
|
|
response = accept(sockfd, addr, addrlen);
|
|
|
|
if (response == -1) {
|
|
char errorstring[1024];
|
|
strerror_r(errno, (char *)errorstring, sizeof(errorstring));
|
|
debug(1, "error %d accept()ing a socket %d: \"%s\". (Note: error %d will be ignored.)", errno,
|
|
sockfd, errorstring, EINTR);
|
|
}
|
|
|
|
} while ((response == -1) && (errno == EINTR));
|
|
return response;
|
|
}
|
|
|
|
pthread_mutex_t safe_socket_lock = PTHREAD_MUTEX_INITIALIZER;
|
|
|
|
int _safe_socket_close(const char *filename, const int linenumber, int *sockfd) {
|
|
int result = 0;
|
|
int oldstate;
|
|
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate);
|
|
pthread_mutex_lock(&safe_socket_lock);
|
|
if (*sockfd == 0) {
|
|
_debug(filename, linenumber, 1, "_safe_socket_close: socket is zero!");
|
|
}
|
|
if ((*sockfd != -1) && (*sockfd != 0)) {
|
|
_debug(filename, linenumber, 4, "_safe_socket_close: closing socket %d.", *sockfd);
|
|
result = close(*sockfd);
|
|
if (result == 0)
|
|
*sockfd = -1;
|
|
} else {
|
|
_debug(filename, linenumber, 1, "_safe_socket_close: socket already closed!");
|
|
}
|
|
pthread_mutex_unlock(&safe_socket_lock);
|
|
pthread_setcancelstate(oldstate, NULL);
|
|
return result;
|
|
} |