cleanup comments

[openldap] / servers / slapd / connection.c

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 6425e199f2561e28e8e49ebfa1dca01f64d001f4..e59d4f047b695f617fb1d0198fcaaeb2b4116ba6 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -60,6 +60,8 @@ static int connection_resched( Connection *conn );
 static void connection_abandon( Connection *conn );
 static void connection_destroy( Connection *c );
 
+static ldap_pvt_thread_start_t connection_operation;
+
 struct co_arg {
        Connection      *co_conn;
        Operation       *co_op;
@@ -74,8 +76,8 @@ int connections_init(void)
 
        if( connections != NULL) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
-                          "connections_init:  already initialized.\n" ));
+               LDAP_LOG( CONNECTION, INFO,
+                          "connections_init:  already initialized.\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "connections_init: already initialized.\n",
                        0, 0, 0 );
@@ -90,9 +92,9 @@ int connections_init(void)
 
        if( connections == NULL ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
-                          "connections_init: allocation (%d * %ld) of connection array failed\n",
-                          dtblsize, (long) sizeof(Connection) ));
+               LDAP_LOG( CONNECTION, ERR,
+                          "connections_init: allocation (%d * %ld) of connection "
+                          "array failed\n", dtblsize, (long) sizeof(Connection), 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "connections_init: allocation (%d*%ld) of connection array failed\n",
@@ -123,8 +125,8 @@ int connections_destroy(void)
 
        if( connections == NULL) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
-                          "connections_destroy: nothing to destroy.\n"));
+               LDAP_LOG( CONNECTION, INFO,
+                          "connections_destroy: nothing to destroy.\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "connections_destroy: nothing to destroy.\n",
                        0, 0, 0 );
@@ -208,8 +210,7 @@ static Connection* connection_get( ber_socket_t s )
        Connection *c;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "connection", LDAP_LEVEL_ENTRY,
-                  "connection_get: socket %ld\n", (long)s ));
+       LDAP_LOG( CONNECTION, ENTRY, "connection_get: socket %ld\n", (long)s, 0, 0 );
 #else
        Debug( LDAP_DEBUG_ARGS,
                "connection_get(%ld)\n",
@@ -273,8 +274,8 @@ static Connection* connection_get( ber_socket_t s )
                        assert( sd == AC_SOCKET_INVALID );
 
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "connection", LDAP_LEVEL_ARGS,
-                                  "connection_get:  connection %d not used\n", s ));
+                       LDAP_LOG( CONNECTION, ARGS, 
+                               "connection_get:  connection %d not used\n", s, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_TRACE,
                                "connection_get(%d): connection not used\n",
@@ -286,8 +287,8 @@ static Connection* connection_get( ber_socket_t s )
                }
 
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "connection", LDAP_LEVEL_RESULTS,
-                          "connection_get: get for %d got connid %lu\n", s, c->c_connid ));
+               LDAP_LOG( CONNECTION, RESULTS, 
+                       "connection_get: get for %d got connid %lu\n", s, c->c_connid, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "connection_get(%d): got connid=%lu\n",
@@ -342,8 +343,8 @@ long connection_init(
 
        if( s == AC_SOCKET_INVALID ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
-                          "connection_init: init of socket %ld invalid.\n", (long)s ));
+               LDAP_LOG( CONNECTION, INFO, 
+                          "connection_init: init of socket %ld invalid.\n", (long)s, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                       "connection_init(%ld): invalid.\n",
@@ -394,9 +395,9 @@ long connection_init(
 
        if( c == NULL ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
+               LDAP_LOG( CONNECTION, INFO, 
                           "connection_init: skt %d      connection table full (%d/%d)\n",
-                          s, i, dtblsize ));
+                          s, i, dtblsize );
 #else
                Debug( LDAP_DEBUG_ANY,
                                "connection_init(%d): connection table full (%d/%d)\n",
@@ -435,6 +436,7 @@ long connection_init(
                c->c_sasl_bind_mech.bv_len = 0;
                c->c_sasl_context = NULL;
                c->c_sasl_extra = NULL;
+               c->c_sasl_bindop = NULL;
 
                c->c_sb = ber_sockbuf_alloc( );
 
@@ -469,6 +471,7 @@ long connection_init(
        assert( c->c_sasl_bind_mech.bv_val == NULL );
        assert( c->c_sasl_context == NULL );
        assert( c->c_sasl_extra == NULL );
+       assert( c->c_sasl_bindop == NULL );
        assert( c->c_currentber == NULL );
 
        ber_str2bv( url, 0, 1, &c->c_listener_url );
@@ -529,9 +532,9 @@ long connection_init(
                c /* non-NULL */ ) < 0 )
        {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
+               LDAP_LOG( CONNECTION, INFO, 
                           "connection_init: conn %lu  set nonblocking failed\n",
-                          c->c_connid ));
+                          c->c_connid, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "connection_init(%d, %s): set nonblocking failed\n",
@@ -753,9 +756,9 @@ void connection_closing( Connection *c )
 
                ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_GET_FD, &sd );
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
+               LDAP_LOG( CONNECTION, DETAIL1, 
                           "connection_closing: conn %lu readying socket %d for close.\n",
-                          c->c_connid, sd ));
+                          c->c_connid, sd, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "connection_closing: readying conn=%lu sd=%d for close\n",
@@ -790,9 +793,9 @@ static void connection_close( Connection *c )
        ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_GET_FD, &sd );
        if( !LDAP_STAILQ_EMPTY(&c->c_ops) ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
+               LDAP_LOG( CONNECTION, DETAIL1, 
                           "connection_close: conn %lu  deferring sd %d\n",
-                          c->c_connid, sd ));
+                          c->c_connid, sd, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "connection_close: deferring conn=%lu sd=%d\n",
@@ -802,9 +805,8 @@ static void connection_close( Connection *c )
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "connection", LDAP_LEVEL_RESULTS,
-                  "connection_close: conn %lu  sd %d\n",
-                  c->c_connid, sd ));
+       LDAP_LOG( CONNECTION, RESULTS, 
+                  "connection_close: conn %lu  sd %d\n", c->c_connid, sd, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "connection_close: conn=%lu sd=%d\n",
                c->c_connid, sd, 0 );
