* Added locking of new_conn_mutex when traversing the c[] array.
*/
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <errno.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <signal.h>
-#ifdef _AIX
-#include <sys/select.h>
-#endif
-#include "slap.h"
#include "portable.h"
+
+#include <stdio.h>
+
+#include <ac/ctype.h>
+#include <ac/errno.h>
+#include <ac/signal.h>
+#include <ac/socket.h>
+#include <ac/string.h>
+#include <ac/time.h>
+#include <ac/unistd.h>
+
#include "ldapconfig.h"
-#ifdef NEED_FILIO
+#include "slap.h"
+
+#ifdef HAVE_SYS_FILIO_H
#include <sys/filio.h>
-#else /* NEED_FILIO */
+#elif HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
-#endif /* NEED_FILIO */
-#ifdef USE_SYSCONF
-#include <unistd.h>
-#endif /* USE_SYSCONF */
+#endif
-#ifdef TCP_WRAPPERS
+#ifdef HAVE_TCPD
#include <tcpd.h>
int allow_severity = LOG_INFO;
int deny_severity = LOG_NOTICE;
-#endif /* TCP_WRAPPERS */
-
-extern Operation *op_add();
-
-#ifndef SYSERRLIST_IN_STDIO
-extern int sys_nerr;
-extern char *sys_errlist[];
-#endif
-extern time_t currenttime;
-extern pthread_mutex_t currenttime_mutex;
-extern int active_threads;
-extern pthread_mutex_t active_threads_mutex;
-extern pthread_mutex_t new_conn_mutex;
-extern int slapd_shutdown;
-extern pthread_t listener_tid;
-extern int num_conns;
-extern pthread_mutex_t ops_mutex;
-extern int g_argc;
-extern char **g_argv;
+#endif /* TCP Wrappers */
int dtblsize;
Connection *c;
-static void set_shutdown();
-static void do_nothing();
+static volatile sig_atomic_t slapd_shutdown = 0;
+static void set_shutdown(int sig);
+static void do_nothing (int sig);
+
+/* a link to the slapd.conf configuration parameters */
+extern char *slapd_pid_file;
+extern char *slapd_args_file;
-void
+void *
slapd_daemon(
- int port
+ void *port
)
{
Operation *o;
FILE *fp;
int on = 1;
-#ifdef USE_SYSCONF
+#ifdef HAVE_SYSCONF
dtblsize = sysconf( _SC_OPEN_MAX );
-#else /* USE_SYSCONF */
+#elif HAVE_GETDTABLESIZE
dtblsize = getdtablesize();
-#endif /* USE_SYSCONF */
- /*
- * Add greg@greg.rim.or.jp
- */
+#else
+ dtblsize = FD_SETSIZE
+#endif
+
#ifdef FD_SETSIZE
if(dtblsize > FD_SETSIZE) {
dtblsize = FD_SETSIZE;
for ( i = 0; i < dtblsize; i++ ) {
c[i].c_dn = NULL;
+ c[i].c_cdn = NULL;
c[i].c_addr = NULL;
c[i].c_domain = NULL;
c[i].c_ops = NULL;
(void) memset( (void *) &addr, '\0', sizeof(addr) );
addr.sin_family = AF_INET;
addr.sin_addr.s_addr = INADDR_ANY;
- addr.sin_port = htons( port );
+ addr.sin_port = htons( (int)port );
if ( bind( tcps, (struct sockaddr *) &addr, sizeof(addr) ) == -1 ) {
Debug( LDAP_DEBUG_ANY, "bind() failed errno %d (%s)\n",
errno, errno > -1 && errno < sys_nerr ? sys_errlist[errno] :
}
(void) SIGNAL( SIGPIPE, SIG_IGN );
-#ifdef linux
- /*
- * LinuxThreads are implemented using SIGUSR1/USR2,
- * so we'll use SIGSTKFLT and SIGUNUSED
- */
- (void) SIGNAL( SIGSTKFLT, (void *) do_nothing );
- (void) SIGNAL( SIGUNUSED, (void *) set_shutdown );
-#else /* !linux */
- (void) SIGNAL( SIGUSR1, (void *) do_nothing );
- (void) SIGNAL( SIGUSR2, (void *) set_shutdown );
-#endif /* !linux */
- (void) SIGNAL( SIGTERM, (void *) set_shutdown );
- (void) SIGNAL( SIGINT, (void *) set_shutdown );
- (void) SIGNAL( SIGHUP, (void *) set_shutdown );
+ (void) SIGNAL( LDAP_SIGUSR1, do_nothing );
+ (void) SIGNAL( LDAP_SIGUSR2, set_shutdown );
+ (void) SIGNAL( SIGTERM, set_shutdown );
+ (void) SIGNAL( SIGINT, set_shutdown );
+ (void) SIGNAL( SIGHUP, set_shutdown );
Debug( LDAP_DEBUG_ANY, "slapd starting\n", 0, 0, 0 );
-#ifdef SLAPD_PIDFILE
- if ( (fp = fopen( SLAPD_PIDFILE, "w" )) != NULL ) {
- fprintf( fp, "%d\n", getpid() );
+
+ if (( slapd_pid_file != NULL ) &&
+ (( fp = fopen( slapd_pid_file, "w" )) != NULL )) {
+ fprintf( fp, "%d\n", (int) getpid() );
fclose( fp );
}
-#endif
-#ifdef SLAPD_ARGSFILE
- if ( (fp = fopen( SLAPD_ARGSFILE, "w" )) != NULL ) {
+
+ if (( slapd_args_file != NULL ) &&
+ (( fp = fopen( slapd_args_file, "w" )) != NULL )) {
for ( i = 0; i < g_argc; i++ ) {
fprintf( fp, "%s ", g_argv[i] );
}
fprintf( fp, "\n" );
fclose( fp );
}
-#endif
while ( !slapd_shutdown ) {
struct sockaddr_in from;
Debug( LDAP_DEBUG_CONNS, "before select active_threads %d\n",
active_threads, 0, 0 );
-#if defined(PTHREAD_PREEMPTIVE) || defined(NO_THREADS)
+#if defined( HAVE_YIELDING_SELECT ) || defined( NO_THREADS )
tvp = NULL;
#else
tvp = active_threads ? &zero : NULL;
"FIONBIO ioctl on %d failed\n", ns, 0, 0 );
}
- c[ns].c_sb.sb_sd = ns;
Debug( LDAP_DEBUG_CONNS, "new connection on %d\n", ns,
0, 0 );
- pthread_mutex_lock( &ops_mutex );
- c[ns].c_connid = num_conns++;
- pthread_mutex_unlock( &ops_mutex );
-
len = sizeof(from);
if ( getpeername( ns, (struct sockaddr *) &from, &len )
char *s;
client_addr = inet_ntoa( from.sin_addr );
-#if defined(REVERSE_LOOKUP) || defined(TCP_WRAPPERS)
+#if defined(SLAPD_RLOOKUPS) || defined(HAVE_TCPD)
hp = gethostbyaddr( (char *)
&(from.sin_addr.s_addr),
sizeof(from.sin_addr.s_addr), AF_INET );
client_addr = NULL;
}
-#ifdef TCP_WRAPPERS
- if(!hosts_ctl("slapd", client_name, client_addr,
+#ifdef HAVE_TCPD
+ if(!hosts_ctl("slapd",
+ client_name != NULL ? client_name : STRING_UNKNOWN,
+ client_addr != NULL ? client_addr : STRING_UNKNOWN,
STRING_UNKNOWN))
{
/* DENY ACCESS */
- Statslog( LDAP_DEBUG_STATS,
- "conn=%d fd=%d connection from %s (%s) denied.\n",
- c[ns].c_connid, ns,
+ Statslog( LDAP_DEBUG_ANY,
+ "fd=%d connection from %s (%s) denied.\n",
+ ns,
client_name == NULL ? "unknown" : client_name,
client_addr == NULL ? "unknown" : client_addr,
0 );
pthread_mutex_unlock( &new_conn_mutex );
continue;
}
-#endif /* TCP_WRAPPERS */
+#endif /* HAVE_TCPD */
+
+ c[ns].c_sb.sb_sd = ns;
+ pthread_mutex_lock( &ops_mutex );
+ c[ns].c_connid = num_conns++;
+ pthread_mutex_unlock( &ops_mutex );
Statslog( LDAP_DEBUG_STATS,
"conn=%d fd=%d connection from %s (%s) accepted.\n",
if ( c[ns].c_addr != NULL ) {
free( c[ns].c_addr );
}
- c[ns].c_addr = strdup( client_addr );
+ c[ns].c_addr = ch_strdup( client_addr );
if ( c[ns].c_domain != NULL ) {
free( c[ns].c_domain );
}
- c[ns].c_domain = strdup( client_name == NULL
+ c[ns].c_domain = ch_strdup( client_name == NULL
? "" : client_name );
pthread_mutex_lock( &c[ns].c_dnmutex );
free( c[ns].c_dn );
c[ns].c_dn = NULL;
}
+ if ( c[ns].c_cdn != NULL ) {
+ free( c[ns].c_cdn );
+ c[ns].c_cdn = NULL;
+ }
pthread_mutex_unlock( &c[ns].c_dnmutex );
c[ns].c_starttime = currenttime;
c[ns].c_opsinitiated = 0;
}
close( tcps );
+
pthread_mutex_lock( &active_threads_mutex );
Debug( LDAP_DEBUG_ANY,
"slapd shutting down - waiting for %d threads to terminate\n",
active_threads, 0, 0 );
while ( active_threads > 0 ) {
- pthread_mutex_unlock( &active_threads_mutex );
- pthread_yield();
- pthread_mutex_lock( &active_threads_mutex );
+ pthread_cond_wait(&active_threads_cond, &active_threads_mutex);
}
pthread_mutex_unlock( &active_threads_mutex );
0 );
be_close();
Debug( LDAP_DEBUG_ANY, "slapd stopping\n", 0, 0, 0 );
+ return NULL;
}
static void
-set_shutdown()
+set_shutdown( int sig )
{
- Debug( LDAP_DEBUG_ANY, "slapd got shutdown signal\n", 0, 0, 0 );
+ Debug( LDAP_DEBUG_ANY, "slapd got shutdown signal %d\n", sig, 0, 0 );
slapd_shutdown = 1;
-#ifdef linux
- /*
- * LinuxThreads are implemented using SIGUSR1/USR2,
- * so we'll use SIGSTKFLT and SIGUNUSED
- */
- pthread_kill( listener_tid, SIGSTKFLT );
- (void) SIGNAL( SIGUNUSED, (void *) set_shutdown );
-#else /* !linux */
- pthread_kill( listener_tid, SIGUSR1 );
- (void) SIGNAL( SIGUSR2, (void *) set_shutdown );
-#endif /* !linux */
- (void) SIGNAL( SIGTERM, (void *) set_shutdown );
- (void) SIGNAL( SIGINT, (void *) set_shutdown );
- (void) SIGNAL( SIGHUP, (void *) set_shutdown );
+ pthread_kill( listener_tid, LDAP_SIGUSR1 );
+ (void) SIGNAL( LDAP_SIGUSR2, set_shutdown );
+ (void) SIGNAL( SIGTERM, set_shutdown );
+ (void) SIGNAL( SIGINT, set_shutdown );
+ (void) SIGNAL( SIGHUP, set_shutdown );
}
static void
-do_nothing()
+do_nothing( int sig )
{
- Debug( LDAP_DEBUG_TRACE, "slapd got do_nothing signal\n", 0, 0, 0 );
-#ifdef linux
- /*
- * LinuxThreads are implemented using SIGUSR1/USR2,
- * so we'll use SIGSTKFLT and SIGUNUSED
- */
- (void) SIGNAL( SIGSTKFLT, (void *) do_nothing );
-#else /* !linux */
- (void) SIGNAL( SIGUSR1, (void *) do_nothing );
-#endif /* !linux */
+ Debug( LDAP_DEBUG_TRACE, "slapd got do_nothing signal %d\n", sig, 0, 0 );
+ (void) SIGNAL( LDAP_SIGUSR1, do_nothing );
}
projects / openldap / blobdiff