/* protected by connections_mutex */
static ldap_pvt_thread_mutex_t connections_mutex;
static Connection *connections = NULL;
-static long conn_nextid = 0;
+static unsigned long conn_nextid = 0;
/* structure state (protected by connections_mutex) */
#define SLAP_C_UNINITIALIZED 0x00 /* MUST BE ZERO (0) */
#define SLAP_C_BINDING 0x03 /* binding */
#define SLAP_C_CLOSING 0x04 /* closing */
-void slapd_remove(int s);
-static Connection* connection_get( int s );
+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 "?";
+}
+
+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;
*/
int connections_destroy(void)
{
- int i;
+ ber_socket_t i;
/* should check return of every call */
*/
int connections_shutdown(void)
{
- int i;
+ ber_socket_t i;
ldap_pvt_thread_mutex_lock( &connections_mutex );
return 0;
}
-static Connection* connection_get( int s )
+/*
+ * Timeout idle connections.
+ */
+int connections_timeout_idle(time_t now)
+{
+ 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 = NULL;
+ 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<dtblsize; i++) {
if( connections[i].c_struct_state == SLAP_C_UNINITIALIZED ) {
continue;
}
- assert( connections[i].c_struct_state == SLAP_C_USED );
- assert( connections[i].c_conn_state != SLAP_C_INVALID );
- assert( ber_pvt_sb_in_use( connections[i].c_sb ) );
+ /* state can actually change from used -> unused by resched,
+ * so don't assert details here.
+ */
if( ber_pvt_sb_get_desc( connections[i].c_sb ) == s ) {
c = &connections[i];
#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;
}
}
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(%d): invalid.\n",
- s, 0, 0 );
+ "connection_init(%ld): invalid.\n",
+ (long) s, 0, 0 );
return -1;
}
#else
{
- int i;
+ unsigned int i;
+
+ c = NULL;
for( i=0; i < dtblsize; i++) {
if( connections[i].c_struct_state == SLAP_C_UNINITIALIZED ) {
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( );
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++;
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;
}
assert( c->c_conn_state != SLAP_C_INVALID );
assert( c->c_ops == NULL );
- c->c_struct_state = SLAP_C_UNUSED;
- c->c_conn_state = SLAP_C_INVALID;
+ backend_connection_destroy(c);
-#ifdef LDAP_COMPAT30
- c->c_version = 0;
-#endif
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);
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_sock_name != NULL) {
+ free(c->c_sock_name);
+ c->c_sock_name = NULL;
}
- if(c->c_client_addr != NULL) {
- free(c->c_client_addr);
- c->c_client_addr = 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,
}
ber_pvt_sb_destroy( c->c_sb );
+
+ c->c_conn_state = SLAP_C_INVALID;
+ c->c_struct_state = SLAP_C_UNUSED;
}
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 );
/* 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",
/* 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 );
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 );
return id;
}
-Connection* connection_first( int *index )
+Connection* connection_first( ber_socket_t *index )
{
assert( connections != NULL );
assert( index != NULL );
return connection_next(NULL, index);
}
-Connection* connection_next( Connection *c, int *index )
+Connection* connection_next( Connection *c, ber_socket_t *index )
{
assert( connections != NULL );
assert( index != NULL );
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 );
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 );
if( conn->c_conn_state == SLAP_C_BINDING) {
conn->c_conn_state = SLAP_C_ACTIVE;
}
+ conn->c_bind_in_progress = ( rc == LDAP_SASL_BIND_IN_PROGRESS );
}
ldap_pvt_thread_mutex_lock( &active_threads_mutex );
return NULL;
}
-int connection_read(int s)
+int connection_read(ber_socket_t s)
{
int rc = 0;
Connection *c;
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",
"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
while(!rc)
#endif
{
+ /* How do we do this without getting into a busy loop ? */
rc = connection_input( 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;
)
{
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())
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++ );
|| 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 );
}
/* 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 ) {
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 );
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 );
}
return status;
}
-int connection_write(int s)
+int connection_write(ber_socket_t s)
{
Connection *c;
assert( connections != NULL );
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;
projects / openldap / blobdiff