/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
#include <ac/socket.h>
#include <ac/errno.h>
-#include <ac/signal.h>
#include <ac/string.h>
#include <ac/time.h>
#include <ac/unistd.h>
#include "lutil.h"
#include "slap.h"
-/* I guess this should be declared in ldap_pvt.h */
-extern void * ldap_pvt_tls_sb_ctx( Sockbuf *sb );
-
/* protected by connections_mutex */
static ldap_pvt_thread_mutex_t connections_mutex;
static Connection *connections = NULL;
static void connection_abandon( Connection *conn );
static void connection_destroy( Connection *c );
+static ldap_pvt_thread_start_t connection_operation;
+
struct co_arg {
Connection *co_conn;
Operation *co_op;
if( connections != NULL) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
- "connections_init: already initialized.\n" ));
+ LDAP_LOG( CONNECTION, INFO,
+ "connections_init: already initialized.\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "connections_init: already initialized.\n",
0, 0, 0 );
if( connections == NULL ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
- "connections_init: allocation (%d * %ld) of connection array failed\n",
- dtblsize, (long) sizeof(Connection) ));
+ LDAP_LOG( CONNECTION, ERR,
+ "connections_init: allocation (%d * %ld) of connection "
+ "array failed\n", dtblsize, (long) sizeof(Connection), 0 );
#else
Debug( LDAP_DEBUG_ANY,
"connections_init: allocation (%d*%ld) of connection array failed\n",
if( connections == NULL) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
- "connections_destroy: nothing to destroy.\n"));
+ LDAP_LOG( CONNECTION, INFO,
+ "connections_destroy: nothing to destroy.\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "connections_destroy: nothing to destroy.\n",
0, 0, 0 );
Connection *c;
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_ENTRY,
- "connection_get: socket %ld\n", (long)s ));
+ LDAP_LOG( CONNECTION, ENTRY, "connection_get: socket %ld\n", (long)s, 0, 0 );
#else
Debug( LDAP_DEBUG_ARGS,
"connection_get(%ld)\n",
ber_socket_t i, sd;
for(i=0; i<dtblsize; i++) {
- ber_sockbuf_ctrl( connections[i].c_sb,
- LBER_SB_OPT_GET_FD, &sd );
-
if( connections[i].c_struct_state == SLAP_C_UNINITIALIZED ) {
assert( connections[i].c_conn_state == SLAP_C_INVALID );
assert( connections[i].c_sb == 0 );
break;
}
+ ber_sockbuf_ctrl( connections[i].c_sb,
+ LBER_SB_OPT_GET_FD, &sd );
+
if( connections[i].c_struct_state == SLAP_C_UNUSED ) {
assert( connections[i].c_conn_state == SLAP_C_INVALID );
assert( sd == AC_SOCKET_INVALID );
assert( sd == AC_SOCKET_INVALID );
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_ARGS,
- "connection_get: connection %d not used\n", s ));
+ LDAP_LOG( CONNECTION, ARGS,
+ "connection_get: connection %d not used\n", s, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"connection_get(%d): connection not used\n",
}
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_RESULTS,
- "connection_get: get for %d got connid %ld\n",s, c->c_connid ));
+ LDAP_LOG( CONNECTION, RESULTS,
+ "connection_get: get for %d got connid %lu\n", s, c->c_connid, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
- "connection_get(%d): got connid=%ld\n",
+ "connection_get(%d): got connid=%lu\n",
s, c->c_connid, 0 );
#endif
long connection_init(
ber_socket_t s,
- const char* url,
+ Listener *listener,
const char* dnsname,
const char* peername,
- const char* sockname,
int tls_udp_option,
slap_ssf_t ssf,
const char *authid )
assert( connections != NULL );
+ assert( listener != NULL );
assert( dnsname != NULL );
assert( peername != NULL );
- assert( sockname != NULL );
#ifndef HAVE_TLS
assert( tls_udp_option != 1 );
if( s == AC_SOCKET_INVALID ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
- "connection_init: init of socket %ld invalid.\n", (long)s ));
+ LDAP_LOG( CONNECTION, INFO,
+ "connection_init: init of socket %ld invalid.\n", (long)s, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"connection_init(%ld): invalid.\n",
#else
{
- unsigned int i;
+ ber_socket_t i;
c = NULL;
if( c == NULL ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
- "connection_init: skt %d connection table full (%d/%d)\n",
- s, i, dtblsize ));
+ LDAP_LOG( CONNECTION, INFO,
+ "connection_init: skt %d connection table full "
+ "(%d/%d)\n", s, i, dtblsize );
#else
Debug( LDAP_DEBUG_ANY,
- "connection_init(%d): connection table full (%d/%d)\n",
- s, i, dtblsize);
+ "connection_init(%d): connection table full "
+ "(%d/%d)\n", s, i, dtblsize);
#endif
ldap_pvt_thread_mutex_unlock( &connections_mutex );
return -1;
}
- }
+ }
#endif
- assert( c != NULL );
+ assert( c != NULL );
if( c->c_struct_state == SLAP_C_UNINITIALIZED ) {
- c->c_authmech = NULL;
- c->c_dn = NULL;
- c->c_cdn = NULL;
+ c->c_send_ldap_result = slap_send_ldap_result;
+ c->c_send_search_entry = slap_send_search_entry;
+ c->c_send_search_result = slap_send_search_result;
+ c->c_send_search_reference = slap_send_search_reference;
+ c->c_send_ldap_extended = slap_send_ldap_extended;
+
+ c->c_authmech.bv_val = NULL;
+ c->c_authmech.bv_len = 0;
+ c->c_dn.bv_val = NULL;
+ c->c_dn.bv_len = 0;
+ c->c_ndn.bv_val = NULL;
+ c->c_ndn.bv_len = 0;
c->c_groups = NULL;
- c->c_listener_url = NULL;
- c->c_peer_domain = NULL;
- c->c_peer_name = NULL;
- c->c_sock_name = NULL;
+ c->c_listener = NULL;
+ c->c_peer_domain.bv_val = NULL;
+ c->c_peer_domain.bv_len = 0;
+ c->c_peer_name.bv_val = NULL;
+ c->c_peer_name.bv_len = 0;
- c->c_ops = NULL;
- c->c_pending_ops = NULL;
+ LDAP_STAILQ_INIT(&c->c_ops);
+ LDAP_STAILQ_INIT(&c->c_pending_ops);
- c->c_sasl_bind_mech = NULL;
+ c->c_sasl_bind_mech.bv_val = NULL;
+ c->c_sasl_bind_mech.bv_len = 0;
c->c_sasl_context = NULL;
c->c_sasl_extra = NULL;
+ c->c_sasl_bindop = NULL;
c->c_sb = ber_sockbuf_alloc( );
ldap_pvt_thread_mutex_lock( &c->c_mutex );
assert( c->c_struct_state == SLAP_C_UNUSED );
- assert( c->c_authmech == NULL );
- assert( c->c_dn == NULL );
- assert( c->c_cdn == NULL );
+ assert( c->c_authmech.bv_val == NULL );
+ assert( c->c_dn.bv_val == NULL );
+ assert( c->c_ndn.bv_val == NULL );
assert( c->c_groups == NULL );
- assert( c->c_listener_url == NULL );
- assert( c->c_peer_domain == NULL );
- assert( c->c_peer_name == NULL );
- assert( c->c_sock_name == NULL );
- assert( c->c_ops == NULL );
- assert( c->c_pending_ops == NULL );
- assert( c->c_sasl_bind_mech == NULL );
+ assert( c->c_listener == NULL );
+ assert( c->c_peer_domain.bv_val == NULL );
+ assert( c->c_peer_name.bv_val == NULL );
+ assert( LDAP_STAILQ_EMPTY(&c->c_ops) );
+ assert( LDAP_STAILQ_EMPTY(&c->c_pending_ops) );
+ assert( c->c_sasl_bind_mech.bv_val == NULL );
assert( c->c_sasl_context == NULL );
assert( c->c_sasl_extra == NULL );
+ assert( c->c_sasl_bindop == NULL );
assert( c->c_currentber == NULL );
- c->c_listener_url = ch_strdup( url );
- c->c_peer_domain = ch_strdup( dnsname );
- c->c_peer_name = ch_strdup( peername );
- c->c_sock_name = ch_strdup( sockname );
+ c->c_listener = listener;
+ ber_str2bv( dnsname, 0, 1, &c->c_peer_domain );
+ ber_str2bv( peername, 0, 1, &c->c_peer_name );
c->c_n_ops_received = 0;
c->c_n_ops_executing = 0;
#ifdef LDAP_CONNECTIONLESS
c->c_is_udp = 0;
- if (tls_udp_option == 2)
- {
+ if( tls_udp_option == 2 ) {
c->c_is_udp = 1;
#ifdef LDAP_DEBUG
- ber_sockbuf_add_io( c->c_sb, &ber_sockbuf_io_debug,
- LBER_SBIOD_LEVEL_PROVIDER, (void*)"udp_" );
+ ber_sockbuf_add_io( c->c_sb, &ber_sockbuf_io_debug,
+ LBER_SBIOD_LEVEL_PROVIDER, (void*)"udp_" );
#endif
- ber_sockbuf_add_io( c->c_sb, &ber_sockbuf_io_udp,
- LBER_SBIOD_LEVEL_PROVIDER, (void *)&s );
+ ber_sockbuf_add_io( c->c_sb, &ber_sockbuf_io_udp,
+ LBER_SBIOD_LEVEL_PROVIDER, (void *)&s );
+ ber_sockbuf_add_io( c->c_sb, &ber_sockbuf_io_readahead,
+ LBER_SBIOD_LEVEL_PROVIDER, NULL );
} else
#endif
{
#ifdef LDAP_DEBUG
- ber_sockbuf_add_io( c->c_sb, &ber_sockbuf_io_debug,
- LBER_SBIOD_LEVEL_PROVIDER, (void*)"tcp_" );
+ ber_sockbuf_add_io( c->c_sb, &ber_sockbuf_io_debug,
+ LBER_SBIOD_LEVEL_PROVIDER, (void*)"tcp_" );
#endif
- ber_sockbuf_add_io( c->c_sb, &ber_sockbuf_io_tcp,
- LBER_SBIOD_LEVEL_PROVIDER, (void *)&s );
+ ber_sockbuf_add_io( c->c_sb, &ber_sockbuf_io_tcp,
+ LBER_SBIOD_LEVEL_PROVIDER, (void *)&s );
}
- ber_sockbuf_add_io( c->c_sb, &ber_sockbuf_io_readahead,
- LBER_SBIOD_LEVEL_PROVIDER, NULL );
#ifdef LDAP_DEBUG
ber_sockbuf_add_io( c->c_sb, &ber_sockbuf_io_debug,
c /* non-NULL */ ) < 0 )
{
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
- "connection_init: conn %d set nonblocking failed\n",
- c->c_connid ));
+ LDAP_LOG( CONNECTION, INFO,
+ "connection_init: conn %lu set nonblocking failed\n",
+ c->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"connection_init(%d, %s): set nonblocking failed\n",
- s, c->c_peer_name, 0 );
+ s, c->c_peer_name.bv_val, 0 );
#endif
}
void connection2anonymous( Connection *c )
{
- assert( connections != NULL );
- assert( c != NULL );
+ assert( connections != NULL );
+ assert( c != NULL );
{
ber_len_t max = sockbuf_max_incoming;
ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_SET_MAX_INCOMING, &max );
}
- if(c->c_authmech != NULL ) {
- free(c->c_authmech);
- c->c_authmech = NULL;
+ if(c->c_authmech.bv_val != NULL ) {
+ free(c->c_authmech.bv_val);
+ c->c_authmech.bv_val = NULL;
}
+ c->c_authmech.bv_len = 0;
- if(c->c_dn != NULL) {
- free(c->c_dn);
- c->c_dn = NULL;
- }
-
- if(c->c_cdn != NULL) {
- free(c->c_cdn);
- c->c_cdn = NULL;
+ if(c->c_dn.bv_val != NULL) {
+ free(c->c_dn.bv_val);
+ c->c_dn.bv_val = NULL;
+ }
+ c->c_dn.bv_len = 0;
+ if(c->c_ndn.bv_val != NULL) {
+ free(c->c_ndn.bv_val);
+ c->c_ndn.bv_val = NULL;
}
+ c->c_ndn.bv_len = 0;
- c->c_authc_backend = NULL;
c->c_authz_backend = NULL;
-
- {
- GroupAssertion *g, *n;
- for (g = c->c_groups; g; g=n)
+
{
- n = g->next;
- free(g);
+ GroupAssertion *g, *n;
+ for (g = c->c_groups; g; g=n) {
+ n = g->ga_next;
+ free(g);
+ }
+ c->c_groups = NULL;
}
- c->c_groups = NULL;
- }
-
}
static void
{
/* note: connections_mutex should be locked by caller */
ber_socket_t sd;
+ unsigned long connid;
assert( connections != NULL );
assert( c != NULL );
assert( c->c_struct_state != SLAP_C_UNUSED );
assert( c->c_conn_state != SLAP_C_INVALID );
- assert( c->c_ops == NULL );
+ assert( LDAP_STAILQ_EMPTY(&c->c_ops) );
+
+ /* only for stats (print -1 as "%lu" may give unexpected results ;) */
+ connid = c->c_connid;
backend_connection_destroy(c);
c->c_activitytime = c->c_starttime = 0;
connection2anonymous( c );
+ c->c_listener = NULL;
- if(c->c_listener_url != NULL) {
- free(c->c_listener_url);
- c->c_listener_url = NULL;
- }
-
- if(c->c_peer_domain != NULL) {
- free(c->c_peer_domain);
- c->c_peer_domain = NULL;
- }
- if(c->c_peer_name != NULL) {
-#ifdef LDAP_PF_lOCAL
- /*
- * If peer was a domain socket, unlink. Mind you,
- * they may be un-named. Should we leave this to
- * the client?
- */
- if (strncmp(c->c_peer_name, "PATH=", 5) == 0) {
- char *path = c->c_peer_name + 5;
- if (path != '\0') {
- (void)unlink(path);
- }
- }
-#endif /* LDAP_PF_LOCAL */
-
- free(c->c_peer_name);
- c->c_peer_name = NULL;
+ if(c->c_peer_domain.bv_val != NULL) {
+ free(c->c_peer_domain.bv_val);
+ c->c_peer_domain.bv_val = NULL;
}
- if(c->c_sock_name != NULL) {
- free(c->c_sock_name);
- c->c_sock_name = NULL;
+ c->c_peer_domain.bv_len = 0;
+ if(c->c_peer_name.bv_val != NULL) {
+ free(c->c_peer_name.bv_val);
+ c->c_peer_name.bv_val = NULL;
}
+ c->c_peer_name.bv_len = 0;
c->c_sasl_bind_in_progress = 0;
- if(c->c_sasl_bind_mech != NULL) {
- free(c->c_sasl_bind_mech);
- c->c_sasl_bind_mech = NULL;
+ if(c->c_sasl_bind_mech.bv_val != NULL) {
+ free(c->c_sasl_bind_mech.bv_val);
+ c->c_sasl_bind_mech.bv_val = NULL;
}
+ c->c_sasl_bind_mech.bv_len = 0;
slap_sasl_close( c );
slapd_remove( sd, 0 );
Statslog( LDAP_DEBUG_STATS,
- "conn=%ld fd=%d closed\n",
- c->c_connid, sd, 0, 0, 0 );
+ "conn=%lu fd=%d closed\n",
+ connid, sd, 0, 0, 0 );
}
ber_sockbuf_free( c->c_sb );
Operation *o;
- for( o = c->c_ops; o != NULL; o = o->o_next ) {
- ldap_pvt_thread_mutex_lock( &o->o_abandonmutex );
+ LDAP_STAILQ_FOREACH(o, &c->c_ops, o_next) {
o->o_abandon = 1;
- ldap_pvt_thread_mutex_unlock( &o->o_abandonmutex );
}
/* remove pending operations */
- for( o = slap_op_pop( &c->c_pending_ops );
- o != NULL;
- o = slap_op_pop( &c->c_pending_ops ) )
- {
+ while ( (o = LDAP_STAILQ_FIRST( &c->c_pending_ops )) != NULL) {
+ LDAP_STAILQ_REMOVE_HEAD( &c->c_pending_ops, o_next );
+ LDAP_STAILQ_NEXT(o, o_next) = NULL;
slap_op_free( o );
}
}
ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_GET_FD, &sd );
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
- "connection_closing: conn %d readying socket %d for close.\n",
- c->c_connid, sd ));
+ LDAP_LOG( CONNECTION, DETAIL1,
+ "connection_closing: conn %lu readying socket %d for close.\n",
+ c->c_connid, sd, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
- "connection_closing: readying conn=%ld sd=%d for close\n",
+ "connection_closing: readying conn=%lu sd=%d for close\n",
c->c_connid, sd, 0 );
#endif
/* update state to closing */
/* note: connections_mutex and c_mutex should be locked by caller */
ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_GET_FD, &sd );
- if( c->c_ops != NULL ) {
+ if( !LDAP_STAILQ_EMPTY(&c->c_ops) ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
- "connection_close: conn %d deferring sd %d\n",
- c->c_connid, sd ));
+ LDAP_LOG( CONNECTION, DETAIL1,
+ "connection_close: conn %lu deferring sd %d\n",
+ c->c_connid, sd, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
- "connection_close: deferring conn=%ld sd=%d\n",
+ "connection_close: deferring conn=%lu sd=%d\n",
c->c_connid, sd, 0 );
#endif
return;
}
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_RESULTS,
- "connection_close: conn %d sd %d\n",
- c->c_connid, sd ));
+ LDAP_LOG( CONNECTION, RESULTS,
+ "connection_close: conn %lu sd %d\n", c->c_connid, sd, 0 );
#else
- Debug( LDAP_DEBUG_TRACE, "connection_close: conn=%ld sd=%d\n",
+ Debug( LDAP_DEBUG_TRACE, "connection_close: conn=%lu sd=%d\n",
c->c_connid, sd, 0 );
#endif
connection_destroy( c );
* calls the appropriate stub to handle it.
*/
+#ifdef SLAPD_MONITOR
+#define INCR_OP(var,index) \
+ do { \
+ ldap_pvt_thread_mutex_lock( &num_ops_mutex ); \
+ (var)[(index)]++; \
+ ldap_pvt_thread_mutex_unlock( &num_ops_mutex ); \
+ } while (0)
+#else /* !SLAPD_MONITOR */
+#define INCR_OP(var,index)
+#endif /* !SLAPD_MONITOR */
+
static void *
-connection_operation( void *arg_v )
+connection_operation( void *ctx, void *arg_v )
{
int rc;
struct co_arg *arg = arg_v;
ber_tag_t tag = arg->co_op->o_tag;
+#ifdef SLAPD_MONITOR
+ ber_tag_t oldtag = tag;
+#endif /* SLAPD_MONITOR */
Connection *conn = arg->co_conn;
ldap_pvt_thread_mutex_lock( &num_ops_mutex );
num_ops_initiated++;
ldap_pvt_thread_mutex_unlock( &num_ops_mutex );
+ arg->co_op->o_threadctx = ctx;
+
if( conn->c_sasl_bind_in_progress && tag != LDAP_REQ_BIND ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
- "connection_operation: conn %d SASL bind in progress (tag=%ld).\n",
- conn->c_connid, (long)tag ));
+ LDAP_LOG( CONNECTION, ERR,
+ "connection_operation: conn %lu SASL bind in progress (tag=%ld).\n",
+ conn->c_connid, (long)tag, 0 );
#else
Debug( LDAP_DEBUG_ANY, "connection_operation: "
"error: SASL bind in progress (tag=%ld).\n",
switch ( tag ) {
case LDAP_REQ_BIND:
+ INCR_OP(num_ops_initiated_, SLAP_OP_BIND);
rc = do_bind( conn, arg->co_op );
break;
case LDAP_REQ_UNBIND:
+ INCR_OP(num_ops_initiated_, SLAP_OP_UNBIND);
rc = do_unbind( conn, arg->co_op );
break;
case LDAP_REQ_ADD:
+ INCR_OP(num_ops_initiated_, SLAP_OP_ADD);
rc = do_add( conn, arg->co_op );
break;
case LDAP_REQ_DELETE:
+ INCR_OP(num_ops_initiated_, SLAP_OP_DELETE);
rc = do_delete( conn, arg->co_op );
break;
case LDAP_REQ_MODRDN:
+ INCR_OP(num_ops_initiated_, SLAP_OP_MODRDN);
rc = do_modrdn( conn, arg->co_op );
break;
case LDAP_REQ_MODIFY:
+ INCR_OP(num_ops_initiated_, SLAP_OP_MODIFY);
rc = do_modify( conn, arg->co_op );
break;
case LDAP_REQ_COMPARE:
+ INCR_OP(num_ops_initiated_, SLAP_OP_COMPARE);
rc = do_compare( conn, arg->co_op );
break;
case LDAP_REQ_SEARCH:
+ INCR_OP(num_ops_initiated_, SLAP_OP_SEARCH);
rc = do_search( conn, arg->co_op );
break;
case LDAP_REQ_ABANDON:
+ INCR_OP(num_ops_initiated_, SLAP_OP_ABANDON);
rc = do_abandon( conn, arg->co_op );
break;
case LDAP_REQ_EXTENDED:
+ INCR_OP(num_ops_initiated_, SLAP_OP_EXTENDED);
rc = do_extended( conn, arg->co_op );
break;
default:
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
- "connection_operation: conn %d unknown LDAP request 0x%lx\n",
- conn->c_connid, tag ));
+ LDAP_LOG( CONNECTION, INFO,
+ "connection_operation: conn %lu unknown LDAP request 0x%lx\n",
+ conn->c_connid, tag, 0 );
#else
Debug( LDAP_DEBUG_ANY, "unknown LDAP request 0x%lx\n",
tag, 0, 0 );
break;
}
+#ifdef SLAPD_MONITOR
+ oldtag = tag;
+#endif /* SLAPD_MONITOR */
if( rc == SLAPD_DISCONNECT ) tag = LBER_ERROR;
operations_error:
ldap_pvt_thread_mutex_lock( &num_ops_mutex );
num_ops_completed++;
+#ifdef SLAPD_MONITOR
+ switch (oldtag) {
+ case LDAP_REQ_BIND:
+ num_ops_completed_[SLAP_OP_BIND]++;
+ break;
+ case LDAP_REQ_UNBIND:
+ num_ops_completed_[SLAP_OP_UNBIND]++;
+ break;
+ case LDAP_REQ_ADD:
+ num_ops_completed_[SLAP_OP_ADD]++;
+ break;
+ case LDAP_REQ_DELETE:
+ num_ops_completed_[SLAP_OP_DELETE]++;
+ break;
+ case LDAP_REQ_MODRDN:
+ num_ops_completed_[SLAP_OP_MODRDN]++;
+ break;
+ case LDAP_REQ_MODIFY:
+ num_ops_completed_[SLAP_OP_MODIFY]++;
+ break;
+ case LDAP_REQ_COMPARE:
+ num_ops_completed_[SLAP_OP_COMPARE]++;
+ break;
+ case LDAP_REQ_SEARCH:
+ num_ops_completed_[SLAP_OP_SEARCH]++;
+ break;
+ case LDAP_REQ_ABANDON:
+ num_ops_completed_[SLAP_OP_ABANDON]++;
+ break;
+ case LDAP_REQ_EXTENDED:
+ num_ops_completed_[SLAP_OP_EXTENDED]++;
+ break;
+ }
+#endif /* SLAPD_MONITOR */
ldap_pvt_thread_mutex_unlock( &num_ops_mutex );
ldap_pvt_thread_mutex_lock( &conn->c_mutex );
conn->c_n_ops_executing--;
conn->c_n_ops_completed++;
- slap_op_remove( &conn->c_ops, arg->co_op );
- slap_op_free( arg->co_op );
+ LDAP_STAILQ_REMOVE( &conn->c_ops, arg->co_op, slap_op, o_next);
+ LDAP_STAILQ_NEXT(arg->co_op, o_next) = NULL;
+#ifdef LDAP_CLIENT_UPDATE
+ if ( !( arg->co_op->o_clientupdate_type & SLAP_LCUP_PERSIST ) )
+#endif /* LDAP_CLIENT_UPDATE */
+ {
+ slap_op_free( arg->co_op );
+ }
arg->co_op = NULL;
arg->co_conn = NULL;
free( (char *) arg );
{
int rc = 0;
Connection *c;
+
assert( connections != NULL );
ldap_pvt_thread_mutex_lock( &connections_mutex );
if( c == NULL ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
- "connection_read: sock %ld no connection\n",
- (long)s ));
+ LDAP_LOG( CONNECTION, INFO,
+ "connection_read: sock %ld no connection\n", (long)s, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"connection_read(%ld): no connection!\n",
if( c->c_conn_state == SLAP_C_CLOSING ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
- "connection_read: conn %d connection closing, ignoring input\n",
- c->c_connid));
+ LDAP_LOG( CONNECTION, INFO,
+ "connection_read: conn %lu connection closing, ignoring input\n",
+ c->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
- "connection_read(%d): closing, ignoring input for id=%ld\n",
+ "connection_read(%d): closing, ignoring input for id=%lu\n",
s, c->c_connid, 0 );
#endif
connection_return( c );
}
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
- "connection_read: conn %d checking for input.\n", c->c_connid ));
+ LDAP_LOG( CONNECTION, DETAIL1,
+ "connection_read: conn %lu checking for input.\n",
+ c->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
- "connection_read(%d): checking for input on id=%ld\n",
+ "connection_read(%d): checking for input on id=%lu\n",
s, c->c_connid, 0 );
#endif
#endif
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
- "connection_read: conn %d TLS accept error, error %d\n",
- c->c_connid, rc ));
+ LDAP_LOG( CONNECTION, ERR,
+ "connection_read: conn %lu TLS accept error, error %d\n",
+ c->c_connid, rc, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"connection_read(%d): TLS accept error "
- "error=%d id=%ld, closing\n",
+ "error=%d id=%lu, closing\n",
s, rc, c->c_connid );
#endif
c->c_needs_tls_accept = 0;
* to propagate to client. */
FD_ZERO(&rfd);
FD_SET(s, &rfd);
- for (rc=1; rc>0;)
- {
+ for (rc=1; rc>0;) {
tv.tv_sec = 1;
tv.tv_usec = 0;
rc = select(s+1, &rfd, NULL, NULL, &tv);
- if (rc == 1)
- ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_DRAIN,
- NULL);
+ if (rc == 1) {
+ ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_DRAIN, NULL);
+ }
}
#endif
connection_close( c );
} else if ( rc == 0 ) {
void *ssl;
- char *authid;
+ struct berval authid = { 0, NULL };
c->c_needs_tls_accept = 0;
/* we need to let SASL know */
- ssl = (void *)ldap_pvt_tls_sb_ctx( c->c_sb );
+ ssl = ldap_pvt_tls_sb_ctx( c->c_sb );
c->c_tls_ssf = (slap_ssf_t) ldap_pvt_tls_get_strength( ssl );
if( c->c_tls_ssf > c->c_ssf ) {
c->c_ssf = c->c_tls_ssf;
}
- authid = (char *)ldap_pvt_tls_get_peer( ssl );
- slap_sasl_external( c, c->c_tls_ssf, authid );
+ rc = dnX509peerNormalize( ssl, &authid );
+ if ( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( CONNECTION, INFO,
+ "connection_read: conn %lu unable to get TLS client DN, "
+ "error %d\n", c->c_connid, rc, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE,
+ "connection_read(%d): unable to get TLS client DN "
+ "error=%d id=%lu\n",
+ s, rc, c->c_connid );
+#endif
+ }
+ slap_sasl_external( c, c->c_tls_ssf, authid.bv_val );
+ if ( authid.bv_val ) free( authid.bv_val );
+ }
+
+ /* if success and data is ready, fall thru to data input loop */
+ if( rc != 0 ||
+ !ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_DATA_READY, NULL ) )
+ {
+ connection_return( c );
+ ldap_pvt_thread_mutex_unlock( &connections_mutex );
+ return 0;
}
- connection_return( c );
- ldap_pvt_thread_mutex_unlock( &connections_mutex );
- return 0;
}
#endif
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
- "connection_read: conn %d SASL install error %d, closing\n",
- c->c_connid, rc ));
+ LDAP_LOG( CONNECTION, ERR,
+ "connection_read: conn %lu SASL install error %d, closing\n",
+ c->c_connid, rc, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"connection_read(%d): SASL install error "
- "error=%d id=%ld, closing\n",
+ "error=%d id=%lu, closing\n",
s, rc, c->c_connid );
#endif
/* connections_mutex and c_mutex are locked */
if( rc < 0 ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
- "connection_read: conn %d input error %d, closing.\n",
- c->c_connid, rc ));
+ LDAP_LOG( CONNECTION, ERR,
+ "connection_read: conn %lu input error %d, closing.\n",
+ c->c_connid, rc, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
- "connection_read(%d): input error=%d id=%ld, closing.\n",
+ "connection_read(%d): input error=%d id=%lu, closing.\n",
s, rc, c->c_connid );
#endif
/* connections_mutex and c_mutex are locked */
char *cdn = NULL;
#endif
- if ( conn->c_currentber == NULL && (conn->c_currentber = ber_alloc())
- == NULL ) {
+ if ( conn->c_currentber == NULL &&
+ ( conn->c_currentber = ber_alloc()) == NULL )
+ {
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
- "connection_input: conn %d ber_alloc failed.\n", conn->c_connid ));
+ LDAP_LOG( CONNECTION, ERR,
+ "connection_input: conn %lu ber_alloc failed.\n",
+ conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "ber_alloc failed\n", 0, 0, 0 );
#endif
errno = 0;
#ifdef LDAP_CONNECTIONLESS
- if (conn->c_is_udp)
- {
+ if ( conn->c_is_udp ) {
char peername[sizeof("IP=255.255.255.255:65336")];
len = ber_int_sb_read(conn->c_sb, &peeraddr,
sizeof(struct sockaddr));
inet_ntoa( peeraddr.sa_in_addr.sin_addr ),
(unsigned) ntohs( peeraddr.sa_in_addr.sin_port ) );
Statslog( LDAP_DEBUG_STATS,
- "conn=%ld UDP request from %s (%s) accepted.\n",
- conn->c_connid, peername,
- conn->c_sock_name, 0, 0 );
+ "conn=%lu UDP request from %s (%s) accepted.\n",
+ conn->c_connid, peername, conn->c_sock_name.bv_val, 0, 0 );
}
#endif
tag = ber_get_next( conn->c_sb, &len, conn->c_currentber );
ber_sockbuf_ctrl( conn->c_sb, LBER_SB_OPT_GET_FD, &sd );
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
- "connection_input: conn %d ber_get_next failed, errno %d (%s).\n",
- conn->c_connid, err, sock_errstr(err) ));
+ LDAP_LOG( CONNECTION, ERR,
+ "connection_input: conn %lu ber_get_next failed, errno %d (%s).\n",
+ conn->c_connid, err, sock_errstr(err) );
#else
Debug( LDAP_DEBUG_TRACE,
"ber_get_next on fd %d failed errno=%d (%s)\n",
if ( (tag = ber_get_int( ber, &msgid )) != LDAP_TAG_MSGID ) {
/* log, close and send error */
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
- "connection_input: conn %d ber_get_int returns 0x%lx.\n",
- conn->c_connid, tag ));
+ LDAP_LOG( CONNECTION, ERR,
+ "connection_input: conn %lu ber_get_int returns 0x%lx.\n",
+ conn->c_connid, tag, 0 );
#else
Debug( LDAP_DEBUG_ANY, "ber_get_int returns 0x%lx\n", tag, 0,
0 );
if ( (tag = ber_peek_tag( ber, &len )) == LBER_ERROR ) {
/* log, close and send error */
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
- "connection_input: conn %d ber_peek_tag returns 0x%lx.\n",
- conn->c_connid, tag ));
+ LDAP_LOG( CONNECTION, ERR,
+ "connection_input: conn %lu ber_peek_tag returns 0x%lx.\n",
+ conn->c_connid, tag, 0 );
#else
Debug( LDAP_DEBUG_ANY, "ber_peek_tag returns 0x%lx\n", tag, 0,
0 );
}
#ifdef LDAP_CONNECTIONLESS
- if (conn->c_is_udp) {
- if (tag == LBER_OCTETSTRING) {
+ if( conn->c_is_udp ) {
+ if( tag == LBER_OCTETSTRING ) {
ber_get_stringa( ber, &cdn );
tag = ber_peek_tag(ber, &len);
}
- if (tag != LDAP_REQ_ABANDON && tag != LDAP_REQ_SEARCH) {
+ if( tag != LDAP_REQ_ABANDON && tag != LDAP_REQ_SEARCH ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
- "connection_input: conn %d invalid req for UDP 0x%lx.\n",
- conn->c_connid, tag ));
+ LDAP_LOG( CONNECTION, ERR,
+ "connection_input: conn %lu invalid req for UDP 0x%lx.\n",
+ conn->c_connid, tag, 0 );
#else
Debug( LDAP_DEBUG_ANY, "invalid req for UDP 0x%lx\n", tag, 0,
0 );
op = slap_op_alloc( ber, msgid, tag, conn->c_n_ops_received++ );
+ op->o_conn = conn;
+ op->vrFilter = NULL;
+ op->o_pagedresults_state = conn->c_pagedresults_state;
#ifdef LDAP_CONNECTIONLESS
op->o_peeraddr = peeraddr;
- if (cdn) {
- op->o_dn = cdn;
+ if (cdn ) {
+ ber_str2bv( cdn, 0, 1, &op->o_dn );
op->o_protocol = LDAP_VERSION2;
}
#endif
+
if ( conn->c_conn_state == SLAP_C_BINDING
|| conn->c_conn_state == SLAP_C_CLOSING )
{
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
- "connection_input: conn %d deferring operation\n",
- conn->c_connid ));
+ LDAP_LOG( CONNECTION, INFO,
+ "connection_input: conn %lu deferring operation\n",
+ conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "deferring operation\n", 0, 0, 0 );
#endif
conn->c_n_ops_pending++;
- slap_op_add( &conn->c_pending_ops, op );
+ LDAP_STAILQ_INSERT_TAIL( &conn->c_pending_ops, op, o_next );
} else {
conn->c_n_ops_executing++;
if( rc ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
- "connection_resched: conn %d reaquiring locks.\n",
- conn->c_connid ));
+ LDAP_LOG( CONNECTION, DETAIL1,
+ "connection_resched: conn %lu reaquiring locks.\n",
+ conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
- "connection_resched: reaquiring locks conn=%ld sd=%d\n",
+ "connection_resched: reaquiring locks conn=%lu sd=%d\n",
conn->c_connid, sd, 0 );
#endif
/*
if( conn->c_conn_state != SLAP_C_CLOSING ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
- "connection_resched: conn %d closed by other thread.\n",
- conn->c_connid ));
+ LDAP_LOG( CONNECTION, INFO,
+ "connection_resched: conn %lu closed by other thread.\n",
+ conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "connection_resched: "
- "closed by other thread conn=%ld sd=%d\n",
+ "closed by other thread conn=%lu sd=%d\n",
conn->c_connid, sd, 0 );
#endif
} else {
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
- "connection_resched: conn %d attempting closing.\n",
- conn->c_connid ));
+ LDAP_LOG( CONNECTION, DETAIL1,
+ "connection_resched: conn %lu attempting closing.\n",
+ conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "connection_resched: "
- "attempting closing conn=%ld sd=%d\n",
+ "attempting closing conn=%lu sd=%d\n",
conn->c_connid, sd, 0 );
#endif
connection_close( conn );
return 0;
}
- for( op = slap_op_pop( &conn->c_pending_ops );
- op != NULL;
- op = slap_op_pop( &conn->c_pending_ops ) )
- {
+ while ((op = LDAP_STAILQ_FIRST( &conn->c_pending_ops )) != NULL) {
+ LDAP_STAILQ_REMOVE_HEAD( &conn->c_pending_ops, o_next );
+ LDAP_STAILQ_NEXT(op, o_next) = NULL;
/* pending operations should not be marked for abandonment */
assert(!op->o_abandon);
arg->co_conn = conn;
arg->co_op = op;
- if (!arg->co_op->o_dn) {
+ if (!arg->co_op->o_dn.bv_len) {
arg->co_op->o_authz = conn->c_authz;
- arg->co_op->o_dn = ch_strdup( conn->c_dn != NULL ? conn->c_dn : "" );
+ arg->co_op->o_dn.bv_val = ch_strdup( conn->c_dn.bv_val ?
+ conn->c_dn.bv_val : "" );
+ arg->co_op->o_ndn.bv_val = ch_strdup( conn->c_ndn.bv_val ?
+ conn->c_ndn.bv_val : "" );
}
- arg->co_op->o_ndn = ch_strdup( arg->co_op->o_dn );
- (void) dn_normalize( arg->co_op->o_ndn );
arg->co_op->o_authtype = conn->c_authtype;
- arg->co_op->o_authmech = conn->c_authmech != NULL
- ? ch_strdup( conn->c_authmech ) : NULL;
+ ber_dupbv( &arg->co_op->o_authmech, &conn->c_authmech );
if (!arg->co_op->o_protocol) {
arg->co_op->o_protocol = conn->c_protocol
}
arg->co_op->o_connid = conn->c_connid;
- slap_op_add( &conn->c_ops, arg->co_op );
+ LDAP_STAILQ_INSERT_TAIL( &conn->c_ops, arg->co_op, o_next );
status = ldap_pvt_thread_pool_submit( &connection_pool,
connection_operation, (void *) arg );
if ( status != 0 ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
- "connection_op_activate: conn %d thread pool submit failed.\n",
- conn->c_connid ));
+ LDAP_LOG( CONNECTION, ERR,
+ "connection_op_activate: conn %lu thread pool submit failed.\n",
+ conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"ldap_pvt_thread_pool_submit failed (%d)\n", status, 0, 0 );
int connection_write(ber_socket_t s)
{
Connection *c;
+
assert( connections != NULL );
ldap_pvt_thread_mutex_lock( &connections_mutex );
if( c == NULL ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
- "connection_write: sock %ld no connection!\n",(long)s));
+ LDAP_LOG( CONNECTION, ERR,
+ "connection_write: sock %ld no connection!\n", (long)s, 0, 0);
#else
Debug( LDAP_DEBUG_ANY,
"connection_write(%ld): no connection!\n",
c->c_n_write++;
#ifdef NEW_LOGGING
- LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
- "connection_write conn %d waking output.\n",
- c->c_connid ));
+ LDAP_LOG( CONNECTION, DETAIL1,
+ "connection_write conn %lu waking output.\n", c->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
- "connection_write(%d): waking output for id=%ld\n",
+ "connection_write(%d): waking output for id=%lu\n",
s, c->c_connid, 0 );
#endif
ldap_pvt_thread_cond_signal( &c->c_write_cv );
return 0;
}
-
-/*
- * Create client side and server side connection structures, connected to
- * one another, for the front end to use for searches on arbitrary back ends.
- */
-
-int connection_internal_open( Connection **conn, LDAP **ldp, const char *id )
-{
- int rc;
- ber_socket_t fd[2] = {-1,-1};
- Operation *op;
-
- *conn=NULL;
- *ldp=NULL;
-
- rc = lutil_pair( fd );
- if( rc == -1 ) {
- return LDAP_OTHER;
- }
-
- rc = connection_init( fd[1], "INT", "localhost",
- "localhost:0", "localhost:00", 0, 256, id );
- if( rc < 0 ) {
- tcp_close( fd[0] );
- tcp_close( fd[1] );
- return LDAP_OTHER;
- }
- slapd_add_internal( fd[1] );
-
- /* A search operation, number 0 */
- op = slap_op_alloc( NULL, 0, LDAP_REQ_SEARCH, 0);
- op->o_ndn = ch_strdup( id );
- op->o_protocol = LDAP_VERSION3;
-
- (*conn) = connection_get( fd[1] );
- (*conn)->c_ops = op;
- (*conn)->c_conn_state = SLAP_C_ACTIVE;
-
-
- /* Create the client side of the connection */
- rc = ldap_open_internal_connection( ldp, &(fd[0]) );
- if( rc != LDAP_SUCCESS ) {
- tcp_close( fd[0] );
- return LDAP_OTHER;
- }
-
- /* The connection_get() will have locked the connection's mutex */
- ldap_pvt_thread_mutex_unlock( &((*conn)->c_mutex) );
-
- return LDAP_SUCCESS;
-}
-
-
-void connection_internal_close( Connection *conn )
-{
- Operation *op = conn->c_ops;
-
- slap_op_remove( &conn->c_ops, op );
- slap_op_free( op );
- connection_closing( conn );
- connection_close( conn );
-}