X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fcancel.c;h=84d5deb9d93f0f8a86e8d624ef88a5a683491566;hb=ef7f5f5e32e6e0f129aee7fa1626017a7dadcb48;hp=96bd7300b51159797e490bb667f7c7b7fa25bdbe;hpb=0c43007e554d2427ae97d3592e2b4d4a30e96051;p=openldap
diff --git a/servers/slapd/cancel.c b/servers/slapd/cancel.c
index 96bd7300b5..84d5deb9d9 100644
--- a/servers/slapd/cancel.c
+++ b/servers/slapd/cancel.c
@@ -1,14 +1,23 @@
/* cancel.c - LDAP cancel extended operation */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2011 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
*/
#include "portable.h"
#include
-#include
#include
#include
#include
@@ -18,96 +27,129 @@
#include
#include
-int cancel_extop(
- Connection *conn,
- Operation *op,
- const char *reqoid,
- struct berval *reqdata,
- char **rspoid,
- struct berval **rspdata,
- LDAPControl ***rspctrls,
- const char **text,
- BerVarray *refs )
+const struct berval slap_EXOP_CANCEL = BER_BVC(LDAP_EXOP_CANCEL);
+
+int cancel_extop( Operation *op, SlapReply *rs )
{
- Backend *be;
+ Operation *o;
int rc;
- int found = 0;
int opid;
BerElement *ber;
- assert( reqoid != NULL );
- assert( strcmp( LDAP_EXOP_X_CANCEL, reqoid ) == 0 );
+ assert( ber_bvcmp( &slap_EXOP_CANCEL, &op->ore_reqoid ) == 0 );
- if ( reqdata == NULL ) {
- *text = "no message ID supplied";
+ if ( op->ore_reqdata == NULL ) {
+ rs->sr_text = "no message ID supplied";
return LDAP_PROTOCOL_ERROR;
}
- ber = ber_init( reqdata );
+ ber = ber_init( op->ore_reqdata );
if ( ber == NULL ) {
- *text = "internal error";
+ rs->sr_text = "internal error";
return LDAP_OTHER;
}
if ( ber_scanf( ber, "{i}", &opid ) == LBER_ERROR ) {
- *text = "message ID parse failed";
+ rs->sr_text = "message ID parse failed";
return LDAP_PROTOCOL_ERROR;
}
(void) ber_free( ber, 1 );
+ Statslog( LDAP_DEBUG_STATS, "%s CANCEL msg=%d\n",
+ op->o_log_prefix, opid, 0, 0, 0 );
+
if ( opid < 0 ) {
- *text = "message ID invalid";
+ rs->sr_text = "message ID invalid";
return LDAP_PROTOCOL_ERROR;
}
- ldap_pvt_thread_mutex_lock( &conn->c_mutex );
- LDAP_STAILQ_FOREACH( op, &conn->c_pending_ops, o_next ) {
- if ( op->o_msgid == opid ) {
- LDAP_STAILQ_REMOVE( &conn->c_pending_ops, op, slap_op, o_next );
- slap_op_free( op );
- found = 1;
- break;
- }
+ ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
+
+ if ( op->o_abandon ) {
+ /* FIXME: Should instead reject the cancel/abandon of this op, but
+ * it seems unsafe to reset op->o_abandon once it is set. ITS#6138.
+ */
+ rc = LDAP_OPERATIONS_ERROR;
+ rs->sr_text = "tried to abandon or cancel this operation";
+ goto out;
}
- ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
- if ( found )
- return LDAP_SUCCESS;
+ LDAP_STAILQ_FOREACH( o, &op->o_conn->c_pending_ops, o_next ) {
+ if ( o->o_msgid == opid ) {
+ /* TODO: We could instead remove the cancelled operation
+ * from c_pending_ops like Abandon does, and send its
+ * response here. Not if it is pending because of a
+ * congested connection though.
+ */
+ rc = LDAP_CANNOT_CANCEL;
+ rs->sr_text = "too busy for Cancel, try Abandon instead";
+ goto out;
+ }
+ }
- found = 0;
- ldap_pvt_thread_mutex_lock( &conn->c_mutex );
- LDAP_STAILQ_FOREACH( op, &conn->c_ops, o_next ) {
- if ( op->o_msgid == opid ) {
- found = 1;
+ LDAP_STAILQ_FOREACH( o, &op->o_conn->c_ops, o_next ) {
+ if ( o->o_msgid == opid ) {
break;
}
}
- if ( !found ) {
- *text = "message ID not found";
- ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
- return LDAP_NO_SUCH_OPERATION;
- }
+ if ( o == NULL ) {
+ rc = LDAP_NO_SUCH_OPERATION;
+ rs->sr_text = "message ID not found";
- if ( op->o_cancel != LDAP_CANCEL_NONE ) {
- *text = "message ID already being cancelled";
- ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
- return LDAP_PROTOCOL_ERROR;
- }
+ } else if ( o->o_tag == LDAP_REQ_BIND
+ || o->o_tag == LDAP_REQ_UNBIND
+ || o->o_tag == LDAP_REQ_ABANDON ) {
+ rc = LDAP_CANNOT_CANCEL;
- op->o_cancel = LDAP_CANCEL_REQ;
- ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+ } else if ( o->o_cancel != SLAP_CANCEL_NONE ) {
+ rc = LDAP_OPERATIONS_ERROR;
+ rs->sr_text = "message ID already being cancelled";
- while ( op->o_cancel == LDAP_CANCEL_REQ ) {
- ldap_pvt_thread_yield();
- }
+#if 0
+ } else if ( o->o_abandon ) {
+ /* TODO: Would this break something when
+ * o_abandon="suppress response"? (ITS#6138)
+ */
+ rc = LDAP_TOO_LATE;
+#endif
- if ( op->o_cancel == LDAP_CANCEL_ACK ) {
- rc = LDAP_SUCCESS;
} else {
- rc = op->o_cancel;
- op->o_cancel = LDAP_CANCEL_NOTDONE;
+ rc = LDAP_SUCCESS;
+ o->o_cancel = SLAP_CANCEL_REQ;
+ o->o_abandon = 1;
+ }
+
+ out:
+ ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
+
+ if ( rc == LDAP_SUCCESS ) {
+ LDAP_STAILQ_FOREACH( op->o_bd, &backendDB, be_next ) {
+ if( !op->o_bd->be_cancel ) continue;
+
+ op->oq_cancel.rs_msgid = opid;
+ if ( op->o_bd->be_cancel( op, rs ) == LDAP_SUCCESS ) {
+ return LDAP_SUCCESS;
+ }
+ }
+
+ do {
+ /* Fake a cond_wait with thread_yield, then
+ * verify the result properly mutex-protected.
+ */
+ while ( o->o_cancel == SLAP_CANCEL_REQ )
+ ldap_pvt_thread_yield();
+ ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
+ rc = o->o_cancel;
+ ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
+ } while ( rc == SLAP_CANCEL_REQ );
+
+ if ( rc == SLAP_CANCEL_ACK ) {
+ rc = LDAP_SUCCESS;
+ }
+
+ o->o_cancel = SLAP_CANCEL_DONE;
}
return rc;