/* conn.c - deal with connection subsystem */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
/*
- * Copyright 2001 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- *
* Copyright 2001, Pierangelo Masarati, All rights reserved. <ando@sys-net.it>
*
* This work has beed deveolped for the OpenLDAP Foundation
#include "slap.h"
#include "back-monitor.h"
+#define CONN_CN_PREFIX "Connection"
+
int
monitor_subsys_conn_init(
BackendDB *be
{
struct monitorinfo *mi;
+ Entry *e, *e_tmp, *e_conn;
+ struct monitorentrypriv *mp;
char buf[1024];
- Entry *e;
- struct berval *bv[2], val;
+ struct berval bv[2];
assert( be != NULL );
mi = ( struct monitorinfo * )be->be_private;
if ( monitor_cache_get( mi,
- monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn, &e ) ) {
+ &monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn, &e_conn ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
"monitor_subsys_conn_init: "
"unable to get entry '%s'\n",
- monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn ));
+ monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val ));
#else
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_conn_init: "
"unable to get entry '%s'\n%s%s",
- monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn,
+ monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val,
+ "", "" );
+#endif
+ return( -1 );
+ }
+
+ e_tmp = NULL;
+
+ /*
+ * Total conns
+ */
+ snprintf( buf, sizeof( buf ),
+ "dn: cn=Total,%s\n"
+ SLAPD_MONITOR_OBJECTCLASSES
+ "cn: Total\n",
+ monitor_subsys[SLAPD_MONITOR_CONN].mss_dn.bv_val );
+
+ e = str2entry( buf );
+ if ( e == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ "monitor_subsys_conn_init: "
+ "unable to create entry 'cn=Total,%s'\n",
+ monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val ));
+#else
+ Debug( LDAP_DEBUG_ANY,
+ "monitor_subsys_conn_init: "
+ "unable to create entry 'cn=Total,%s'\n%s%s",
+ monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val,
+ "", "" );
+#endif
+ return( -1 );
+ }
+
+ bv[1].bv_val = NULL;
+ bv[0].bv_val = "0";
+ bv[0].bv_len = 1;
+ attr_merge( e, monitor_ad_desc, bv );
+
+ mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
+ e->e_private = ( void * )mp;
+ mp->mp_next = e_tmp;
+ mp->mp_children = NULL;
+ mp->mp_info = &monitor_subsys[SLAPD_MONITOR_CONN];
+ mp->mp_flags = monitor_subsys[SLAPD_MONITOR_CONN].mss_flags \
+ | MONITOR_F_SUB | MONITOR_F_PERSISTENT;
+ mp->mp_flags &= ~MONITOR_F_VOLATILE_CH;
+
+ if ( monitor_cache_add( mi, e ) ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ "monitor_subsys_conn_init: "
+ "unable to add entry 'cn=Total,%s'\n",
+ monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val ));
+#else
+ Debug( LDAP_DEBUG_ANY,
+ "monitor_subsys_conn_init: "
+ "unable to add entry 'cn=Total,%s'\n%s%s",
+ monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val,
+ "", "" );
+#endif
+ return( -1 );
+ }
+
+ e_tmp = e;
+
+ /*
+ * Current conns
+ */
+ snprintf( buf, sizeof( buf ),
+ "dn: cn=Current,%s\n"
+ SLAPD_MONITOR_OBJECTCLASSES
+ "cn: Current\n",
+ monitor_subsys[SLAPD_MONITOR_CONN].mss_dn.bv_val );
+
+ e = str2entry( buf );
+ if ( e == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ "monitor_subsys_conn_init: "
+ "unable to create entry 'cn=Current,%s'\n",
+ monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val ));
+#else
+ Debug( LDAP_DEBUG_ANY,
+ "monitor_subsys_conn_init: "
+ "unable to create entry 'cn=Current,%s'\n%s%s",
+ monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val,
"", "" );
#endif
return( -1 );
}
+
+ bv[1].bv_val = NULL;
+ bv[0].bv_val = "0";
+ bv[0].bv_len = 1;
+ attr_merge( e, monitor_ad_desc, bv );
+
+ mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
+ e->e_private = ( void * )mp;
+ mp->mp_next = e_tmp;
+ mp->mp_children = NULL;
+ mp->mp_info = &monitor_subsys[SLAPD_MONITOR_CONN];
+ mp->mp_flags = monitor_subsys[SLAPD_MONITOR_CONN].mss_flags \
+ | MONITOR_F_SUB | MONITOR_F_PERSISTENT;
+ mp->mp_flags &= ~MONITOR_F_VOLATILE_CH;
- bv[0] = &val;
- bv[1] = NULL;
+ if ( monitor_cache_add( mi, e ) ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ "monitor_subsys_conn_init: "
+ "unable to add entry 'cn=Current,%s'\n",
+ monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val ));
+#else
+ Debug( LDAP_DEBUG_ANY,
+ "monitor_subsys_conn_init: "
+ "unable to add entry 'cn=Current,%s'\n%s%s",
+ monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val,
+ "", "" );
+#endif
+ return( -1 );
+ }
+
+ e_tmp = e;
- monitor_cache_release( mi, e );
+ mp = ( struct monitorentrypriv * )e_conn->e_private;
+ mp->mp_children = e_tmp;
+
+ monitor_cache_release( mi, e_conn );
return( 0 );
}
Entry *e
)
{
- Connection *c;
- int connindex;
- int nconns, nwritewaiters, nreadwaiters;
+ long n = -1;
- Attribute *a;
- struct berval *bv[2], val, **b = NULL;
- char buf[1024];
-
- assert( mi != NULL );
- assert( e != NULL );
+ assert( mi );
+ assert( e );
- bv[0] = &val;
- bv[1] = NULL;
-
- nconns = nwritewaiters = nreadwaiters = 0;
- for ( c = connection_first( &connindex );
- c != NULL;
- c = connection_next( c, &connindex ), nconns++ ) {
- if ( c->c_writewaiter ) {
- nwritewaiters++;
- }
- if ( c->c_currentber != NULL ) {
- nreadwaiters++;
+ if ( strncasecmp( e->e_ndn, "CN=TOTAL",
+ sizeof("CN=TOTAL")-1 ) == 0 ) {
+ n = connections_nextid();
+
+ } else if ( strncasecmp( e->e_ndn, "CN=CURRENT",
+ sizeof("CN=CURRENT")-1 ) == 0 ) {
+ Connection *c;
+ int connindex;
+
+ for ( n = 0, c = connection_first( &connindex );
+ c != NULL;
+ n++, c = connection_next( c, &connindex ) ) {
+ /* No Op */ ;
}
+ connection_done(c);
}
- connection_done(c);
-#if 0
- snprintf( buf, sizeof( buf ), "readwaiters=%d", nreadwaiters );
+ if ( n != -1 ) {
+ Attribute *a;
+ char buf[16];
- if ( ( a = attr_find( e->e_attrs, monitor_ad_desc ) ) != NULL ) {
- for ( b = a->a_vals; b[0] != NULL; b++ ) {
- if ( strncmp( b[0]->bv_val, "readwaiters=",
- sizeof( "readwaiters=" ) - 1 ) == 0 ) {
- free( b[0]->bv_val );
- b[0] = ber_bvstrdup( buf );
- break;
- }
+ a = attr_find( e->e_attrs, monitor_ad_desc );
+ if ( a == NULL ) {
+ return( -1 );
}
+
+ snprintf( buf, sizeof( buf ), "%ld", n );
+ free( a->a_vals[ 0 ].bv_val );
+ ber_str2bv( buf, 0, 1, a->a_vals );
}
-
- if ( b == NULL || b[0] == NULL ) {
- val.bv_val = buf;
- val.bv_len = strlen( buf );
- attr_merge( e, monitor_ad_desc, bv );
- }
-#endif
return( 0 );
}
char buf2[22];
char buf3[22];
- struct berval *bv[2], val;
+ struct berval bv[2];
Entry *e;
assert( ep != NULL );
snprintf( buf, sizeof( buf ),
- "dn: cn=%ld,%s\n"
- "objectClass: top\n"
- "objectClass: LDAPsubEntry\n"
-#ifdef SLAPD_MONITORSUBENTRY
- "objectClass: monitorSubEntry\n"
-#else /* !SLAPD_MONITORSUBENTRY */
- "objectClass: extensibleObject\n"
-#endif /* !SLAPD_MONITORSUBENTRY */
- "cn: %ld\n",
- c->c_connid, monitor_subsys[SLAPD_MONITOR_CONN].mss_dn,
+ "dn: cn=" CONN_CN_PREFIX " %ld,%s\n"
+ SLAPD_MONITOR_OBJECTCLASSES
+ "cn: " CONN_CN_PREFIX " %ld\n",
+ c->c_connid, monitor_subsys[SLAPD_MONITOR_CONN].mss_dn.bv_val,
c->c_connid );
e = str2entry( buf );
LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
"monitor_subsys_conn_create: "
"unable to create entry "
- "'cn=%ld,%s' entry\n",
+ "'cn=" CONN_CN_PREFIX " %ld,%s' entry\n",
c->c_connid,
- monitor_subsys[SLAPD_MONITOR_CONN].mss_dn ));
+ monitor_subsys[SLAPD_MONITOR_CONN].mss_dn.bv_val ));
#else
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_conn_create: "
"unable to create entry "
- "'cn=%ld,%s' entry\n%s",
+ "'cn=" CONN_CN_PREFIX " %ld,%s' entry\n",
c->c_connid,
- monitor_subsys[SLAPD_MONITOR_CONN].mss_dn, "" );
+ monitor_subsys[SLAPD_MONITOR_CONN].mss_dn.bv_val, 0 );
#endif
return( -1 );
}
c->c_currentber ? "r" : "",
c->c_writewaiter ? "w" : "",
- c->c_ops != NULL ? "x" : "",
- c->c_pending_ops != NULL ? "p" : "",
+ LDAP_STAILQ_EMPTY( &c->c_ops ) ? "" : "x",
+ LDAP_STAILQ_EMPTY( &c->c_pending_ops ) ? "" : "p",
connection_state2str( c->c_conn_state ),
c->c_sasl_bind_in_progress ? "S" : "",
- c->c_cdn ? c->c_cdn : SLAPD_ANONYMOUS,
+ c->c_cdn.bv_len ? c->c_cdn.bv_val : SLAPD_ANONYMOUS,
- c->c_listener_url,
- c->c_peer_domain,
- c->c_peer_name,
- c->c_sock_name,
+ c->c_listener_url.bv_val,
+ c->c_peer_domain.bv_val,
+ c->c_peer_name.bv_val,
+ c->c_sock_name.bv_val,
buf2,
buf3
);
- bv[0] = &val;
- bv[1] = NULL;
-
- val.bv_val = buf;
- val.bv_len = strlen( buf );
+ bv[1].bv_val = NULL;
+ bv[0].bv_val = buf;
+ bv[0].bv_len = strlen( buf );
attr_merge( e, monitor_ad_desc, bv );
mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
int
monitor_subsys_conn_create(
struct monitorinfo *mi,
- const char *ndn,
+ struct berval *ndn,
Entry *e_parent,
Entry **ep
)
c != NULL;
c = connection_next( c, &connindex )) {
if ( conn_create( c, &e ) || e == NULL ) {
- // error
+ connection_done(c);
+ for ( ; e_tmp != NULL; ) {
+ mp = ( struct monitorentrypriv * )e_tmp->e_private;
+ e = mp->mp_next;
+
+ ch_free( mp );
+ e_tmp->e_private = NULL;
+ entry_free( e_tmp );
+
+ e_tmp = e;
+ }
+ return( -1 );
}
mp = ( struct monitorentrypriv * )e->e_private;
mp->mp_next = e_tmp;
connection_done(c);
*ep = e;
+
} else {
- /* create exactly the required entry */
- char *rdn, *value;
- unsigned long connid;
+ LDAPRDN *values = NULL;
+ const char *text = NULL;
+ unsigned long connid;
- rdn = dn_rdn( NULL, ndn );
- value = rdn_attr_value( rdn );
- connid = atol( value );
- free( value );
- free( rdn );
+ /* create exactly the required entry */
+
+ if ( ldap_bv2rdn( ndn, &values, (char **)&text,
+ LDAP_DN_FORMAT_LDAP ) )
+ {
+ return( -1 );
+ }
+
+ assert( values );
+ assert( values[ 0 ][ 0 ] );
+
+ connid = atol( values[ 0 ][ 0 ]->la_value.bv_val
+ + sizeof( CONN_CN_PREFIX ) );
+
+ ldap_rdnfree( values );
for ( c = connection_first( &connindex );
c != NULL;
c = connection_next( c, &connindex )) {
if ( c->c_connid == connid ) {
if ( conn_create( c, ep ) || *ep == NULL ) {
- // error
+ connection_done(c);
+ return( -1 );
}
+
+ break;
}
}
projects / openldap / blobdiff