/* 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"
void
slap_op_free( Operation *op )
{
- ldap_pvt_thread_mutex_lock( &op->o_abandonmutex );
+ 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 );
+ if ( op->o_dn.bv_val != NULL ) {
+ free( op->o_dn.bv_val );
}
- if ( op->o_ndn != NULL ) {
- free( op->o_ndn );
+ 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 );
}
- ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex );
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 **tmp;
+ Operation *op;
- for ( tmp = olist; *tmp != NULL; tmp = &(*tmp)->o_next )
- ; /* NULL */
+ op = (Operation *) ch_calloc( 1, sizeof(Operation) );
- *tmp = (Operation *) ch_calloc( 1, sizeof(Operation) );
+ ldap_pvt_thread_mutex_init( &op->o_abandonmutex );
- ldap_pvt_thread_mutex_init( &(*tmp)->o_abandonmutex );
- (*tmp)->o_ber = ber;
- (*tmp)->o_msgid = msgid;
- (*tmp)->o_tag = tag;
- (*tmp)->o_abandon = 0;
+ op->o_ber = ber;
+ op->o_msgid = msgid;
+ op->o_tag = tag;
+
+ op->o_time = slap_get_time();
+ op->o_opid = id;
+
+ return( op );
+}
+
+#if 0
+int slap_op_add(
+ Operation **olist,
+ Operation *op
+)
+{
+ Operation **tmp;
- (*tmp)->o_dn = ch_strdup( dn != NULL ? dn : "" );
- (*tmp)->o_ndn = dn_normalize_case( ch_strdup( (*tmp)->o_dn ) );
+ for ( tmp = olist; *tmp != NULL; tmp = &(*tmp)->o_next )
+ ; /* NULL */
- ldap_pvt_thread_mutex_lock( ¤ttime_mutex );
- (*tmp)->o_time = currenttime;
- ldap_pvt_thread_mutex_unlock( ¤ttime_mutex );
- (*tmp)->o_opid = id;
- (*tmp)->o_connid = connid;
- (*tmp)->o_next = NULL;
+ *tmp = op;
- return( *tmp );
+ return 0;
}
-void
-slap_op_delete( Operation **olist, Operation *op )
+int
+slap_op_remove( Operation **olist, Operation *op )
{
Operation **tmp;
; /* 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 );
- slap_op_free( op );
- 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;
}
+#endif