@@ -906,7 +908,7 @@ void connection_done( Connection *c )
 #endif /* !SLAPD_MONITOR */
 
 static void *
-connection_operation( void *arg_v )
+connection_operation( void *ctx, void *arg_v )
 {
        int rc;
        struct co_arg   *arg = arg_v;
@@ -920,11 +922,13 @@ connection_operation( void *arg_v )
        num_ops_initiated++;
        ldap_pvt_thread_mutex_unlock( &num_ops_mutex );
 
+       arg->co_op->o_threadctx = ctx;
+
        if( conn->c_sasl_bind_in_progress && tag != LDAP_REQ_BIND ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
-                          "connection_operation: conn %lu  SASL bind in progress (tag=%ld).\n",
-                          conn->c_connid, (long)tag ));
+               LDAP_LOG( CONNECTION, ERR, 
+                       "connection_operation: conn %lu SASL bind in progress (tag=%ld).\n",
+                       conn->c_connid, (long)tag, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "connection_operation: "
                        "error: SASL bind in progress (tag=%ld).\n",
@@ -989,9 +993,9 @@ connection_operation( void *arg_v )
 
        default:
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
+               LDAP_LOG( CONNECTION, INFO, 
                           "connection_operation: conn %lu  unknown LDAP request 0x%lx\n",
-                          conn->c_connid, tag ));
+                          conn->c_connid, tag, 0  );
 #else
                Debug( LDAP_DEBUG_ANY, "unknown LDAP request 0x%lx\n",
                    tag, 0, 0 );
