*/
#include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <ctype.h>
+
+#include <errno.h>
#include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
+#include <stdio.h>
#include <syslog.h>
#include <sys/syslog.h>
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
-#include <limits.h>
-#include <sys/resource.h>
+#include <sys/un.h>
+#include <sys/types.h>
+#include <sys/socket.h>
#include <netinet/in.h>
+#include <arpa/inet.h>
#include <netinet/tcp.h>
#include <arpa/inet.h>
-#include <netdb.h>
-#include <sys/un.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <grp.h>
+
#define SHOW_ME_VAPPEND_PRINTF
#include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "sysdep_decls.h"
-#include "citserver.h"
-#include "support.h"
-#include "config.h"
-#include "database.h"
-#include "housekeeping.h"
-#include "modules/crypto/serv_crypto.h" /* Needed for init_ssl, client_write_ssl, client_read_ssl, destruct_ssl */
-#include "ecrash.h"
-#include "context.h"
-
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
+#include "citserver.h"
#include "ctdl_module.h"
-#include "threads.h"
-#include "user_ops.h"
-#include "control.h"
+#include "sysdep_decls.h"
+#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.
*/
void close_masters (void)
{
struct ServiceFunctionHook *serviceptr;
-
+ const char *Text;
+
/*
* close all protocol master sockets
*/
if (serviceptr->tcp_port > 0)
{
- const char *Text;
-
if (serviceptr->msock == -1)
Text = "not closing again";
else
CtdlDestroyCleanupHooks();
CtdlDestroyFixedOutputHooks();
CtdlDestroySessionHooks();
+ CtdlDestroyTDAPVetoHooks();
CtdlDestroyServiceHook();
CtdlDestroyRoomHooks();
CtdlDestroySearchHooks();
*/
int convert_login(char NameToConvert[]) {
struct passwd *pw;
- int a;
+ unsigned int a;
pw = getpwnam(NameToConvert);
if (pw == NULL) {
+void HuntBadSession(void)
+{
+ int highest;
+ CitContext *ptr;
+ fd_set readfds;
+ 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) {
+ if ((ptr->state == CON_SYS) && (ptr->client_socket == 0))
+ continue;
+ /* Initialize the fdset. */
+ FD_ZERO(&readfds);
+ highest = 0;
+ tv.tv_sec = 0; /* wake up every second if no input */
+ tv.tv_usec = 0;
+
+ /* Don't select on dead sessions, only truly idle ones */
+ 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))
+ {
+ /* Gotcha! */
+ syslog(LOG_EMERG,
+ "Killing Session CC[%d] bad FD: [%d:%d] User[%s] Host[%s:%s]\n",
+ ptr->cs_pid,
+ ptr->client_socket,
+ ptr->is_local_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 ) {
+
+ /* Initialize the fdset. */
+ highest = 0;
+ tv.tv_sec = 0; /* wake up every second if no input */
+ tv.tv_usec = 0;
+
+ FD_SET(serviceptr->msock, &readfds);
+ if (serviceptr->msock > highest) {
+ highest = serviceptr->msock;
+ }
+ if ((select(highest + 1, &readfds, NULL, NULL, &tv) < 0) &&
+ (errno == EBADF))
+ {
+ /* Gotcha! server socket dead? commit suicide! */
+ syslog(LOG_EMERG,
+ "Found bad FD: %d and its a server socket! Shutting Down!\n",
+ serviceptr->msock);
+
+ server_shutting_down = 1;
+ break;
+ }
+ }
+
+
+}
+
+
/*
* This loop just keeps going and going and going...
*/
CitContext *con = NULL; /* Temporary context pointer */
int i;
+ pthread_mutex_lock(&ThreadCountMutex);
++num_workers;
+ pthread_mutex_unlock(&ThreadCountMutex);
while (!server_shutting_down) {
*/
if (retval < 0) {
if (errno == EBADF) {
- syslog(LOG_NOTICE, "select() failed: (%s)\n", strerror(errno));
+ syslog(LOG_EMERG, "select() failed: (%s)\n", strerror(errno));
+ HuntBadSession ();
goto do_select;
}
if (errno != EINTR) {
SKIP_SELECT:
/* We're bound to a session */
+ pthread_mutex_lock(&ThreadCountMutex);
++active_workers;
+ pthread_mutex_unlock(&ThreadCountMutex);
+
if (bind_me != NULL) {
become_session(bind_me);
dead_session_purge(force_purge);
do_housekeeping();
+
+ pthread_mutex_lock(&ThreadCountMutex);
--active_workers;
+ if ((active_workers + config.c_min_workers < num_workers) &&
+ (num_workers > config.c_min_workers))
+ {
+ num_workers--;
+ pthread_mutex_unlock(&ThreadCountMutex);
+ return (NULL);
+ }
+ pthread_mutex_unlock(&ThreadCountMutex);
}
/* If control reaches this point, the server is shutting down */
+ pthread_mutex_lock(&ThreadCountMutex);
--num_workers;
+ pthread_mutex_unlock(&ThreadCountMutex);
return(NULL);
}
projects / citadel.git / blobdiff