Cleanup ISO C compatibility for recent commits

[openldap] / servers / slapd / cancel.c

diff --git a/servers/slapd/cancel.c b/servers/slapd/cancel.c
index d11ad6a001d7e859282b0372ea67646652c8d175..84d5deb9d93f0f8a86e8d624ef88a5a683491566 100644 (file)
--- a/servers/slapd/cancel.c
+++ b/servers/slapd/cancel.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2011 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -65,34 +65,66 @@ int cancel_extop( Operation *op, SlapReply *rs )
        }
 
        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_STAILQ_FOREACH( o, &op->o_conn->c_pending_ops, o_next ) {
                if ( o->o_msgid == opid ) {
-                       LDAP_STAILQ_REMOVE( &op->o_conn->c_pending_ops, o, Operation, o_next );
-                       LDAP_STAILQ_NEXT(o, o_next) = NULL;
-                       op->o_conn->c_n_ops_pending--;
-                       slap_op_free( o, NULL );
-                       ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
-                       return LDAP_SUCCESS;
+                       /* 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;
                }
        }
 
        LDAP_STAILQ_FOREACH( o, &op->o_conn->c_ops, o_next ) {
                if ( o->o_msgid == opid ) {
-                       o->o_abandon = 1;
                        break;
                }
        }
 
-       ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
+       if ( o == NULL ) {
+               rc = LDAP_NO_SUCH_OPERATION;
+               rs->sr_text = "message ID not found";
 
-       if ( o ) {
-               if ( o->o_cancel != SLAP_CANCEL_NONE ) {
-                       rs->sr_text = "message ID already being cancelled";
-                       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;
+
+       } else if ( o->o_cancel != SLAP_CANCEL_NONE ) {
+               rc = LDAP_OPERATIONS_ERROR;
+               rs->sr_text = "message ID already being cancelled";
 
+#if 0
+       } else if ( o->o_abandon ) {
+               /* TODO: Would this break something when
+                * o_abandon="suppress response"? (ITS#6138)
+                */
+               rc = LDAP_TOO_LATE;
+#endif
+
+       } else {
+               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;
 
@@ -102,20 +134,22 @@ int cancel_extop( Operation *op, SlapReply *rs )
                        }
                }
 
-               while ( o->o_cancel == SLAP_CANCEL_REQ ) {
-                       ldap_pvt_thread_yield();
-               }
+               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 ( o->o_cancel == SLAP_CANCEL_ACK ) {
+               if ( rc == SLAP_CANCEL_ACK ) {
                        rc = LDAP_SUCCESS;
-               } else {
-                       rc = o->o_cancel;
                }
 
                o->o_cancel = SLAP_CANCEL_DONE;
-       } else {
-               rs->sr_text = "message ID not found";
-               rc = LDAP_NO_SUCH_OPERATION;
        }
 
        return rc;