Use queue-compat for Connection->c_ops,c_pending_ops

diff --git a/servers/slapd/abandon.c b/servers/slapd/abandon.c
index e0f40f5fe1b7979ccacc1815690d96f7d1220cb3..4ac9d0ebbaa325564fe3d8222c3e505f2f2c7e76 100644 (file)
--- a/servers/slapd/abandon.c
+++ b/servers/slapd/abandon.c
@@ -91,7 +91,7 @@ do_abandon(
         * flag and abort the operation at a convenient time.
         */
 
-       for ( o = conn->c_ops; o != NULL; o = o->o_next ) {
+       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;
@@ -102,16 +102,13 @@ do_abandon(
                }
        }
 
-       for ( oo = &conn->c_pending_ops;
-               (*oo != NULL) && ((*oo)->o_msgid != id);
-               oo = &(*oo)->o_next )
-       {
-               /* EMPTY */ ;
+       STAILQ_FOREACH( o, &conn->c_pending_ops, o_next ) {
+               if ( o->o_msgid == id )
+                       break;
        }
 
-       if( *oo != NULL ) {
-               o = *oo;
-               *oo = (*oo)->o_next;
+       if( o != NULL ) {
+               STAILQ_REMOVE( &conn->c_pending_ops, o, slap_op, o_next );
                slap_op_free( o );
                notfound = 0;
        }

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 15f71ebbf193103cf6a23ae93f67d0a02fd8e79e..de09e7a2a26b7df83b1a0f56703c977d2fc5f4ce 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -425,8 +425,8 @@ long connection_init(
                c->c_peer_name = NULL;
                c->c_sock_name = NULL;
 
-               c->c_ops = NULL;
-               c->c_pending_ops = NULL;
+               STAILQ_INIT(&c->c_ops);
+               STAILQ_INIT(&c->c_pending_ops);
 
                c->c_sasl_bind_mech = NULL;
                c->c_sasl_context = NULL;
@@ -461,8 +461,8 @@ long connection_init(
     assert( c->c_peer_domain == NULL );
     assert( c->c_peer_name == NULL );
     assert( c->c_sock_name == NULL );
-    assert( c->c_ops == NULL );
-    assert( c->c_pending_ops == NULL );
+    assert( STAILQ_EMPTY(&c->c_ops) );
+    assert( STAILQ_EMPTY(&c->c_pending_ops) );
        assert( c->c_sasl_bind_mech == NULL );
        assert( c->c_sasl_context == NULL );
        assert( c->c_sasl_extra == NULL );
@@ -621,7 +621,7 @@ connection_destroy( Connection *c )
     assert( c != NULL );
     assert( c->c_struct_state != SLAP_C_UNUSED );
     assert( c->c_conn_state != SLAP_C_INVALID );
-    assert( c->c_ops == NULL );
+    assert( STAILQ_EMPTY(&c->c_ops) );
 
     backend_connection_destroy(c);
 
@@ -720,17 +720,16 @@ static void connection_abandon( Connection *c )
 
        Operation *o;
 
-       for( o = c->c_ops; o != NULL; o = o->o_next ) {
+       STAILQ_FOREACH(o, &c->c_ops, o_next) {
                ldap_pvt_thread_mutex_lock( &o->o_abandonmutex );
                o->o_abandon = 1;
                ldap_pvt_thread_mutex_unlock( &o->o_abandonmutex );
        }
 
        /* remove pending operations */
-       for( o = slap_op_pop( &c->c_pending_ops );
-               o != NULL;
-               o = slap_op_pop( &c->c_pending_ops ) )
-       {
+       while ( (o = STAILQ_FIRST( &c->c_pending_ops )) != NULL) {
+               STAILQ_REMOVE_HEAD( &c->c_pending_ops, o_next );
+               STAILQ_NEXT(o, o_next) = NULL;
                slap_op_free( o );
        }
 }
@@ -784,7 +783,7 @@ static void connection_close( Connection *c )
        /* note: connections_mutex and c_mutex should be locked by caller */
 
        ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_GET_FD, &sd );
-       if( c->c_ops != NULL ) {
+       if( !STAILQ_EMPTY(&c->c_ops) ) {
 #ifdef NEW_LOGGING
                LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
                           "connection_close: conn %d  deferring sd %d\n",
@@ -987,7 +986,8 @@ operations_error:
        conn->c_n_ops_executing--;
        conn->c_n_ops_completed++;
 
-       slap_op_remove( &conn->c_ops, arg->co_op );
+       STAILQ_REMOVE( &conn->c_ops, arg->co_op, slap_op, o_next);
+       STAILQ_NEXT(arg->co_op, o_next) = NULL;
        slap_op_free( arg->co_op );
        arg->co_op = NULL;
        arg->co_conn = NULL;
@@ -1351,7 +1351,7 @@ connection_input(
                Debug( LDAP_DEBUG_ANY, "deferring operation\n", 0, 0, 0 );
 #endif
                conn->c_n_ops_pending++;
-               slap_op_add( &conn->c_pending_ops, op );
+               STAILQ_INSERT_TAIL( &conn->c_pending_ops, op, o_next );
 
        } else {
                conn->c_n_ops_executing++;
@@ -1434,10 +1434,9 @@ connection_resched( Connection *conn )
                return 0;
        }
 
-       for( op = slap_op_pop( &conn->c_pending_ops );
-               op != NULL;
-               op = slap_op_pop( &conn->c_pending_ops ) )
-       {
+       while ((op = STAILQ_FIRST( &conn->c_pending_ops )) != NULL) {
+               STAILQ_REMOVE_HEAD( &conn->c_pending_ops, o_next );
+               STAILQ_NEXT(op, o_next) = NULL;
                /* pending operations should not be marked for abandonment */
                assert(!op->o_abandon);
 
@@ -1484,7 +1483,7 @@ static int connection_op_activate( Connection *conn, Operation *op )
        }
        arg->co_op->o_connid = conn->c_connid;
 
-       slap_op_add( &conn->c_ops, arg->co_op );
+       STAILQ_INSERT_TAIL( &conn->c_ops, arg->co_op, o_next );
 
        status = ldap_pvt_thread_pool_submit( &connection_pool,
                connection_operation, (void *) arg );
@@ -1587,9 +1586,8 @@ int connection_internal_open( Connection **conn, LDAP **ldp, const char *id )
        op->o_protocol = LDAP_VERSION3;
 
        (*conn) = connection_get( fd[1] );
-       (*conn)->c_ops = op;
-    (*conn)->c_conn_state = SLAP_C_ACTIVE;
-
+       STAILQ_INSERT_HEAD( &(*conn)->c_ops, op, o_next);
+       (*conn)->c_conn_state = SLAP_C_ACTIVE;
 
        /* Create the client side of the connection */
        rc = ldap_open_internal_connection( ldp, &(fd[0]) );
@@ -1607,9 +1605,10 @@ int connection_internal_open( Connection **conn, LDAP **ldp, const char *id )
 
 void connection_internal_close( Connection *conn )
 {
-       Operation *op = conn->c_ops;
+       Operation *op = STAILQ_FIRST(&conn->c_ops);
 
-       slap_op_remove( &conn->c_ops, op );
+       STAILQ_REMOVE_HEAD(&conn->c_ops, o_next);
+       STAILQ_NEXT(op, o_next) = NULL;
        slap_op_free( op );
        connection_closing( conn );
        connection_close( conn );

diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index 0dd9c1f334fdd7c2105ad7fe81016ab6416a9c79..9440784b4de5a274879630a4965befc7102ef9ac 100644 (file)
--- a/servers/slapd/operation.c
+++ b/servers/slapd/operation.c
@@ -18,7 +18,7 @@
 void
 slap_op_free( Operation *op )
 {
-       assert( op->o_next == NULL );
+       assert( STAILQ_NEXT(op, o_next) == NULL );
 
        if ( op->o_ber != NULL ) {
                ber_free( op->o_ber, 1 );
@@ -54,26 +54,18 @@ slap_op_alloc(
        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.bv_val = NULL;
-       op->o_dn.bv_len = 0;
-       op->o_ndn.bv_val = NULL;
-       op->o_ndn.bv_len = 0;
-       op->o_authmech = NULL;
-       op->o_ctrls = NULL;
-
        op->o_time = slap_get_time();
        op->o_opid = id;
-       op->o_next = NULL;
 
        return( op );
 }
 
+#if 0
 int slap_op_add(
     Operation          **olist,
        Operation               *op
@@ -127,4 +119,4 @@ Operation * slap_op_pop( Operation **olist )
 
        return tmp;
 }
-
+#endif

diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index ca64be45dda346361dcad3d8583a30cbf461638a..2b55104a17dd038956ecd094bca4c35e80eb1196 100644 (file)
--- a/servers/slapd/saslauthz.c
+++ b/servers/slapd/saslauthz.c
@@ -361,7 +361,7 @@ char *slap_sasl2dn( char *saslname )
        if( rc != LDAP_SUCCESS )
                goto FINISHED;
 
-       (*be->be_search)( be, conn, conn->c_ops, /*base*/NULL, &searchbase,
+       (*be->be_search)( be, conn, STAILQ_FIRST(&conn->c_ops), /*base*/NULL, &searchbase,
           scope, /*deref=*/1, /*sizelimit=*/1, /*time=*/0, filter, /*fstr=*/NULL,
           /*attrs=*/NULL, /*attrsonly=*/0 );
 
@@ -491,7 +491,7 @@ int slap_sasl_match( char *rule, char *assertDN, char *authc )
        if( rc != LDAP_SUCCESS )
                goto CONCLUDED;
 
-       (*be->be_search)( be, conn, conn->c_ops, /*base=*/NULL, &searchbase,
+       (*be->be_search)( be, conn, STAILQ_FIRST(&conn->c_ops), /*base=*/NULL, &searchbase,
           scope, /*deref=*/1, /*sizelimit=*/0, /*time=*/0, filter, /*fstr=*/NULL,
           /*attrs=*/NULL, /*attrsonly=*/0 );
 

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 1216151f0ef207c14d3353996011666b69126b16..7e2e9527d95e91cb3d1dd68d0380b51d11da8611 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -32,6 +32,7 @@
 #include <ldap_schema.h>
 
 #include "ldap_pvt_thread.h"
+#include "queue-compat.h"
 
 LDAP_BEGIN_DECL
 
@@ -1285,7 +1286,7 @@ typedef struct slap_op {
        slap_response   *o_response;    /* callback function */
        slap_sresult    *o_sresult;     /* search result callback */
 
-       struct slap_op  *o_next;        /* next operation in list         */
+       STAILQ_ENTRY(slap_op)   o_next; /* next operation in list         */
        void    *o_private;     /* anything the backend needs     */
        void    *o_glue;        /* for the glue backend */
 } Operation;
@@ -1339,8 +1340,8 @@ typedef struct slap_conn {
 
        ber_int_t       c_protocol;     /* version of the LDAP protocol used by client */
 
-       Operation       *c_ops;                 /* list of operations being processed */
-       Operation       *c_pending_ops; /* list of pending operations */
+       STAILQ_HEAD(c_o, slap_op) c_ops;        /* list of operations being processed */
+       STAILQ_HEAD(c_po, slap_op) c_pending_ops;       /* list of pending operations */
 
        ldap_pvt_thread_mutex_t c_write_mutex;  /* only one pdu written at a time */
        ldap_pvt_thread_cond_t  c_write_cv;             /* used to wait for sd write-ready*/

diff --git a/servers/slapd/starttls.c b/servers/slapd/starttls.c
index 0e258e9708dd018e10e386aff1e782d249df08c4..225aa60dd43185cf0a2960215bf8cbaa32d6bb33 100644 (file)
--- a/servers/slapd/starttls.c
+++ b/servers/slapd/starttls.c
@@ -52,11 +52,12 @@ starttls_extop (
        }
 
        /* can't start TLS if there are other op's around */
-       if (( conn->c_ops != NULL &&
-                       (conn->c_ops != op || op->o_next != NULL)) ||
-               ( conn->c_pending_ops != NULL))
+       if (( !STAILQ_EMPTY(&conn->c_ops) &&
+                       (STAILQ_FIRST(&conn->c_ops) != op ||
+                       STAILQ_NEXT(op, o_next) != NULL)) ||
+               ( !STAILQ_EMPTY(&conn->c_pending_ops) ))
        {
-               *text = "cannot start TLS when operations our outstanding";
+               *text = "cannot start TLS when operations are outstanding";
                rc = LDAP_OPERATIONS_ERROR;
                goto done;
        }