/* protected by connections_mutex */
static ldap_pvt_thread_mutex_t connections_mutex;
static Connection *connections = NULL;
+
+static ldap_pvt_thread_mutex_t conn_nextid_mutex;
static unsigned long conn_nextid = 0;
/* structure state (protected by connections_mutex) */
/* should check return of every call */
ldap_pvt_thread_mutex_init( &connections_mutex );
+ ldap_pvt_thread_mutex_init( &conn_nextid_mutex );
connections = (Connection *) ch_calloc( dtblsize, sizeof(Connection) );
connections = NULL;
ldap_pvt_thread_mutex_destroy( &connections_mutex );
+ ldap_pvt_thread_mutex_destroy( &conn_nextid_mutex );
return 0;
}
c->c_send_ldap_intermediate = slap_send_ldap_intermediate;
#endif
- 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;
+ BER_BVZERO( &c->c_authmech );
+ BER_BVZERO( &c->c_dn );
+ BER_BVZERO( &c->c_ndn );
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;
+ BER_BVZERO( &c->c_peer_domain );
+ BER_BVZERO( &c->c_peer_name );
LDAP_STAILQ_INIT(&c->c_ops);
LDAP_STAILQ_INIT(&c->c_pending_ops);
- c->c_sasl_bind_mech.bv_val = NULL;
- c->c_sasl_bind_mech.bv_len = 0;
+ BER_BVZERO( &c->c_sasl_bind_mech );
c->c_sasl_done = 0;
c->c_sasl_authctx = NULL;
c->c_sasl_sockctx = NULL;
ldap_pvt_thread_mutex_lock( &c->c_mutex );
assert( c->c_struct_state == SLAP_C_UNUSED );
- assert( c->c_authmech.bv_val == NULL );
- assert( c->c_dn.bv_val == NULL );
- assert( c->c_ndn.bv_val == NULL );
+ assert( BER_BVISNULL( &c->c_authmech ) );
+ assert( BER_BVISNULL( &c->c_dn ) );
+ assert( BER_BVISNULL( &c->c_ndn ) );
assert( c->c_listener == NULL );
- assert( c->c_peer_domain.bv_val == NULL );
- assert( c->c_peer_name.bv_val == NULL );
+ assert( BER_BVISNULL( &c->c_peer_domain ) );
+ assert( BER_BVISNULL( &c->c_peer_name ) );
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( BER_BVISNULL( &c->c_sasl_bind_mech ) );
assert( c->c_sasl_done == 0 );
assert( c->c_sasl_authctx == NULL );
assert( c->c_sasl_sockctx == NULL );
#endif
}
+ ldap_pvt_thread_mutex_lock( &conn_nextid_mutex );
id = c->c_connid = conn_nextid++;
+ ldap_pvt_thread_mutex_unlock( &conn_nextid_mutex );
c->c_conn_state = SLAP_C_INACTIVE;
c->c_struct_state = SLAP_C_USED;
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;
+ BER_BVZERO( &c->c_authmech );
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;
+ BER_BVZERO( &c->c_dn );
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;
+ BER_BVZERO( &c->c_ndn );
c->c_authz_backend = NULL;
}
if(c->c_peer_domain.bv_val != NULL) {
free(c->c_peer_domain.bv_val);
- c->c_peer_domain.bv_val = NULL;
}
- c->c_peer_domain.bv_len = 0;
+ BER_BVZERO( &c->c_peer_domain );
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;
+ BER_BVZERO( &c->c_peer_name );
c->c_sasl_bind_in_progress = 0;
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;
+ BER_BVZERO( &c->c_sasl_bind_mech );
slap_sasl_close( c );
static void *
connection_operation( void *ctx, void *arg_v )
{
- int rc = SLAPD_DISCONNECT;
+ int rc = LDAP_OTHER;
Operation *op = arg_v;
SlapReply rs = {REP_RESULT};
ber_tag_t tag = op->o_tag;
op->o_threadctx = ctx;
+ switch ( tag ) {
+ case LDAP_REQ_BIND:
+ case LDAP_REQ_UNBIND:
+ case LDAP_REQ_ADD:
+ case LDAP_REQ_DELETE:
+ case LDAP_REQ_MODRDN:
+ case LDAP_REQ_MODIFY:
+ case LDAP_REQ_COMPARE:
+ case LDAP_REQ_SEARCH:
+ case LDAP_REQ_ABANDON:
+ case LDAP_REQ_EXTENDED:
+ break;
+ default:
+#ifdef NEW_LOGGING
+ LDAP_LOG( CONNECTION, INFO, "connection_operation: "
+ "conn %lu unknown LDAP request 0x%lx\n",
+ conn->c_connid, tag, 0 );
+#else
+ Debug( LDAP_DEBUG_ANY, "connection_operation: "
+ "conn %lu unknown LDAP request 0x%lx\n",
+ conn->c_connid, tag, 0 );
+#endif
+ op->o_tag = LBER_ERROR;
+ rs.sr_err = LDAP_PROTOCOL_ERROR;
+ rs.sr_text = "unknown LDAP request";
+ send_ldap_disconnect( op, &rs );
+ rc = SLAPD_DISCONNECT;
+ goto operations_error;
+ }
+
if( conn->c_sasl_bind_in_progress && tag != LDAP_REQ_BIND ) {
#ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, ERR,
#endif
send_ldap_error( op, &rs, LDAP_OPERATIONS_ERROR,
"SASL bind in progress" );
+ rc = LDAP_OPERATIONS_ERROR;
goto operations_error;
}
*/
#if 0
memsiz = ber_len( op->o_ber ) * 64;
- if ( SLMALLOC_SLAB_SIZE > memsiz ) memsiz = SLMALLOC_SLAB_SIZE;
+ if ( SLAP_SLAB_SIZE > memsiz ) memsiz = SLAP_SLAB_SIZE;
#endif
- memsiz = SLMALLOC_SLAB_SIZE;
+ memsiz = SLAP_SLAB_SIZE;
- memctx = sl_mem_create( memsiz, ctx );
+ memctx = slap_sl_mem_create( memsiz, ctx );
op->o_tmpmemctx = memctx;
- op->o_tmpmfuncs = &sl_mfuncs;
+ op->o_tmpmfuncs = &slap_sl_mfuncs;
if ( tag != LDAP_REQ_ADD && tag != LDAP_REQ_MODIFY ) {
/* Note - the ber and its buffer are already allocated from
* regular memory; this only affects subsequent mallocs that
break;
default:
-#ifdef NEW_LOGGING
- 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 );
-#endif
- op->o_tag = LBER_ERROR;
- rs.sr_err = LDAP_PROTOCOL_ERROR;
- rs.sr_text = "unknown LDAP request";
- send_ldap_disconnect( op, &rs );
- rc = -1;
- break;
+ /* not reachable */
+ assert( 0 );
}
-#ifdef SLAPD_MONITOR
- oldtag = tag;
-#endif /* SLAPD_MONITOR */
+operations_error:
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_EXTENDED:
num_ops_completed_[SLAP_OP_EXTENDED]++;
break;
+ default:
+ /* not reachable */
+ assert( 0 );
}
#endif /* SLAPD_MONITOR */
ldap_pvt_thread_mutex_unlock( &num_ops_mutex );
if ( op->o_cancel == SLAP_CANCEL_REQ ) {
op->o_cancel = LDAP_TOO_LATE;
}
-
while ( op->o_cancel != SLAP_CANCEL_NONE &&
op->o_cancel != SLAP_CANCEL_DONE )
{
ber_set_option( op->o_ber, LBER_OPT_BER_MEMCTX, &memctx_null );
if ( op->o_cancel != SLAP_CANCEL_ACK &&
- ( op->o_sync_mode & SLAP_SYNC_PERSIST ) ) {
- sl_mem_detach( ctx, memctx );
- } else if (( op->o_sync_slog_size != -1 )) {
- sl_mem_detach( ctx, memctx );
+ ( op->o_sync_mode & SLAP_SYNC_PERSIST ) )
+ {
+ slap_sl_mem_detach( ctx, memctx );
+
+ } else if ( op->o_sync_slog_size != -1 ) {
+ slap_sl_mem_detach( ctx, memctx );
LDAP_STAILQ_REMOVE( &conn->c_ops, op, slap_op, o_next);
LDAP_STAILQ_NEXT(op, o_next) = NULL;
conn->c_n_ops_executing--;
conn->c_n_ops_completed++;
+
} else {
LDAP_STAILQ_REMOVE( &conn->c_ops, op, slap_op, o_next);
LDAP_STAILQ_NEXT(op, o_next) = NULL;
}
connection_resched( conn );
-
ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
-
return NULL;
}
-static const Listener dummy_list = { {0, ""}, {0, ""} };
+static const Listener dummy_list = { BER_BVC(""), BER_BVC("") };
int connection_client_setup(
ber_socket_t s,
ldap_pvt_thread_start_t *func,
void *arg )
{
+ int rc;
Connection *c;
- if ( connection_init( s, &dummy_list, "", "", CONN_IS_CLIENT, 0, NULL ) < 0 ) {
- return -1;
- }
+ rc = connection_init( s, (Listener *)&dummy_list, "", "",
+ CONN_IS_CLIENT, 0, NULL );
+ if ( rc < 0 ) return -1;
c = connection_get( s );
c->c_clientfunc = func;
}
void connection_client_enable(
- ber_socket_t s
-)
+ ber_socket_t s )
{
slapd_set_read( s, 1 );
}
void connection_client_stop(
- ber_socket_t s
-)
+ ber_socket_t s )
{
Connection *c;
#ifdef HAVE_TLS
if ( c->c_is_tls && c->c_needs_tls_accept ) {
- rc = ldap_pvt_tls_accept( c->c_sb, NULL );
+ rc = ldap_pvt_tls_accept( c->c_sb, slap_tls_ctx );
if ( rc < 0 ) {
#if 0 /* required by next #if 0 */
struct timeval tv;
} else if ( rc == 0 ) {
void *ssl;
- struct berval authid = { 0, NULL };
+ struct berval authid = BER_BVNULL;
c->c_needs_tls_accept = 0;
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 );
+ 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 );
+ 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 );
op->o_preread_attrs = NULL;
op->o_postread_attrs = NULL;
op->o_vrFilter = NULL;
+ /* clear state if the connection is being reused from inactive */
+ if ( conn->c_conn_state == SLAP_C_INACTIVE ) {
+ memset( &conn->c_pagedresults_state, 0, sizeof( conn->c_pagedresults_state ) );
+ }
op->o_pagedresults_state = conn->c_pagedresults_state;
op->o_res_ber = NULL;
conn->c_send_search_entry = slap_send_search_entry;
conn->c_send_search_reference = slap_send_search_reference;
conn->c_listener = (Listener *)&dummy_list;
+ conn->c_peer_domain = slap_empty_bv;
conn->c_peer_name = slap_empty_bv;
/* set memory context */
- op->o_tmpmemctx = sl_mem_create( SLMALLOC_SLAB_SIZE, ctx );
- op->o_tmpmfuncs = &sl_mfuncs;
+ op->o_tmpmemctx = slap_sl_mem_create( SLAP_SLAB_SIZE, ctx );
+ op->o_tmpmfuncs = &slap_sl_mfuncs;
op->o_threadctx = ctx;
op->o_conn = conn;
op->o_time = slap_get_time();
}
+
+void
+connection_assign_nextid( Connection *conn )
+{
+ ldap_pvt_thread_mutex_lock( &conn_nextid_mutex );
+ conn->c_connid = conn_nextid++;
+ ldap_pvt_thread_mutex_unlock( &conn_nextid_mutex );
+}
+
projects / openldap / blobdiff