Skip to content
Snippets Groups Projects
Commit 99ba95ab authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

cleanup

parent 72cfae72
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
servers/slapd/connection.c
+ 132
− 133
View file @ 99ba95ab
......@@ -78,7 +78,7 @@ int connections_init(void)
if( connections != NULL) {
#ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, INFO,
"connections_init: already initialized.\n", 0, 0, 0 );
"connections_init: already initialized.\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "connections_init: already initialized.\n",
0, 0, 0 );
......@@ -94,8 +94,8 @@ int connections_init(void)
if( connections == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, ERR,
"connections_init: allocation (%d * %ld) of connection "
"array failed\n", dtblsize, (long) sizeof(Connection), 0 );
"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",
......@@ -104,8 +104,8 @@ int connections_init(void)
return -1;
}
assert( connections[0].c_struct_state == SLAP_C_UNINITIALIZED );
assert( connections[dtblsize-1].c_struct_state == SLAP_C_UNINITIALIZED );
assert( connections[0].c_struct_state == SLAP_C_UNINITIALIZED );
assert( connections[dtblsize-1].c_struct_state == SLAP_C_UNINITIALIZED );
/*
* per entry initialization of the Connection array initialization
......@@ -127,7 +127,7 @@ int connections_destroy(void)
if( connections == NULL) {
#ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, INFO,
"connections_destroy: nothing to destroy.\n", 0, 0, 0 );
"connections_destroy: nothing to destroy.\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "connections_destroy: nothing to destroy.\n",
0, 0, 0 );
......@@ -292,7 +292,7 @@ static Connection* connection_get( ber_socket_t s )
#ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, ARGS,
"connection_get: connection %d not used\n", s, 0, 0 );
"connection_get: connection %d not used\n", s, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"connection_get(%d): connection not used\n",
......@@ -361,11 +361,10 @@ long connection_init(
if( s == AC_SOCKET_INVALID ) {
#ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, INFO,
"connection_init: init of socket %ld invalid.\n", (long)s, 0, 0 );
"connection_init: init of socket %ld invalid.\n", (long)s, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"connection_init(%ld): invalid.\n",
(long) s, 0, 0 );
"connection_init: init of socket %ld invalid.\n", (long)s, 0, 0 );
#endif
return -1;
}
......@@ -382,48 +381,49 @@ long connection_init(
#else
{
ber_socket_t i;
ber_socket_t i;
c = NULL;
for( i=0; i < dtblsize; i++) {
ber_socket_t sd;
for( i=0; i < dtblsize; i++) {
ber_socket_t sd;
if( connections[i].c_struct_state == SLAP_C_UNINITIALIZED ) {
assert( connections[i].c_sb == 0 );
c = &connections[i];
break;
}
if( connections[i].c_struct_state == SLAP_C_UNINITIALIZED ) {
assert( connections[i].c_sb == 0 );
c = &connections[i];
break;
}
sd = AC_SOCKET_INVALID;
if (connections[i].c_sb != NULL)
ber_sockbuf_ctrl( connections[i].c_sb, LBER_SB_OPT_GET_FD, &sd );
if( connections[i].c_struct_state == SLAP_C_UNUSED ) {
assert( sd == AC_SOCKET_INVALID );
c = &connections[i];
break;
}
if (connections[i].c_sb != NULL) {
ber_sockbuf_ctrl( connections[i].c_sb,
LBER_SB_OPT_GET_FD, &sd );
}
assert( connections[i].c_struct_state == SLAP_C_USED );
assert( connections[i].c_conn_state != SLAP_C_INVALID );
assert( sd != AC_SOCKET_INVALID );
}
if( connections[i].c_struct_state == SLAP_C_UNUSED ) {
assert( sd == AC_SOCKET_INVALID );
c = &connections[i];
break;
}
if( c == NULL ) {
assert( connections[i].c_struct_state == SLAP_C_USED );
assert( connections[i].c_conn_state != SLAP_C_INVALID );
assert( sd != AC_SOCKET_INVALID );
}
if( c == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, INFO,
"connection_init: skt %d connection table full "
"(%d/%d)\n", s, i, dtblsize );
LDAP_LOG( CONNECTION, INFO,
"connection_init(%d): connection table full "
"(%d/%d)\n", s, i, dtblsize );
#else
Debug( LDAP_DEBUG_ANY,
Debug( LDAP_DEBUG_ANY,
"connection_init(%d): connection table full "
"(%d/%d)\n", s, i, dtblsize);
#endif
ldap_pvt_thread_mutex_unlock( &connections_mutex );
return -1;
ldap_pvt_thread_mutex_unlock( &connections_mutex );
return -1;
}
}
}
#endif
assert( c != NULL );
......@@ -484,17 +484,17 @@ long connection_init(
c->c_struct_state = SLAP_C_UNUSED;
}
ldap_pvt_thread_mutex_lock( &c->c_mutex );
ldap_pvt_thread_mutex_lock( &c->c_mutex );
assert( c->c_struct_state == SLAP_C_UNUSED );
assert( c->c_authmech.bv_val == NULL );
assert( c->c_dn.bv_val == NULL );
assert( c->c_ndn.bv_val == NULL );
assert( c->c_listener == NULL );
assert( c->c_peer_domain.bv_val == NULL );
assert( c->c_peer_name.bv_val == NULL );
assert( LDAP_STAILQ_EMPTY(&c->c_ops) );
assert( LDAP_STAILQ_EMPTY(&c->c_pending_ops) );
assert( c->c_struct_state == SLAP_C_UNUSED );
assert( c->c_authmech.bv_val == NULL );
assert( c->c_dn.bv_val == NULL );
assert( c->c_ndn.bv_val == NULL );
assert( c->c_listener == NULL );
assert( c->c_peer_domain.bv_val == NULL );
assert( c->c_peer_name.bv_val == NULL );
assert( LDAP_STAILQ_EMPTY(&c->c_ops) );
assert( LDAP_STAILQ_EMPTY(&c->c_pending_ops) );
assert( c->c_sasl_bind_mech.bv_val == NULL );
assert( c->c_sasl_done == 0 );
assert( c->c_sasl_authctx == NULL );
......@@ -517,10 +517,10 @@ long connection_init(
ber_str2bv( dnsname, 0, 1, &c->c_peer_domain );
ber_str2bv( peername, 0, 1, &c->c_peer_name );
c->c_n_ops_received = 0;
c->c_n_ops_executing = 0;
c->c_n_ops_pending = 0;
c->c_n_ops_completed = 0;
c->c_n_ops_received = 0;
c->c_n_ops_executing = 0;
c->c_n_ops_pending = 0;
c->c_n_ops_completed = 0;
c->c_n_get = 0;
c->c_n_read = 0;
......@@ -570,8 +570,8 @@ long connection_init(
{
#ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, INFO,
"connection_init: conn %lu set nonblocking failed\n",
c->c_connid, 0, 0 );
"connection_init: conn %lu set nonblocking failed\n",
c->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"connection_init(%d, %s): set nonblocking failed\n",
......@@ -579,33 +579,33 @@ long connection_init(
#endif
}
id = c->c_connid = conn_nextid++;
id = c->c_connid = conn_nextid++;
c->c_conn_state = SLAP_C_INACTIVE;
c->c_struct_state = SLAP_C_USED;
c->c_conn_state = SLAP_C_INACTIVE;
c->c_struct_state = SLAP_C_USED;
c->c_ssf = c->c_transport_ssf = ssf;
c->c_tls_ssf = 0;
#ifdef HAVE_TLS
if ( flags == CONN_IS_TLS ) {
c->c_is_tls = 1;
c->c_needs_tls_accept = 1;
} else {
c->c_is_tls = 0;
c->c_needs_tls_accept = 0;
}
if ( flags == CONN_IS_TLS ) {
c->c_is_tls = 1;
c->c_needs_tls_accept = 1;
} else {
c->c_is_tls = 0;
c->c_needs_tls_accept = 0;
}
#endif
slap_sasl_open( c, 0 );
slap_sasl_external( c, ssf, authid );
ldap_pvt_thread_mutex_unlock( &c->c_mutex );
ldap_pvt_thread_mutex_unlock( &connections_mutex );
ldap_pvt_thread_mutex_unlock( &c->c_mutex );
ldap_pvt_thread_mutex_unlock( &connections_mutex );
backend_connection_init(c);
backend_connection_init(c);
return id;
return id;
}
void connection2anonymous( Connection *c )
......@@ -642,24 +642,24 @@ static void
connection_destroy( Connection *c )
{
/* note: connections_mutex should be locked by caller */
ber_socket_t sd;
unsigned long connid;
ber_socket_t sd;
unsigned long connid;
assert( connections != NULL );
assert( c != NULL );
assert( c->c_struct_state != SLAP_C_UNUSED );
assert( c->c_conn_state != SLAP_C_INVALID );
assert( LDAP_STAILQ_EMPTY(&c->c_ops) );
assert( connections != NULL );
assert( c != NULL );
assert( c->c_struct_state != SLAP_C_UNUSED );
assert( c->c_conn_state != SLAP_C_INVALID );
assert( LDAP_STAILQ_EMPTY(&c->c_ops) );
/* only for stats (print -1 as "%lu" may give unexpected results ;) */
connid = c->c_connid;
/* only for stats (print -1 as "%lu" may give unexpected results ;) */
connid = c->c_connid;
backend_connection_destroy(c);
backend_connection_destroy(c);
c->c_protocol = 0;
c->c_connid = -1;
c->c_protocol = 0;
c->c_connid = -1;
c->c_activitytime = c->c_starttime = 0;
c->c_activitytime = c->c_starttime = 0;
connection2anonymous( c );
c->c_listener = NULL;
......@@ -694,7 +694,7 @@ connection_destroy( Connection *c )
slapd_remove( sd, 1, 0 );
Statslog( LDAP_DEBUG_STATS,
"conn=%lu fd=%ld closed\n",
"conn=%lu fd=%ld closed\n",
connid, (long) sd, 0, 0, 0 );
}
......@@ -707,8 +707,8 @@ connection_destroy( Connection *c )
ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_SET_MAX_INCOMING, &max );
}
c->c_conn_state = SLAP_C_INVALID;
c->c_struct_state = SLAP_C_UNUSED;
c->c_conn_state = SLAP_C_INVALID;
c->c_struct_state = SLAP_C_UNUSED;
#ifdef LDAP_SLAPI
/* call destructors, then constructors; avoids unnecessary allocation */
......@@ -766,8 +766,8 @@ void connection_closing( Connection *c )
ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_GET_FD, &sd );
#ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, DETAIL1,
"connection_closing: conn %lu readying socket %d for close.\n",
c->c_connid, sd, 0 );
"connection_closing: conn %lu readying socket %d for close.\n",
c->c_connid, sd, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"connection_closing: readying conn=%lu sd=%d for close\n",
......@@ -803,8 +803,8 @@ static void connection_close( Connection *c )
if( !LDAP_STAILQ_EMPTY(&c->c_ops) ) {
#ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, DETAIL1,
"connection_close: conn %lu deferring sd %d\n",
c->c_connid, sd, 0 );
"connection_close: conn %lu deferring sd %d\n",
c->c_connid, sd, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"connection_close: deferring conn=%lu sd=%d\n",
......@@ -815,7 +815,7 @@ static void connection_close( Connection *c )
#ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, RESULTS,
"connection_close: conn %lu sd %d\n", c->c_connid, sd, 0 );
"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 );
......@@ -1027,11 +1027,11 @@ connection_operation( void *ctx, void *arg_v )
default:
#ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, INFO,
"connection_operation: conn %lu unknown LDAP request 0x%lx\n",
conn->c_connid, tag, 0 );
"connection_operation: conn %lu unknown LDAP request 0x%lx\n",
conn->c_connid, tag, 0 );
#else
Debug( LDAP_DEBUG_ANY, "unknown LDAP request 0x%lx\n",
tag, 0, 0 );
tag, 0, 0 );
#endif
op->o_tag = LBER_ERROR;
rs.sr_err = LDAP_PROTOCOL_ERROR;
......@@ -1244,8 +1244,8 @@ int connection_read(ber_socket_t s)
#ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, DETAIL1,
"connection_read: conn %lu checking for input.\n",
c->c_connid, 0, 0 );
"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",
......@@ -1263,8 +1263,8 @@ int connection_read(ber_socket_t s)
#ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, ERR,
"connection_read: conn %lu TLS accept error, error %d\n",
c->c_connid, rc, 0 );
"connection_read: conn %lu TLS accept error, error %d\n",
c->c_connid, rc, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"connection_read(%d): TLS accept error "
......@@ -1281,10 +1281,10 @@ int connection_read(ber_socket_t s)
FD_ZERO(&rfd);
FD_SET(s, &rfd);
for (rc=1; rc>0;) {
tv.tv_sec = 1;
tv.tv_usec = 0;
rc = select(s+1, &rfd, NULL, NULL, &tv);
if (rc == 1) {
tv.tv_sec = 1;
tv.tv_usec = 0;
rc = select(s+1, &rfd, NULL, NULL, &tv);
if (rc == 1) {
ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_DRAIN, NULL);
}
}
......@@ -1344,7 +1344,7 @@ int connection_read(ber_socket_t s)
c->c_sasl_layers = 0;
rc = ldap_pvt_sasl_install( c->c_sb, c->c_sasl_sockctx );
rc = ldap_pvt_sasl_install( c->c_sb, c->c_sasl_sockctx );
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
......@@ -1386,7 +1386,7 @@ int connection_read(ber_socket_t s)
if( rc < 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, ERR,
"connection_read: conn %lu input error %d, closing.\n",
"connection_read: conn %lu input error %d, closing.\n",
c->c_connid, rc, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
......@@ -1416,7 +1416,7 @@ int connection_read(ber_socket_t s)
static int
connection_input(
Connection *conn
Connection *conn
)
{
Operation *op;
......@@ -1435,7 +1435,7 @@ connection_input(
{
#ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, ERR,
"connection_input: conn %lu ber_alloc failed.\n",
"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 );
......@@ -1469,7 +1469,7 @@ connection_input(
#ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, ERR,
"connection_input: conn %lu ber_get_next failed, errno %d (%s).\n",
"connection_input: conn %lu ber_get_next failed, errno %d (%s).\n",
conn->c_connid, err, sock_errstr(err) );
#else
Debug( LDAP_DEBUG_TRACE,
......@@ -1493,11 +1493,11 @@ connection_input(
/* log, close and send error */
#ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, ERR,
"connection_input: conn %lu ber_get_int returns 0x%lx.\n",
"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 );
Debug( LDAP_DEBUG_ANY, "ber_get_int returns 0x%lx\n",
tag, 0, 0 );
#endif
ber_free( ber, 1 );
return -1;
......@@ -1507,11 +1507,11 @@ connection_input(
/* log, close and send error */
#ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, ERR,
"connection_input: conn %lu ber_peek_tag returns 0x%lx.\n",
conn->c_connid, tag, 0 );
"connection_input: conn %lu ber_peek_tag returns 0x%lx.\n",
conn->c_connid, tag, 0 );
#else
Debug( LDAP_DEBUG_ANY, "ber_peek_tag returns 0x%lx\n", tag, 0,
0 );
Debug( LDAP_DEBUG_ANY, "ber_peek_tag returns 0x%lx\n",
tag, 0, 0 );
#endif
ber_free( ber, 1 );
......@@ -1526,15 +1526,14 @@ connection_input(
}
if( tag != LDAP_REQ_ABANDON && tag != LDAP_REQ_SEARCH ) {
#ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, ERR,
"connection_input: conn %lu invalid req for UDP 0x%lx.\n",
conn->c_connid, tag, 0 );
LDAP_LOG( CONNECTION, ERR,
"connection_input: conn %lu invalid req for UDP 0x%lx.\n",
conn->c_connid, tag, 0 );
#else
Debug( LDAP_DEBUG_ANY, "invalid req for UDP 0x%lx\n", tag, 0,
0 );
Debug( LDAP_DEBUG_ANY, "invalid req for UDP 0x%lx\n", tag, 0, 0 );
#endif
ber_free( ber, 1 );
return 0;
ber_free( ber, 1 );
return 0;
}
}
#endif
......@@ -1560,8 +1559,8 @@ connection_input(
#ifdef LDAP_CONNECTIONLESS
if (conn->c_is_udp) {
if ( cdn ) {
ber_str2bv( cdn, 0, 1, &op->o_dn );
op->o_protocol = LDAP_VERSION2;
ber_str2bv( cdn, 0, 1, &op->o_dn );
op->o_protocol = LDAP_VERSION2;
}
op->o_res_ber = ber_alloc_t( LBER_USE_DER );
if (op->o_res_ber == NULL) return 1;
......@@ -1572,7 +1571,7 @@ connection_input(
if (rc != sizeof(struct sockaddr)) {
#ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, INFO,
"connection_input: conn %lu ber_write failed\n",
"connection_input: conn %lu ber_write failed\n",
conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "ber_write failed\n", 0, 0, 0 );
......@@ -1585,7 +1584,7 @@ connection_input(
if (rc == -1) {
#ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, INFO,
"connection_input: conn %lu put outer sequence failed\n",
"connection_input: conn %lu put outer sequence failed\n",
conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY, "ber_write failed\n", 0, 0, 0 );
......@@ -1618,7 +1617,7 @@ connection_input(
#ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, INFO,
"connection_input: conn %lu deferring operation\n",
"connection_input: conn %lu deferring operation\n",
conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
......@@ -1664,7 +1663,7 @@ connection_resched( Connection *conn )
if( rc ) {
#ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, DETAIL1,
"connection_resched: conn %lu reaquiring locks.\n",
"connection_resched: conn %lu reaquiring locks.\n",
conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
......@@ -1684,7 +1683,7 @@ connection_resched( Connection *conn )
if( conn->c_conn_state != SLAP_C_CLOSING ) {
#ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, INFO,
"connection_resched: conn %lu closed by other thread.\n",
"connection_resched: conn %lu closed by other thread.\n",
conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "connection_resched: "
......@@ -1694,7 +1693,7 @@ connection_resched( Connection *conn )
} else {
#ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, DETAIL1,
"connection_resched: conn %lu attempting closing.\n",
"connection_resched: conn %lu attempting closing.\n",
conn->c_connid, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "connection_resched: "
......@@ -1744,9 +1743,9 @@ static int connection_op_activate( Operation *op )
}
if (!op->o_dn.bv_len) {
op->o_authz = op->o_conn->c_authz;
ber_dupbv( &op->o_dn, &op->o_conn->c_dn );
ber_dupbv( &op->o_ndn, &op->o_conn->c_ndn );
op->o_authz = op->o_conn->c_authz;
ber_dupbv( &op->o_dn, &op->o_conn->c_dn );
ber_dupbv( &op->o_ndn, &op->o_conn->c_ndn );
}
op->o_authtype = op->o_conn->c_authtype;
ber_dupbv( &op->o_authmech, &op->o_conn->c_authmech );
......@@ -1799,7 +1798,7 @@ int connection_write(ber_socket_t s)
if( c == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, ERR,
"connection_write: sock %ld no connection!\n", (long)s, 0, 0);
"connection_write: sock %ld no connection!\n", (long)s, 0, 0);
#else
Debug( LDAP_DEBUG_ANY,
"connection_write(%ld): no connection!\n",
......@@ -1814,7 +1813,7 @@ int connection_write(ber_socket_t s)
#ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, DETAIL1,
"connection_write conn %lu waking output.\n", c->c_connid, 0, 0 );
"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",
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment