X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fsysdep.c;h=fe8afed300531ccc99b2002579f49f0110b0811e;hb=e73e0afde89f43dd19d53c380accb2d1877b03f2;hp=d36a39517185c0bb03124ade6db43f1f9fb31cfd;hpb=7e8e24791e16e0a94ed346c6a11595a40d3a31b1;p=citadel.git

diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index d36a39517..fe8afed30 100644
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -4,7 +4,7 @@
  * Here's where we (hopefully) have most parts of the Citadel server that
  * might need tweaking when run on different operating system variants.
  *
- * Copyright (c) 1987-2017 by the citadel.org team
+ * Copyright (c) 1987-2021 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 3.
@@ -41,6 +41,7 @@
 #include "modules/crypto/serv_crypto.h"	/* Needed for init_ssl, client_write_ssl, client_read_ssl, destruct_ssl */
 #include "housekeeping.h"
 #include "context.h"
+
 /*
  * Signal handler to shut down the server.
  */
@@ -50,18 +51,19 @@ volatile int shutdown_and_halt = 0;
 volatile int restart_server = 0;
 volatile int running_as_daemon = 0;
 
+
 static RETSIGTYPE signal_cleanup(int signum) {
 	syslog(LOG_DEBUG, "sysdep: caught signal %d; shutting down.", signum);
 	exit_signal = signum;
 	server_shutting_down = 1;
 }
 
+
 static RETSIGTYPE signal_exit(int signum) {
 	exit(1);
 }
 
 
-
 /*
  * Some initialization stuff...
  */
