/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1999-2005 The OpenLDAP Foundation.
+ * Copyright 1999-2006 The OpenLDAP Foundation.
* Portions Copyright 2001-2003 Pierangelo Masarati.
* Portions Copyright 1999-2003 Howard Chu.
* All rights reserved.
#include <stdio.h>
+#include <ac/errno.h>
#include <ac/socket.h>
#include <ac/string.h>
-#include <ac/errno.h>
#include "slap.h"
#include "../back-ldap/back-ldap.h"
Connection *conn )
{
metainfo_t *mi = ( metainfo_t * )be->be_private;
- metaconn_t *mc,
+ metaconn_t *mc,
mc_curr = { 0 };
+ int i;
+
Debug( LDAP_DEBUG_TRACE,
- "=>meta_back_conn_destroy: fetching conn %ld\n",
- conn->c_connid, 0, 0 );
+ "=>meta_back_conn_destroy: fetching conn=%ld DN=\"%s\"\n",
+ conn->c_connid,
+ BER_BVISNULL( &conn->c_ndn ) ? "" : conn->c_ndn.bv_val, 0 );
mc_curr.mc_conn = conn;
- ldap_pvt_thread_mutex_lock( &mi->mi_conn_mutex );
- mc = avl_delete( &mi->mi_conntree, ( caddr_t )&mc_curr,
- meta_back_conn_cmp );
- ldap_pvt_thread_mutex_unlock( &mi->mi_conn_mutex );
-
- if ( mc ) {
- int i;
-
+ ldap_pvt_thread_mutex_lock( &mi->mi_conninfo.lai_mutex );
+#if META_BACK_PRINT_CONNTREE > 0
+ meta_back_print_conntree( mi, ">>> meta_back_conn_destroy" );
+#endif /* META_BACK_PRINT_CONNTREE */
+ while ( ( mc = avl_delete( &mi->mi_conninfo.lai_tree, ( caddr_t )&mc_curr, meta_back_conn_cmp ) ) != NULL )
+ {
Debug( LDAP_DEBUG_TRACE,
"=>meta_back_conn_destroy: destroying conn %ld\n",
- mc->mc_conn->c_connid, 0, 0 );
+ LDAP_BACK_PCONN_ID( mc ), 0, 0 );
- /*
- * Cleanup rewrite session
- */
- for ( i = 0; i < mi->mi_ntargets; ++i ) {
- if ( mc->mc_conns[ i ].msc_ld == NULL ) {
- continue;
- }
+ assert( mc->mc_refcnt == 0 );
- rewrite_session_delete( mi->mi_targets[ i ]->mt_rwmap.rwm_rw, conn );
- meta_clear_one_candidate( &mc->mc_conns[ i ] );
- }
meta_back_conn_free( mc );
}
+#if META_BACK_PRINT_CONNTREE > 0
+ meta_back_print_conntree( mi, "<<< meta_back_conn_destroy" );
+#endif /* META_BACK_PRINT_CONNTREE */
+ ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex );
- /* no response to unbind */
+ /*
+ * Cleanup rewrite session
+ */
+ for ( i = 0; i < mi->mi_ntargets; ++i ) {
+ rewrite_session_delete( mi->mi_targets[ i ]->mt_rwmap.rwm_rw, conn );
+ }
return 0;
}