/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#include "slapi/slapi.h"
#endif
-
#ifdef SLAP_MULTI_CONN_ARRAY
/* for Multiple Connection Arrary (MCA) Support */
static ldap_pvt_thread_mutex_t* connections_mutex;
/* partition the array in a modulo manner */
# define MCA_conn_array_id(fd) ((int)(fd)%NUM_CONNECTION_ARRAY)
# define MCA_conn_array_element_id(fd) ((int)(fd)/NUM_CONNECTION_ARRAY)
+# define MCA_ARRAY_SIZE ((int)(MCA_conn_array_element_id(dtblsize) + (MCA_conn_array_id(dtblsize) ? 1 : 0)))
+# define MCA_conn_check(fd) (dtblsize > 0 && (fd) >= 0 && (fd) < (MCA_ARRAY_SIZE*NUM_CONNECTION_ARRAY))
# define MCA_GET_CONNECTION(fd) (&(connections[MCA_conn_array_id(fd)]) \
[MCA_conn_array_element_id(fd)])
# define MCA_GET_CONN_MUTEX(fd) (&connections_mutex[MCA_conn_array_id(fd)])
static ldap_pvt_thread_mutex_t connections_mutex;
static Connection *connections = NULL;
+# define MCA_conn_check(fd) (dtblsize > 0 && (fd) < dtblsize)
# define MCA_GET_CONNECTION(fd) (&connections[s])
# define MCA_GET_CONN_MUTEX(fd) (&connections_mutex)
#endif
static Connection* connection_get( ber_socket_t s );
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
-static int connection_input( Connection *c, Operation** op );
+
+typedef struct conn_readinfo {
+ Operation *op;
+ ldap_pvt_thread_start_t *func;
+ void *arg;
+ int nullop;
+} conn_readinfo;
+
+static int connection_input( Connection *c, conn_readinfo *cri );
#else
static int connection_input( Connection *c );
#endif
int connections_init(void)
#ifdef SLAP_MULTI_CONN_ARRAY
{
- int i, j;
- Connection* conn;
+ int i, j;
+ Connection* conn;
assert( connections == NULL );
NUM_CONNECTION_ARRAY, sizeof(ldap_pvt_thread_mutex_t) );
if( connections_mutex == NULL ) {
Debug( LDAP_DEBUG_ANY, "connections_init: "
- "allocation of connection mutex[%d] failed\n", i, 0, 0 );
+ "allocation of connection mutexes failed\n", 0, 0, 0 );
return -1;
}
for ( i = 0; i < NUM_CONNECTION_ARRAY; i++ ) {
ldap_pvt_thread_mutex_init( connections_mutex+i );
connections[i] = (Connection*) ch_calloc(
- dtblsize/NUM_CONNECTION_ARRAY, sizeof(Connection) );
+ MCA_ARRAY_SIZE, sizeof(Connection) );
if( connections[i] == NULL ) {
Debug( LDAP_DEBUG_ANY, "connections_init: "
"allocation (%d*%ld) of connection array[%d] failed\n",
for ( i = 0; i < NUM_CONNECTION_ARRAY; i++ ) {
conn = connections[i];
- for ( j = 0; j < (dtblsize/NUM_CONNECTION_ARRAY); j++ ) {
+ for ( j = 0; j < MCA_ARRAY_SIZE; j++ ) {
conn[j].c_conn_idx = j;
}
}
for ( i = 0; i < NUM_CONNECTION_ARRAY; i++ ) {
Connection* conn = connections[i];
- for ( j = 0; j < (dtblsize/NUM_CONNECTION_ARRAY); j++ ) {
+ for ( j = 0; j < MCA_ARRAY_SIZE; j++ ) {
if( conn[j].c_struct_state != SLAP_C_UNINITIALIZED ) {
ber_sockbuf_free( conn[j].c_sb );
ldap_pvt_thread_mutex_destroy( &conn[j].c_mutex );
ldap_pvt_thread_mutex_destroy( &connections_mutex[i] );
}
+ free( connections );
+ free( connections_mutex );
+
ldap_pvt_thread_mutex_destroy( &conn_nextid_mutex );
return 0;
for ( i = 0; i < NUM_CONNECTION_ARRAY; i++ ) {
Connection* conn = connections[i];
ldap_pvt_thread_mutex_lock( &connections_mutex[i] );
- for ( j = 0; j < (dtblsize/NUM_CONNECTION_ARRAY); j++ ) {
+ for ( j = 0; j < MCA_ARRAY_SIZE; j++ ) {
if( conn[j].c_struct_state != SLAP_C_USED ) {
continue;
}
if(s == AC_SOCKET_INVALID) return NULL;
#ifndef HAVE_WINSOCK
+ assert( MCA_conn_check( s ) );
c = MCA_GET_CONNECTION(s);
assert( c->c_struct_state != SLAP_C_UNINITIALIZED );
ldap_pvt_thread_mutex_lock( MCA_GET_CONN_MUTEX(s) );
#ifndef HAVE_WINSOCK
+ assert( MCA_conn_check( s ) );
c = MCA_GET_CONNECTION(s);
#else
{
c->c_send_search_entry = slap_send_search_entry;
c->c_send_search_reference = slap_send_search_reference;
c->c_send_ldap_extended = slap_send_ldap_extended;
-#ifdef LDAP_RES_INTERMEDIATE
c->c_send_ldap_intermediate = slap_send_ldap_intermediate;
-#endif
BER_BVZERO( &c->c_authmech );
BER_BVZERO( &c->c_dn );
assert( connections != NULL );
assert( index != NULL );
- assert( *index <= (dtblsize/NUM_CONNECTION_ARRAY) );
+ assert( *index >= 0 && *index < MCA_ARRAY_SIZE );
if( c != NULL ) ldap_pvt_thread_mutex_unlock( &c->c_mutex );
c = NULL;
for(; *index < dtblsize; (*index)++) {
+ assert( MCA_conn_check( *index ) );
conn = MCA_GET_CONNECTION(*index);
if( conn->c_struct_state == SLAP_C_UNINITIALIZED ) {
assert( conn->c_conn_state == SLAP_C_INVALID );
}
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
-static int connection_read( ber_socket_t s, Operation** op );
+
+static int connection_read( ber_socket_t s, conn_readinfo *cri );
static void* connection_read_thread( void* ctx, void* argv )
{
int rc ;
- Operation* new_op = NULL;
+ conn_readinfo cri = { NULL, NULL, NULL, 0 };
ber_socket_t s = (long)argv;
/*
* read incoming LDAP requests. If there is more than one,
* the first one is returned with new_op
*/
- if( ( rc = connection_read( s, &new_op ) ) < 0 ) {
+ if( ( rc = connection_read( s, &cri ) ) < 0 ) {
Debug( LDAP_DEBUG_CONNS, "connection_read(%d) error\n", s, 0, 0 );
return (void*)(long)rc;
}
- /* execute the queued request in the same thread */
- if( new_op ) {
- rc = (long)connection_operation( ctx, new_op );
+ /* execute a single queued request in the same thread */
+ if( cri.op && !cri.nullop ) {
+ rc = (long)connection_operation( ctx, cri.op );
+ } else if ( cri.func ) {
+ rc = (long)cri.func( ctx, cri.arg );
}
return (void*)(long)rc;
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
static int
-connection_read( ber_socket_t s, Operation** op )
+connection_read( ber_socket_t s, conn_readinfo *cri )
#else
int connection_read(ber_socket_t s)
#endif
if ( c->c_conn_state == SLAP_C_CLIENT ) {
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
+ cri->func = c->c_clientfunc;
+ cri->arg = c->c_clientarg;
/* read should already be cleared */
#else
slapd_clr_read( s, 0 );
-#endif
ldap_pvt_thread_pool_submit( &connection_pool,
c->c_clientfunc, c->c_clientarg );
-
+#endif
connection_return( c );
ldap_pvt_thread_mutex_unlock( MCA_GET_CONN_MUTEX(s) );
return 0;
do {
/* How do we do this without getting into a busy loop ? */
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
- rc = connection_input( c, op );
+ rc = connection_input( c, cri );
#else
rc = connection_input( c );
#endif
static int
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
-connection_input( Connection *conn , Operation** c_op )
+connection_input( Connection *conn , conn_readinfo *cri )
#else
connection_input( Connection *conn )
#endif
} else {
conn->c_n_ops_executing++;
-#if 0
+#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
/*
* The first op will be processed in the same thread context,
+ * as long as there is only one op total.
* Subsequent ops will be submitted to the pool by
* calling connection_op_activate()
*/
- if ( *c_op == NULL ) {
+ if ( cri->op == NULL ) {
/* the first incoming request */
connection_op_queue( op );
- *c_op = op;
- } else
-#endif
- {
+ cri->op = op;
+ } else {
+ if ( !cri->nullop ) {
+ cri->nullop = 1;
+ rc = ldap_pvt_thread_pool_submit( &connection_pool,
+ connection_operation, (void *) cri->op );
+ }
connection_op_activate( op );
}
+#else
+ connection_op_activate( op );
+#endif
}
#ifdef NO_THREADS
static int connection_bind_cb( Operation *op, SlapReply *rs )
{
slap_callback *cb = op->o_callback;
- op->o_callback = cb->sc_next;
ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
op->o_conn->c_conn_state = SLAP_C_ACTIVE;
+ op->o_conn->c_sasl_bind_in_progress =
+ ( rs->sr_err == LDAP_SASL_BIND_IN_PROGRESS );
+
+ /* Moved here from bind.c due to ITS#4158 */
+ op->o_conn->c_sasl_bindop = NULL;
+ if ( op->orb_method == LDAP_AUTH_SASL ) {
+ if( rs->sr_err == LDAP_SUCCESS ) {
+ ber_dupbv(&op->o_conn->c_dn, &op->orb_edn);
+ if( !BER_BVISEMPTY( &op->orb_edn ) ) {
+ /* edn is always normalized already */
+ ber_dupbv( &op->o_conn->c_ndn, &op->o_conn->c_dn );
+ }
+ op->o_tmpfree( op->orb_edn.bv_val, op->o_tmpmemctx );
+ BER_BVZERO( &op->orb_edn );
+ op->o_conn->c_authmech = op->o_conn->c_sasl_bind_mech;
+ BER_BVZERO( &op->o_conn->c_sasl_bind_mech );
+
+ op->o_conn->c_sasl_ssf = op->orb_ssf;
+ if( op->orb_ssf > op->o_conn->c_ssf ) {
+ op->o_conn->c_ssf = op->orb_ssf;
+ }
+
+ if( !BER_BVISEMPTY( &op->o_conn->c_dn ) ) {
+ ber_len_t max = sockbuf_max_incoming_auth;
+ ber_sockbuf_ctrl( op->o_conn->c_sb,
+ LBER_SB_OPT_SET_MAX_INCOMING, &max );
+ }
+
+ /* log authorization identity */
+ Statslog( LDAP_DEBUG_STATS,
+ "%s BIND dn=\"%s\" mech=%s ssf=%d\n",
+ op->o_log_prefix,
+ BER_BVISNULL( &op->o_conn->c_dn ) ? "<empty>" : op->o_conn->c_dn.bv_val,
+ op->o_conn->c_authmech.bv_val, op->orb_ssf, 0 );
+
+ Debug( LDAP_DEBUG_TRACE,
+ "do_bind: SASL/%s bind: dn=\"%s\" ssf=%d\n",
+ op->o_conn->c_authmech.bv_val,
+ BER_BVISNULL( &op->o_conn->c_dn ) ? "<empty>" : op->o_conn->c_dn.bv_val,
+ op->orb_ssf );
+
+ } else if ( rs->sr_err != LDAP_SASL_BIND_IN_PROGRESS ) {
+ if ( !BER_BVISNULL( &op->o_conn->c_sasl_bind_mech ) ) {
+ free( op->o_conn->c_sasl_bind_mech.bv_val );
+ BER_BVZERO( &op->o_conn->c_sasl_bind_mech );
+ }
+ }
+ }
ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
+ ch_free( op->o_callback );
+ op->o_callback = NULL;
+
return SLAP_CB_CONTINUE;
}
static void connection_op_queue( Operation *op )
{
- int status;
ber_tag_t tag = op->o_tag;
if (tag == LDAP_REQ_BIND) {
static int connection_op_activate( Operation *op )
{
int rc;
- ber_tag_t tag = op->o_tag;
connection_op_queue( op );
op->o_connid = op->o_conn->c_connid;
connection_init_log_prefix( op );
+#ifdef LDAP_SLAPI
+ slapi_int_create_object_extensions( SLAPI_X_EXT_CONNECTION, conn );
+ slapi_int_create_object_extensions( SLAPI_X_EXT_OPERATION, op );
+#endif /* LDAP_SLAPI */
+
slap_op_time( &op->o_time, &op->o_tincr );
}
projects / openldap / blobdiff