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

diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index b08d679298..4745076706 100644
--- a/servers/slapd/operation.c
+++ b/servers/slapd/operation.c
@@ -1,6 +1,12 @@
 /* operation.c - routines to deal with pending ldap operations */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
+#include "slapi_common.h"
 
 #include <stdio.h>
 
@@ -8,70 +14,67 @@
 #include <ac/socket.h>
 
 #include "slap.h"
+#include "slapi.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( LDAP_STAILQ_NEXT(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_dn.bv_val != NULL ) {
+		free( op->o_dn.bv_val );
+	}
+	if ( op->o_ndn.bv_val != NULL ) {
+		free( op->o_ndn.bv_val );
+	}
+	if ( op->o_authmech.bv_val != NULL ) {
+		free( op->o_authmech.bv_val );
+	}
+	if ( op->o_ctrls != NULL ) {
+		ldap_controls_free( op->o_ctrls );
+	}
+
+#ifdef LDAP_CLIENT_UPDATE
+	if ( op->o_clientupdate_state.bv_val != NULL ) {
+		free( op->o_clientupdate_state.bv_val );
+	}
+#endif /* LDAP_CLIENT_UPDATE */
+
+#if defined( LDAP_SLAPI )
+	if ( op->o_pb != NULL ) {
+		slapi_pblock_destroy( (Slapi_PBlock *)op->o_pb );
+	}
+#endif /* defined( LDAP_SLAPI ) */
+
 	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	**tmp;
-
-	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 );
-}
+	Operation	*op;
 
-void
-op_delete( Operation **olist, Operation *op )
-{
-	Operation	**tmp;
+	op = (Operation *) ch_calloc( 1, sizeof(Operation) );
 
-	for ( tmp = olist; *tmp != NULL && *tmp != op; tmp = &(*tmp)->o_next )
-		;	/* NULL */
+	op->o_ber = ber;
+	op->o_msgid = msgid;
+	op->o_tag = tag;
 
-	if ( *tmp == NULL ) {
-		Debug( LDAP_DEBUG_ANY, "op_delete: can't find op %d\n",
-		    op->o_msgid, 0, 0 );
-		return; 
-	}
+	op->o_time = slap_get_time();
+	op->o_opid = id;
+
+#if defined( LDAP_SLAPI )
+	op->o_pb = slapi_pblock_new();
+#endif /* defined( LDAP_SLAPI ) */
 
-	*tmp = (*tmp)->o_next;
-	op_free( op );
+	return( op );
 }