X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foperation.c;h=4ca92d801b7ac8a5b48242b4fcf97f1c23d167cb;hb=f90ed5aef8f41ee90e1f67b0badbb793cb99f3ed;hp=b08d67929840f6e0a4b5f326664aef1d23b04529;hpb=2a869f5a99f537b246ba8640502e2a86117cb6e8;p=openldap

diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index b08d679298..4ca92d801b 100644
--- a/servers/slapd/operation.c
+++ b/servers/slapd/operation.c
@@ -9,30 +9,67 @@
 
 #include "slap.h"
 
-extern time_t		currenttime;
-extern pthread_mutex_t	currenttime_mutex;
 
 void
-op_free( Operation *op )
+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 *
-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;
@@ -40,26 +77,13 @@ 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 = 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
-op_delete( Operation **olist, Operation *op )
+int
+slap_op_remove( Operation **olist, Operation *op )
 {
 	Operation	**tmp;
 
@@ -67,11 +91,26 @@ op_delete( Operation **olist, Operation *op )
 		;	/* NULL */
 
 	if ( *tmp == NULL ) {
-		Debug( LDAP_DEBUG_ANY, "op_delete: can't find op %d\n",
+		Debug( LDAP_DEBUG_ANY, "op_delete: can't find op %ld\n",
 		    op->o_msgid, 0, 0 );
-		return; 
+		return -1; 
 	}
 
 	*tmp = (*tmp)->o_next;
-	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;
+}
+