mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Abandon all operations upon receiving a BindRequest.

Browse Source
This commit is contained in:
Kurt Zeilenga 1999-07-02 21:42:53 +00:00
parent b7bbc7504d
commit daf40a51c1
1 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
servers/slapd/connection.c
View File

@ -49,6 +49,7 @@ static void connection_close( Connection *c );
static int connection_op_activate( Connection *conn, Operation *op ); static int connection_op_activate( Connection *conn, Operation *op );
static int connection_resched( Connection *conn ); static int connection_resched( Connection *conn );
static void connection_abandon( Connection *conn );
struct co_arg { struct co_arg {
Connection *co_conn; Connection *co_conn;
@ -473,6 +474,27 @@ int connection_state_closing( Connection *c )
return state == SLAP_C_CLOSING; 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 ) void connection_closing( Connection *c )
{ {
assert( connections != NULL ); assert( connections != NULL );
@ -483,7 +505,6 @@ void connection_closing( Connection *c )
/* c_mutex must be locked by caller */ /* c_mutex must be locked by caller */
if( c->c_conn_state != SLAP_C_CLOSING ) { if( c->c_conn_state != SLAP_C_CLOSING ) {
Operation *o;
Debug( LDAP_DEBUG_TRACE, Debug( LDAP_DEBUG_TRACE,
"connection_closing: readying conn=%ld sd=%d for close.\n", "connection_closing: readying conn=%ld sd=%d for close.\n",
@ -498,19 +519,7 @@ void connection_closing( Connection *c )
/* shutdown I/O -- not yet implemented */ /* shutdown I/O -- not yet implemented */
/* abandon active operations */ /* abandon active operations */
for( o = c->c_ops; o != NULL; o = o->o_next ) { connection_abandon( c );
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 );
}
/* wake write blocked operations */ /* wake write blocked operations */
slapd_clr_write( ber_pvt_sb_get_desc(c->c_sb), 1 ); slapd_clr_write( ber_pvt_sb_get_desc(c->c_sb), 1 );
@ -853,6 +862,11 @@ connection_input(
return -1; return -1;
} }
if(tag == LDAP_REQ_BIND) {
/* immediately abandon all exiting operations upon BIND */
connection_abandon( conn );
}
op = slap_op_alloc( ber, msgid, tag, conn->c_n_ops_received++ ); op = slap_op_alloc( ber, msgid, tag, conn->c_n_ops_received++ );
if ( conn->c_conn_state == SLAP_C_BINDING if ( conn->c_conn_state == SLAP_C_BINDING
@ -923,6 +937,10 @@ static int connection_op_activate( Connection *conn, Operation *op )
int status; int status;
ber_tag_t 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 ) { if ( conn->c_dn != NULL ) {
tmpdn = ch_strdup( conn->c_dn ); tmpdn = ch_strdup( conn->c_dn );
} else { } else {
@ -946,10 +964,6 @@ static int connection_op_activate( Connection *conn, Operation *op )
slap_op_add( &conn->c_ops, arg->co_op ); slap_op_add( &conn->c_ops, arg->co_op );
if(tag == LDAP_REQ_BIND) {
conn->c_conn_state = SLAP_C_BINDING;
}
if( tmpdn != NULL ) { if( tmpdn != NULL ) {
free( tmpdn ); free( tmpdn );
} }