@@ -84,14 +86,14 @@ void init_sysdep(void) {
 	init_ssl();
 #endif
 
-	/*
-	 * Set up a place to put thread-specific data.
-	 * We only need a single pointer per thread - it points to the
-	 * CitContext structure (in the ContextList linked list) of the
-	 * session to which the calling thread is currently bound.
-	 */
-	if (pthread_key_create(&MyConKey, NULL) != 0) {
-		syslog(LOG_CRIT, "sysdep: can't create TSD key: %s", strerror(errno));
+	if (pthread_key_create(&ThreadKey, NULL) != 0) {			// TSD for threads
+		syslog(LOG_ERR, "pthread_key_create() : %m");
+		abort();
+	}
+	
+	if (pthread_key_create(&MyConKey, NULL) != 0) {				// TSD for sessions
+		syslog(LOG_CRIT, "sysdep: can't create TSD key: %m");
+		abort();
 	}
 
 	/*
@@ -126,7 +128,7 @@ void init_sysdep(void) {
  * port_number	port number to bind
  * queue_len	number of incoming connections to allow in the queue
  */
-int ctdl_tcp_server(char *ip_addr, int port_number, int queue_len, char *errormessage)
+int ctdl_tcp_server(char *ip_addr, int port_number, int queue_len)
 {
 	struct protoent *p;
 	struct sockaddr_in6 sin6;
@@ -155,8 +157,7 @@ int ctdl_tcp_server(char *ip_addr, int port_number, int queue_len, char *errorme
 	{
 		ip_version = 4;
 		if (inet_pton(AF_INET, ip_addr, &sin4.sin_addr) <= 0) {
-			snprintf(errormessage, SIZ, "Error binding to [%s] : %s", ip_addr, strerror(errno));
-			syslog(LOG_ALERT, "tcpserver: %s", errormessage);
+			syslog(LOG_ALERT, "tcpserver: inet_pton: %m");
 			return (-1);
 		}
 	}
@@ -164,28 +165,27 @@ int ctdl_tcp_server(char *ip_addr, int port_number, int queue_len, char *errorme
 	{
 		ip_version = 6;
 		if (inet_pton(AF_INET6, ip_addr, &sin6.sin6_addr) <= 0) {
-			snprintf(errormessage, SIZ,
-				 "Error binding to [%s] : %s", ip_addr, strerror(errno)
-			);
-			syslog(LOG_ALERT, "tcpserver: %s", errormessage);
+			syslog(LOG_ALERT, "tcpserver: inet_pton: %m");
 			return (-1);
 		}
 	}
 
 	if (port_number == 0) {
-		snprintf(errormessage, SIZ, "Can't start: no port number specified.");
-		syslog(LOG_ALERT, "tcpserver: %s", errormessage);
+		syslog(LOG_ALERT, "tcpserver: no port number was specified");
 		return (-1);
 	}
 	sin6.sin6_port = htons((u_short) port_number);
 	sin4.sin_port = htons((u_short) port_number);
 
 	p = getprotobyname("tcp");
+	if (p == NULL) {
+		syslog(LOG_ALERT, "tcpserver: getprotobyname: %m");
+		return (-1);
+	}
 
 	s = socket( ((ip_version == 6) ? PF_INET6 : PF_INET), SOCK_STREAM, (p->p_proto));
 	if (s < 0) {
-		snprintf(errormessage, SIZ, "Can't create a listening socket: %s", strerror(errno));
-		syslog(LOG_ALERT, "tcpserver: %s", errormessage);
+		syslog(LOG_ALERT, "tcpserver: socket: %m");
 		return (-1);
 	}
 	/* Set some socket options that make sense. */
@@ -200,16 +200,14 @@ int ctdl_tcp_server(char *ip_addr, int port_number, int queue_len, char *errorme
 	}
 
 	if (b < 0) {
-		snprintf(errormessage, SIZ, "Can't bind: %s", strerror(errno));
-		syslog(LOG_ALERT, "tcpserver: %s", errormessage);
+		syslog(LOG_ALERT, "tcpserver: bind: %m");
 		return (-1);
 	}
 
 	fcntl(s, F_SETFL, O_NONBLOCK);
 
 	if (listen(s, ((queue_len >= 5) ? queue_len : 5) ) < 0) {
-		snprintf(errormessage, SIZ, "Can't listen: %s", strerror(errno));
-		syslog(LOG_ALERT, "tcpserver: %s", errormessage);
+		syslog(LOG_ALERT, "tcpserver: listen: %m");
 		return (-1);
 	}
 	return (s);
@@ -219,7 +217,7 @@ int ctdl_tcp_server(char *ip_addr, int port_number, int queue_len, char *errorme
 /*
  * Create a Unix domain socket and listen on it
  */
-int ctdl_uds_server(char *sockpath, int queue_len, char *errormessage)
+int ctdl_uds_server(char *sockpath, int queue_len)
 {
 	struct sockaddr_un addr;
 	int s;
@@ -234,8 +232,7 @@ int ctdl_uds_server(char *sockpath, int queue_len, char *errormessage)
 
 	i = unlink(sockpath);
 	if ((i != 0) && (errno != ENOENT)) {
-		snprintf(errormessage, SIZ, "can't unlink %s: %s", sockpath, strerror(errno));
-		syslog(LOG_EMERG, "udsserver: %s", errormessage);
+		syslog(LOG_ERR, "udsserver: %m");
 		return(-1);
 	}
 
@@ -245,28 +242,24 @@ int ctdl_uds_server(char *sockpath, int queue_len, char *errormessage)
 
 	s = socket(AF_UNIX, SOCK_STREAM, 0);
 	if (s < 0) {
-		snprintf(errormessage, SIZ, "can't create a socket: %s", strerror(errno));
-		syslog(LOG_EMERG, "udsserver: %s", errormessage);
+		syslog(LOG_ERR, "udsserver: socket: %m");
 		return(-1);
 	}
 
 	if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
-		snprintf(errormessage, SIZ, "can't bind: %s", strerror(errno));
-		syslog(LOG_EMERG, "udsserver: %s", errormessage);
+		syslog(LOG_ERR, "udsserver: bind: %m");
 		return(-1);
 	}
 
 	/* set to nonblock - we need this for some obscure situations */
 	if (fcntl(s, F_SETFL, O_NONBLOCK) < 0) {
-		snprintf(errormessage, SIZ, "can't set socket to non-blocking: %s", strerror(errno));
-		syslog(LOG_EMERG, "udsserver: %s", errormessage);
+		syslog(LOG_ERR, "udsserver: fcntl: %m");
 		close(s);
 		return(-1);
 	}
 
 	if (listen(s, actual_queue_len) < 0) {
-		snprintf(errormessage, SIZ, "can't listen: %s", strerror(errno));
-		syslog(LOG_EMERG, "udsserver: %s", errormessage);
+		syslog(LOG_ERR, "udsserver: listen: %m");
 		return(-1);
 	}
 
@@ -329,7 +322,6 @@ static void flush_client_inbuf(void)
 
 	FlushStrBuf(CCC->ReadBuf);
 	CCC->RecvBuf->ReadWritePointer = NULL;
-
 }
 */
 
@@ -376,8 +368,7 @@ int client_write(const char *buf, int nbytes)
 		
 		fd = fopen(fn, "a+");
 		if (fd == NULL) {
-			syslog(LOG_ERR, "%s: %s", fn, strerror(errno));
-			cit_backtrace();
+			syslog(LOG_ERR, "%s: %m", fn);
 			exit(1);
 		}
 		fprintf(fd, "Sending: BufSize: %d BufContent: [", nbytes);
@@ -419,12 +410,7 @@ int client_write(const char *buf, int nbytes)
 						continue;
 					}
 				} else {
-					syslog(LOG_ERR,
-						"sysdep: client_write(%d bytes) select failed: %s (%d)",
-						nbytes - bytes_written,
-						strerror(errno), errno
-					);
-					cit_backtrace();
+					syslog(LOG_ERR, "sysdep: client_write(%d bytes) select failed: %m", nbytes - bytes_written);
 					client_close();
 					Ctx->kill_me = KILLME_SELECT_FAILED;
 					return -1;
@@ -434,12 +420,7 @@ int client_write(const char *buf, int nbytes)
 
 		retval = write(Ctx->client_socket, &buf[bytes_written], nbytes - bytes_written);
 		if (retval < 1) {
-			syslog(LOG_ERR,
-				"sysdep: client_write(%d bytes) failed: %s (%d)",
-				nbytes - bytes_written,
-				strerror(errno), errno
-			);
-			cit_backtrace();
+			syslog(LOG_ERR, "sysdep: client_write(%d bytes) failed: %m", nbytes - bytes_written);
 			client_close();
 			Ctx->kill_me = KILLME_WRITE_FAILED;
 			return -1;
@@ -500,8 +481,7 @@ int client_read_blob(StrBuf *Target, int bytes, int timeout)
 			
 		fd = fopen(fn, "a+");
 		if (fd == NULL) {
-			syslog(LOG_ERR, "%s: %s", fn, strerror(errno));
-			cit_backtrace();
+			syslog(LOG_ERR, "%s: %m", fn);
 			exit(1);
 		}
 		fprintf(fd, "Reading BLOB: BufSize: %d ", bytes);
@@ -520,8 +500,7 @@ int client_read_blob(StrBuf *Target, int bytes, int timeout)
 		
 		fd = fopen(fn, "a+");
 		if (fd == NULL) {
-			syslog(LOG_ERR, "%s: %s", fn, strerror(errno));
-			cit_backtrace();
+			syslog(LOG_ERR, "%s: %m", fn);
 			exit(1);
 		}
 		fprintf(fd, "Read: %d BufContent: [", StrLength(Target));
@@ -542,8 +521,7 @@ int client_read_blob(StrBuf *Target, int bytes, int timeout)
 			
 		fd = fopen(fn, "a+");
 		if (fd == NULL) {
-			syslog(LOG_ERR, "%s: %s", fn, strerror(errno));
-			cit_backtrace();
+			syslog(LOG_ERR, "%s: %m", fn);
 			exit(1);
 		}
 		fprintf(fd, "Reading BLOB: BufSize: %d ",
@@ -571,8 +549,7 @@ int client_read_blob(StrBuf *Target, int bytes, int timeout)
 		
 		fd = fopen(fn, "a+");
 		if (fd == NULL) {
-			syslog(LOG_ERR, "%s: %s", fn, strerror(errno));
-			cit_backtrace();
+			syslog(LOG_ERR, "%s: %m", fn);
 			exit(1);
 		}
 		fprintf(fd, "Read: %d BufContent: [",
@@ -630,8 +607,7 @@ int client_read_random_blob(StrBuf *Target, int timeout)
 			
 				fd = fopen(fn, "a+");
 				if (fd == NULL) {
-					syslog(LOG_ERR, "%s: %s", fn, strerror(errno));
-					cit_backtrace();
+					syslog(LOG_ERR, "%s: %m", fn);
 					exit(1);
 				}
 				fprintf(fd, "Read: BufSize: %d BufContent: [",
@@ -715,8 +691,7 @@ int CtdlClientGetLine(StrBuf *Target)
 
 		fd = fopen(fn, "a+");
 		if (fd == NULL) {
-			syslog(LOG_ERR, "%s: %s", fn, strerror(errno));
-			cit_backtrace();
+			syslog(LOG_ERR, "%s: %m", fn);
 			exit(1);
 		}
 		pch = ChrPtr(CCC->RecvBuf.Buf);
@@ -773,8 +748,7 @@ int CtdlClientGetLine(StrBuf *Target)
 
 		fd = fopen(fn, "a+");
 		if (fd == NULL) {
-			syslog(LOG_ERR, "%s: %s", fn, strerror(errno));
-			cit_backtrace();
+			syslog(LOG_ERR, "%s: %m", fn);
 			exit(1);
 		}
 		pch = ChrPtr(CCC->RecvBuf.Buf);
@@ -941,7 +915,6 @@ void sysdep_master_cleanup(void) {
 	CtdlDestroyProtoHooks();
 	CtdlDestroyDeleteHooks();
 	CtdlDestroyXmsgHooks();
-	CtdlDestroyNetprocHooks();
 	CtdlDestroyUserHooks();
 	CtdlDestroyMessageHook();
 	CtdlDestroyCleanupHooks();
@@ -950,9 +923,6 @@ void sysdep_master_cleanup(void) {
 	CtdlDestroyServiceHook();
 	CtdlDestroyRoomHooks();
 	CtdlDestroySearchHooks();
-	#ifdef HAVE_BACKTRACE
-///	eCrash_Uninit();
-	#endif
 }
 
 
@@ -976,17 +946,16 @@ void start_daemon(int unused) {
 	pid_t child = 0;
 	FILE *fp;
 	int do_restart = 0;
-
 	current_child = 0;
 
+	//if (chdir(ctdl_run_dir) != 0) {
+		//syslog(LOG_ERR, "%s: %m", ctdl_run_dir);
+	//}
+
 	/* Close stdin/stdout/stderr and replace them with /dev/null.
 	 * We don't just call close() because we don't want these fd's
 	 * to be reused for other files.
 	 */
-	if (chdir(ctdl_run_dir) != 0) {
-		syslog(LOG_ERR, "%s: %s", ctdl_run_dir, strerror(errno));
-	}
-
 	child = fork();
 	if (child != 0) {
 		exit(0);
@@ -1002,7 +971,7 @@ void start_daemon(int unused) {
 		(freopen("/dev/null", "w", stdout) != stdout) || 
 		(freopen("/dev/null", "w", stderr) != stderr)
 	) {
-		syslog(LOG_ERR, "sysdep: unable to reopen stdio: %s", strerror(errno));
+		syslog(LOG_ERR, "sysdep: unable to reopen stdio: %m");
 	}
 
 	do {
@@ -1108,8 +1077,6 @@ void HuntBadSession(void)
 	struct timeval tv;
 	struct ServiceFunctionHook *serviceptr;
 
-
-
 	/* Next, add all of the client sockets. */
 	begin_critical_section(S_SESSION_TABLE);
 	for (ptr = ContextList; ptr != NULL; ptr = ptr->next) {
@@ -1125,33 +1092,30 @@ void HuntBadSession(void)
 		if (	(ptr->state == CON_IDLE)
 			&& (ptr->kill_me == 0)
 			&& (ptr->client_socket > 0)
-			) {
+		) {
 			FD_SET(ptr->client_socket, &readfds);
 			if (ptr->client_socket > highest)
 				highest = ptr->client_socket;
 			
-			if ((select(highest + 1, &readfds, NULL, NULL, &tv) < 0) &&
-			    (errno == EBADF))
+			if ((select(highest + 1, &readfds, NULL, NULL, &tv) < 0) && (errno == EBADF))
 			{
 				/* Gotcha! */
 				syslog(LOG_ERR,
-				       "sysdep: killing session CC[%d] bad FD: [%d:%d] User[%s] Host[%s:%s]",
-				       ptr->cs_pid,
-				       ptr->client_socket,
-				       ptr->is_local_socket,
-				       ptr->curr_user,
-				       ptr->cs_host,ptr->cs_addr);
-
+				       "sysdep: killing session CC[%d] bad FD: [%d] User[%s] Host[%s:%s]",
+					ptr->cs_pid,
+					ptr->client_socket,
+					ptr->curr_user,
+					ptr->cs_host,
+					ptr->cs_addr
+				);
 				ptr->kill_me = 1;
 				ptr->client_socket = -1;
 				break;
 			}
 		}
-		
 	}
 	end_critical_section(S_SESSION_TABLE);
 
-
 	/* First, add the various master sockets to the fdset. */
 	for (serviceptr = ServiceHookTable; serviceptr != NULL; serviceptr = serviceptr->next ) {
 
@@ -1173,11 +1137,9 @@ void HuntBadSession(void)
 			break;
 		}
 	}
-
-
 }
 
-const char *WorkerLogStr = "W";
+
 /* 
  * This loop just keeps going and going and going...
  */
@@ -1200,9 +1162,7 @@ void *worker_thread(void *blah) {
 
 	while (!server_shutting_down) {
 
-		/* make doubly sure we're not holding any stale db handles
-		 * which might cause a deadlock.
-		 */
+		/* make doubly sure we're not holding any stale db handles * which might cause a deadlock */
 		cdb_check_handles();
 do_select:	force_purge = 0;
 		bind_me = NULL;		/* Which session shall we handle? */
@@ -1271,12 +1231,12 @@ do_select:	force_purge = 0;
 		 */
 		if (retval < 0) {
 			if (errno == EBADF) {
-				syslog(LOG_ERR, "sysdep: select() failed: (%s)", strerror(errno));
+				syslog(LOG_ERR, "sysdep: select() failed: %m");
 				HuntBadSession();
 				goto do_select;
 			}
 			if (errno != EINTR) {
-				syslog(LOG_ERR, "sysdep: exiting (%s)", strerror(errno));
+				syslog(LOG_ERR, "sysdep: exiting: %m");
 				server_shutting_down = 1;
 				continue;
 			} else {
@@ -1294,7 +1254,7 @@ do_select:	force_purge = 0;
 			}
 		}
 
-		/* Next, check to see if it's a new client connecting * on a master socket. */
+		/* Next, check to see if it's a new client connecting on a master socket. */
 
 		else if ((retval > 0) && (!server_shutting_down)) for (serviceptr = ServiceHookTable; serviceptr != NULL; serviceptr = serviceptr->next) {
 
@@ -1308,7 +1268,7 @@ do_select:	force_purge = 0;
 					 * operations barf on FreeBSD.  Not a fatal error.
 					 */
 					if (fcntl(ssock, F_SETFL, 0) < 0) {
-						syslog(LOG_ERR, "sysdep: Can't set socket to blocking: %s", strerror(errno));
+						syslog(LOG_ERR, "sysdep: Can't set socket to blocking: %m");
 					}
 
 					/* New context will be created already
@@ -1324,9 +1284,9 @@ do_select:	force_purge = 0;
 					con->h_greeting_function = serviceptr->h_greeting_function;
 					con->ServiceName = serviceptr->ServiceName;
 					
-					/* Determine whether it's a local socket */
+					/* Connections on a local client are always from the same host */
 					if (serviceptr->sockpath != NULL) {
-						con->is_local_socket = 1;
+						con->is_local_client = 1;
 					}
 	
 					/* Set the SO_REUSEADDR socket option */
@@ -1396,14 +1356,12 @@ SKIP_SELECT:
 				CC->input_waiting = 0;
 			}
 
-			/* If there are asynchronous messages waiting and the
-			 * client supports it, do those now */
-			if ((CC->is_async) && (CC->async_waiting)
-			   && (CC->h_async_function != NULL)) {
+			/* If there are asynchronous messages waiting and the client supports it, do those now */
+			if ((CC->is_async) && (CC->async_waiting) && (CC->h_async_function != NULL)) {
 				CC->h_async_function();
 				CC->async_waiting = 0;
 			}
-			
+
 			force_purge = CC->kill_me;
 			become_session(NULL);
 			bind_me->state = CON_IDLE;
@@ -1432,7 +1390,6 @@ SKIP_SELECT:
 }
 
 
-
 /*
  * SyslogFacility()
  * Translate text facility name to syslog.h defined value.