Handle start and end times together

[citadel.git] / webcit-ng / server / tcp_sockets.c

diff --git a/webcit-ng/server/tcp_sockets.c b/webcit-ng/server/tcp_sockets.c
index 6c5701266a52bd6c0551dd7f111a4859819ab773..928bebcacd9738d1577bc862df3042ea6c9da113 100644 (file)
--- a/webcit-ng/server/tcp_sockets.c
+++ b/webcit-ng/server/tcp_sockets.c
@@ -1,6 +1,6 @@
 // TCP sockets layer
 //
-// Copyright (c) 1987-2022 by the citadel.org team
+// Copyright (c) 1987-2024 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or disclosure is subject to the GNU General Public License v3.
 
@@ -78,7 +78,7 @@ retry:
        else if ((strchr(ip_addr, '.')) && (!strchr(ip_addr, ':'))) {   // specific IPv4
                ip_version = 4;
                if (inet_pton(AF_INET, ip_addr, &sin4.sin_addr) <= 0) {
-                       syslog(LOG_WARNING, "Error binding to [%s] : %s\n", ip_addr, strerror(errno));
+                       syslog(LOG_WARNING, "tcp_sockets: error binding to [%s] : %m", ip_addr);
                        return (-1);
                }
        }
@@ -86,13 +86,13 @@ retry:
 
                ip_version = 6;
                if (inet_pton(AF_INET6, ip_addr, &sin6.sin6_addr) <= 0) {
-                       syslog(LOG_WARNING, "Error binding to [%s] : %s\n", ip_addr, strerror(errno));
+                       syslog(LOG_WARNING, "tcp_sockets: error binding to [%s] : %m", ip_addr);
                        return (-1);
                }
        }
 
        if (port_number == 0) {
-               syslog(LOG_WARNING, "Cannot start: no port number specified.\n");
+               syslog(LOG_WARNING, "tcp_sockets: cannot start: no port number specified");
                return (-1);
        }
        sin6.sin6_port = htons((u_short) port_number);
@@ -107,7 +107,7 @@ retry:
                        ip_addr = ipv4broadcast;
                        goto retry;
                }
-               syslog(LOG_WARNING, "Can't create a listening socket: %s\n", strerror(errno));
+               syslog(LOG_WARNING, "tcp_sockets: can't create a listening socket: %m");
                return (-1);
        }
 
@@ -123,13 +123,13 @@ retry:
        }
 
        if (b < 0) {
-               syslog(LOG_ERR, "Can't bind: %s\n", strerror(errno));
+               syslog(LOG_ERR, "tcp_sockets: can't bind: %m");
                close(s);
                return (-1);
        }
 
        if (listen(s, queue_len) < 0) {
-               syslog(LOG_ERR, "Can't listen: %s\n", strerror(errno));
+               syslog(LOG_ERR, "tcp_sockets: can't listen: %m");
                close(s);
                return (-1);
        }
@@ -152,7 +152,7 @@ int webcit_uds_server(char *sockpath, int queue_len) {
 
        i = unlink(sockpath);
        if ((i != 0) && (errno != ENOENT)) {
-               syslog(LOG_WARNING, "webcit: can't unlink %s: %s", sockpath, strerror(errno));
+               syslog(LOG_WARNING, "tcp_sockets: can't unlink %s: %m", sockpath);
                return (-1);
        }
 
@@ -162,18 +162,18 @@ int webcit_uds_server(char *sockpath, int queue_len) {
 
        s = socket(AF_UNIX, SOCK_STREAM, 0);
        if (s < 0) {
-               syslog(LOG_WARNING, "webcit: Can't create a unix domain socket: %s", strerror(errno));
+               syslog(LOG_WARNING, "tcp_sockets: can't create a unix domain socket: %m");
                return (-1);
        }
 
        if (bind(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
-               syslog(LOG_WARNING, "webcit: Can't bind: %s", strerror(errno));
+               syslog(LOG_WARNING, "tcp_sockets: Can't bind: %m");
                close(s);
                return (-1);
        }
 
        if (listen(s, actual_queue_len) < 0) {
-               syslog(LOG_WARNING, "webcit: Can't listen: %s", strerror(errno));
+               syslog(LOG_WARNING, "tcp_sockets: Can't listen: %m");
                close(s);
                return (-1);
        }