X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fabandon.c;h=b092d124f338f2c1d2713d7a0fe672af46949edd;hb=62139b6ef3634529c6d1ff726c337e685ea38cf8;hp=5678589bb9658871383bc171862c78e3ce0a4252;hpb=f9db1ea88905734aef29cac9eb6bfffd5420e14e;p=openldap

diff --git a/servers/slapd/abandon.c b/servers/slapd/abandon.c
index 5678589bb9..b092d124f3 100644
--- a/servers/slapd/abandon.c
+++ b/servers/slapd/abandon.c
@@ -1,4 +1,9 @@
 /* abandon.c - decode and handle an ldap abandon operation */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 /*
  * Copyright (c) 1995 Regents of the University of Michigan.
@@ -19,7 +24,7 @@
 
 #include "slap.h"
 
-void
+int
 do_abandon(
     Connection	*conn,
     Operation	*op
@@ -27,9 +32,14 @@ do_abandon(
 {
 	ber_int_t		id;
 	Operation	*o;
-	Operation	**oo;
+	int rc;
 
+#ifdef NEW_LOGGING
+	LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY, "conn: %d do_abandon\n",
+		conn->c_connid));
+#else
 	Debug( LDAP_DEBUG_TRACE, "do_abandon\n", 0, 0, 0 );
+#endif
 
 	/*
 	 * Parse the abandon request.  It looks like this:
@@ -38,54 +48,73 @@ do_abandon(
 	 */
 
 	if ( ber_scanf( op->o_ber, "i", &id ) == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG(( "operation", LDAP_LEVEL_ERR, 
+		       "conn: %d do_abandon: ber_scanf failed\n",
+		       conn->c_connid ));
+#else
 		Debug( LDAP_DEBUG_ANY, "do_abandon: ber_scanf failed\n", 0, 0 ,0 );
-		return;
+#endif
+		send_ldap_disconnect( conn, op,
+			LDAP_PROTOCOL_ERROR, "decoding error" );
+		return -1;
 	}
 
-#ifdef GET_CTRLS
-	if( get_ctrls( conn, op, 0 ) == -1 ) {
+	if( (rc = get_ctrls( conn, op, 0 )) != LDAP_SUCCESS ) {
 		Debug( LDAP_DEBUG_ANY, "do_abandon: get_ctrls failed\n", 0, 0 ,0 );
-		return;
+		return rc;
 	} 
+
+#ifdef NEW_LOGGING
+	LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
+		"do_abandon: conn: %d  id=%ld\n", conn->c_connid, (long) id ));
+#else
+	Debug( LDAP_DEBUG_ARGS, "do_abandon: id=%ld\n", (long) id, 0 ,0 );
 #endif
 
-	Debug( LDAP_DEBUG_ARGS, "do_abandon: id %d\n", id, 0 ,0 );
+	if( id <= 0 ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+		    "do_abandon: conn: %d bad msgid %ld\n", conn->c_connid, (long) id ));
+#else
+		Debug( LDAP_DEBUG_ANY,
+			"do_abandon: bad msgid %ld\n", (long) id, 0, 0 );
+#endif
+		return LDAP_SUCCESS;
+	}
 
+	ldap_pvt_thread_mutex_lock( &conn->c_mutex );
 	/*
 	 * find the operation being abandoned and set the o_abandon
 	 * flag.  It's up to the backend to periodically check this
 	 * flag and abort the operation at a convenient time.
 	 */
 
-	ldap_pvt_thread_mutex_lock( &conn->c_mutex );
-
-	for ( o = conn->c_ops; o != NULL; o = o->o_next ) {
+	LDAP_STAILQ_FOREACH( o, &conn->c_ops, o_next ) {
 		if ( o->o_msgid == id ) {
-			ldap_pvt_thread_mutex_lock( &o->o_abandonmutex );
 			o->o_abandon = 1;
-			ldap_pvt_thread_mutex_unlock( &o->o_abandonmutex );
-
-			goto found_it;
+			goto done;
 		}
 	}
 
-	for ( oo = &conn->c_pending_ops;
-		(*oo != NULL) && ((*oo)->o_msgid != id);
-		oo = &(*oo)->o_next )
-	{
-		/* EMPTY */ ;
-	}
-
-	if( *oo != NULL ) {
-		o = *oo;
-		*oo = (*oo)->o_next;
-		slap_op_free( o );
-
-		goto found_it;
+	LDAP_STAILQ_FOREACH( o, &conn->c_pending_ops, o_next ) {
+		if ( o->o_msgid == id ) {
+			LDAP_STAILQ_REMOVE( &conn->c_pending_ops, o, slap_op, o_next );
+			slap_op_free( o );
+			goto done;
+		}
 	}
 
-	Debug( LDAP_DEBUG_TRACE, "do_abandon: op not found\n", 0, 0, 0 );
-
-found_it:
+done:
 	ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+
+#ifdef NEW_LOGGING
+	LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
+		"do_abandon: conn: %d op=%ld %sfound\n",
+		conn->c_connid, (long)id, o ? "" : "not " ));
+#else
+	Debug( LDAP_DEBUG_TRACE, "do_abandon: op=%ld %sfound\n",
+		(long) id, o ? "" : "not ", 0 );
+#endif
+	return LDAP_SUCCESS;
 }