Backout the input exhaustion change, it loops. Still looking for

[openldap] / servers / slapd / connection.c

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 0ff5d2a8cd67a09474f727c4a5d5198381612c72..a5476ad0b3022e9588698d6323cbfbdd06c5c479 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -273,12 +273,16 @@ long connection_init(
        ber_socket_t s,
        const char* name,
        const char* addr,
-       int use_tls)
+       int use_tls )
 {
        unsigned long id;
        Connection *c;
        assert( connections != NULL );
 
+#ifndef HAVE_TLS
+       assert( !use_tls );
+#endif
+
        if( s == AC_SOCKET_INVALID ) {
         Debug( LDAP_DEBUG_ANY,
                        "connection_init(%ld): invalid.\n",
@@ -394,10 +398,12 @@ long connection_init(
     c->c_conn_state = SLAP_C_INACTIVE;
     c->c_struct_state = SLAP_C_USED;
 
+#ifdef HAVE_TLS
     if ( use_tls ) {
            c->c_is_tls = 1;
            c->c_needs_tls_accept = 1;
     }
+#endif
 
     ldap_pvt_thread_mutex_unlock( &c->c_mutex );
     ldap_pvt_thread_mutex_unlock( &connections_mutex );
@@ -421,6 +427,7 @@ connection_destroy( Connection *c )
     backend_connection_destroy(c);
 
     c->c_protocol = 0;
+    c->c_connid = -1;
 
     c->c_activitytime = c->c_starttime = 0;
 
@@ -815,6 +822,7 @@ int connection_read(ber_socket_t s)
        while(!rc)
 #endif
        {
+               /* How do we do this without getting into a busy loop ? */
                rc = connection_input( c );
        }
 
@@ -828,6 +836,10 @@ int connection_read(ber_socket_t s)
                connection_close( c );
        }
 
+       if ( ber_pvt_sb_needs_read( c->c_sb ) )
+               slapd_set_read( s, 1 );
+       if ( ber_pvt_sb_needs_write( c->c_sb ) )
+               slapd_set_write( s, 1 );
        connection_return( c );
        ldap_pvt_thread_mutex_unlock( &connections_mutex );
        return 0;
@@ -990,6 +1002,7 @@ static int connection_op_activate( Connection *conn, Operation *op )
        arg->co_op->o_ndn = dn_normalize_case( ch_strdup( arg->co_op->o_dn ) );
 
        arg->co_op->o_protocol = conn->c_protocol;
+       arg->co_op->o_connid = conn->c_connid;
 
        arg->co_op->o_authtype = conn->c_authtype;
        arg->co_op->o_authmech = conn->c_authmech != NULL
@@ -1046,6 +1059,10 @@ int connection_write(ber_socket_t s)
 
        ldap_pvt_thread_cond_signal( &c->c_write_cv );
 
+       if ( ber_pvt_sb_needs_read( c->c_sb ) )
+               slapd_set_read( s, 1 );
+       if ( ber_pvt_sb_needs_write( c->c_sb ) )
+               slapd_set_write( s, 1 );
        connection_return( c );
        ldap_pvt_thread_mutex_unlock( &connections_mutex );
        return 0;