/* 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 "portable.h"
#include <stdio.h>
+#include "lutil.h"
#include "slap.h"
#include "back-monitor.h"
+#define CONN_CN_PREFIX "Connection"
+
int
monitor_subsys_conn_init(
BackendDB *be
Entry *e, *e_tmp, *e_conn;
struct monitorentrypriv *mp;
char buf[1024];
- struct berval val, *bv[2] = { &val, NULL };
+ 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_conn ) ) {
+ &monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn, &e_conn ) ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ LDAP_LOG( OPERATION, CRIT,
"monitor_subsys_conn_init: "
"unable to get entry '%s'\n",
- monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn->bv_val ));
+ monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_conn_init: "
"unable to get entry '%s'\n%s%s",
- monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn->bv_val,
+ monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val,
"", "" );
#endif
return( -1 );
*/
snprintf( buf, sizeof( buf ),
"dn: cn=Total,%s\n"
- "objectClass: top\n"
- "objectClass: LDAPsubEntry\n"
-#ifdef SLAPD_MONITORSUBENTRY
- "objectClass: monitorSubEntry\n"
-#else /* !SLAPD_MONITORSUBENTRY */
- "objectClass: extensibleObject\n"
-#endif /* !SLAPD_MONITORSUBENTRY */
+ SLAPD_MONITOR_OBJECTCLASSES
"cn: Total\n",
- monitor_subsys[SLAPD_MONITOR_CONN].mss_dn->bv_val );
+ monitor_subsys[SLAPD_MONITOR_CONN].mss_dn.bv_val );
e = str2entry( buf );
if ( e == NULL ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ LDAP_LOG( OPERATION, CRIT,
"monitor_subsys_conn_init: "
"unable to create entry 'cn=Total,%s'\n",
- monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn->bv_val ));
+ monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val, 0, 0 );
#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,
+ monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val,
"", "" );
#endif
return( -1 );
}
- val.bv_val = "0";
- val.bv_len = 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 );
if ( monitor_cache_add( mi, e ) ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ LDAP_LOG( OPERATION, CRIT,
"monitor_subsys_conn_init: "
"unable to add entry 'cn=Total,%s'\n",
- monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn->bv_val ));
+ monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val, 0, 0 );
#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,
+ monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val,
"", "" );
#endif
return( -1 );
*/
snprintf( buf, sizeof( buf ),
"dn: cn=Current,%s\n"
- "objectClass: top\n"
- "objectClass: LDAPsubEntry\n"
-#ifdef SLAPD_MONITORSUBENTRY
- "objectClass: monitorSubEntry\n"
-#else /* !SLAPD_MONITORSUBENTRY */
- "objectClass: extensibleObject\n"
-#endif /* !SLAPD_MONITORSUBENTRY */
+ SLAPD_MONITOR_OBJECTCLASSES
"cn: Current\n",
- monitor_subsys[SLAPD_MONITOR_CONN].mss_dn->bv_val );
+ monitor_subsys[SLAPD_MONITOR_CONN].mss_dn.bv_val );
e = str2entry( buf );
if ( e == NULL ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ LDAP_LOG( OPERATION, CRIT,
"monitor_subsys_conn_init: "
"unable to create entry 'cn=Current,%s'\n",
- monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn->bv_val ));
+ monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val, 0, 0 );
#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,
+ 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;
if ( monitor_cache_add( mi, e ) ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ LDAP_LOG( OPERATION, CRIT,
"monitor_subsys_conn_init: "
"unable to add entry 'cn=Current,%s'\n",
- monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn->bv_val ));
+ monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val, 0, 0 );
#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,
+ monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val,
"", "" );
#endif
return( -1 );
assert( mi );
assert( e );
- if ( strncasecmp( e->e_ndn, "CN=TOTAL",
- sizeof("CN=TOTAL")-1 ) == 0 ) {
+ 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 ) {
+ } else if ( strncasecmp( e->e_ndn, "cn=current",
+ sizeof("cn=current")-1 ) == 0 ) {
Connection *c;
int connindex;
}
snprintf( buf, sizeof( buf ), "%ld", n );
- ber_bvfree( a->a_vals[ 0 ] );
- a->a_vals[ 0 ] = ber_bvstrdup( buf );
+ free( a->a_vals[ 0 ].bv_val );
+ ber_str2bv( buf, 0, 1, a->a_vals );
}
return( 0 );
{
struct monitorentrypriv *mp;
struct tm *ltm;
- char buf[1024];
- char buf2[22];
- char buf3[22];
+ char buf[ 1024 ];
+ char buf2[ LDAP_LUTIL_GENTIME_BUFSIZE ];
+ char buf3[ LDAP_LUTIL_GENTIME_BUFSIZE ];
- struct berval val, *bv[2] = { &val, NULL };
+ 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->bv_val,
+ "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 );
if ( e == NULL) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
+ LDAP_LOG( OPERATION, CRIT,
"monitor_subsys_conn_create: "
"unable to create entry "
- "'cn=%ld,%s' entry\n",
- c->c_connid,
- monitor_subsys[SLAPD_MONITOR_CONN].mss_dn->bv_val ));
+ "'cn=" CONN_CN_PREFIX " %ld,%s' entry\n",
+ c->c_connid, monitor_subsys[SLAPD_MONITOR_CONN].mss_dn.bv_val, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"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->bv_val, 0 );
+ monitor_subsys[SLAPD_MONITOR_CONN].mss_dn.bv_val, 0 );
#endif
return( -1 );
}
ldap_pvt_thread_mutex_lock( &gmtime_mutex );
ltm = gmtime( &c->c_starttime );
- strftime( buf2, sizeof(buf2), "%Y%m%d%H%M%SZ", ltm );
+ lutil_gentime( buf2, sizeof( buf2 ), ltm );
ltm = gmtime( &c->c_activitytime );
- strftime( buf3, sizeof(buf2), "%Y%m%d%H%M%SZ", ltm );
+ lutil_gentime( buf3, sizeof( buf3 ), ltm );
ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
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_dn.bv_len ? c->c_dn.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
);
- 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 );
c = connection_next( c, &connindex )) {
if ( conn_create( c, &e ) || e == NULL ) {
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;
*ep = e;
} else {
- char **values = NULL;
+ LDAPRDN *values = NULL;
+ const char *text = NULL;
unsigned long connid;
/* create exactly the required entry */
-#if 0
- struct berval rdn;
-
- /*
- * FIXME: we can pass the entire DN
- * only if rdn_attrs does not complain.
- */
- if ( dnExtractRdn( ndn, &rdn ) != LDAP_SUCCESS ) {
+ if ( ldap_bv2rdn( ndn, &values, (char **)&text,
+ LDAP_DN_FORMAT_LDAP ) )
+ {
return( -1 );
}
- if ( rdn_attrs( rdn.bv_val, NULL, &values ) != LDAP_SUCCESS ) {
- free( rdn.bv_val );
- return( -1 );
- }
- free( rdn.bv_val );
-#else
- if ( rdn_attrs( ndn->bv_val, NULL, &values ) != LDAP_SUCCESS ) {
- return( -1 );
- }
-#endif
assert( values );
- assert( values[ 0 ] );
+ assert( values[ 0 ][ 0 ] );
- connid = atol( values[ 0 ] );
+ connid = atol( values[ 0 ][ 0 ]->la_value.bv_val
+ + sizeof( CONN_CN_PREFIX ) );
- ldap_value_free( values );
+ ldap_rdnfree( values );
for ( c = connection_first( &connindex );
c != NULL;
connection_done(c);
return( -1 );
}
+
+ break;
}
}
projects / openldap / blobdiff