X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foperation.c;h=159b57278c7fd4c6498a2b46eecede80f63f5197;hb=78066c08c0650e5b1e7e205946d409e3dd10e73b;hp=47d084d6b494a5c818a82a9fb15bd1649e504a87;hpb=d0516836b57d967d2ae604deef528f5f55518d7a;p=openldap

diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index 47d084d6b4..159b57278c 100644
--- a/servers/slapd/operation.c
+++ b/servers/slapd/operation.c
@@ -1,4 +1,9 @@
 /* operation.c - routines to deal with pending ldap operations */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
@@ -13,24 +18,63 @@
 void
 slap_op_free( Operation *op )
 {
-	if ( op->o_ber != NULL )
+	assert( op->o_next == NULL );
+
+	if ( op->o_ber != NULL ) {
 		ber_free( op->o_ber, 1 );
+	}
 	if ( op->o_dn != NULL ) {
 		free( op->o_dn );
 	}
-	/* pthread_mutex_destroy( &op->o_abandonmutex ); */
+	if ( op->o_ndn != NULL ) {
+		free( op->o_ndn );
+	}
+	if ( op->o_authmech != NULL ) {
+		free( op->o_authmech );
+	}
+	if ( op->o_ctrls != NULL ) {
+		ldap_controls_free( op->o_ctrls );
+	}
+
+	ldap_pvt_thread_mutex_destroy( &op->o_abandonmutex );
+
 	free( (char *) op );
 }
 
 Operation *
-slap_op_add(
-    Operation		**olist,
+slap_op_alloc(
     BerElement		*ber,
-    unsigned long	msgid,
-    unsigned long	tag,
-    char			*dn,
-    int				id,
-    int				connid
+    ber_int_t	msgid,
+    ber_tag_t	tag,
+    ber_int_t	id
+)
+{
+	Operation	*op;
+
+	op = (Operation *) ch_calloc( 1, sizeof(Operation) );
+
+	ldap_pvt_thread_mutex_init( &op->o_abandonmutex );
+	op->o_abandon = 0;
+
+	op->o_ber = ber;
+	op->o_msgid = msgid;
+	op->o_tag = tag;
+
+	op->o_dn = NULL;
+	op->o_ndn = NULL;
+	op->o_authmech = NULL;
+	op->o_ctrls = NULL;
+
+	op->o_time = slap_get_time();
+	op->o_opid = id;
+	op->o_next = NULL;
+
+	return( op );
+}
+
+int slap_op_add(
+    Operation		**olist,
+	Operation		*op
 )
 {
 	Operation	**tmp;
@@ -38,26 +82,13 @@ slap_op_add(
 	for ( tmp = olist; *tmp != NULL; tmp = &(*tmp)->o_next )
 		;	/* NULL */
 
-	*tmp = (Operation *) calloc( 1, sizeof(Operation) );
-	pthread_mutex_init( &(*tmp)->o_abandonmutex,
-	    pthread_mutexattr_default );
-	(*tmp)->o_ber = ber;
-	(*tmp)->o_msgid = msgid;
-	(*tmp)->o_tag = tag;
-	(*tmp)->o_abandon = 0;
-	(*tmp)->o_dn = ch_strdup( dn != NULL ? dn : "" );
-	pthread_mutex_lock( &currenttime_mutex );
-	(*tmp)->o_time = currenttime;
-	pthread_mutex_unlock( &currenttime_mutex );
-	(*tmp)->o_opid = id;
-	(*tmp)->o_connid = connid;
-	(*tmp)->o_next = NULL;
-
-	return( *tmp );
+	*tmp = op;
+
+	return 0;
 }
 
-void
-slap_op_delete( Operation **olist, Operation *op )
+int
+slap_op_remove( Operation **olist, Operation *op )
 {
 	Operation	**tmp;
 
@@ -65,11 +96,33 @@ slap_op_delete( Operation **olist, Operation *op )
 		;	/* NULL */
 
 	if ( *tmp == NULL ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+			   "slap_op_remove: can't find op %ld.\n",
+			   (long)op->o_msgid ));
+#else
 		Debug( LDAP_DEBUG_ANY, "op_delete: can't find op %ld\n",
-		    op->o_msgid, 0, 0 );
-		return; 
+		       (long) op->o_msgid, 0, 0 );
+#endif
+
+		return -1; 
 	}
 
 	*tmp = (*tmp)->o_next;
-	slap_op_free( op );
+	op->o_next = NULL;
+
+	return 0;
 }
+
+Operation * slap_op_pop( Operation **olist )
+{
+	Operation *tmp = *olist;
+
+	if(tmp != NULL) {
+		*olist = tmp->o_next;
+		tmp->o_next = NULL;
+	}
+
+	return tmp;
+}
+