@@ -1087,6 +1091,7 @@ int connection_read(ber_socket_t s)
 {
        int rc = 0;
        Connection *c;
+
        assert( connections != NULL );
 
        ldap_pvt_thread_mutex_lock( &connections_mutex );
@@ -1096,9 +1101,8 @@ int connection_read(ber_socket_t s)
 
        if( c == NULL ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
-                          "connection_read: sock %ld no connection\n",
-                          (long)s ));
+               LDAP_LOG( CONNECTION, INFO, 
+                       "connection_read: sock %ld no connection\n", (long)s, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "connection_read(%ld): no connection!\n",
@@ -1114,9 +1118,9 @@ int connection_read(ber_socket_t s)
 
        if( c->c_conn_state == SLAP_C_CLOSING ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
-                          "connection_read: conn %lu connection closing, ignoring input\n",
-                          c->c_connid));
+               LDAP_LOG( CONNECTION, INFO, 
+                       "connection_read: conn %lu connection closing, ignoring input\n",
+                       c->c_connid, 0, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "connection_read(%d): closing, ignoring input for id=%lu\n",
@@ -1128,8 +1132,9 @@ int connection_read(ber_socket_t s)
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
-                  "connection_read: conn %lu  checking for input.\n", c->c_connid ));
+       LDAP_LOG( CONNECTION, DETAIL1, 
+                  "connection_read: conn %lu  checking for input.\n", 
+                  c->c_connid, 0, 0  );
 #else
        Debug( LDAP_DEBUG_TRACE,
                "connection_read(%d): checking for input on id=%lu\n",
@@ -1146,9 +1151,9 @@ int connection_read(ber_socket_t s)
 #endif
 
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
+                       LDAP_LOG( CONNECTION, ERR, 
                                   "connection_read: conn %lu  TLS accept error, error %d\n",
-                                  c->c_connid, rc ));
+                                  c->c_connid, rc, 0 );
 #else
                        Debug( LDAP_DEBUG_TRACE,
                                "connection_read(%d): TLS accept error "
@@ -1192,9 +1197,9 @@ int connection_read(ber_socket_t s)
                        rc = dnX509peerNormalize( ssl, &authid );
                        if ( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-                               LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
-                               "connection_read: conn %lu unable to get TLS client DN, error %d\n",
-                                       c->c_connid, rc));
+                               LDAP_LOG( CONNECTION, INFO, 
+                                       "connection_read: conn %lu unable to get TLS client DN, "
+                                       "error %d\n", c->c_connid, rc, 0 );
 #else
                                Debug( LDAP_DEBUG_TRACE,
                                "connection_read(%d): unable to get TLS client DN "
@@ -1225,9 +1230,9 @@ int connection_read(ber_socket_t s)
 
                if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
-                                  "connection_read: conn %lu SASL install error %d, closing\n",
-                                  c->c_connid, rc ));
+                       LDAP_LOG( CONNECTION, ERR, 
+                               "connection_read: conn %lu SASL install error %d, closing\n",
+                               c->c_connid, rc, 0 );
 #else
                        Debug( LDAP_DEBUG_TRACE,
                                "connection_read(%d): SASL install error "
@@ -1258,9 +1263,9 @@ int connection_read(ber_socket_t s)
 
        if( rc < 0 ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
-                          "connection_read: conn %lu  input error %d, closing.\n",
-                          c->c_connid, rc ));
+               LDAP_LOG( CONNECTION, ERR, 
+                       "connection_read: conn %lu  input error %d, closing.\n",
+                       c->c_connid, rc, 0 );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "connection_read(%d): input error=%d id=%lu, closing.\n",
@@ -1305,9 +1310,9 @@ connection_input(
        if ( conn->c_currentber == NULL && (conn->c_currentber = ber_alloc())
            == NULL ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
-                          "connection_input: conn %lu  ber_alloc failed.\n", 
-                          conn->c_connid ));
+               LDAP_LOG( CONNECTION, ERR, 
+                       "connection_input: conn %lu  ber_alloc failed.\n", 
+                       conn->c_connid, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "ber_alloc failed\n", 0, 0, 0 );
 #endif
@@ -1340,9 +1345,9 @@ connection_input(
                ber_sockbuf_ctrl( conn->c_sb, LBER_SB_OPT_GET_FD, &sd );
 
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
-                          "connection_input: conn %lu  ber_get_next failed, errno %d (%s).\n",
-                          conn->c_connid, err, sock_errstr(err) ));
+               LDAP_LOG( CONNECTION, ERR, 
+                       "connection_input: conn %lu  ber_get_next failed, errno %d (%s).\n",
+                       conn->c_connid, err, sock_errstr(err) );
 #else
                Debug( LDAP_DEBUG_TRACE,
                        "ber_get_next on fd %d failed errno=%d (%s)\n",
@@ -1364,9 +1369,9 @@ connection_input(
        if ( (tag = ber_get_int( ber, &msgid )) != LDAP_TAG_MSGID ) {
                /* log, close and send error */
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
-                          "connection_input: conn %lu  ber_get_int returns 0x%lx.\n",
-                          conn->c_connid, tag ));
+               LDAP_LOG( CONNECTION, ERR, 
+                       "connection_input: conn %lu  ber_get_int returns 0x%lx.\n",
+                       conn->c_connid, tag, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "ber_get_int returns 0x%lx\n", tag, 0,
                    0 );
@@ -1378,9 +1383,9 @@ connection_input(
        if ( (tag = ber_peek_tag( ber, &len )) == LBER_ERROR ) {
                /* log, close and send error */
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
+               LDAP_LOG( CONNECTION, ERR, 
                           "connection_input: conn %lu  ber_peek_tag returns 0x%lx.\n",
-                          conn->c_connid, tag ));
+                          conn->c_connid, tag, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "ber_peek_tag returns 0x%lx\n", tag, 0,
                    0 );
@@ -1398,9 +1403,9 @@ connection_input(
                }
                if (tag != LDAP_REQ_ABANDON && tag != LDAP_REQ_SEARCH) {
 #ifdef NEW_LOGGING
-                   LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
+                   LDAP_LOG( CONNECTION, ERR, 
                               "connection_input: conn %lu  invalid req for UDP 0x%lx.\n",
-                              conn->c_connid, tag ));
+                              conn->c_connid, tag, 0 );
 #else
                    Debug( LDAP_DEBUG_ANY, "invalid req for UDP 0x%lx\n", tag, 0,
                        0 );
