From d02ef27da01149f2b3da9de3efea85504afeecfa Mon Sep 17 00:00:00 2001 From: Moritz Warning Date: Thu, 12 Nov 2020 03:15:48 +0100 Subject: dlt-daemon.c: exit early on error (#261) Change warning to error, as it will abort the daemon startup. Also reduce the amount of follow up error messages. Signed-off-by: Moritz Warning --- src/daemon/dlt_daemon_socket.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/daemon/dlt_daemon_socket.c b/src/daemon/dlt_daemon_socket.c index 50bf68e..9db48b9 100644 --- a/src/daemon/dlt_daemon_socket.c +++ b/src/daemon/dlt_daemon_socket.c @@ -66,14 +66,16 @@ int dlt_daemon_socket_open(int *sock, unsigned int servPort, char *ip) /* create socket */ if ((*sock = socket(AF_INET6, SOCK_STREAM, 0)) == -1) { lastErrno = errno; - dlt_vlog(LOG_WARNING, "dlt_daemon_socket_open: socket() error %d: %s\n", lastErrno, strerror(lastErrno)); + dlt_vlog(LOG_ERR, "dlt_daemon_socket_open: socket() error %d: %s\n", lastErrno, strerror(lastErrno)); + return -1; } #else if ((*sock = socket(AF_INET, SOCK_STREAM, 0)) == -1) { lastErrno = errno; - dlt_vlog(LOG_WARNING, "dlt_daemon_socket_open: socket() error %d: %s\n", lastErrno, strerror(lastErrno)); + dlt_vlog(LOG_ERR, "dlt_daemon_socket_open: socket() error %d: %s\n", lastErrno, strerror(lastErrno)); + return -1; } #endif @@ -83,10 +85,11 @@ int dlt_daemon_socket_open(int *sock, unsigned int servPort, char *ip) /* setsockpt SO_REUSEADDR */ if (setsockopt(*sock, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(int)) == -1) { lastErrno = errno; - dlt_vlog(LOG_WARNING, + dlt_vlog(LOG_ERR, "dlt_daemon_socket_open: Setsockopt error %d in dlt_daemon_local_connection_init: %s\n", lastErrno, strerror(lastErrno)); + return -1; } /* bind */ -- cgit v1.2.1