X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fdaemon.c;h=20375a7beb60f74ec30d4f32c8759f9cfa7fca06;hb=f7e3566ceb66c65a5f581f073ceaead4d6b9e860;hp=ed6078081b11c201caa9560393ee6651ddd38548;hpb=656c6011bbcc6373c79a9a3bcbc6011a84769dda;p=openldap diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c index ed6078081b..20375a7beb 100644 --- a/servers/slapd/daemon.c +++ b/servers/slapd/daemon.c @@ -1,7 +1,8 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2005 The OpenLDAP Foundation. + * Copyright 1998-2008 The OpenLDAP Foundation. + * Portions Copyright 2007 by Howard Chu, Symas Corporation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -42,17 +43,17 @@ #if defined(HAVE_SYS_EPOLL_H) && defined(HAVE_EPOLL) # include -#endif +#elif defined(SLAP_X_DEVPOLL) && defined(HAVE_SYS_DEVPOLL_H) && defined(HAVE_DEVPOLL) +# include +# include +# include +# include +#endif /* ! epoll && ! /dev/poll */ #ifdef HAVE_TCPD -# include int allow_severity = LOG_INFO; int deny_severity = LOG_NOTICE; - -# define SLAP_STRING_UNKNOWN STRING_UNKNOWN -#else /* ! TCP Wrappers */ -# define SLAP_STRING_UNKNOWN "unknown" -#endif /* ! TCP Wrappers */ +#endif /* TCP Wrappers */ #ifdef LDAP_PF_LOCAL # include @@ -62,9 +63,9 @@ int deny_severity = LOG_NOTICE; #ifdef LDAP_PF_INET6 int slap_inet4or6 = AF_UNSPEC; -#else +#else /* ! INETv6 */ int slap_inet4or6 = AF_INET; -#endif +#endif /* ! INETv6 */ /* globals */ time_t starttime; @@ -76,106 +77,147 @@ Listener **slap_listeners = NULL; #ifndef SLAPD_LISTEN_BACKLOG #define SLAPD_LISTEN_BACKLOG 1024 -#endif +#endif /* ! SLAPD_LISTEN_BACKLOG */ -static ber_socket_t wake_sds[2]; +static ber_socket_t wake_sds[2] +#ifdef HAVE_WINSOCK + = { INVALID_SOCKET, INVALID_SOCKET } +#endif /* HAVE_WINSOCK */ + ; static int emfile; -static int waking; +static volatile int waking; +#ifdef NO_THREADS #define WAKE_LISTENER(w) do { \ - if ((w) && waking < 5) { \ - waking++; \ - tcp_write( wake_sds[1], "0", 1 ); \ + if ((w) && ++waking < 5) { \ + tcp_write( SLAP_FD2SOCK(wake_sds[1]), "0", 1 ); \ } \ -} while(0) +} while (0) +#else /* ! NO_THREADS */ +#define WAKE_LISTENER(w) do { \ + if (w) { \ + tcp_write( SLAP_FD2SOCK(wake_sds[1]), "0", 1 ); \ + } \ +} while (0) +#endif /* ! NO_THREADS */ volatile sig_atomic_t slapd_shutdown = 0; volatile sig_atomic_t slapd_gentle_shutdown = 0; volatile sig_atomic_t slapd_abrupt_shutdown = 0; +#ifdef HAVE_WINSOCK +ldap_pvt_thread_mutex_t slapd_ws_mutex; +SOCKET *slapd_ws_sockets; +#define SD_READ 1 +#define SD_WRITE 2 +#define SD_ACTIVE 4 +#define SD_LISTENER 8 +#endif + static struct slap_daemon { ldap_pvt_thread_mutex_t sd_mutex; - - ber_socket_t sd_nactives; - int sd_nwriters; - -#ifdef HAVE_EPOLL - struct epoll_event *sd_epolls; - int sd_nepolls; - int *sd_index; - int sd_epfd; - int sd_nfds; -#else -#ifndef HAVE_WINSOCK - /* In winsock, accept() returns values higher than dtblsize - so don't bother with this optimization */ - int sd_nfds; -#endif - fd_set sd_actives; - fd_set sd_readers; - fd_set sd_writers; -#endif +#ifdef HAVE_TCPD + ldap_pvt_thread_mutex_t sd_tcpd_mutex; +#endif /* TCP Wrappers */ + + ber_socket_t sd_nactives; + int sd_nwriters; + int sd_nfds; + +#if defined(HAVE_EPOLL) + struct epoll_event *sd_epolls; + int *sd_index; + int sd_epfd; +#elif defined(SLAP_X_DEVPOLL) && defined(HAVE_DEVPOLL) + /* eXperimental */ + struct pollfd *sd_pollfd; + int *sd_index; + Listener **sd_l; + int sd_dpfd; +#else /* ! epoll && ! /dev/poll */ +#ifdef HAVE_WINSOCK + char *sd_flags; + char *sd_rflags; +#else /* ! HAVE_WINSOCK */ + fd_set sd_actives; + fd_set sd_readers; + fd_set sd_writers; +#endif /* ! HAVE_WINSOCK */ +#endif /* ! epoll && ! /dev/poll */ } slap_daemon; -#ifdef HAVE_EPOLL +/* + * NOTE: naming convention for macros: + * + * - SLAP_SOCK_* and SLAP_EVENT_* for public interface that deals + * with file descriptors and events respectively + * + * - SLAP__* for private interface; type by now is one of + * EPOLL, DEVPOLL, SELECT + * + * private interface should not be used in the code. + */ +#if defined(HAVE_EPOLL) +/*************************************** + * Use epoll infrastructure - epoll(4) * + ***************************************/ +# define SLAP_EVENT_FNAME "epoll" # define SLAP_EVENTS_ARE_INDEXED 0 -# define SLAP_SOCK_IX(s) (slap_daemon.sd_index[(s)]) -# define SLAP_SOCK_EP(s) (slap_daemon.sd_epolls[SLAP_SOCK_IX(s)]) -# define SLAP_SOCK_EV(s) (SLAP_SOCK_EP(s).events) -# define SLAP_SOCK_IS_ACTIVE(s) (SLAP_SOCK_IX(s) != -1) -# define SLAP_SOCK_NOT_ACTIVE(s) (SLAP_SOCK_IX(s) == -1) -# define SLAP_SOCK_IS_SET(s, mode) (SLAP_SOCK_EV(s) & (mode)) - -# define SLAP_SOCK_IS_READ(s) SLAP_SOCK_IS_SET((s), EPOLLIN) -# define SLAP_SOCK_IS_WRITE(s) SLAP_SOCK_IS_SET((s), EPOLLOUT) - -# define SLAP_SET_SOCK(s, mode) do { \ - if ((SLAP_SOCK_EV(s) & (mode)) != (mode)) { \ - SLAP_SOCK_EV(s) |= (mode); \ - epoll_ctl(slap_daemon.sd_epfd, EPOLL_CTL_MOD, (s), \ - &SLAP_SOCK_EP(s)); \ +# define SLAP_EPOLL_SOCK_IX(s) (slap_daemon.sd_index[(s)]) +# define SLAP_EPOLL_SOCK_EP(s) (slap_daemon.sd_epolls[SLAP_EPOLL_SOCK_IX(s)]) +# define SLAP_EPOLL_SOCK_EV(s) (SLAP_EPOLL_SOCK_EP(s).events) +# define SLAP_SOCK_IS_ACTIVE(s) (SLAP_EPOLL_SOCK_IX(s) != -1) +# define SLAP_SOCK_NOT_ACTIVE(s) (SLAP_EPOLL_SOCK_IX(s) == -1) +# define SLAP_EPOLL_SOCK_IS_SET(s, mode) (SLAP_EPOLL_SOCK_EV(s) & (mode)) + +# define SLAP_SOCK_IS_READ(s) SLAP_EPOLL_SOCK_IS_SET((s), EPOLLIN) +# define SLAP_SOCK_IS_WRITE(s) SLAP_EPOLL_SOCK_IS_SET((s), EPOLLOUT) + +# define SLAP_EPOLL_SOCK_SET(s, mode) do { \ + if ( (SLAP_EPOLL_SOCK_EV(s) & (mode)) != (mode) ) { \ + SLAP_EPOLL_SOCK_EV(s) |= (mode); \ + epoll_ctl( slap_daemon.sd_epfd, EPOLL_CTL_MOD, (s), \ + &SLAP_EPOLL_SOCK_EP(s) ); \ } \ -} while(0) +} while (0) -# define SLAP_CLR_SOCK(s, mode) do { \ - if ((SLAP_SOCK_EV(s) & (mode))) { \ - SLAP_SOCK_EV(s) &= ~(mode); \ - epoll_ctl(slap_daemon.sd_epfd, EPOLL_CTL_MOD, s, \ - &SLAP_SOCK_EP(s)); \ +# define SLAP_EPOLL_SOCK_CLR(s, mode) do { \ + if ( (SLAP_EPOLL_SOCK_EV(s) & (mode)) ) { \ + SLAP_EPOLL_SOCK_EV(s) &= ~(mode); \ + epoll_ctl( slap_daemon.sd_epfd, EPOLL_CTL_MOD, s, \ + &SLAP_EPOLL_SOCK_EP(s) ); \ } \ -} while(0) +} while (0) + +# define SLAP_SOCK_SET_READ(s) SLAP_EPOLL_SOCK_SET(s, EPOLLIN) +# define SLAP_SOCK_SET_WRITE(s) SLAP_EPOLL_SOCK_SET(s, EPOLLOUT) -# define SLAP_SOCK_SET_READ(s) SLAP_SET_SOCK(s, EPOLLIN) -# define SLAP_SOCK_SET_WRITE(s) SLAP_SET_SOCK(s, EPOLLOUT) +# define SLAP_SOCK_CLR_READ(s) SLAP_EPOLL_SOCK_CLR((s), EPOLLIN) +# define SLAP_SOCK_CLR_WRITE(s) SLAP_EPOLL_SOCK_CLR((s), EPOLLOUT) -# ifdef SLAP_LIGHTWEIGHT_DISPATCHER # define SLAP_SOCK_SET_SUSPEND(s) \ - ( slap_daemon.sd_suspend[SLAP_SOCK_IX(s)] = 1 ) + ( slap_daemon.sd_suspend[SLAP_EPOLL_SOCK_IX(s)] = 1 ) # define SLAP_SOCK_CLR_SUSPEND(s) \ - ( slap_daemon.sd_suspend[SLAP_SOCK_IX(s)] = 0 ) + ( slap_daemon.sd_suspend[SLAP_EPOLL_SOCK_IX(s)] = 0 ) # define SLAP_SOCK_IS_SUSPEND(s) \ - ( slap_daemon.sd_suspend[SLAP_SOCK_IX(s)] == 1 ) -# endif - -# define SLAP_SOCK_CLR_READ(s) SLAP_CLR_SOCK((s), EPOLLIN) -# define SLAP_SOCK_CLR_WRITE(s) SLAP_CLR_SOCK((s), EPOLLOUT) + ( slap_daemon.sd_suspend[SLAP_EPOLL_SOCK_IX(s)] == 1 ) -# define SLAP_CLR_EVENT(i, mode) (revents[(i)].events &= ~(mode)) +# define SLAP_EPOLL_EVENT_CLR(i, mode) (revents[(i)].events &= ~(mode)) -# define SLAP_EVENT_MAX slap_daemon.sd_nfds +# define SLAP_EVENT_MAX slap_daemon.sd_nfds /* If a Listener address is provided, store that as the epoll data. * Otherwise, store the address of this socket's slot in the * index array. If we can't do this add, the system is out of * resources and we need to shutdown. */ -# define SLAP_ADD_SOCK(s, l) do { \ +# define SLAP_SOCK_ADD(s, l) do { \ int rc; \ - SLAP_SOCK_IX((s)) = slap_daemon.sd_nfds; \ - SLAP_SOCK_EP((s)).data.ptr = (l) ? (l) : (void *)(&SLAP_SOCK_IX(s)); \ - SLAP_SOCK_EV((s)) = EPOLLIN; \ + SLAP_EPOLL_SOCK_IX((s)) = slap_daemon.sd_nfds; \ + SLAP_EPOLL_SOCK_EP((s)).data.ptr = (l) ? (l) : (void *)(&SLAP_EPOLL_SOCK_IX(s)); \ + SLAP_EPOLL_SOCK_EV((s)) = EPOLLIN; \ rc = epoll_ctl(slap_daemon.sd_epfd, EPOLL_CTL_ADD, \ - (s), &SLAP_SOCK_EP((s))); \ + (s), &SLAP_EPOLL_SOCK_EP((s))); \ if ( rc == 0 ) { \ slap_daemon.sd_nfds++; \ } else { \ @@ -186,63 +228,365 @@ static struct slap_daemon { } \ } while (0) -# define SLAP_EV_LISTENER(ptr) (((int *)(ptr) >= slap_daemon.sd_index && \ - (int *)(ptr) <= (slap_daemon.sd_index+dtblsize)) ? 0 : 1 ) +# define SLAP_EPOLL_EV_LISTENER(ptr) \ + (((int *)(ptr) >= slap_daemon.sd_index && \ + (int *)(ptr) <= &slap_daemon.sd_index[dtblsize]) ? 0 : 1 ) -# define SLAP_EV_PTRFD(ptr) (SLAP_EV_LISTENER(ptr) ? \ - ((Listener *)ptr)->sl_sd : (int *)(ptr) - slap_daemon.sd_index) +# define SLAP_EPOLL_EV_PTRFD(ptr) (SLAP_EPOLL_EV_LISTENER(ptr) ? \ + ((Listener *)ptr)->sl_sd : \ + (ber_socket_t) ((int *)(ptr) - slap_daemon.sd_index)) -# define SLAP_DEL_SOCK(s) do { \ - int fd, rc, index = SLAP_SOCK_IX((s)); \ +# define SLAP_SOCK_DEL(s) do { \ + int fd, rc, index = SLAP_EPOLL_SOCK_IX((s)); \ if ( index < 0 ) break; \ rc = epoll_ctl(slap_daemon.sd_epfd, EPOLL_CTL_DEL, \ - (s), &SLAP_SOCK_EP((s))); \ + (s), &SLAP_EPOLL_SOCK_EP((s))); \ slap_daemon.sd_epolls[index] = \ slap_daemon.sd_epolls[slap_daemon.sd_nfds-1]; \ - fd = SLAP_EV_PTRFD(slap_daemon.sd_epolls[index].data.ptr); \ + fd = SLAP_EPOLL_EV_PTRFD(slap_daemon.sd_epolls[index].data.ptr); \ slap_daemon.sd_index[fd] = index; \ slap_daemon.sd_index[(s)] = -1; \ slap_daemon.sd_nfds--; \ } while (0) -# define SLAP_EVENT_CLR_READ(i) SLAP_CLR_EVENT((i), EPOLLIN) -# define SLAP_EVENT_CLR_WRITE(i) SLAP_CLR_EVENT((i), EPOLLOUT) +# define SLAP_EVENT_CLR_READ(i) SLAP_EPOLL_EVENT_CLR((i), EPOLLIN) +# define SLAP_EVENT_CLR_WRITE(i) SLAP_EPOLL_EVENT_CLR((i), EPOLLOUT) -# define SLAP_CHK_EVENT(i, mode) (revents[(i)].events & mode) +# define SLAP_EPOLL_EVENT_CHK(i, mode) (revents[(i)].events & mode) -# define SLAP_EVENT_IS_READ(i) SLAP_CHK_EVENT((i), EPOLLIN) -# define SLAP_EVENT_IS_WRITE(i) SLAP_CHK_EVENT((i), EPOLLOUT) -# define SLAP_EVENT_IS_LISTENER(i) SLAP_EV_LISTENER(revents[(i)].data.ptr) -# define SLAP_EVENT_LISTENER(i) (revents[(i)].data.ptr) +# define SLAP_EVENT_IS_READ(i) SLAP_EPOLL_EVENT_CHK((i), EPOLLIN) +# define SLAP_EVENT_IS_WRITE(i) SLAP_EPOLL_EVENT_CHK((i), EPOLLOUT) +# define SLAP_EVENT_IS_LISTENER(i) SLAP_EPOLL_EV_LISTENER(revents[(i)].data.ptr) +# define SLAP_EVENT_LISTENER(i) ((Listener *)(revents[(i)].data.ptr)) -# define SLAP_EVENT_FD(i) SLAP_EV_PTRFD(revents[(i)].data.ptr) +# define SLAP_EVENT_FD(i) SLAP_EPOLL_EV_PTRFD(revents[(i)].data.ptr) -# define SLAP_SOCK_SET_INIT do { \ +# define SLAP_SOCK_INIT do { \ slap_daemon.sd_epolls = ch_calloc(1, \ - sizeof(struct epoll_event) * dtblsize * 2); \ - slap_daemon.sd_index = ch_malloc(sizeof(int) * dtblsize); \ + ( sizeof(struct epoll_event) * 2 \ + + sizeof(int) ) * dtblsize * 2); \ + slap_daemon.sd_index = (int *)&slap_daemon.sd_epolls[ 2 * dtblsize ]; \ slap_daemon.sd_epfd = epoll_create( dtblsize ); \ - for (i=0; itv_sec * 1000 : -1 ) +# define SLAP_EVENT_WAIT(tvp, nsp) do { \ + *(nsp) = epoll_wait( slap_daemon.sd_epfd, revents, \ + dtblsize, (tvp) ? (tvp)->tv_sec * 1000 : -1 ); \ +} while (0) + +#elif defined(SLAP_X_DEVPOLL) && defined(HAVE_DEVPOLL) -#else -/* select */ +/************************************************************* + * Use Solaris' (>= 2.7) /dev/poll infrastructure - poll(7d) * + *************************************************************/ +# define SLAP_EVENT_FNAME "/dev/poll" +# define SLAP_EVENTS_ARE_INDEXED 0 +/* + * - sd_index is used much like with epoll() + * - sd_l is maintained as an array containing the address + * of the listener; the index is the fd itself + * - sd_pollfd is used to keep track of what data has been + * registered in /dev/poll + */ +# define SLAP_DEVPOLL_SOCK_IX(s) (slap_daemon.sd_index[(s)]) +# define SLAP_DEVPOLL_SOCK_LX(s) (slap_daemon.sd_l[(s)]) +# define SLAP_DEVPOLL_SOCK_EP(s) (slap_daemon.sd_pollfd[SLAP_DEVPOLL_SOCK_IX((s))]) +# define SLAP_DEVPOLL_SOCK_FD(s) (SLAP_DEVPOLL_SOCK_EP((s)).fd) +# define SLAP_DEVPOLL_SOCK_EV(s) (SLAP_DEVPOLL_SOCK_EP((s)).events) +# define SLAP_SOCK_IS_ACTIVE(s) (SLAP_DEVPOLL_SOCK_IX((s)) != -1) +# define SLAP_SOCK_NOT_ACTIVE(s) (SLAP_DEVPOLL_SOCK_IX((s)) == -1) +# define SLAP_SOCK_IS_SET(s, mode) (SLAP_DEVPOLL_SOCK_EV((s)) & (mode)) + +# define SLAP_SOCK_IS_READ(s) SLAP_SOCK_IS_SET((s), POLLIN) +# define SLAP_SOCK_IS_WRITE(s) SLAP_SOCK_IS_SET((s), POLLOUT) + +/* as far as I understand, any time we need to communicate with the kernel + * about the number and/or properties of a file descriptor we need it to + * wait for, we have to rewrite the whole set */ +# define SLAP_DEVPOLL_WRITE_POLLFD(s, pfd, n, what, shdn) do { \ + int rc; \ + size_t size = (n) * sizeof( struct pollfd ); \ + /* FIXME: use pwrite? */ \ + rc = write( slap_daemon.sd_dpfd, (pfd), size ); \ + if ( rc != size ) { \ + Debug( LDAP_DEBUG_ANY, "daemon: " SLAP_EVENT_FNAME ": " \ + "%s fd=%d failed errno=%d\n", \ + (what), (s), errno ); \ + if ( (shdn) ) { \ + slapd_shutdown = 2; \ + } \ + } \ +} while (0) + +# define SLAP_DEVPOLL_SOCK_SET(s, mode) do { \ + Debug( LDAP_DEBUG_CONNS, "SLAP_SOCK_SET_%s(%d)=%d\n", \ + (mode) == POLLIN ? "READ" : "WRITE", (s), \ + ( (SLAP_DEVPOLL_SOCK_EV((s)) & (mode)) != (mode) ) ); \ + if ( (SLAP_DEVPOLL_SOCK_EV((s)) & (mode)) != (mode) ) { \ + struct pollfd pfd; \ + SLAP_DEVPOLL_SOCK_EV((s)) |= (mode); \ + pfd.fd = SLAP_DEVPOLL_SOCK_FD((s)); \ + pfd.events = /* (mode) */ SLAP_DEVPOLL_SOCK_EV((s)); \ + SLAP_DEVPOLL_WRITE_POLLFD((s), &pfd, 1, "SET", 0); \ + } \ +} while (0) + +# define SLAP_DEVPOLL_SOCK_CLR(s, mode) do { \ + Debug( LDAP_DEBUG_CONNS, "SLAP_SOCK_CLR_%s(%d)=%d\n", \ + (mode) == POLLIN ? "READ" : "WRITE", (s), \ + ( (SLAP_DEVPOLL_SOCK_EV((s)) & (mode)) == (mode) ) ); \ + if ((SLAP_DEVPOLL_SOCK_EV((s)) & (mode)) == (mode) ) { \ + struct pollfd pfd[2]; \ + SLAP_DEVPOLL_SOCK_EV((s)) &= ~(mode); \ + pfd[0].fd = SLAP_DEVPOLL_SOCK_FD((s)); \ + pfd[0].events = POLLREMOVE; \ + pfd[1] = SLAP_DEVPOLL_SOCK_EP((s)); \ + SLAP_DEVPOLL_WRITE_POLLFD((s), &pfd[0], 2, "CLR", 0); \ + } \ +} while (0) + +# define SLAP_SOCK_SET_READ(s) SLAP_DEVPOLL_SOCK_SET(s, POLLIN) +# define SLAP_SOCK_SET_WRITE(s) SLAP_DEVPOLL_SOCK_SET(s, POLLOUT) + +# define SLAP_SOCK_CLR_READ(s) SLAP_DEVPOLL_SOCK_CLR((s), POLLIN) +# define SLAP_SOCK_CLR_WRITE(s) SLAP_DEVPOLL_SOCK_CLR((s), POLLOUT) + +# define SLAP_SOCK_SET_SUSPEND(s) \ + ( slap_daemon.sd_suspend[SLAP_DEVPOLL_SOCK_IX((s))] = 1 ) +# define SLAP_SOCK_CLR_SUSPEND(s) \ + ( slap_daemon.sd_suspend[SLAP_DEVPOLL_SOCK_IX((s))] = 0 ) +# define SLAP_SOCK_IS_SUSPEND(s) \ + ( slap_daemon.sd_suspend[SLAP_DEVPOLL_SOCK_IX((s))] == 1 ) + +# define SLAP_DEVPOLL_EVENT_CLR(i, mode) (revents[(i)].events &= ~(mode)) + +# define SLAP_EVENT_MAX slap_daemon.sd_nfds + +/* If a Listener address is provided, store that in the sd_l array. + * If we can't do this add, the system is out of resources and we + * need to shutdown. + */ +# define SLAP_SOCK_ADD(s, l) do { \ + Debug( LDAP_DEBUG_CONNS, "SLAP_SOCK_ADD(%d, %p)\n", (s), (l), 0 ); \ + SLAP_DEVPOLL_SOCK_IX((s)) = slap_daemon.sd_nfds; \ + SLAP_DEVPOLL_SOCK_LX((s)) = (l); \ + SLAP_DEVPOLL_SOCK_FD((s)) = (s); \ + SLAP_DEVPOLL_SOCK_EV((s)) = POLLIN; \ + SLAP_DEVPOLL_WRITE_POLLFD((s), &SLAP_DEVPOLL_SOCK_EP((s)), 1, "ADD", 1); \ + slap_daemon.sd_nfds++; \ +} while (0) + +# define SLAP_DEVPOLL_EV_LISTENER(ptr) ((ptr) != NULL) + +# define SLAP_SOCK_DEL(s) do { \ + int fd, index = SLAP_DEVPOLL_SOCK_IX((s)); \ + Debug( LDAP_DEBUG_CONNS, "SLAP_SOCK_DEL(%d)\n", (s), 0, 0 ); \ + if ( index < 0 ) break; \ + if ( index < slap_daemon.sd_nfds - 1 ) { \ + struct pollfd pfd = slap_daemon.sd_pollfd[index]; \ + fd = slap_daemon.sd_pollfd[slap_daemon.sd_nfds - 1].fd; \ + slap_daemon.sd_pollfd[index] = slap_daemon.sd_pollfd[slap_daemon.sd_nfds - 1]; \ + slap_daemon.sd_pollfd[slap_daemon.sd_nfds - 1] = pfd; \ + slap_daemon.sd_index[fd] = index; \ + } \ + slap_daemon.sd_index[(s)] = -1; \ + slap_daemon.sd_pollfd[slap_daemon.sd_nfds - 1].events = POLLREMOVE; \ + SLAP_DEVPOLL_WRITE_POLLFD((s), &slap_daemon.sd_pollfd[slap_daemon.sd_nfds - 1], 1, "DEL", 0); \ + slap_daemon.sd_pollfd[slap_daemon.sd_nfds - 1].events = 0; \ + slap_daemon.sd_nfds--; \ +} while (0) + +# define SLAP_EVENT_CLR_READ(i) SLAP_DEVPOLL_EVENT_CLR((i), POLLIN) +# define SLAP_EVENT_CLR_WRITE(i) SLAP_DEVPOLL_EVENT_CLR((i), POLLOUT) + +# define SLAP_DEVPOLL_EVENT_CHK(i, mode) (revents[(i)].events & (mode)) + +# define SLAP_EVENT_FD(i) (revents[(i)].fd) + +# define SLAP_EVENT_IS_READ(i) SLAP_DEVPOLL_EVENT_CHK((i), POLLIN) +# define SLAP_EVENT_IS_WRITE(i) SLAP_DEVPOLL_EVENT_CHK((i), POLLOUT) +# define SLAP_EVENT_IS_LISTENER(i) SLAP_DEVPOLL_EV_LISTENER(SLAP_DEVPOLL_SOCK_LX(SLAP_EVENT_FD((i)))) +# define SLAP_EVENT_LISTENER(i) SLAP_DEVPOLL_SOCK_LX(SLAP_EVENT_FD((i))) + +# define SLAP_SOCK_INIT do { \ + slap_daemon.sd_pollfd = ch_calloc( 1, \ + ( sizeof(struct pollfd) * 2 \ + + sizeof( int ) \ + + sizeof( Listener * ) ) * dtblsize ); \ + slap_daemon.sd_index = (int *)&slap_daemon.sd_pollfd[ 2 * dtblsize ]; \ + slap_daemon.sd_l = (Listener **)&slap_daemon.sd_index[ dtblsize ]; \ + slap_daemon.sd_dpfd = open( SLAP_EVENT_FNAME, O_RDWR ); \ + if ( slap_daemon.sd_dpfd == -1 ) { \ + Debug( LDAP_DEBUG_ANY, "daemon: " SLAP_EVENT_FNAME ": " \ + "open(\"" SLAP_EVENT_FNAME "\") failed errno=%d\n", \ + errno, 0, 0 ); \ + SLAP_SOCK_DESTROY; \ + return -1; \ + } \ + for ( i = 0; i < dtblsize; i++ ) { \ + slap_daemon.sd_pollfd[i].fd = -1; \ + slap_daemon.sd_index[i] = -1; \ + } \ +} while (0) + +# define SLAP_SOCK_DESTROY do { \ + if ( slap_daemon.sd_pollfd != NULL ) { \ + ch_free( slap_daemon.sd_pollfd ); \ + slap_daemon.sd_pollfd = NULL; \ + slap_daemon.sd_index = NULL; \ + slap_daemon.sd_l = NULL; \ + close( slap_daemon.sd_dpfd ); \ + } \ +} while ( 0 ) -# define SLAP_EVENTS_ARE_INDEXED 1 -# define SLAP_EVENT_DECL \ - fd_set readfds, writefds +# define SLAP_EVENT_DECL struct pollfd *revents -# define SLAP_EVENT_INIT do { \ +# define SLAP_EVENT_INIT do { \ + revents = &slap_daemon.sd_pollfd[ dtblsize ]; \ +} while (0) + +# define SLAP_EVENT_WAIT(tvp, nsp) do { \ + struct dvpoll sd_dvpoll; \ + sd_dvpoll.dp_timeout = (tvp) ? (tvp)->tv_sec * 1000 : -1; \ + sd_dvpoll.dp_nfds = dtblsize; \ + sd_dvpoll.dp_fds = revents; \ + *(nsp) = ioctl( slap_daemon.sd_dpfd, DP_POLL, &sd_dvpoll ); \ +} while (0) + +#else /* ! epoll && ! /dev/poll */ +# ifdef HAVE_WINSOCK +# define SLAP_EVENT_FNAME "WSselect" +/* Winsock provides a "select" function but its fd_sets are + * actually arrays of sockets. Since these sockets are handles + * and not a contiguous range of small integers, we manage our + * own "fd" table of socket handles and use their indices as + * descriptors. + * + * All of our listener/connection structures use fds; the actual + * I/O functions use sockets. The SLAP_FD2SOCK macro in proto-slap.h + * handles the mapping. + * + * Despite the mapping overhead, this is about 45% more efficient + * than just using Winsock's select and FD_ISSET directly. + * + * Unfortunately Winsock's select implementation doesn't scale well + * as the number of connections increases. This probably needs to be + * rewritten to use the Winsock overlapped/asynchronous I/O functions. + */ +# define SLAP_EVENTS_ARE_INDEXED 1 +# define SLAP_EVENT_DECL fd_set readfds, writefds +# define SLAP_EVENT_INIT do { \ + int i; \ + FD_ZERO( &readfds ); \ + FD_ZERO( &writefds ); \ + memset( slap_daemon.sd_rflags, 0, slap_daemon.sd_nfds ); \ + for ( i=0; i 0 ? &writefds : NULL, NULL, (tvp) ); \ + for ( i=0; i= 0 ) { \ + slap_daemon.sd_rflags[fd] = SD_READ; \ + if ( fd >= *(nsp)) *(nsp) = fd+1; \ + } \ + } \ + for ( i=0; i= 0 ) { \ + slap_daemon.sd_rflags[fd] = SD_WRITE; \ + if ( fd >= *(nsp)) *(nsp) = fd+1; \ + } \ + } \ +} while (0) + +# define SLAP_EVENT_IS_READ(fd) (slap_daemon.sd_rflags[fd] & SD_READ) +# define SLAP_EVENT_IS_WRITE(fd) (slap_daemon.sd_rflags[fd] & SD_WRITE) + +# define SLAP_EVENT_CLR_READ(fd) slap_daemon.sd_rflags[fd] &= ~SD_READ; +# define SLAP_EVENT_CLR_WRITE(fd) slap_daemon.sd_rflags[fd] &= ~SD_WRITE; + +# define SLAP_SOCK_INIT do { \ + ldap_pvt_thread_mutex_init( &slapd_ws_mutex ); \ + slapd_ws_sockets = ch_malloc( dtblsize * ( sizeof(SOCKET) + 2)); \ + slap_daemon.sd_flags = (char *)(slapd_ws_sockets + dtblsize); \ + slap_daemon.sd_rflags = slap_daemon.sd_flags + dtblsize; \ + memset( slapd_ws_sockets, -1, dtblsize * sizeof(SOCKET) ); \ + slapd_ws_sockets[0] = wake_sds[0]; \ + slapd_ws_sockets[1] = wake_sds[1]; \ + wake_sds[0] = 0; \ + wake_sds[1] = 1; \ + slap_daemon.sd_nfds = 2; \ + } while ( 0 ) + +# define SLAP_SOCK_DESTROY do { \ + ch_free( slapd_ws_sockets ); slapd_ws_sockets = NULL; \ + slap_daemon.sd_flags = NULL; \ + slap_daemon.sd_rflags = NULL; \ + ldap_pvt_thread_mutex_destroy( &slapd_ws_mutex ); \ + } while ( 0 ) + +# define SLAP_SOCK_IS_ACTIVE(fd) ( slap_daemon.sd_flags[fd] & SD_ACTIVE ) +# define SLAP_SOCK_IS_READ(fd) ( slap_daemon.sd_flags[fd] & SD_READ ) +# define SLAP_SOCK_IS_WRITE(fd) ( slap_daemon.sd_flags[fd] & SD_WRITE ) +# define SLAP_SOCK_NOT_ACTIVE(fd) (!slap_daemon.sd_flags[fd]) + +# define SLAP_SOCK_SET_READ(fd) ( slap_daemon.sd_flags[fd] |= SD_READ ) +# define SLAP_SOCK_SET_WRITE(fd) ( slap_daemon.sd_flags[fd] |= SD_WRITE ) + +# define SLAP_SELECT_ADDTEST(s) do { \ + if ((s) >= slap_daemon.sd_nfds) slap_daemon.sd_nfds = (s)+1; \ +} while (0) + +# define SLAP_SOCK_CLR_READ(fd) ( slap_daemon.sd_flags[fd] &= ~SD_READ ) +# define SLAP_SOCK_CLR_WRITE(fd) ( slap_daemon.sd_flags[fd] &= ~SD_WRITE ) + +# define SLAP_SOCK_ADD(s, l) do { \ + SLAP_SELECT_ADDTEST((s)); \ + slap_daemon.sd_flags[s] = SD_ACTIVE|SD_READ; \ +} while ( 0 ) + +# define SLAP_SOCK_DEL(s) do { \ + slap_daemon.sd_flags[s] = 0; \ + slapd_sockdel( s ); \ +} while ( 0 ) + +# else /* !HAVE_WINSOCK */ + +/************************************** + * Use select system call - select(2) * + **************************************/ +# define SLAP_EVENT_FNAME "select" +/* select */ +# define SLAP_EVENTS_ARE_INDEXED 1 +# define SLAP_EVENT_DECL fd_set readfds, writefds + +# define SLAP_EVENT_INIT do { \ AC_MEMCPY( &readfds, &slap_daemon.sd_readers, sizeof(fd_set) ); \ if ( nwriters ) { \ AC_MEMCPY( &writefds, &slap_daemon.sd_writers, sizeof(fd_set) ); \ @@ -252,19 +596,22 @@ static struct slap_daemon { } while (0) # ifdef FD_SETSIZE -# define CHK_SETSIZE do { \ +# define SLAP_SELECT_CHK_SETSIZE do { \ if (dtblsize > FD_SETSIZE) dtblsize = FD_SETSIZE; \ } while (0) -# else -# define CHK_SETSIZE do { ; } while (0) -# endif +# else /* ! FD_SETSIZE */ +# define SLAP_SELECT_CHK_SETSIZE do { ; } while (0) +# endif /* ! FD_SETSIZE */ -# define SLAP_SOCK_SET_INIT do { \ - CHK_SETSIZE; \ +# define SLAP_SOCK_INIT do { \ + SLAP_SELECT_CHK_SETSIZE; \ + FD_ZERO(&slap_daemon.sd_actives); \ FD_ZERO(&slap_daemon.sd_readers); \ FD_ZERO(&slap_daemon.sd_writers); \ } while (0) +# define SLAP_SOCK_DESTROY + # define SLAP_SOCK_IS_ACTIVE(fd) FD_ISSET((fd), &slap_daemon.sd_actives) # define SLAP_SOCK_IS_READ(fd) FD_ISSET((fd), &slap_daemon.sd_readers) # define SLAP_SOCK_IS_WRITE(fd) FD_ISSET((fd), &slap_daemon.sd_writers) @@ -272,40 +619,28 @@ static struct slap_daemon { # define SLAP_SOCK_NOT_ACTIVE(fd) (!SLAP_SOCK_IS_ACTIVE(fd) && \ !SLAP_SOCK_IS_READ(fd) && !SLAP_SOCK_IS_WRITE(fd)) -# ifdef HAVE_WINSOCK -# define SLAP_SOCK_SET_READ(fd) do { \ - if (!SLAP_SOCK_IS_READ(fd)) { FD_SET((fd), &slap_daemon.sd_readers); } \ -} while(0) -# define SLAP_SOCK_SET_WRITE(fd) do { \ - if (!SLAP_SOCK_IS_WRITE(fd)) { FD_SET((fd), &slap_daemon.sd_writers); } \ -} while(0) - -# define SLAP_ADDTEST(s) do { } while 0 -# define SLAP_EVENT_MAX dtblsize -# else -# define SLAP_SOCK_SET_READ(fd) FD_SET((fd), &slap_daemon.sd_readers) -# define SLAP_SOCK_SET_WRITE(fd) FD_SET((fd), &slap_daemon.sd_writers) - -# define SLAP_EVENT_MAX slap_daemon.sd_nfds -# define SLAP_ADDTEST(s) do { \ +# define SLAP_SOCK_SET_READ(fd) FD_SET((fd), &slap_daemon.sd_readers) +# define SLAP_SOCK_SET_WRITE(fd) FD_SET((fd), &slap_daemon.sd_writers) + +# define SLAP_EVENT_MAX slap_daemon.sd_nfds +# define SLAP_SELECT_ADDTEST(s) do { \ if ((s) >= slap_daemon.sd_nfds) slap_daemon.sd_nfds = (s)+1; \ } while (0) -# endif # define SLAP_SOCK_CLR_READ(fd) FD_CLR((fd), &slap_daemon.sd_readers) # define SLAP_SOCK_CLR_WRITE(fd) FD_CLR((fd), &slap_daemon.sd_writers) -# define SLAP_ADD_SOCK(s, l) do { \ - SLAP_ADDTEST((s)); \ +# define SLAP_SOCK_ADD(s, l) do { \ + SLAP_SELECT_ADDTEST((s)); \ FD_SET((s), &slap_daemon.sd_actives); \ FD_SET((s), &slap_daemon.sd_readers); \ -} while(0) +} while (0) -# define SLAP_DEL_SOCK(s) do { \ +# define SLAP_SOCK_DEL(s) do { \ FD_CLR((s), &slap_daemon.sd_actives); \ FD_CLR((s), &slap_daemon.sd_readers); \ FD_CLR((s), &slap_daemon.sd_writers); \ -} while(0) +} while (0) # define SLAP_EVENT_IS_READ(fd) FD_ISSET((fd), &readfds) # define SLAP_EVENT_IS_WRITE(fd) FD_ISSET((fd), &writefds) @@ -313,10 +648,12 @@ static struct slap_daemon { # define SLAP_EVENT_CLR_READ(fd) FD_CLR((fd), &readfds) # define SLAP_EVENT_CLR_WRITE(fd) FD_CLR((fd), &writefds) -# define SLAP_EVENT_WAIT(tvp) \ - select( SLAP_EVENT_MAX, &readfds, \ - nwriters > 0 ? &writefds : NULL, NULL, (tvp) ) -#endif +# define SLAP_EVENT_WAIT(tvp, nsp) do { \ + *(nsp) = select( SLAP_EVENT_MAX, &readfds, \ + nwriters > 0 ? &writefds : NULL, NULL, (tvp) ); \ +} while (0) +# endif /* !HAVE_WINSOCK */ +#endif /* ! epoll && ! /dev/poll */ #ifdef HAVE_SLP /* @@ -329,48 +666,50 @@ static struct slap_daemon { static char** slapd_srvurls = NULL; static SLPHandle slapd_hslp = 0; int slapd_register_slp = 0; +const char *slapd_slp_attrs = NULL; -void slapd_slp_init( const char* urls ) { +static SLPError slapd_slp_cookie; + +static void +slapd_slp_init( const char* urls ) +{ int i; + SLPError err; slapd_srvurls = ldap_str2charray( urls, " " ); - if( slapd_srvurls == NULL ) return; + if ( slapd_srvurls == NULL ) return; /* find and expand INADDR_ANY URLs */ - for( i=0; slapd_srvurls[i] != NULL; i++ ) { - if( strcmp( slapd_srvurls[i], "ldap:///" ) == 0) { - char *host = ldap_pvt_get_fqdn( NULL ); - if ( host != NULL ) { - slapd_srvurls[i] = (char *) ch_realloc( slapd_srvurls[i], - strlen( host ) + - sizeof( LDAP_SRVTYPE_PREFIX ) ); - strcpy( lutil_strcopy(slapd_srvurls[i], - LDAP_SRVTYPE_PREFIX ), host ); - - ch_free( host ); - } - - } else if ( strcmp( slapd_srvurls[i], "ldaps:///" ) == 0) { - char *host = ldap_pvt_get_fqdn( NULL ); - if ( host != NULL ) { - slapd_srvurls[i] = (char *) ch_realloc( slapd_srvurls[i], - strlen( host ) + - sizeof( LDAPS_SRVTYPE_PREFIX ) ); - strcpy( lutil_strcopy(slapd_srvurls[i], - LDAPS_SRVTYPE_PREFIX ), host ); - - ch_free( host ); - } + for ( i = 0; slapd_srvurls[i] != NULL; i++ ) { + if ( strcmp( slapd_srvurls[i], "ldap:///" ) == 0 ) { + slapd_srvurls[i] = (char *) ch_realloc( slapd_srvurls[i], + strlen( global_host ) + + sizeof( LDAP_SRVTYPE_PREFIX ) ); + strcpy( lutil_strcopy(slapd_srvurls[i], + LDAP_SRVTYPE_PREFIX ), global_host ); + } else if ( strcmp( slapd_srvurls[i], "ldaps:///" ) == 0 ) { + slapd_srvurls[i] = (char *) ch_realloc( slapd_srvurls[i], + strlen( global_host ) + + sizeof( LDAPS_SRVTYPE_PREFIX ) ); + strcpy( lutil_strcopy(slapd_srvurls[i], + LDAPS_SRVTYPE_PREFIX ), global_host ); } } /* open the SLP handle */ - SLPOpen( "en", 0, &slapd_hslp ); + err = SLPOpen( "en", 0, &slapd_hslp ); + + if ( err != SLP_OK ) { + Debug( LDAP_DEBUG_CONNS, "daemon: SLPOpen() failed with %ld\n", + (long)err, 0, 0 ); + } } -void slapd_slp_deinit() { - if( slapd_srvurls == NULL ) return; +static void +slapd_slp_deinit( void ) +{ + if ( slapd_srvurls == NULL ) return; ldap_charray_free( slapd_srvurls ); slapd_srvurls = NULL; @@ -379,51 +718,107 @@ void slapd_slp_deinit() { SLPClose( slapd_hslp ); } -void slapd_slp_regreport( - SLPHandle hslp, - SLPError errcode, - void* cookie ) +static void +slapd_slp_regreport( + SLPHandle hslp, + SLPError errcode, + void *cookie ) { - /* empty report */ + /* return the error code in the cookie */ + *(SLPError*)cookie = errcode; } -void slapd_slp_reg() { +static void +slapd_slp_reg() +{ int i; + SLPError err; - if( slapd_srvurls == NULL ) return; + if ( slapd_srvurls == NULL ) return; - for( i=0; slapd_srvurls[i] != NULL; i++ ) { - if( strncmp( slapd_srvurls[i], LDAP_SRVTYPE_PREFIX, + for ( i = 0; slapd_srvurls[i] != NULL; i++ ) { + if ( strncmp( slapd_srvurls[i], LDAP_SRVTYPE_PREFIX, sizeof( LDAP_SRVTYPE_PREFIX ) - 1 ) == 0 || - strncmp( slapd_srvurls[i], LDAPS_SRVTYPE_PREFIX, + strncmp( slapd_srvurls[i], LDAPS_SRVTYPE_PREFIX, sizeof( LDAPS_SRVTYPE_PREFIX ) - 1 ) == 0 ) { - SLPReg( slapd_hslp, + err = SLPReg( slapd_hslp, slapd_srvurls[i], SLP_LIFETIME_MAXIMUM, "ldap", - "", - 1, + (slapd_slp_attrs) ? slapd_slp_attrs : "", + SLP_TRUE, slapd_slp_regreport, - NULL ); + &slapd_slp_cookie ); + + if ( err != SLP_OK || slapd_slp_cookie != SLP_OK ) { + Debug( LDAP_DEBUG_CONNS, + "daemon: SLPReg(%s) failed with %ld, cookie = %ld\n", + slapd_srvurls[i], (long)err, (long)slapd_slp_cookie ); + } } } } -void slapd_slp_dereg() { +static void +slapd_slp_dereg( void ) +{ int i; + SLPError err; - if( slapd_srvurls == NULL ) return; + if ( slapd_srvurls == NULL ) return; - for( i=0; slapd_srvurls[i] != NULL; i++ ) { - SLPDereg( slapd_hslp, + for ( i = 0; slapd_srvurls[i] != NULL; i++ ) { + err = SLPDereg( slapd_hslp, slapd_srvurls[i], slapd_slp_regreport, - NULL ); + &slapd_slp_cookie ); + + if ( err != SLP_OK || slapd_slp_cookie != SLP_OK ) { + Debug( LDAP_DEBUG_CONNS, + "daemon: SLPDereg(%s) failed with %ld, cookie = %ld\n", + slapd_srvurls[i], (long)err, (long)slapd_slp_cookie ); + } } } #endif /* HAVE_SLP */ +#ifdef HAVE_WINSOCK +/* Manage the descriptor to socket table */ +ber_socket_t +slapd_socknew( ber_socket_t s ) +{ + ber_socket_t i; + ldap_pvt_thread_mutex_lock( &slapd_ws_mutex ); + for ( i = 0; i < dtblsize && slapd_ws_sockets[i] != INVALID_SOCKET; i++ ); + if ( i == dtblsize ) { + WSASetLastError( WSAEMFILE ); + } else { + slapd_ws_sockets[i] = s; + } + ldap_pvt_thread_mutex_unlock( &slapd_ws_mutex ); + return i; +} + +void +slapd_sockdel( ber_socket_t s ) +{ + ldap_pvt_thread_mutex_lock( &slapd_ws_mutex ); + slapd_ws_sockets[s] = INVALID_SOCKET; + ldap_pvt_thread_mutex_unlock( &slapd_ws_mutex ); +} + +ber_socket_t +slapd_sock2fd( ber_socket_t s ) +{ + ber_socket_t i; + for ( i=0; isa_family = AF_LOCAL; strcpy( ((struct sockaddr_un *)*sap)->sun_path, host ); } else -#endif +#endif /* LDAP_PF_LOCAL */ { #ifdef HAVE_GETADDRINFO struct addrinfo hints, *res, *sai; @@ -725,7 +1168,7 @@ static int slap_get_listener_addresses( *(struct sockaddr_in6 *)*sap = *((struct sockaddr_in6 *)sai->ai_addr); break; -# endif +# endif /* LDAP_PF_INET6 */ case AF_INET: *sap = ch_malloc(sizeof(struct sockaddr_in)); if (*sap == NULL) { @@ -749,7 +1192,7 @@ static int slap_get_listener_addresses( freeaddrinfo(res); -#else +#else /* ! HAVE_GETADDRINFO */ int i, n = 1; struct in_addr in; struct hostent *he = NULL; @@ -779,10 +1222,11 @@ static int slap_get_listener_addresses( sap[i]->sa_family = AF_INET; ((struct sockaddr_in *)sap[i])->sin_port = htons(port); AC_MEMCPY( &((struct sockaddr_in *)sap[i])->sin_addr, - he ? he->h_addr_list[i] : &in, sizeof(struct in_addr) ); + he ? (struct in_addr *)he->h_addr_list[i] : &in, + sizeof(struct in_addr) ); } sap[i] = NULL; -#endif +#endif /* ! HAVE_GETADDRINFO */ } return 0; @@ -792,11 +1236,11 @@ errexit: return -1; } -static int slap_open_listener( +static int +slap_open_listener( const char* url, int *listeners, - int *cur - ) + int *cur ) { int num, tmp, rc; Listener l; @@ -806,6 +1250,7 @@ static int slap_open_listener( int err, addrlen = 0; struct sockaddr **sal, **psal; int socktype = SOCK_STREAM; /* default to COTS */ + ber_socket_t s; #if defined(LDAP_PF_LOCAL) || defined(SLAP_X_LISTENER_MOD) /* @@ -825,9 +1270,7 @@ static int slap_open_listener( l.sl_url.bv_val = NULL; l.sl_mute = 0; -#ifdef SLAP_LIGHTWEIGHT_DISPATCHER l.sl_busy = 0; -#endif #ifndef HAVE_TLS if( ldap_pvt_url_scheme2tls( lud->lud_scheme ) ) { @@ -839,13 +1282,13 @@ static int slap_open_listener( if(! lud->lud_port ) lud->lud_port = LDAP_PORT; -#else +#else /* HAVE_TLS */ l.sl_is_tls = ldap_pvt_url_scheme2tls( lud->lud_scheme ); if(! lud->lud_port ) { lud->lud_port = l.sl_is_tls ? LDAPS_PORT : LDAP_PORT; } -#endif +#endif /* HAVE_TLS */ port = (unsigned short) lud->lud_port; @@ -857,13 +1300,13 @@ static int slap_open_listener( } else { err = slap_get_listener_addresses(lud->lud_host, 0, &sal); } -#else +#else /* ! LDAP_PF_LOCAL */ Debug( LDAP_DEBUG_ANY, "daemon: URL scheme not supported: %s", url, 0, 0); ldap_free_urldesc( lud ); return -1; -#endif +#endif /* ! LDAP_PF_LOCAL */ } else { if( lud->lud_host == NULL || lud->lud_host[0] == '\0' || strcmp(lud->lud_host, "*") == 0 ) @@ -876,7 +1319,7 @@ static int slap_open_listener( #ifdef LDAP_CONNECTIONLESS l.sl_is_udp = ( tmp == LDAP_PROTO_UDP ); -#endif +#endif /* LDAP_CONNECTIONLESS */ #if defined(LDAP_PF_LOCAL) || defined(SLAP_X_LISTENER_MOD) if ( lud->lud_exts ) { @@ -910,12 +1353,12 @@ static int slap_open_listener( case AF_INET6: af = "IPv6"; break; -#endif +#endif /* LDAP_PF_INET6 */ #ifdef LDAP_PF_LOCAL case AF_LOCAL: af = "Local"; break; -#endif +#endif /* LDAP_PF_LOCAL */ default: sal++; continue; @@ -923,10 +1366,10 @@ static int slap_open_listener( #ifdef LDAP_CONNECTIONLESS if( l.sl_is_udp ) socktype = SOCK_DGRAM; -#endif +#endif /* LDAP_CONNECTIONLESS */ - l.sl_sd = socket( (*sal)->sa_family, socktype, 0); - if ( l.sl_sd == AC_SOCKET_INVALID ) { + s = socket( (*sal)->sa_family, socktype, 0); + if ( s == AC_SOCKET_INVALID ) { int err = sock_errno(); Debug( LDAP_DEBUG_ANY, "daemon: %s socket() failed errno=%d (%s)\n", @@ -934,28 +1377,27 @@ static int slap_open_listener( sal++; continue; } + l.sl_sd = SLAP_SOCKNEW( s ); -#ifndef HAVE_WINSOCK if ( l.sl_sd >= dtblsize ) { Debug( LDAP_DEBUG_ANY, "daemon: listener descriptor %ld is too great %ld\n", (long) l.sl_sd, (long) dtblsize, 0 ); - tcp_close( l.sl_sd ); + tcp_close( s ); sal++; continue; } -#endif #ifdef LDAP_PF_LOCAL if ( (*sal)->sa_family == AF_LOCAL ) { unlink( ((struct sockaddr_un *)*sal)->sun_path ); } else -#endif +#endif /* LDAP_PF_LOCAL */ { #ifdef SO_REUSEADDR /* enable address reuse */ tmp = 1; - rc = setsockopt( l.sl_sd, SOL_SOCKET, SO_REUSEADDR, + rc = setsockopt( s, SOL_SOCKET, SO_REUSEADDR, (char *) &tmp, sizeof(tmp) ); if ( rc == AC_SOCKET_ERROR ) { int err = sock_errno(); @@ -963,7 +1405,7 @@ static int slap_open_listener( "setsockopt(SO_REUSEADDR) failed errno=%d (%s)\n", (long) l.sl_sd, err, sock_errstr(err) ); } -#endif +#endif /* SO_REUSEADDR */ } switch( (*sal)->sa_family ) { @@ -975,7 +1417,7 @@ static int slap_open_listener( #ifdef IPV6_V6ONLY /* Try to use IPv6 sockets for IPv6 only */ tmp = 1; - rc = setsockopt( l.sl_sd, IPPROTO_IPV6, IPV6_V6ONLY, + rc = setsockopt( s , IPPROTO_IPV6, IPV6_V6ONLY, (char *) &tmp, sizeof(tmp) ); if ( rc == AC_SOCKET_ERROR ) { int err = sock_errno(); @@ -983,30 +1425,53 @@ static int slap_open_listener( "setsockopt(IPV6_V6ONLY) failed errno=%d (%s)\n", (long) l.sl_sd, err, sock_errstr(err) ); } -#endif +#endif /* IPV6_V6ONLY */ addrlen = sizeof(struct sockaddr_in6); break; -#endif +#endif /* LDAP_PF_INET6 */ #ifdef LDAP_PF_LOCAL case AF_LOCAL: #ifdef LOCAL_CREDS - { - int one = 1; - setsockopt(l.sl_sd, 0, LOCAL_CREDS, &one, sizeof one); - } -#endif - addrlen = sizeof(struct sockaddr_un); - break; -#endif + { + int one = 1; + setsockopt( s, 0, LOCAL_CREDS, &one, sizeof( one ) ); + } +#endif /* LOCAL_CREDS */ + + addrlen = sizeof( struct sockaddr_un ); + break; +#endif /* LDAP_PF_LOCAL */ } - if (bind(l.sl_sd, *sal, addrlen)) { +#ifdef LDAP_PF_LOCAL + /* create socket with all permissions set for those systems + * that honor permissions on sockets (e.g. Linux); typically, + * only write is required. To exploit filesystem permissions, + * place the socket in a directory and use directory's + * permissions. Need write perms to the directory to + * create/unlink the socket; likely need exec perms to access + * the socket (ITS#4709) */ + { + mode_t old_umask; + + if ( (*sal)->sa_family == AF_LOCAL ) { + old_umask = umask( 0 ); + } +#endif /* LDAP_PF_LOCAL */ + rc = bind( s, *sal, addrlen ); +#ifdef LDAP_PF_LOCAL + if ( (*sal)->sa_family == AF_LOCAL ) { + umask( old_umask ); + } + } +#endif /* LDAP_PF_LOCAL */ + if ( rc ) { err = sock_errno(); Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed errno=%d (%s)\n", - (long) l.sl_sd, err, sock_errstr(err) ); - tcp_close( l.sl_sd ); + (long)l.sl_sd, err, sock_errstr( err ) ); + tcp_close( s ); sal++; continue; } @@ -1029,9 +1494,9 @@ static int slap_open_listener( inet_ntop( AF_INET, &((struct sockaddr_in *)*sal)->sin_addr, addr, sizeof(addr) ); s = addr; -#else +#else /* ! HAVE_GETADDRINFO || ! HAVE_INET_NTOP */ s = inet_ntoa( ((struct sockaddr_in *) *sal)->sin_addr ); -#endif +#endif /* ! HAVE_GETADDRINFO || ! HAVE_INET_NTOP */ port = ntohs( ((struct sockaddr_in *)*sal) ->sin_port ); l.sl_name.bv_val = ber_memalloc( sizeof("IP=255.255.255.255:65535") ); @@ -1047,9 +1512,9 @@ static int slap_open_listener( inet_ntop( AF_INET6, &((struct sockaddr_in6 *)*sal)->sin6_addr, addr, sizeof addr); port = ntohs( ((struct sockaddr_in6 *)*sal)->sin6_port ); - l.sl_name.bv_len = strlen(addr) + sizeof("IP= 65535"); + l.sl_name.bv_len = strlen(addr) + sizeof("IP=[]:65535"); l.sl_name.bv_val = ber_memalloc( l.sl_name.bv_len ); - snprintf( l.sl_name.bv_val, l.sl_name.bv_len, "IP=%s %d", + snprintf( l.sl_name.bv_val, l.sl_name.bv_len, "IP=[%s]:%d", addr, port ); l.sl_name.bv_len = strlen( l.sl_name.bv_val ); } break; @@ -1078,21 +1543,6 @@ static int slap_open_listener( return -1; } -#ifdef LDAP_CONNECTIONLESS - if( l.sl_is_udp ) { - long id = connection_init( l.sl_sd, &l, "", "", CONN_IS_UDP, - (slap_ssf_t) 0, NULL ); - - if( id < 0 ) { - Debug( LDAP_DEBUG_TRACE, - "slap_open_listener: connectionless init failed on %s (%d)\n", - url, l.sl_sd, 0 ); - return -1; - } - l.sl_is_udp++; - } -#endif - Debug( LDAP_DEBUG_TRACE, "daemon: listener initialized %s\n", l.sl_url.bv_val, 0, 0 ); return 0; @@ -1101,22 +1551,29 @@ static int slap_open_listener( static int sockinit(void); static int sockdestroy(void); -int slapd_daemon_init( const char *urls ) +int +slapd_daemon_init( const char *urls ) { int i, j, n, rc; char **u; Debug( LDAP_DEBUG_ARGS, "daemon_init: %s\n", urls ? urls : "", 0, 0 ); + + ldap_pvt_thread_mutex_init( &slap_daemon.sd_mutex ); +#ifdef HAVE_TCPD + ldap_pvt_thread_mutex_init( &slap_daemon.sd_tcpd_mutex ); +#endif /* TCP Wrappers */ + if( (rc = sockinit()) != 0 ) return rc; #ifdef HAVE_SYSCONF dtblsize = sysconf( _SC_OPEN_MAX ); -#elif HAVE_GETDTABLESIZE +#elif defined(HAVE_GETDTABLESIZE) dtblsize = getdtablesize(); -#else +#else /* ! HAVE_SYSCONF && ! HAVE_GETDTABLESIZE */ dtblsize = FD_SETSIZE; -#endif +#endif /* ! HAVE_SYSCONF && ! HAVE_GETDTABLESIZE */ /* open a pipe (or something equivalent connected to itself). * we write a byte on this fd whenever we catch a signal. The main @@ -1129,7 +1586,7 @@ int slapd_daemon_init( const char *urls ) return rc; } - SLAP_SOCK_SET_INIT; + SLAP_SOCK_INIT; if( urls == NULL ) urls = "ldap:///"; @@ -1138,6 +1595,8 @@ int slapd_daemon_init( const char *urls ) if( u == NULL || u[0] == NULL ) { Debug( LDAP_DEBUG_ANY, "daemon_init: no urls (%s) provided.\n", urls, 0, 0 ); + if ( u ) + ldap_charray_free( u ); return -1; } @@ -1174,21 +1633,26 @@ int slapd_daemon_init( const char *urls ) slapd_slp_init( urls ); slapd_slp_reg(); } -#endif +#endif /* HAVE_SLP */ ldap_charray_free( u ); - ldap_pvt_thread_mutex_init( &slap_daemon.sd_mutex ); return !i; } int -slapd_daemon_destroy(void) +slapd_daemon_destroy( void ) { connections_destroy(); - tcp_close( wake_sds[1] ); - tcp_close( wake_sds[0] ); +#ifdef HAVE_WINSOCK + if ( wake_sds[1] != INVALID_SOCKET ) +#endif /* HAVE_WINSOCK */ + tcp_close( SLAP_FD2SOCK(wake_sds[1]) ); +#ifdef HAVE_WINSOCK + if ( wake_sds[0] != INVALID_SOCKET ) +#endif /* HAVE_WINSOCK */ + tcp_close( SLAP_FD2SOCK(wake_sds[0]) ); sockdestroy(); #ifdef HAVE_SLP @@ -1196,8 +1660,13 @@ slapd_daemon_destroy(void) slapd_slp_dereg(); slapd_slp_deinit(); } -#endif +#endif /* HAVE_SLP */ + +#ifdef HAVE_TCPD + ldap_pvt_thread_mutex_destroy( &slap_daemon.sd_tcpd_mutex ); +#endif /* TCP Wrappers */ + ldap_pvt_thread_mutex_destroy( &slap_daemon.sd_mutex ); return 0; } @@ -1212,7 +1681,7 @@ close_listeners( Listener *lr = slap_listeners[l]; if ( lr->sl_sd != AC_SOCKET_INVALID ) { - if ( remove ) slapd_remove( lr->sl_sd, 0, 0 ); + if ( remove ) slapd_remove( lr->sl_sd, NULL, 0, 0, 0 ); #ifdef LDAP_PF_LOCAL if ( lr->sl_sa.sa_addr.sa_family == AF_LOCAL ) { @@ -1242,30 +1711,39 @@ slap_listener( { Sockaddr from; - ber_socket_t s; - socklen_t len = sizeof(from); - long id; + ber_socket_t s, sfd; + ber_socklen_t len = sizeof(from); + Connection *c; slap_ssf_t ssf = 0; struct berval authid = BER_BVNULL; #ifdef SLAPD_RLOOKUPS char hbuf[NI_MAXHOST]; -#endif +#endif /* SLAPD_RLOOKUPS */ char *dnsname = NULL; char *peeraddr = NULL; #ifdef LDAP_PF_LOCAL char peername[MAXPATHLEN + sizeof("PATH=")]; +#ifdef LDAP_PF_LOCAL_SENDMSG + char peerbuf[8]; + struct berval peerbv = BER_BVNULL; +#endif #elif defined(LDAP_PF_INET6) - char peername[sizeof("IP=ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff 65535")]; -#else + char peername[sizeof("IP=[ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]:65535")]; +#else /* ! LDAP_PF_LOCAL && ! LDAP_PF_INET6 */ char peername[sizeof("IP=255.255.255.255:65336")]; #endif /* LDAP_PF_LOCAL */ + int cflag; + + Debug( LDAP_DEBUG_TRACE, + ">>> slap_listener(%s)\n", + sl->sl_url.bv_val, 0, 0 ); peername[0] = '\0'; #ifdef LDAP_CONNECTIONLESS if ( sl->sl_is_udp ) return 1; -#endif +#endif /* LDAP_CONNECTIONLESS */ # ifdef LDAP_PF_LOCAL /* FIXME: apparently accept doesn't fill @@ -1273,15 +1751,13 @@ slap_listener( from.sa_un_addr.sun_path[0] = '\0'; # endif /* LDAP_PF_LOCAL */ - s = accept( sl->sl_sd, (struct sockaddr *) &from, &len ); + s = accept( SLAP_FD2SOCK( sl->sl_sd ), (struct sockaddr *) &from, &len ); -#ifdef SLAP_LIGHTWEIGHT_DISPATCHER /* Resume the listener FD to allow concurrent-processing of * additional incoming connections. */ sl->sl_busy = 0; WAKE_LISTENER(1); -#endif if ( s == AC_SOCKET_INVALID ) { int err = sock_errno(); @@ -1289,10 +1765,10 @@ slap_listener( if( #ifdef EMFILE err == EMFILE || -#endif +#endif /* EMFILE */ #ifdef ENFILE err == ENFILE || -#endif +#endif /* ENFILE */ 0 ) { ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex ); @@ -1308,26 +1784,25 @@ slap_listener( ldap_pvt_thread_yield(); return 0; } + sfd = SLAP_SOCKNEW( s ); -#ifndef HAVE_WINSOCK /* make sure descriptor number isn't too great */ - if ( s >= dtblsize ) { + if ( sfd >= dtblsize ) { Debug( LDAP_DEBUG_ANY, "daemon: %ld beyond descriptor table size %ld\n", - (long) s, (long) dtblsize, 0 ); + (long) sfd, (long) dtblsize, 0 ); - slapd_close(s); + tcp_close(s); ldap_pvt_thread_yield(); return 0; } -#endif #ifdef LDAP_DEBUG ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex ); /* newly accepted stream should not be in any of the FD SETS */ - assert( SLAP_SOCK_NOT_ACTIVE( s )); + assert( SLAP_SOCK_NOT_ACTIVE( sfd )); ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex ); -#endif +#endif /* LDAP_DEBUG */ #if defined( SO_KEEPALIVE ) || defined( TCP_NODELAY ) #ifdef LDAP_PF_LOCAL @@ -1346,9 +1821,9 @@ slap_listener( int err = sock_errno(); Debug( LDAP_DEBUG_ANY, "slapd(%ld): setsockopt(SO_KEEPALIVE) failed " - "errno=%d (%s)\n", (long) s, err, sock_errstr(err) ); + "errno=%d (%s)\n", (long) sfd, err, sock_errstr(err) ); } -#endif +#endif /* SO_KEEPALIVE */ #ifdef TCP_NODELAY /* enable no delay */ tmp = 1; @@ -1358,19 +1833,22 @@ slap_listener( int err = sock_errno(); Debug( LDAP_DEBUG_ANY, "slapd(%ld): setsockopt(TCP_NODELAY) failed " - "errno=%d (%s)\n", (long) s, err, sock_errstr(err) ); + "errno=%d (%s)\n", (long) sfd, err, sock_errstr(err) ); } -#endif +#endif /* TCP_NODELAY */ } -#endif +#endif /* SO_KEEPALIVE || TCP_NODELAY */ Debug( LDAP_DEBUG_CONNS, "daemon: listen=%ld, new connection on %ld\n", - (long) sl->sl_sd, (long) s, 0 ); + (long) sl->sl_sd, (long) sfd, 0 ); + cflag = 0; switch ( from.sa_addr.sa_family ) { # ifdef LDAP_PF_LOCAL case AF_LOCAL: + cflag |= CONN_IS_IPC; + /* FIXME: apparently accept doesn't fill * the sun_path sun_path member */ if ( from.sa_un_addr.sun_path[0] == '\0' ) { @@ -1385,7 +1863,11 @@ slap_listener( uid_t uid; gid_t gid; - if( getpeereid( s, &uid, &gid ) == 0 ) { +#ifdef LDAP_PF_LOCAL_SENDMSG + peerbv.bv_val = peerbuf; + peerbv.bv_len = sizeof( peerbuf ); +#endif + if( LUTIL_GETPEEREID( s, &uid, &gid, &peerbv ) == 0 ) { authid.bv_val = ch_malloc( STRLENOF( "gidNumber=4294967295+uidNumber=4294967295," "cn=peercred,cn=external,cn=auth" ) + 1 ); @@ -1416,7 +1898,7 @@ slap_listener( peeraddr = (char *) inet_ntop( AF_INET6, &from.sa_in6_addr.sin6_addr, addr, sizeof addr ); - sprintf( peername, "IP=%s %d", + sprintf( peername, "IP=[%s]:%d", peeraddr != NULL ? peeraddr : SLAP_STRING_UNKNOWN, (unsigned) ntohs( from.sa_in6_addr.sin6_port ) ); } @@ -1424,21 +1906,21 @@ slap_listener( # endif /* LDAP_PF_INET6 */ case AF_INET: - peeraddr = inet_ntoa( from.sa_in_addr.sin_addr ); - sprintf( peername, "IP=%s:%d", - peeraddr != NULL ? peeraddr : SLAP_STRING_UNKNOWN, - (unsigned) ntohs( from.sa_in_addr.sin_port ) ); + peeraddr = inet_ntoa( from.sa_in_addr.sin_addr ); + sprintf( peername, "IP=%s:%d", + peeraddr != NULL ? peeraddr : SLAP_STRING_UNKNOWN, + (unsigned) ntohs( from.sa_in_addr.sin_port ) ); break; default: - slapd_close(s); + slapd_close(sfd); return 0; } if ( ( from.sa_addr.sa_family == AF_INET ) #ifdef LDAP_PF_INET6 || ( from.sa_addr.sa_family == AF_INET6 ) -#endif +#endif /* LDAP_PF_INET6 */ ) { dnsname = NULL; @@ -1454,67 +1936,70 @@ slap_listener( #endif /* SLAPD_RLOOKUPS */ #ifdef HAVE_TCPD - if ( !hosts_ctl("slapd", - dnsname != NULL ? dnsname : SLAP_STRING_UNKNOWN, - peeraddr != NULL ? peeraddr : SLAP_STRING_UNKNOWN, - SLAP_STRING_UNKNOWN )) { - /* DENY ACCESS */ - Statslog( LDAP_DEBUG_STATS, - "fd=%ld DENIED from %s (%s)\n", - (long) s, + int rc; + ldap_pvt_thread_mutex_lock( &slap_daemon.sd_tcpd_mutex ); + rc = hosts_ctl("slapd", dnsname != NULL ? dnsname : SLAP_STRING_UNKNOWN, peeraddr != NULL ? peeraddr : SLAP_STRING_UNKNOWN, - 0, 0 ); - slapd_close(s); - return 0; + SLAP_STRING_UNKNOWN ); + ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_tcpd_mutex ); + if ( !rc ) { + /* DENY ACCESS */ + Statslog( LDAP_DEBUG_STATS, + "fd=%ld DENIED from %s (%s)\n", + (long) sfd, + dnsname != NULL ? dnsname : SLAP_STRING_UNKNOWN, + peeraddr != NULL ? peeraddr : SLAP_STRING_UNKNOWN, + 0, 0 ); + slapd_close(sfd); + return 0; + } } #endif /* HAVE_TCPD */ } - id = connection_init(s, sl, - dnsname != NULL ? dnsname : SLAP_STRING_UNKNOWN, - peername, #ifdef HAVE_TLS - sl->sl_is_tls ? CONN_IS_TLS : 0, -#else - 0, + if ( sl->sl_is_tls ) cflag |= CONN_IS_TLS; #endif - ssf, - authid.bv_val ? &authid : NULL ); + c = connection_init(sfd, sl, + dnsname != NULL ? dnsname : SLAP_STRING_UNKNOWN, + peername, cflag, ssf, + authid.bv_val ? &authid : NULL + LDAP_PF_LOCAL_SENDMSG_ARG(&peerbv)); if( authid.bv_val ) ch_free(authid.bv_val); - if( id < 0 ) { + if( !c ) { Debug( LDAP_DEBUG_ANY, "daemon: connection_init(%ld, %s, %s) failed.\n", - (long) s, peername, sl->sl_name.bv_val ); - slapd_close(s); + (long) sfd, peername, sl->sl_name.bv_val ); + slapd_close(sfd); return 0; } Statslog( LDAP_DEBUG_STATS, "conn=%ld fd=%ld ACCEPT from %s (%s)\n", - id, (long) s, peername, sl->sl_name.bv_val, + c->c_connid, (long) sfd, peername, sl->sl_name.bv_val, 0 ); - slapd_add( s, 1, NULL ); return 0; } -#ifdef SLAP_LIGHTWEIGHT_DISPATCHER static void* slap_listener_thread( void* ctx, void* ptr ) { - int rc; + int rc; + Listener *sl = (Listener *)ptr; - rc = slap_listener( (Listener*)ptr ); + rc = slap_listener( sl ); if( rc != LDAP_SUCCESS ) { Debug( LDAP_DEBUG_ANY, - "listener_thread: failed %d", rc, 0, 0 ); + "slap_listener_thread(%s): failed err=%d", + sl->sl_url.bv_val, rc, 0 ); } return (void*)NULL; @@ -1541,7 +2026,6 @@ slap_listener_activate( } return rc; } -#endif static void * slapd_daemon_task( @@ -1579,13 +2063,11 @@ slapd_daemon_task( * listening port. The listen() and accept() calls * are unnecessary. */ - if ( slap_listeners[l]->sl_is_udp ) { - slapd_add( slap_listeners[l]->sl_sd, 1, slap_listeners[l] ); + if ( slap_listeners[l]->sl_is_udp ) continue; - } -#endif +#endif /* LDAP_CONNECTIONLESS */ - if ( listen( slap_listeners[l]->sl_sd, SLAPD_LISTEN_BACKLOG ) == -1 ) { + if ( listen( SLAP_FD2SOCK( slap_listeners[l]->sl_sd ), SLAPD_LISTEN_BACKLOG ) == -1 ) { int err = sock_errno(); #ifdef LDAP_PF_INET6 @@ -1622,7 +2104,7 @@ slapd_daemon_task( } } } -#endif +#endif /* LDAP_PF_INET6 */ Debug( LDAP_DEBUG_ANY, "daemon: listen(%s, 5) failed errno=%d (%s)\n", slap_listeners[l]->sl_url.bv_val, err, @@ -1630,107 +2112,103 @@ slapd_daemon_task( return (void*)-1; } -#ifdef SLAP_LIGHTWEIGHT_DISPATCHER /* make the listening socket non-blocking */ - if ( ber_pvt_socket_set_nonblock( slap_listeners[l]->sl_sd, 1 ) < 0 ) { + if ( ber_pvt_socket_set_nonblock( SLAP_FD2SOCK( slap_listeners[l]->sl_sd ), 1 ) < 0 ) { Debug( LDAP_DEBUG_ANY, "slapd_daemon_task: " "set nonblocking on a listening socket failed\n", 0, 0, 0 ); slapd_shutdown = 2; return (void*)-1; } -#endif slapd_add( slap_listeners[l]->sl_sd, 0, slap_listeners[l] ); } #ifdef HAVE_NT_SERVICE_MANAGER - if ( started_event != NULL ) } + if ( started_event != NULL ) { ldap_pvt_thread_cond_signal( &started_event ); } -#endif - -#ifdef SLAP_SEM_LOAD_CONTROL - /* - * initialize count and lazyness of a semaphore - */ - (void) ldap_lazy_sem_init( - SLAP_MAX_WORKER_THREADS + 4 /* max workers + margin */, - 4 /* lazyness */ ); -#endif +#endif /* HAVE_NT_SERVICE_MANAGER */ /* initialization complete. Here comes the loop. */ while ( !slapd_shutdown ) { - ber_socket_t i; - int ns, nwriters; - int at; - ber_socket_t nfds; + ber_socket_t i; + int ns, nwriters; + int at; + ber_socket_t nfds; #if SLAP_EVENTS_ARE_INDEXED - ber_socket_t nrfds, nwfds; -#endif + ber_socket_t nrfds, nwfds; +#endif /* SLAP_EVENTS_ARE_INDEXED */ #define SLAPD_EBADF_LIMIT 16 - time_t now; + time_t now; SLAP_EVENT_DECL; struct timeval tv; struct timeval *tvp; - struct timeval *cat; - time_t tdelta = 1; + struct timeval cat; + time_t tdelta = 1; struct re_s* rtask; + now = slap_get_time(); - if( ( global_idletimeout > 0 ) && + if ( ( global_idletimeout > 0 ) && difftime( last_idle_check + - global_idletimeout/SLAPD_IDLE_CHECK_LIMIT, now ) < 0 ) { + global_idletimeout/SLAPD_IDLE_CHECK_LIMIT, now ) < 0 ) + { connections_timeout_idle( now ); last_idle_check = now; } tv = idle; #ifdef SIGHUP - if( slapd_gentle_shutdown ) { + if ( slapd_gentle_shutdown ) { ber_socket_t active; - if( slapd_gentle_shutdown == 1 ) { + if ( slapd_gentle_shutdown == 1 ) { + BackendDB *be; Debug( LDAP_DEBUG_ANY, "slapd gentle shutdown\n", 0, 0, 0 ); close_listeners( 1 ); frontendDB->be_restrictops |= SLAP_RESTRICT_OP_WRITES; + LDAP_STAILQ_FOREACH(be, &backendDB, be_next) { + be->be_restrictops |= SLAP_RESTRICT_OP_WRITES; + } slapd_gentle_shutdown = 2; } ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex ); active = slap_daemon.sd_nactives; ldap_pvt_thread_mutex_unlock( &slap_daemon.sd_mutex ); - if( active == 0 ) { - slapd_shutdown = 2; + if ( active == 0 ) { + slapd_shutdown = 1; break; } } -#endif - +#endif /* SIGHUP */ at = 0; ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex ); nwriters = slap_daemon.sd_nwriters; - SLAP_EVENT_INIT; for ( l = 0; slap_listeners[l] != NULL; l++ ) { Listener *lr = slap_listeners[l]; if ( lr->sl_sd == AC_SOCKET_INVALID ) continue; - if ( lr->sl_mute || lr->sl_busy ) { - SLAP_SOCK_CLR_READ( lr->sl_sd ); + if ( lr->sl_mute || lr->sl_busy ) + { + SLAP_SOCK_CLR_READ( lr->sl_sd ); } else { SLAP_SOCK_SET_READ( lr->sl_sd ); } } + SLAP_EVENT_INIT; + nfds = SLAP_EVENT_MAX; if ( global_idletimeout && slap_daemon.sd_nactives ) at = 1; @@ -1740,7 +2218,7 @@ slapd_daemon_task( if ( at #if defined(HAVE_YIELDING_SELECT) || defined(NO_THREADS) && ( tv.tv_sec || tv.tv_usec ) -#endif +#endif /* HAVE_YIELDING_SELECT || NO_THREADS */ ) { tvp = &tv; @@ -1750,7 +2228,7 @@ slapd_daemon_task( ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex ); rtask = ldap_pvt_runqueue_next_sched( &slapd_rq, &cat ); - while ( cat && cat->tv_sec && cat->tv_sec <= now ) { + while ( rtask && cat.tv_sec && cat.tv_sec <= now ) { if ( ldap_pvt_runqueue_isrunning( &slapd_rq, rtask )) { ldap_pvt_runqueue_resched( &slapd_rq, rtask, 0 ); } else { @@ -1758,16 +2236,22 @@ slapd_daemon_task( ldap_pvt_runqueue_resched( &slapd_rq, rtask, 0 ); ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex ); ldap_pvt_thread_pool_submit( &connection_pool, - rtask->routine, (void *) rtask ); + rtask->routine, (void *) rtask ); ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex ); } rtask = ldap_pvt_runqueue_next_sched( &slapd_rq, &cat ); } ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex ); - if ( cat && cat->tv_sec ) { - time_t diff = difftime( cat->tv_sec, now ); - if ( diff == 0 ) diff = tdelta; + if ( rtask && cat.tv_sec ) { + /* NOTE: diff __should__ always be >= 0, + * AFAI understand; however (ITS#4872), + * time_t might be unsigned in some systems, + * while difftime() returns a double */ + double diff = difftime( cat.tv_sec, now ); + if ( diff <= 0 ) { + diff = tdelta; + } if ( tvp == NULL || diff < tv.tv_sec ) { tv.tv_sec = diff; tv.tv_usec = 0; @@ -1784,42 +2268,47 @@ slapd_daemon_task( if ( lr->sl_mute ) { Debug( LDAP_DEBUG_CONNS, - "daemon: select: listen=%d muted\n", + "daemon: " SLAP_EVENT_FNAME ": " + "listen=%d muted\n", lr->sl_sd, 0, 0 ); continue; } if ( lr->sl_busy ) { Debug( LDAP_DEBUG_CONNS, - "daemon: select: listen=%d busy\n", + "daemon: " SLAP_EVENT_FNAME ": " + "listen=%d busy\n", lr->sl_sd, 0, 0 ); continue; } Debug( LDAP_DEBUG_CONNS, - "daemon: select: listen=%d active_threads=%d tvp=%s\n", + "daemon: " SLAP_EVENT_FNAME ": " + "listen=%d active_threads=%d tvp=%s\n", lr->sl_sd, at, tvp == NULL ? "NULL" : "zero" ); } - switch(ns = SLAP_EVENT_WAIT(tvp)) { + SLAP_EVENT_WAIT( tvp, &ns ); + switch ( ns ) { case -1: { /* failure - try again */ int err = sock_errno(); - if( err == EBADF -#ifdef WSAENOTSOCK - /* you'd think this would be EBADF */ - || err == WSAENOTSOCK -#endif - ) { - if (++ebadf < SLAPD_EBADF_LIMIT) - continue; - } - - if( err != EINTR ) { - Debug( LDAP_DEBUG_CONNS, - "daemon: select failed (%d): %s\n", - err, sock_errstr(err), 0 ); - slapd_shutdown = 2; + if ( err != EINTR ) { + ebadf++; + + /* Don't log unless we got it twice in a row */ + if ( !( ebadf & 1 ) ) { + Debug( LDAP_DEBUG_ANY, + "daemon: " + SLAP_EVENT_FNAME + " failed count %d " + "err (%d): %s\n", + ebadf, err, + sock_errstr( err ) ); + } + if ( ebadf >= SLAPD_EBADF_LIMIT ) { + slapd_shutdown = 2; + } } } continue; @@ -1827,15 +2316,16 @@ slapd_daemon_task( case 0: /* timeout - let threads run */ ebadf = 0; #ifndef HAVE_YIELDING_SELECT - Debug( LDAP_DEBUG_CONNS, "daemon: select timeout - yielding\n", - 0, 0, 0 ); + Debug( LDAP_DEBUG_CONNS, "daemon: " SLAP_EVENT_FNAME + "timeout - yielding\n", + 0, 0, 0 ); ldap_pvt_thread_yield(); -#endif +#endif /* ! HAVE_YIELDING_SELECT */ continue; default: /* something happened - deal with it */ - if( slapd_shutdown ) continue; + if ( slapd_shutdown ) continue; ebadf = 0; Debug( LDAP_DEBUG_CONNS, @@ -1845,15 +2335,12 @@ slapd_daemon_task( } #if SLAP_EVENTS_ARE_INDEXED - if ( SLAP_EVENT_IS_READ( wake_sds[0] )) { + if ( SLAP_EVENT_IS_READ( wake_sds[0] ) ) { + char c[BUFSIZ]; SLAP_EVENT_CLR_READ( wake_sds[0] ); - ns--; - { - char c[BUFSIZ]; - tcp_read( wake_sds[0], c, sizeof(c) ); - } - Debug( LDAP_DEBUG_CONNS, "daemon: waked\n", 0, 0, 0 ); waking = 0; + tcp_read( SLAP_FD2SOCK(wake_sds[0]), c, sizeof(c) ); + Debug( LDAP_DEBUG_CONNS, "daemon: waked\n", 0, 0, 0 ); continue; } @@ -1868,43 +2355,26 @@ slapd_daemon_task( if ( slap_listeners[l]->sl_sd == AC_SOCKET_INVALID ) continue; #ifdef LDAP_CONNECTIONLESS if ( slap_listeners[l]->sl_is_udp ) continue; -#endif - if ( !SLAP_EVENT_IS_READ( slap_listeners[l]->sl_sd )) continue; +#endif /* LDAP_CONNECTIONLESS */ + if ( !SLAP_EVENT_IS_READ( slap_listeners[l]->sl_sd ) ) continue; /* clear events */ SLAP_EVENT_CLR_READ( slap_listeners[l]->sl_sd ); SLAP_EVENT_CLR_WRITE( slap_listeners[l]->sl_sd ); ns--; -#ifdef SLAP_LIGHTWEIGHT_DISPATCHER - rc = slap_listener_activate(slap_listeners[l]); -#else - rc = slap_listener(slap_listeners[l]); -#endif + rc = slap_listener_activate( slap_listeners[l] ); } /* bypass the following tests if no descriptors left */ if ( ns <= 0 ) { #ifndef HAVE_YIELDING_SELECT ldap_pvt_thread_yield(); -#endif +#endif /* HAVE_YIELDING_SELECT */ continue; } Debug( LDAP_DEBUG_CONNS, "daemon: activity on:", 0, 0, 0 ); -#ifdef HAVE_WINSOCK - nrfds = readfds.fd_count; - nwfds = writefds.fd_count; - for ( i = 0; i < readfds.fd_count; i++ ) { - Debug( LDAP_DEBUG_CONNS, " %d%s", - readfds.fd_array[i], "r", 0 ); - } - for ( i = 0; i < writefds.fd_count; i++ ) { - Debug( LDAP_DEBUG_CONNS, " %d%s", - writefds.fd_array[i], "w", 0 ); - } - -#else nrfds = 0; nwfds = 0; for ( i = 0; i < nfds; i++ ) { @@ -1927,19 +2397,13 @@ slapd_daemon_task( } if ( ns <= 0 ) break; } -#endif Debug( LDAP_DEBUG_CONNS, "\n", 0, 0, 0 ); - /* loop through the writers */ for ( i = 0; nwfds > 0; i++ ) { ber_socket_t wd; -#ifdef HAVE_WINSOCK - wd = writefds.fd_array[i]; -#else - if( ! SLAP_EVENT_IS_WRITE( i ) ) continue; + if ( ! SLAP_EVENT_IS_WRITE( i ) ) continue; wd = i; -#endif SLAP_EVENT_CLR_WRITE( wd ); nwfds--; @@ -1948,33 +2412,27 @@ slapd_daemon_task( "daemon: write active on %d\n", wd, 0, 0 ); -#ifdef SLAP_LIGHTWEIGHT_DISPATCHER - connection_write_activate( wd ); -#else /* * NOTE: it is possible that the connection was closed * and that the stream is now inactive. - * connection_write() must validitate the stream is still + * connection_write() must validate the stream is still * active. + * + * ITS#4338: if the stream is invalid, there is no need to + * close it here. It has already been closed in connection.c. */ if ( connection_write( wd ) < 0 ) { - if ( SLAP_EVENT_IS_READ( wd )) { + if ( SLAP_EVENT_IS_READ( wd ) ) { SLAP_EVENT_CLR_READ( (unsigned) wd ); nrfds--; } - slapd_close( wd ); } -#endif } for ( i = 0; nrfds > 0; i++ ) { ber_socket_t rd; -#ifdef HAVE_WINSOCK - rd = readfds.fd_array[i]; -#else - if( ! SLAP_EVENT_IS_READ( i ) ) continue; + if ( ! SLAP_EVENT_IS_READ( i ) ) continue; rd = i; -#endif SLAP_EVENT_CLR_READ( rd ); nrfds--; @@ -1987,13 +2445,7 @@ slapd_daemon_task( * active. */ -#ifdef SLAP_LIGHTWEIGHT_DISPATCHER connection_read_activate( rd ); -#else - if ( connection_read( rd ) < 0 ) { - slapd_close( rd ); - } -#endif } #else /* !SLAP_EVENTS_ARE_INDEXED */ /* FIXME */ @@ -2008,55 +2460,45 @@ slapd_daemon_task( * an event, so we could use pointers to the listener structure * instead of just the file descriptor. For /dev/poll we have to * search the listeners array for a matching descriptor. + * + * We now handle wake events when we see them; they are not given + * higher priority. */ - /* if waking is set and we woke up, we'll read whatever - * we can. - */ - if ( waking ) { - char c[BUFSIZ]; - tcp_read( wake_sds[0], c, sizeof(c) ); - waking = 0; - ns--; - continue; - } - #ifdef LDAP_DEBUG Debug( LDAP_DEBUG_CONNS, "daemon: activity on:", 0, 0, 0 ); - for (i=0; isl_is_udp) -#endif + && !( (SLAP_EVENT_LISTENER( i ))->sl_is_udp ) +#endif /* LDAP_CONNECTIONLESS */ ) { continue; } + fd = SLAP_EVENT_FD( i ); /* Don't log internal wake events */ - if ( SLAP_EVENT_FD( i ) == wake_sds[0] ) continue; + if ( fd == wake_sds[0] ) continue; r = SLAP_EVENT_IS_READ( i ); w = SLAP_EVENT_IS_WRITE( i ); if ( r || w ) { - Debug( LDAP_DEBUG_CONNS, " %d%s%s", SLAP_EVENT_FD(i), + Debug( LDAP_DEBUG_CONNS, " %d%s%s", fd, r ? "r" : "", w ? "w" : "" ); } } -#endif + Debug( LDAP_DEBUG_CONNS, "\n", 0, 0, 0 ); +#endif /* LDAP_DEBUG */ - for (i=0; isl_is_udp ) { + continue; + } + + c = connection_init( lr->sl_sd, lr, "", "", + CONN_IS_UDP, (slap_ssf_t) 0, NULL + LDAP_PF_LOCAL_SENDMSG_ARG(NULL)); + + if ( !c ) { + Debug( LDAP_DEBUG_TRACE, + "connectionless_init: failed on %s (%d)\n", + lr->sl_url, lr->sl_sd, 0 ); + return -1; + } + lr->sl_is_udp++; + } + + return 0; +} +#endif /* LDAP_CONNECTIONLESS */ + +int +slapd_daemon( void ) { int rc; - connections_init(); +#ifdef LDAP_CONNECTIONLESS + connectionless_init(); +#endif /* LDAP_CONNECTIONLESS */ #define SLAPD_LISTENER_THREAD 1 #if defined( SLAPD_LISTENER_THREAD ) @@ -2177,21 +2650,21 @@ int slapd_daemon( void ) } /* wait for the listener thread to complete */ - ldap_pvt_thread_join( listener_tid, (void *) NULL ); + ldap_pvt_thread_join( listener_tid, (void *)NULL ); } -#else +#else /* ! SLAPD_LISTENER_THREAD */ /* experimental code */ slapd_daemon_task( NULL ); -#endif +#endif /* ! SLAPD_LISTENER_THREAD */ return 0; - } -static int sockinit(void) +static int +sockinit( void ) { #if defined( HAVE_WINSOCK2 ) - WORD wVersionRequested; + WORD wVersionRequested; WSADATA wsaData; int err; @@ -2223,16 +2696,19 @@ static int sockinit(void) #elif defined( HAVE_WINSOCK ) WSADATA wsaData; if ( WSAStartup( 0x0101, &wsaData ) != 0 ) return -1; -#endif +#endif /* ! HAVE_WINSOCK2 && ! HAVE_WINSOCK */ return 0; } -static int sockdestroy(void) +static int +sockdestroy( void ) { #if defined( HAVE_WINSOCK2 ) || defined( HAVE_WINSOCK ) WSACleanup(); -#endif +#endif /* HAVE_WINSOCK2 || HAVE_WINSOCK */ + SLAP_SOCK_DESTROY; + return 0; } @@ -2249,16 +2725,16 @@ slap_sig_shutdown( int sig ) * SIGBREAK is generated when a user logs out. */ -#if HAVE_NT_SERVICE_MANAGER && SIGBREAK +#if defined(HAVE_NT_SERVICE_MANAGER) && defined(SIGBREAK) if (is_NT_Service && sig == SIGBREAK) { /* empty */; } else -#endif +#endif /* HAVE_NT_SERVICE_MANAGER && SIGBREAK */ #ifdef SIGHUP if (sig == SIGHUP && global_gentlehup && slapd_gentle_shutdown == 0) { slapd_gentle_shutdown = 1; } else -#endif +#endif /* SIGHUP */ { slapd_shutdown = 1; } @@ -2279,14 +2755,20 @@ slap_sig_wake( int sig ) } -void slapd_add_internal(ber_socket_t s, int isactive) { - slapd_add(s, isactive, NULL); +void +slapd_add_internal( ber_socket_t s, int isactive ) +{ + slapd_add( s, isactive, NULL ); } -Listener ** slapd_get_listeners(void) { +Listener ** +slapd_get_listeners( void ) +{ return slap_listeners; } -void slap_wake_listener() { +void +slap_wake_listener() +{ WAKE_LISTENER(1); }