@@ -1417,10 +1422,9 @@ connection_input(
 
        op = slap_op_alloc( ber, msgid, tag, conn->c_n_ops_received++ );
 
+       op->o_conn = conn;
        op->vrFilter = NULL;
-
        op->o_pagedresults_state = conn->c_pagedresults_state;
-
 #ifdef LDAP_CONNECTIONLESS
        op->o_peeraddr = peeraddr;
        if (cdn) {
@@ -1428,13 +1432,14 @@ connection_input(
            op->o_protocol = LDAP_VERSION2;
        }
 #endif
+
        if ( conn->c_conn_state == SLAP_C_BINDING
                || conn->c_conn_state == SLAP_C_CLOSING )
        {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
-                          "connection_input: conn %lu  deferring operation\n",
-                          conn->c_connid ));
+               LDAP_LOG( CONNECTION, INFO, 
+                       "connection_input: conn %lu  deferring operation\n",
+                       conn->c_connid, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "deferring operation\n", 0, 0, 0 );
 #endif
@@ -1472,9 +1477,9 @@ connection_resched( Connection *conn )
 
                if( rc ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
-                                  "connection_resched: conn %lu  reaquiring locks.\n",
-                                  conn->c_connid ));
+                       LDAP_LOG( CONNECTION, DETAIL1, 
+                               "connection_resched: conn %lu  reaquiring locks.\n",
+                               conn->c_connid, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_TRACE,
                                "connection_resched: reaquiring locks conn=%lu sd=%d\n",
@@ -1492,9 +1497,9 @@ connection_resched( Connection *conn )
 
                if( conn->c_conn_state != SLAP_C_CLOSING ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
-                                  "connection_resched: conn %lu  closed by other thread.\n",
-                                  conn->c_connid ));
+                       LDAP_LOG( CONNECTION, INFO, 
+                               "connection_resched: conn %lu  closed by other thread.\n",
+                               conn->c_connid, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_TRACE, "connection_resched: "
                                "closed by other thread conn=%lu sd=%d\n",
@@ -1502,9 +1507,9 @@ connection_resched( Connection *conn )
 #endif
                } else {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
-                                  "connection_resched: conn %lu  attempting closing.\n",
-                                  conn->c_connid ));
+                       LDAP_LOG( CONNECTION, DETAIL1, 
+                               "connection_resched: conn %lu  attempting closing.\n",
+                               conn->c_connid, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_TRACE, "connection_resched: "
                                "attempting closing conn=%lu sd=%d\n",
@@ -1577,9 +1582,9 @@ static int connection_op_activate( Connection *conn, Operation *op )
 
        if ( status != 0 ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
-                          "connection_op_activate: conn %lu     thread pool submit failed.\n",
-                          conn->c_connid ));
+               LDAP_LOG( CONNECTION, ERR, 
+                       "connection_op_activate: conn %lu        thread pool submit failed.\n",
+                       conn->c_connid, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                "ldap_pvt_thread_pool_submit failed (%d)\n", status, 0, 0 );
@@ -1593,6 +1598,7 @@ static int connection_op_activate( Connection *conn, Operation *op )
 int connection_write(ber_socket_t s)
 {
        Connection *c;
+
        assert( connections != NULL );
 
        ldap_pvt_thread_mutex_lock( &connections_mutex );
@@ -1603,8 +1609,8 @@ int connection_write(ber_socket_t s)
 
        if( c == NULL ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
-                          "connection_write: sock %ld  no connection!\n",(long)s));
+               LDAP_LOG( CONNECTION, ERR, 
+                       "connection_write: sock %ld  no connection!\n", (long)s, 0, 0);
 #else
                Debug( LDAP_DEBUG_ANY,
                        "connection_write(%ld): no connection!\n",
@@ -1618,9 +1624,8 @@ int connection_write(ber_socket_t s)
        c->c_n_write++;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
-                  "connection_write conn %lu  waking output.\n",
-                  c->c_connid ));
+       LDAP_LOG( CONNECTION, DETAIL1, 
+               "connection_write conn %lu  waking output.\n", c->c_connid, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE,
                "connection_write(%d): waking output for id=%lu\n",