X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fconnection.c;h=504fe2cbfe0c13a82f0ef354426eded7eeaadd23;hb=008bbf56dbbe472cc0e95fb15e78c55e7e97e4c4;hp=2f6759d4815c635d269ace201f65d7a1991136d3;hpb=60a068ae893f00325c6664d4e71aac956fc7aa12;p=openldap diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c index 2f6759d481..504fe2cbfe 100644 --- a/servers/slapd/connection.c +++ b/servers/slapd/connection.c @@ -16,29 +16,41 @@ /* protected by connections_mutex */ static ldap_pvt_thread_mutex_t connections_mutex; static Connection *connections = NULL; -static int conn_index = -1; -static long conn_nextid = 0; +static unsigned long conn_nextid = 0; /* structure state (protected by connections_mutex) */ -#define SLAP_C_UNINITIALIZED 0x0 /* MUST BE ZERO (0) */ -#define SLAP_C_UNUSED 0x1 -#define SLAP_C_USED 0x2 +#define SLAP_C_UNINITIALIZED 0x00 /* MUST BE ZERO (0) */ +#define SLAP_C_UNUSED 0x01 +#define SLAP_C_USED 0x02 /* connection state (protected by c_mutex ) */ -#define SLAP_C_INVALID 0x0 /* MUST BE ZERO (0) */ -#define SLAP_C_INACTIVE 0x1 /* zero threads */ -#define SLAP_C_ACTIVE 0x2 /* one or more threads */ -#define SLAP_C_BINDING 0x3 /* binding */ -#define SLAP_C_CLOSING 0x4 /* closing */ +#define SLAP_C_INVALID 0x00 /* MUST BE ZERO (0) */ +#define SLAP_C_INACTIVE 0x01 /* zero threads */ +#define SLAP_C_ACTIVE 0x02 /* one or more threads */ +#define SLAP_C_BINDING 0x03 /* binding */ +#define SLAP_C_CLOSING 0x04 /* closing */ + +char* connection_state2str( int state ) { + switch( state ) { + case SLAP_C_INVALID: return "!"; + case SLAP_C_INACTIVE: return "|"; + case SLAP_C_ACTIVE: return ""; + case SLAP_C_BINDING: return "B"; + case SLAP_C_CLOSING: return "C"; + } + + return "?"; +} -void slapd_remove(int s); -static Connection* connection_get( int s ); +static Connection* connection_get( ber_socket_t s ); static int connection_input( Connection *c ); static void connection_close( Connection *c ); static int connection_op_activate( Connection *conn, Operation *op ); static int connection_resched( Connection *conn ); +static void connection_abandon( Connection *conn ); +static void connection_destroy( Connection *c ); struct co_arg { Connection *co_conn; @@ -50,8 +62,6 @@ struct co_arg { */ int connections_init(void) { - int i; - assert( connections == NULL ); if( connections != NULL) { @@ -72,8 +82,8 @@ int connections_init(void) return -1; } - for ( i = 0; i < dtblsize; i++ ) - memset( &connections[i], 0, sizeof(Connection) ); + assert( connections[0].c_struct_state == SLAP_C_UNINITIALIZED ); + assert( connections[dtblsize-1].c_struct_state == SLAP_C_UNINITIALIZED ); /* * per entry initialization of the Connection array initialization @@ -88,7 +98,7 @@ int connections_init(void) */ int connections_destroy(void) { - int i; + ber_socket_t i; /* should check return of every call */ @@ -118,7 +128,7 @@ int connections_destroy(void) */ int connections_shutdown(void) { - int i; + ber_socket_t i; ldap_pvt_thread_mutex_lock( &connections_mutex ); @@ -128,8 +138,11 @@ int connections_shutdown(void) } ldap_pvt_thread_mutex_lock( &connections[i].c_mutex ); + + /* connections_mutex and c_mutex are locked */ connection_closing( &connections[i] ); connection_close( &connections[i] ); + ldap_pvt_thread_mutex_unlock( &connections[i].c_mutex ); } @@ -138,25 +151,60 @@ int connections_shutdown(void) return 0; } -static Connection* connection_get( int s ) +/* + * Timeout idle connections. + */ +int connections_timeout_idle(time_t now) { - Connection *c = NULL; + int i = 0; + int connindex; + Connection* c; + + ldap_pvt_thread_mutex_lock( &connections_mutex ); + + for( c = connection_first( &connindex ); + c != NULL; + c = connection_next( c, &connindex ) ) + { + if( difftime( c->c_activitytime+global_idletimeout, now) < 0 ) { + /* close it */ + connection_closing( c ); + connection_close( c ); + i++; + } + } + connection_done( c ); + + ldap_pvt_thread_mutex_unlock( &connections_mutex ); + + return i; +} + +static Connection* connection_get( ber_socket_t s ) +{ + /* connections_mutex should be locked by caller */ + + Connection *c; + + Debug( LDAP_DEBUG_ARGS, + "connection_get(%ld)\n", + (long) s, 0, 0 ); assert( connections != NULL ); - if(s < 0) { + if(s == AC_SOCKET_INVALID) { return NULL; } #ifndef HAVE_WINSOCK - assert( connections[s].c_struct_state == SLAP_C_USED ); - assert( connections[s].c_conn_state != SLAP_C_INVALID ); - assert( ber_pvt_sb_in_use( connections[s].c_sb ) ); - c = &connections[s]; + + assert( c->c_struct_state != SLAP_C_UNINITIALIZED ); + #else + c = NULL; { - int i; + ber_socket_t i; for(i=0; i unused by resched, + * so don't assert details here. + */ if( ber_pvt_sb_get_desc( connections[i].c_sb ) == s ) { c = &connections[i]; @@ -184,13 +232,35 @@ static Connection* connection_get( int s ) #endif if( c != NULL ) { - /* we do this BEFORE locking to aid in debugging */ + ldap_pvt_thread_mutex_lock( &c->c_mutex ); + + if( c->c_struct_state != SLAP_C_USED ) { + /* connection must have been closed due to resched */ + + assert( c->c_conn_state == SLAP_C_INVALID ); + assert( !ber_pvt_sb_in_use( c->c_sb ) ); + + Debug( LDAP_DEBUG_TRACE, + "connection_get(%d): connection not used.\n", + s, c->c_connid, 0 ); + + ldap_pvt_thread_mutex_unlock( &c->c_mutex ); + return NULL; + } + Debug( LDAP_DEBUG_TRACE, "connection_get(%d): got connid=%ld\n", s, c->c_connid, 0 ); - ldap_pvt_thread_mutex_lock( &c->c_mutex ); + c->c_n_get++; + + assert( c->c_struct_state == SLAP_C_USED ); + assert( c->c_conn_state != SLAP_C_INVALID ); + assert( ber_pvt_sb_in_use( c->c_sb ) ); + + c->c_activitytime = slap_get_time(); } + return c; } @@ -200,15 +270,30 @@ static void connection_return( Connection *c ) } long connection_init( - int s, - const char* name, - const char* addr) + ber_socket_t s, + const char* url, + const char* dnsname, + const char* peername, + const char* sockname, + int use_tls ) { - long id; + unsigned long id; Connection *c; + assert( connections != NULL ); - if( s < 0 ) { + assert( dnsname != NULL ); + assert( peername != NULL ); + assert( sockname != NULL ); + +#ifndef HAVE_TLS + assert( !use_tls ); +#endif + + if( s == AC_SOCKET_INVALID ) { + Debug( LDAP_DEBUG_ANY, + "connection_init(%ld): invalid.\n", + (long) s, 0, 0 ); return -1; } @@ -224,7 +309,9 @@ long connection_init( #else { - int i; + unsigned int i; + + c = NULL; for( i=0; i < dtblsize; i++) { if( connections[i].c_struct_state == SLAP_C_UNINITIALIZED ) { @@ -245,6 +332,9 @@ long connection_init( } if( c == NULL ) { + Debug( LDAP_DEBUG_ANY, + "connection_init(%d): connection table full (%d/%d).\n", + s, i, dtblsize); ldap_pvt_thread_mutex_unlock( &connections_mutex ); return -1; } @@ -258,10 +348,16 @@ long connection_init( if( c->c_struct_state == SLAP_C_UNINITIALIZED ) { c->c_dn = NULL; c->c_cdn = NULL; - c->c_client_name = NULL; - c->c_client_addr = NULL; + + c->c_listener_url = NULL; + c->c_peer_domain = NULL; + c->c_peer_name = NULL; + c->c_sock_name = NULL; + c->c_ops = NULL; c->c_pending_ops = NULL; + c->c_authmech = NULL; + c->c_authstate = NULL; c->c_sb = ber_sockbuf_alloc( ); @@ -278,30 +374,38 @@ long connection_init( assert( c->c_struct_state == SLAP_C_UNUSED ); assert( c->c_dn == NULL ); assert( c->c_cdn == NULL ); - assert( c->c_client_name == NULL ); - assert( c->c_client_addr == 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_authmech == NULL ); + assert( c->c_authstate == NULL ); - c->c_client_name = ch_strdup( name == NULL ? "" : name ); - c->c_client_addr = ch_strdup( addr ); + 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_n_ops_received = 0; -#ifdef LDAP_COUNTERS c->c_n_ops_executing = 0; c->c_n_ops_pending = 0; c->c_n_ops_completed = 0; -#endif - c->c_starttime = slap_get_time(); + c->c_n_get = 0; + c->c_n_read = 0; + c->c_n_write = 0; + + c->c_activitytime = c->c_starttime = slap_get_time(); ber_pvt_sb_set_desc( c->c_sb, s ); ber_pvt_sb_set_io( c->c_sb, &ber_pvt_sb_io_tcp, NULL ); if( ber_pvt_sb_set_nonblock( c->c_sb, 1 ) < 0 ) { Debug( LDAP_DEBUG_ANY, - "connection_init(%d, %s, %s): set nonblocking failed\n", - s, c->c_client_name, c->c_client_addr); + "connection_init(%d, %s): set nonblocking failed\n", + s, c->c_peer_name,0 ); } id = c->c_connid = conn_nextid++; @@ -309,29 +413,38 @@ long connection_init( c->c_conn_state = SLAP_C_INACTIVE; c->c_struct_state = SLAP_C_USED; +#ifdef HAVE_TLS + if ( use_tls ) { + c->c_is_tls = 1; + c->c_needs_tls_accept = 1; + } +#endif + ldap_pvt_thread_mutex_unlock( &c->c_mutex ); ldap_pvt_thread_mutex_unlock( &connections_mutex ); + backend_connection_init(c); + return id; } static void connection_destroy( Connection *c ) { + /* note: connections_mutex should be locked by caller */ + 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 ); - ldap_pvt_thread_mutex_lock( &connections_mutex ); - c->c_struct_state = SLAP_C_UNUSED; - c->c_conn_state = SLAP_C_INVALID; + backend_connection_destroy(c); - c->c_version = 0; c->c_protocol = 0; + c->c_connid = -1; - c->c_starttime = 0; + c->c_activitytime = c->c_starttime = 0; if(c->c_dn != NULL) { free(c->c_dn); @@ -341,19 +454,35 @@ connection_destroy( Connection *c ) free(c->c_cdn); c->c_cdn = NULL; } - if(c->c_client_name != NULL) { - free(c->c_client_name); - c->c_client_name = 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) { + free(c->c_peer_name); + c->c_peer_name = NULL; } - if(c->c_client_addr != NULL) { - free(c->c_client_addr); - c->c_client_addr = NULL; + if(c->c_sock_name != NULL) { + free(c->c_sock_name); + c->c_sock_name = NULL; + } + if(c->c_authmech != NULL ) { + free(c->c_authmech); + c->c_authmech = NULL; + } + if(c->c_authstate != NULL ) { + free(c->c_authstate); + c->c_authstate = NULL; } if ( ber_pvt_sb_in_use(c->c_sb) ) { int sd = ber_pvt_sb_get_desc(c->c_sb); - slapd_remove( sd ); + slapd_remove( sd, 0 ); ber_pvt_sb_close( c->c_sb ); Statslog( LDAP_DEBUG_STATS, @@ -362,12 +491,15 @@ connection_destroy( Connection *c ) } ber_pvt_sb_destroy( c->c_sb ); - ldap_pvt_thread_mutex_unlock( &connections_mutex ); + + c->c_conn_state = SLAP_C_INVALID; + c->c_struct_state = SLAP_C_UNUSED; } int connection_state_closing( Connection *c ) { - /* connection must be locked by caller */ + /* c_mutex must be locked by caller */ + int state; assert( c != NULL ); assert( c->c_struct_state == SLAP_C_USED ); @@ -379,6 +511,27 @@ int connection_state_closing( Connection *c ) return state == SLAP_C_CLOSING; } +static void connection_abandon( Connection *c ) +{ + /* c_mutex must be locked by caller */ + + Operation *o; + + for( o = c->c_ops; o != NULL; o = o->o_next ) { + ldap_pvt_thread_mutex_lock( &o->o_abandonmutex ); + 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 ) ) + { + slap_op_free( o ); + } +} + void connection_closing( Connection *c ) { assert( connections != NULL ); @@ -386,8 +539,9 @@ void connection_closing( Connection *c ) assert( c->c_struct_state == SLAP_C_USED ); assert( c->c_conn_state != SLAP_C_INVALID ); + /* c_mutex must be locked by caller */ + if( c->c_conn_state != SLAP_C_CLOSING ) { - Operation *o; Debug( LDAP_DEBUG_TRACE, "connection_closing: readying conn=%ld sd=%d for close.\n", @@ -402,19 +556,7 @@ void connection_closing( Connection *c ) /* shutdown I/O -- not yet implemented */ /* abandon active operations */ - for( o = c->c_ops; o != NULL; o = o->o_next ) { - ldap_pvt_thread_mutex_lock( &o->o_abandonmutex ); - 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 ) ) - { - slap_op_free( o ); - } + connection_abandon( c ); /* wake write blocked operations */ slapd_clr_write( ber_pvt_sb_get_desc(c->c_sb), 1 ); @@ -429,6 +571,8 @@ static void connection_close( Connection *c ) assert( c->c_struct_state == SLAP_C_USED ); assert( c->c_conn_state == SLAP_C_CLOSING ); + /* note: connections_mutex and c_mutex should be locked by caller */ + if( c->c_ops != NULL ) { Debug( LDAP_DEBUG_TRACE, "connection_close: deferring conn=%ld sd=%d.\n", @@ -443,9 +587,9 @@ static void connection_close( Connection *c ) connection_destroy( c ); } -long connections_nextid(void) +unsigned long connections_nextid(void) { - long id; + unsigned long id; assert( connections != NULL ); ldap_pvt_thread_mutex_lock( &connections_mutex ); @@ -457,23 +601,23 @@ long connections_nextid(void) return id; } -Connection* connection_first(void) +Connection* connection_first( ber_socket_t *index ) { assert( connections != NULL ); + assert( index != NULL ); ldap_pvt_thread_mutex_lock( &connections_mutex ); - assert( conn_index == -1 ); - conn_index = 0; + *index = 0; - return connection_next(NULL); + return connection_next(NULL, index); } -Connection* connection_next(Connection *c) +Connection* connection_next( Connection *c, ber_socket_t *index ) { assert( connections != NULL ); - assert( conn_index != -1 ); - assert( conn_index <= dtblsize ); + assert( index != NULL ); + assert( *index <= dtblsize ); if( c != NULL ) { ldap_pvt_thread_mutex_unlock( &c->c_mutex ); @@ -481,9 +625,9 @@ Connection* connection_next(Connection *c) c = NULL; - for(; conn_index < dtblsize; conn_index++) { - if( connections[conn_index].c_struct_state == SLAP_C_UNINITIALIZED ) { - assert( connections[conn_index].c_conn_state == SLAP_C_INVALID ); + for(; *index < dtblsize; (*index)++) { + if( connections[*index].c_struct_state == SLAP_C_UNINITIALIZED ) { + assert( connections[*index].c_conn_state == SLAP_C_INVALID ); #ifndef HAVE_WINSOCK continue; #else @@ -491,14 +635,14 @@ Connection* connection_next(Connection *c) #endif } - if( connections[conn_index].c_struct_state == SLAP_C_USED ) { - assert( connections[conn_index].c_conn_state != SLAP_C_INVALID ); - c = &connections[conn_index++]; + if( connections[*index].c_struct_state == SLAP_C_USED ) { + assert( connections[*index].c_conn_state != SLAP_C_INVALID ); + c = &connections[(*index)++]; break; } - assert( connections[conn_index].c_struct_state == SLAP_C_UNUSED ); - assert( connections[conn_index].c_conn_state == SLAP_C_INVALID ); + assert( connections[*index].c_struct_state == SLAP_C_UNUSED ); + assert( connections[*index].c_conn_state == SLAP_C_INVALID ); } if( c != NULL ) { @@ -508,17 +652,14 @@ Connection* connection_next(Connection *c) return c; } -void connection_done(Connection *c) +void connection_done( Connection *c ) { assert( connections != NULL ); - assert( conn_index != -1 ); - assert( conn_index <= dtblsize ); if( c != NULL ) { ldap_pvt_thread_mutex_unlock( &c->c_mutex ); } - conn_index = -1; ldap_pvt_thread_mutex_unlock( &connections_mutex ); } @@ -531,79 +672,76 @@ void connection_done(Connection *c) static void * connection_operation( void *arg_v ) { + int rc; struct co_arg *arg = arg_v; - int tag = arg->co_op->o_tag; + ber_tag_t tag = arg->co_op->o_tag; Connection *conn = arg->co_conn; -#ifdef LDAP_COUNTERS ldap_pvt_thread_mutex_lock( &num_ops_mutex ); num_ops_initiated++; ldap_pvt_thread_mutex_unlock( &num_ops_mutex ); -#endif switch ( tag ) { case LDAP_REQ_BIND: - do_bind( conn, arg->co_op ); + rc = do_bind( conn, arg->co_op ); break; -#ifdef LDAP_COMPAT30 - case LDAP_REQ_UNBIND_30: -#endif case LDAP_REQ_UNBIND: - do_unbind( conn, arg->co_op ); + rc = do_unbind( conn, arg->co_op ); break; case LDAP_REQ_ADD: - do_add( conn, arg->co_op ); + rc = do_add( conn, arg->co_op ); break; -#ifdef LDAP_COMPAT30 - case LDAP_REQ_DELETE_30: -#endif case LDAP_REQ_DELETE: - do_delete( conn, arg->co_op ); + rc = do_delete( conn, arg->co_op ); break; case LDAP_REQ_MODRDN: - do_modrdn( conn, arg->co_op ); + rc = do_modrdn( conn, arg->co_op ); break; case LDAP_REQ_MODIFY: - do_modify( conn, arg->co_op ); + rc = do_modify( conn, arg->co_op ); break; case LDAP_REQ_COMPARE: - do_compare( conn, arg->co_op ); + rc = do_compare( conn, arg->co_op ); break; case LDAP_REQ_SEARCH: - do_search( conn, arg->co_op ); + rc = do_search( conn, arg->co_op ); break; -#ifdef LDAP_COMPAT30 - case LDAP_REQ_ABANDON_30: -#endif case LDAP_REQ_ABANDON: - do_abandon( conn, arg->co_op ); + rc = do_abandon( conn, arg->co_op ); + break; + + case LDAP_REQ_EXTENDED: + rc = do_extended( conn, arg->co_op ); break; default: - Debug( LDAP_DEBUG_ANY, "unknown request 0x%lx\n", - arg->co_op->o_tag, 0, 0 ); + Debug( LDAP_DEBUG_ANY, "unknown LDAP request 0x%lx\n", + tag, 0, 0 ); + arg->co_op->o_tag = LBER_ERROR; + send_ldap_disconnect( conn, arg->co_op, + LDAP_PROTOCOL_ERROR, "unknown LDAP request" ); + rc = -1; break; } -#ifdef LDAP_COUNTERS + if( rc == -1 ) tag = LBER_ERROR; + ldap_pvt_thread_mutex_lock( &num_ops_mutex ); num_ops_completed++; ldap_pvt_thread_mutex_unlock( &num_ops_mutex ); -#endif ldap_pvt_thread_mutex_lock( &conn->c_mutex ); -#ifdef LDAP_COUNTERS + conn->c_n_ops_executing--; conn->c_n_ops_completed++; -#endif slap_op_remove( &conn->c_ops, arg->co_op ); slap_op_free( arg->co_op ); @@ -613,10 +751,9 @@ connection_operation( void *arg_v ) arg = NULL; switch( tag ) { -#ifdef LDAP_COMPAT30 - case LDAP_REQ_UNBIND_30: -#endif + case LBER_ERROR: case LDAP_REQ_UNBIND: + /* c_mutex is locked */ connection_closing( conn ); break; @@ -624,14 +761,7 @@ connection_operation( void *arg_v ) if( conn->c_conn_state == SLAP_C_BINDING) { conn->c_conn_state = SLAP_C_ACTIVE; } - } - - if( conn->c_conn_state == SLAP_C_CLOSING ) { - Debug( LDAP_DEBUG_TRACE, - "connection_operation: attempting closing conn=%ld sd=%d.\n", - conn->c_connid, ber_pvt_sb_get_desc( conn->c_sb ), 0 ); - - connection_close( conn ); + conn->c_bind_in_progress = ( rc == LDAP_SASL_BIND_IN_PROGRESS ); } ldap_pvt_thread_mutex_lock( &active_threads_mutex ); @@ -648,7 +778,7 @@ connection_operation( void *arg_v ) return NULL; } -int connection_read(int s) +int connection_read(ber_socket_t s) { int rc = 0; Connection *c; @@ -656,15 +786,22 @@ int connection_read(int s) ldap_pvt_thread_mutex_lock( &connections_mutex ); + /* get (locked) connection */ c = connection_get( s ); + if( c == NULL ) { Debug( LDAP_DEBUG_ANY, - "connection_read(%d): no connection!\n", - s, 0, 0 ); + "connection_read(%ld): no connection!\n", + (long) s, 0, 0 ); + + slapd_remove(s, 0); + ldap_pvt_thread_mutex_unlock( &connections_mutex ); return -1; } + c->c_n_read++; + if( c->c_conn_state == SLAP_C_CLOSING ) { Debug( LDAP_DEBUG_TRACE, "connection_read(%d): closing, ignoring input for id=%ld\n", @@ -679,6 +816,27 @@ int connection_read(int s) "connection_read(%d): checking for input on id=%ld\n", s, c->c_connid, 0 ); +#ifdef HAVE_TLS + if ( c->c_is_tls && c->c_needs_tls_accept ) { + rc = ldap_pvt_tls_accept( c->c_sb, NULL ); + if ( rc < 0 ) { + Debug( LDAP_DEBUG_TRACE, + "connection_read(%d): TLS accept error error=%d id=%ld, closing.\n", + s, rc, c->c_connid ); + + c->c_needs_tls_accept = 0; + /* connections_mutex and c_mutex are locked */ + connection_closing( c ); + connection_close( c ); + } else if ( rc == 0 ) { + c->c_needs_tls_accept = 0; + } + connection_return( c ); + ldap_pvt_thread_mutex_unlock( &connections_mutex ); + return 0; + } +#endif + #define CONNECTION_INPUT_LOOP 1 #ifdef DATA_READY_LOOP @@ -687,6 +845,7 @@ int connection_read(int s) while(!rc) #endif { + /* How do we do this without getting into a busy loop ? */ rc = connection_input( c ); } @@ -695,10 +854,15 @@ int connection_read(int s) "connection_read(%d): input error=%d id=%ld, closing.\n", s, rc, c->c_connid ); + /* connections_mutex and c_mutex are locked */ connection_closing( c ); connection_close( c ); } + if ( ber_pvt_sb_needs_read( c->c_sb ) ) + slapd_set_read( s, 1 ); + if ( ber_pvt_sb_needs_write( c->c_sb ) ) + slapd_set_write( s, 1 ); connection_return( c ); ldap_pvt_thread_mutex_unlock( &connections_mutex ); return 0; @@ -710,8 +874,9 @@ connection_input( ) { Operation *op; - unsigned long tag, len; - long msgid; + ber_tag_t tag; + ber_len_t len; + ber_int_t msgid; BerElement *ber; if ( conn->c_currentber == NULL && (conn->c_currentber = ber_alloc()) @@ -765,11 +930,10 @@ connection_input( return -1; } -#ifdef LDAP_COMPAT30 - if ( conn->c_version == 30 ) { - (void) ber_skip_tag( ber, &len ); + if(tag == LDAP_REQ_BIND) { + /* immediately abandon all exiting operations upon BIND */ + connection_abandon( conn ); } -#endif op = slap_op_alloc( ber, msgid, tag, conn->c_n_ops_received++ ); @@ -777,9 +941,11 @@ connection_input( || conn->c_conn_state == SLAP_C_CLOSING ) { Debug( LDAP_DEBUG_ANY, "deferring operation\n", 0, 0, 0 ); + conn->c_n_ops_pending++; slap_op_add( &conn->c_pending_ops, op ); } else { + conn->c_n_ops_executing++; connection_op_activate( conn, op ); } @@ -799,6 +965,15 @@ connection_resched( Connection *conn ) { Operation *op; + if( conn->c_conn_state == SLAP_C_CLOSING ) { + Debug( LDAP_DEBUG_TRACE, + "connection_resched: attempting closing conn=%ld sd=%d.\n", + conn->c_connid, ber_pvt_sb_get_desc( conn->c_sb ), 0 ); + + connection_close( conn ); + return 0; + } + if( conn->c_conn_state != SLAP_C_ACTIVE ) { /* other states need different handling */ return 0; @@ -811,6 +986,9 @@ connection_resched( Connection *conn ) /* pending operations should not be marked for abandonment */ assert(!op->o_abandon); + conn->c_n_ops_pending--; + conn->c_n_ops_executing++; + connection_op_activate( conn, op ); if ( conn->c_conn_state == SLAP_C_BINDING ) { @@ -825,7 +1003,11 @@ static int connection_op_activate( Connection *conn, Operation *op ) struct co_arg *arg; char *tmpdn; int status; - unsigned long tag = op->o_tag; + ber_tag_t tag = op->o_tag; + + if(tag == LDAP_REQ_BIND) { + conn->c_conn_state = SLAP_C_BINDING; + } if ( conn->c_dn != NULL ) { tmpdn = ch_strdup( conn->c_dn ); @@ -837,16 +1019,22 @@ static int connection_op_activate( Connection *conn, Operation *op ) arg->co_conn = conn; arg->co_op = op; + arg->co_op->o_bind_in_progress = conn->c_bind_in_progress; + arg->co_op->o_dn = ch_strdup( tmpdn != NULL ? tmpdn : "" ); - arg->co_op->o_ndn = dn_normalize_case( ch_strdup( arg->co_op->o_dn ) ); + arg->co_op->o_ndn = ch_strdup( arg->co_op->o_dn ); + (void) dn_normalize_case( arg->co_op->o_ndn ); - slap_op_add( &conn->c_ops, arg->co_op ); + arg->co_op->o_protocol = conn->c_protocol; + arg->co_op->o_connid = conn->c_connid; - if(tag == LDAP_REQ_BIND) { - conn->c_conn_state = SLAP_C_BINDING; - } + arg->co_op->o_authtype = conn->c_authtype; + arg->co_op->o_authmech = conn->c_authmech != NULL + ? ch_strdup( conn->c_authmech ) : NULL; + + slap_op_add( &conn->c_ops, arg->co_op ); - if ( tmpdn != NULL ) { + if( tmpdn != NULL ) { free( tmpdn ); } @@ -867,7 +1055,7 @@ static int connection_op_activate( Connection *conn, Operation *op ) return status; } -int connection_write(int s) +int connection_write(ber_socket_t s) { Connection *c; assert( connections != NULL ); @@ -875,20 +1063,30 @@ int connection_write(int s) ldap_pvt_thread_mutex_lock( &connections_mutex ); c = connection_get( s ); + + slapd_clr_write( s, 0); + if( c == NULL ) { Debug( LDAP_DEBUG_ANY, - "connection_write(%d): no connection!\n", - s, 0, 0 ); + "connection_write(%ld): no connection!\n", + (long) s, 0, 0 ); + slapd_remove(s, 0); ldap_pvt_thread_mutex_unlock( &connections_mutex ); return -1; } + c->c_n_write++; + Debug( LDAP_DEBUG_TRACE, "connection_write(%d): waking output for id=%ld\n", s, c->c_connid, 0 ); ldap_pvt_thread_cond_signal( &c->c_write_cv ); + if ( ber_pvt_sb_needs_read( c->c_sb ) ) + slapd_set_read( s, 1 ); + if ( ber_pvt_sb_needs_write( c->c_sb ) ) + slapd_set_write( s, 1 ); connection_return( c ); ldap_pvt_thread_mutex_unlock( &connections_mutex ); return 0;