/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2001-2006 The OpenLDAP Foundation.
+ * Copyright 2001-2007 The OpenLDAP Foundation.
* Portions Copyright 2001-2003 Pierangelo Masarati.
* All rights reserved.
*
#include "lber_pvt.h"
#include "back-monitor.h"
+#include "config.h"
+
#undef INTEGRATE_CORE_SCHEMA
/*
static struct monitor_subsys_t **monitor_subsys;
static int monitor_subsys_opened;
static monitor_info_t monitor_info;
+static const monitor_extra_t monitor_extra = {
+ monitor_back_is_configured,
+ monitor_back_get_subsys,
+ monitor_back_get_subsys_by_dn,
+
+ monitor_back_register_subsys,
+ monitor_back_register_backend,
+ monitor_back_register_database,
+ monitor_back_register_overlay_info,
+ monitor_back_register_overlay,
+ monitor_back_register_entry,
+ monitor_back_register_entry_parent,
+ monitor_back_register_entry_attrs,
+ monitor_back_register_entry_callback,
+
+ monitor_back_unregister_entry,
+ monitor_back_unregister_entry_parent,
+ monitor_back_unregister_entry_attrs,
+ monitor_back_unregister_entry_callback
+};
+
/*
* subsystem data
}, { NULL }
};
+int
+monitor_subsys_is_opened( void )
+{
+ return monitor_subsys_opened;
+}
+
int
monitor_back_register_subsys(
monitor_subsys_t *ms )
/* if a subsystem is registered __AFTER__ subsystem
* initialization (depending on the sequence the databases
* are listed in slapd.conf), init it */
- if ( monitor_subsys_opened ) {
+ if ( monitor_subsys_is_opened() ) {
/* FIXME: this should only be possible
* if be_monitor is already initialized */
LIMBO_ENTRY,
LIMBO_ENTRY_PARENT,
LIMBO_ATTRS,
- LIMBO_CB
+ LIMBO_CB,
+ LIMBO_BACKEND,
+ LIMBO_DATABASE,
+ LIMBO_OVERLAY_INFO,
+ LIMBO_OVERLAY,
+
+ LIMBO_LAST
};
typedef struct entry_limbo_t {
int el_type;
+ BackendInfo *el_bi;
+ BackendDB *el_be;
+ slap_overinst *el_on;
Entry *el_e;
Attribute *el_a;
struct berval el_ndn;
return be_monitor != NULL;
}
+int
+monitor_back_register_backend(
+ BackendInfo *bi )
+{
+ return -1;
+}
+
+int
+monitor_back_register_overlay_info(
+ slap_overinst *on )
+{
+ return -1;
+}
+
+int
+monitor_back_register_overlay(
+ BackendDB *be )
+{
+ return -1;
+}
+
+int
+monitor_back_register_backend_limbo(
+ BackendInfo *bi )
+{
+ return -1;
+}
+
+int
+monitor_back_register_database_limbo(
+ BackendDB *be )
+{
+ entry_limbo_t **elpp, el = { 0 };
+ monitor_info_t *mi;
+
+ if ( be_monitor == NULL ) {
+ Debug( LDAP_DEBUG_ANY,
+ "monitor_back_register_database_limbo: "
+ "monitor database not configured.\n",
+ 0, 0, 0 );
+ return -1;
+ }
+
+ mi = ( monitor_info_t * )be_monitor->be_private;
+
+
+ el.el_type = LIMBO_DATABASE;
+
+ el.el_be = be;
+
+ for ( elpp = (entry_limbo_t **)&mi->mi_entry_limbo;
+ *elpp;
+ elpp = &(*elpp)->el_next )
+ /* go to last */;
+
+ *elpp = (entry_limbo_t *)ch_malloc( sizeof( entry_limbo_t ) );
+
+ el.el_next = NULL;
+ **elpp = el;
+
+ return 0;
+}
+
+int
+monitor_back_register_overlay_info_limbo(
+ slap_overinst *on )
+{
+ return -1;
+}
+
+int
+monitor_back_register_overlay_limbo(
+ BackendDB *be )
+{
+ return -1;
+}
+
int
monitor_back_register_entry(
Entry *e,
assert( e != NULL );
assert( e->e_private == NULL );
- if ( monitor_subsys_opened ) {
+ if ( monitor_subsys_is_opened() ) {
Entry *e_parent = NULL,
*e_new = NULL,
**ep = NULL;
return -1;
}
- if ( monitor_subsys_opened ) {
+ if ( monitor_subsys_is_opened() ) {
Entry *e_parent = NULL,
*e_new = NULL,
**ep = NULL;
*mp_parent = NULL;
int rc = 0;
- if ( monitor_filter2ndn( nbase, scope, filter, &ndn ) ) {
+ if ( monitor_search2ndn( nbase, scope, filter, &ndn ) ) {
/* entry does not exist */
Debug( LDAP_DEBUG_ANY,
"monitor_back_register_entry_parent(\"\"): "
- "base=\"%s\" scope=%d filter=\"%s\": "
+ "base=\"%s\" scope=%s filter=\"%s\": "
"unable to find entry\n",
nbase->bv_val ? nbase->bv_val : "\"\"",
- scope, filter->bv_val );
+ ldap_pvt_scope2str( scope ),
+ filter->bv_val );
return -1;
}
"entry already exists\n",
e_name.bv_val, 0, 0 );
monitor_cache_release( mi, e_new );
+ e_new = NULL;
rc = -1;
goto done;
}
el.el_scope = scope;
if ( !BER_BVISNULL( filter ) ) {
- Filter *f = str2filter( filter->bv_val );
- if ( f == NULL ) {
- goto done_limbo;
- }
- filter2bv( f, &el.el_filter );
- filter_free( f );
+ ber_dupbv( &el.el_filter, filter );
}
el.el_cb = cb;
}
static int
-monitor_filter2ndn_cb( Operation *op, SlapReply *rs )
+monitor_search2ndn_cb( Operation *op, SlapReply *rs )
{
if ( rs->sr_type == REP_SEARCH ) {
struct berval *ndn = op->o_callback->sc_private;
+
+ if ( !BER_BVISNULL( ndn ) ) {
+ rs->sr_err = LDAP_SIZELIMIT_EXCEEDED;
+ ch_free( ndn->bv_val );
+ BER_BVZERO( ndn );
+ return rs->sr_err;
+ }
ber_dupbv( ndn, &rs->sr_entry->e_nname );
}
}
int
-monitor_filter2ndn(
+monitor_search2ndn(
struct berval *nbase,
int scope,
struct berval *filter,
Connection conn = { 0 };
OperationBuffer opbuf;
Operation *op;
+ void *thrctx;
SlapReply rs = { 0 };
- slap_callback cb = { NULL, monitor_filter2ndn_cb, NULL, NULL };
+ slap_callback cb = { NULL, monitor_search2ndn_cb, NULL, NULL };
int rc;
BER_BVZERO( ndn );
}
op = (Operation *) &opbuf;
- connection_fake_init( &conn, op, &conn );
+ thrctx = ldap_pvt_thread_pool_context();
+ connection_fake_init( &conn, op, thrctx );
op->o_tag = LDAP_REQ_SEARCH;
/* use global malloc for now */
if ( op->o_tmpmemctx ) {
- /* FIXME: connection_fake_init() calls slap_sl_mem_create, so we destroy it for now */
- slap_sl_mem_destroy( NULL, op->o_tmpmemctx );
op->o_tmpmemctx = NULL;
}
op->o_tmpmfuncs = &ch_mfuncs;
return -1;
}
- if ( monitor_subsys_opened ) {
+ if ( monitor_subsys_is_opened() ) {
Entry *e = NULL;
Attribute **atp = NULL;
monitor_entry_t *mp = NULL;
int freeit = 0;
if ( BER_BVISNULL( &ndn ) ) {
- if ( monitor_filter2ndn( nbase, scope, filter, &ndn ) ) {
+ if ( monitor_search2ndn( nbase, scope, filter, &ndn ) ) {
char buf[ SLAP_TEXT_BUFLEN ];
snprintf( buf, sizeof( buf ),
"monitor_back_register_entry_%s(\"\"): "
- "base=\"%s\" scope=%d filter=\"%s\": "
+ "base=\"%s\" scope=%s filter=\"%s\": "
"unable to find entry\n",
fname,
nbase->bv_val ? nbase->bv_val : "\"\"",
- scope, filter->bv_val );
+ ldap_pvt_scope2str( scope ),
+ filter->bv_val );
/* entry does not exist */
Debug( LDAP_DEBUG_ANY, "%s\n", buf, 0, 0 );
}
el.el_scope = scope;
if ( !BER_BVISNULL( filter ) ) {
- Filter *f = str2filter( filter->bv_val );
- if ( f == NULL ) {
- goto done_limbo;
- }
- filter2bv( f, &el.el_filter );
- filter_free( f );
+ ber_dupbv( &el.el_filter, filter );
}
el.el_a = attrs_dup( a );
return -1;
}
-done_limbo:;
if ( *elpp != NULL ) {
el.el_next = NULL;
**elpp = el;
return -1;
}
+ /* entry will be regularly freed, and resources released
+ * according to callbacks */
+ if ( slapd_shutdown ) {
+ return 0;
+ }
+
mi = ( monitor_info_t * )be_monitor->be_private;
assert( mi != NULL );
- if ( monitor_subsys_opened ) {
+ if ( monitor_subsys_is_opened() ) {
Entry *e = NULL;
monitor_entry_t *mp = NULL;
monitor_callback_t *cb = NULL;
monitor_callback_t *next = cb->mc_next;
if ( cb->mc_free ) {
- (void)cb->mc_free( e, cb->mc_private );
+ (void)cb->mc_free( e, &cb->mc_private );
}
ch_free( cb );
return -1;
}
+ /* entry will be regularly freed, and resources released
+ * according to callbacks */
+ if ( slapd_shutdown ) {
+ return 0;
+ }
+
mi = ( monitor_info_t * )be_monitor->be_private;
assert( mi != NULL );
return -1;
}
- if ( monitor_subsys_opened ) {
+ if ( monitor_subsys_is_opened() ) {
Entry *e = NULL;
monitor_entry_t *mp = NULL;
- if ( monitor_filter2ndn( nbase, scope, filter, &ndn ) ) {
+ if ( monitor_search2ndn( nbase, scope, filter, &ndn ) ) {
/* entry does not exist */
Debug( LDAP_DEBUG_ANY,
"monitor_back_unregister_entry_parent(\"\"): "
for ( cbp = &mp->mp_cb; *cbp != NULL; cbp = &(*cbp)->mc_next ) {
if ( *cbp == target_cb ) {
if ( (*cbp)->mc_free ) {
- (void)(*cbp)->mc_free( e, (*cbp)->mc_private );
+ (void)(*cbp)->mc_free( e, &(*cbp)->mc_private );
}
*cbp = (*cbp)->mc_next;
ch_free( target_cb );
return -1;
}
+ /* entry will be regularly freed, and resources released
+ * according to callbacks */
+ if ( slapd_shutdown ) {
+ return 0;
+ }
+
mi = ( monitor_info_t * )be_monitor->be_private;
assert( mi != NULL );
return -1;
}
- if ( monitor_subsys_opened ) {
+ if ( monitor_subsys_is_opened() ) {
Entry *e = NULL;
monitor_entry_t *mp = NULL;
int freeit = 0;
if ( BER_BVISNULL( &ndn ) ) {
- if ( monitor_filter2ndn( nbase, scope, filter, &ndn ) ) {
+ if ( monitor_search2ndn( nbase, scope, filter, &ndn ) ) {
char buf[ SLAP_TEXT_BUFLEN ];
snprintf( buf, sizeof( buf ),
for ( cbp = &mp->mp_cb; *cbp != NULL; cbp = &(*cbp)->mc_next ) {
if ( *cbp == target_cb ) {
if ( (*cbp)->mc_free ) {
- (void)(*cbp)->mc_free( e, (*cbp)->mc_private );
+ (void)(*cbp)->mc_free( e, &(*cbp)->mc_private );
}
*cbp = (*cbp)->mc_next;
ch_free( target_cb );
};
struct m_s {
- char *name;
char *schema;
slap_mask_t flags;
int offset;
} moc[] = {
- { "monitor", "( 1.3.6.1.4.1.4203.666.3.16.1 "
+ { "( 1.3.6.1.4.1.4203.666.3.16.1 "
"NAME 'monitor' "
"DESC 'OpenLDAP system monitoring' "
"SUP top STRUCTURAL "
"$ monitorOverlay "
") )", SLAP_OC_OPERATIONAL|SLAP_OC_HIDE,
offsetof(monitor_info_t, mi_oc_monitor) },
- { "monitorServer", "( 1.3.6.1.4.1.4203.666.3.16.2 "
+ { "( 1.3.6.1.4.1.4203.666.3.16.2 "
"NAME 'monitorServer' "
"DESC 'Server monitoring root entry' "
"SUP monitor STRUCTURAL )", SLAP_OC_OPERATIONAL|SLAP_OC_HIDE,
offsetof(monitor_info_t, mi_oc_monitorServer) },
- { "monitorContainer", "( 1.3.6.1.4.1.4203.666.3.16.3 "
+ { "( 1.3.6.1.4.1.4203.666.3.16.3 "
"NAME 'monitorContainer' "
"DESC 'monitor container class' "
"SUP monitor STRUCTURAL )", SLAP_OC_OPERATIONAL|SLAP_OC_HIDE,
offsetof(monitor_info_t, mi_oc_monitorContainer) },
- { "monitorCounterObject", "( 1.3.6.1.4.1.4203.666.3.16.4 "
+ { "( 1.3.6.1.4.1.4203.666.3.16.4 "
"NAME 'monitorCounterObject' "
"DESC 'monitor counter class' "
"SUP monitor STRUCTURAL )", SLAP_OC_OPERATIONAL|SLAP_OC_HIDE,
offsetof(monitor_info_t, mi_oc_monitorCounterObject) },
- { "monitorOperation", "( 1.3.6.1.4.1.4203.666.3.16.5 "
+ { "( 1.3.6.1.4.1.4203.666.3.16.5 "
"NAME 'monitorOperation' "
"DESC 'monitor operation class' "
"SUP monitor STRUCTURAL )", SLAP_OC_OPERATIONAL|SLAP_OC_HIDE,
offsetof(monitor_info_t, mi_oc_monitorOperation) },
- { "monitorConnection", "( 1.3.6.1.4.1.4203.666.3.16.6 "
+ { "( 1.3.6.1.4.1.4203.666.3.16.6 "
"NAME 'monitorConnection' "
"DESC 'monitor connection class' "
"SUP monitor STRUCTURAL )", SLAP_OC_OPERATIONAL|SLAP_OC_HIDE,
offsetof(monitor_info_t, mi_oc_monitorConnection) },
- { "managedObject", "( 1.3.6.1.4.1.4203.666.3.16.7 "
+ { "( 1.3.6.1.4.1.4203.666.3.16.7 "
"NAME 'managedObject' "
"DESC 'monitor managed entity class' "
"SUP monitor STRUCTURAL )", SLAP_OC_OPERATIONAL|SLAP_OC_HIDE,
offsetof(monitor_info_t, mi_oc_managedObject) },
- { "monitoredObject", "( 1.3.6.1.4.1.4203.666.3.16.8 "
+ { "( 1.3.6.1.4.1.4203.666.3.16.8 "
"NAME 'monitoredObject' "
"DESC 'monitor monitored entity class' "
"SUP monitor STRUCTURAL )", SLAP_OC_OPERATIONAL|SLAP_OC_HIDE,
offsetof(monitor_info_t, mi_oc_monitoredObject) },
- { NULL, NULL, 0, -1 }
+ { NULL, 0, -1 }
}, mat[] = {
- { "monitoredInfo", "( 1.3.6.1.4.1.4203.666.1.55.1 "
+ { "( 1.3.6.1.4.1.4203.666.1.55.1 "
"NAME 'monitoredInfo' "
"DESC 'monitored info' "
/* "SUP name " */
"SUBSTR caseIgnoreSubstringsMatch "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768} "
"NO-USER-MODIFICATION "
- "USAGE directoryOperation )", SLAP_AT_HIDE,
+ "USAGE dSAOperation )", SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_monitoredInfo) },
- { "managedInfo", "( 1.3.6.1.4.1.4203.666.1.55.2 "
+ { "( 1.3.6.1.4.1.4203.666.1.55.2 "
"NAME 'managedInfo' "
"DESC 'monitor managed info' "
"SUP name )", SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_managedInfo) },
- { "monitorCounter", "( 1.3.6.1.4.1.4203.666.1.55.3 "
+ { "( 1.3.6.1.4.1.4203.666.1.55.3 "
"NAME 'monitorCounter' "
"DESC 'monitor counter' "
"EQUALITY integerMatch "
"ORDERING integerOrderingMatch "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 "
"NO-USER-MODIFICATION "
- "USAGE directoryOperation )", SLAP_AT_HIDE,
+ "USAGE dSAOperation )", SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_monitorCounter) },
- { "monitorOpCompleted", "( 1.3.6.1.4.1.4203.666.1.55.4 "
+ { "( 1.3.6.1.4.1.4203.666.1.55.4 "
"NAME 'monitorOpCompleted' "
"DESC 'monitor completed operations' "
"SUP monitorCounter "
"NO-USER-MODIFICATION "
- "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+ "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_monitorOpCompleted) },
- { "monitorOpInitiated", "( 1.3.6.1.4.1.4203.666.1.55.5 "
+ { "( 1.3.6.1.4.1.4203.666.1.55.5 "
"NAME 'monitorOpInitiated' "
"DESC 'monitor initiated operations' "
"SUP monitorCounter "
"NO-USER-MODIFICATION "
- "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+ "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_monitorOpInitiated) },
- { "monitorConnectionNumber", "( 1.3.6.1.4.1.4203.666.1.55.6 "
+ { "( 1.3.6.1.4.1.4203.666.1.55.6 "
"NAME 'monitorConnectionNumber' "
"DESC 'monitor connection number' "
"SUP monitorCounter "
"NO-USER-MODIFICATION "
- "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+ "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_monitorConnectionNumber) },
- { "monitorConnectionAuthzDN", "( 1.3.6.1.4.1.4203.666.1.55.7 "
+ { "( 1.3.6.1.4.1.4203.666.1.55.7 "
"NAME 'monitorConnectionAuthzDN' "
"DESC 'monitor connection authorization DN' "
/* "SUP distinguishedName " */
"EQUALITY distinguishedNameMatch "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 "
"NO-USER-MODIFICATION "
- "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+ "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_monitorConnectionAuthzDN) },
- { "monitorConnectionLocalAddress", "( 1.3.6.1.4.1.4203.666.1.55.8 "
+ { "( 1.3.6.1.4.1.4203.666.1.55.8 "
"NAME 'monitorConnectionLocalAddress' "
"DESC 'monitor connection local address' "
"SUP monitoredInfo "
"NO-USER-MODIFICATION "
- "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+ "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_monitorConnectionLocalAddress) },
- { "monitorConnectionPeerAddress", "( 1.3.6.1.4.1.4203.666.1.55.9 "
+ { "( 1.3.6.1.4.1.4203.666.1.55.9 "
"NAME 'monitorConnectionPeerAddress' "
"DESC 'monitor connection peer address' "
"SUP monitoredInfo "
"NO-USER-MODIFICATION "
- "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+ "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_monitorConnectionPeerAddress) },
- { "monitorTimestamp", "( 1.3.6.1.4.1.4203.666.1.55.10 "
+ { "( 1.3.6.1.4.1.4203.666.1.55.10 "
"NAME 'monitorTimestamp' "
"DESC 'monitor timestamp' "
"EQUALITY generalizedTimeMatch "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 "
"SINGLE-VALUE "
"NO-USER-MODIFICATION "
- "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+ "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_monitorTimestamp) },
- { "monitorOverlay", "( 1.3.6.1.4.1.4203.666.1.55.11 "
+ { "( 1.3.6.1.4.1.4203.666.1.55.11 "
"NAME 'monitorOverlay' "
"DESC 'name of overlays defined for a given database' "
"SUP monitoredInfo "
"NO-USER-MODIFICATION "
- "USAGE directoryOperation )", SLAP_AT_HIDE,
+ "USAGE dSAOperation )", SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_monitorOverlay) },
- { "readOnly", "( 1.3.6.1.4.1.4203.666.1.55.12 "
+ { "( 1.3.6.1.4.1.4203.666.1.55.12 "
"NAME 'readOnly' "
"DESC 'read/write status of a given database' "
"EQUALITY booleanMatch "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 "
"SINGLE-VALUE "
- "USAGE directoryOperation )", SLAP_AT_HIDE,
+ "USAGE dSAOperation )", SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_readOnly) },
- { "restrictedOperation", "( 1.3.6.1.4.1.4203.666.1.55.13 "
+ { "( 1.3.6.1.4.1.4203.666.1.55.13 "
"NAME 'restrictedOperation' "
"DESC 'name of restricted operation for a given database' "
"SUP managedInfo )", SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_restrictedOperation ) },
- { "monitorConnectionProtocol", "( 1.3.6.1.4.1.4203.666.1.55.14 "
+ { "( 1.3.6.1.4.1.4203.666.1.55.14 "
"NAME 'monitorConnectionProtocol' "
"DESC 'monitor connection protocol' "
"SUP monitoredInfo "
"NO-USER-MODIFICATION "
- "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+ "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_monitorConnectionProtocol) },
- { "monitorConnectionOpsReceived", "( 1.3.6.1.4.1.4203.666.1.55.15 "
+ { "( 1.3.6.1.4.1.4203.666.1.55.15 "
"NAME 'monitorConnectionOpsReceived' "
"DESC 'monitor number of operations received by the connection' "
"SUP monitorCounter "
"NO-USER-MODIFICATION "
- "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+ "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_monitorConnectionOpsReceived) },
- { "monitorConnectionOpsExecuting", "( 1.3.6.1.4.1.4203.666.1.55.16 "
+ { "( 1.3.6.1.4.1.4203.666.1.55.16 "
"NAME 'monitorConnectionOpsExecuting' "
"DESC 'monitor number of operations in execution within the connection' "
"SUP monitorCounter "
"NO-USER-MODIFICATION "
- "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+ "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_monitorConnectionOpsExecuting) },
- { "monitorConnectionOpsPending", "( 1.3.6.1.4.1.4203.666.1.55.17 "
+ { "( 1.3.6.1.4.1.4203.666.1.55.17 "
"NAME 'monitorConnectionOpsPending' "
"DESC 'monitor number of pending operations within the connection' "
"SUP monitorCounter "
"NO-USER-MODIFICATION "
- "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+ "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_monitorConnectionOpsPending) },
- { "monitorConnectionOpsCompleted", "( 1.3.6.1.4.1.4203.666.1.55.18 "
+ { "( 1.3.6.1.4.1.4203.666.1.55.18 "
"NAME 'monitorConnectionOpsCompleted' "
"DESC 'monitor number of operations completed within the connection' "
"SUP monitorCounter "
"NO-USER-MODIFICATION "
- "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+ "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_monitorConnectionOpsCompleted) },
- { "monitorConnectionGet", "( 1.3.6.1.4.1.4203.666.1.55.19 "
+ { "( 1.3.6.1.4.1.4203.666.1.55.19 "
"NAME 'monitorConnectionGet' "
"DESC 'number of times connection_get() was called so far' "
"SUP monitorCounter "
"NO-USER-MODIFICATION "
- "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+ "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_monitorConnectionGet) },
- { "monitorConnectionRead", "( 1.3.6.1.4.1.4203.666.1.55.20 "
+ { "( 1.3.6.1.4.1.4203.666.1.55.20 "
"NAME 'monitorConnectionRead' "
"DESC 'number of times connection_read() was called so far' "
"SUP monitorCounter "
"NO-USER-MODIFICATION "
- "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+ "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_monitorConnectionRead) },
- { "monitorConnectionWrite", "( 1.3.6.1.4.1.4203.666.1.55.21 "
+ { "( 1.3.6.1.4.1.4203.666.1.55.21 "
"NAME 'monitorConnectionWrite' "
"DESC 'number of times connection_write() was called so far' "
"SUP monitorCounter "
"NO-USER-MODIFICATION "
- "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+ "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_monitorConnectionWrite) },
- { "monitorConnectionMask", "( 1.3.6.1.4.1.4203.666.1.55.22 "
+ { "( 1.3.6.1.4.1.4203.666.1.55.22 "
"NAME 'monitorConnectionMask' "
"DESC 'monitor connection mask' "
"SUP monitoredInfo "
"NO-USER-MODIFICATION "
- "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+ "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_monitorConnectionMask) },
- { "monitorConnectionListener", "( 1.3.6.1.4.1.4203.666.1.55.23 "
+ { "( 1.3.6.1.4.1.4203.666.1.55.23 "
"NAME 'monitorConnectionListener' "
"DESC 'monitor connection listener' "
"SUP monitoredInfo "
"NO-USER-MODIFICATION "
- "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+ "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_monitorConnectionListener) },
- { "monitorConnectionPeerDomain", "( 1.3.6.1.4.1.4203.666.1.55.24 "
+ { "( 1.3.6.1.4.1.4203.666.1.55.24 "
"NAME 'monitorConnectionPeerDomain' "
"DESC 'monitor connection peer domain' "
"SUP monitoredInfo "
"NO-USER-MODIFICATION "
- "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+ "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_monitorConnectionPeerDomain) },
- { "monitorConnectionStartTime", "( 1.3.6.1.4.1.4203.666.1.55.25 "
+ { "( 1.3.6.1.4.1.4203.666.1.55.25 "
"NAME 'monitorConnectionStartTime' "
"DESC 'monitor connection start time' "
"SUP monitorTimestamp "
"SINGLE-VALUE "
"NO-USER-MODIFICATION "
- "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+ "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_monitorConnectionStartTime) },
- { "monitorConnectionActivityTime", "( 1.3.6.1.4.1.4203.666.1.55.26 "
+ { "( 1.3.6.1.4.1.4203.666.1.55.26 "
"NAME 'monitorConnectionActivityTime' "
"DESC 'monitor connection activity time' "
"SUP monitorTimestamp "
"SINGLE-VALUE "
"NO-USER-MODIFICATION "
- "USAGE directoryOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
+ "USAGE dSAOperation )", SLAP_AT_FINAL|SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_monitorConnectionActivityTime) },
- { "monitorIsShadow", "( 1.3.6.1.4.1.4203.666.1.55.27 "
+ { "( 1.3.6.1.4.1.4203.666.1.55.27 "
"NAME 'monitorIsShadow' "
"DESC 'TRUE if the database is shadow' "
"EQUALITY booleanMatch "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 "
"SINGLE-VALUE "
- "USAGE directoryOperation )", SLAP_AT_HIDE,
+ "USAGE dSAOperation )", SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_monitorIsShadow) },
- { "monitorUpdateRef", "( 1.3.6.1.4.1.4203.666.1.55.28 "
+ { "( 1.3.6.1.4.1.4203.666.1.55.28 "
"NAME 'monitorUpdateRef' "
"DESC 'update referral for shadow databases' "
"SUP monitoredInfo "
"SINGLE-VALUE "
- "USAGE directoryOperation )", SLAP_AT_HIDE,
+ "USAGE dSAOperation )", SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_monitorUpdateRef) },
- { "monitorRuntimeConfig", "( 1.3.6.1.4.1.4203.666.1.55.29 "
+ { "( 1.3.6.1.4.1.4203.666.1.55.29 "
"NAME 'monitorRuntimeConfig' "
"DESC 'TRUE if component allows runtime configuration' "
"EQUALITY booleanMatch "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 "
"SINGLE-VALUE "
- "USAGE directoryOperation )", SLAP_AT_HIDE,
+ "USAGE dSAOperation )", SLAP_AT_HIDE,
offsetof(monitor_info_t, mi_ad_monitorRuntimeConfig) },
- { NULL, NULL, 0, -1 }
+ { NULL, 0, -1 }
};
static struct {
};
int i, rc;
- const char *text;
monitor_info_t *mi = &monitor_info;
+ ConfigArgs c;
+ char *argv[ 3 ];
+
+ argv[ 0 ] = "monitor";
+ c.argv = argv;
+ c.argc = 3;
+ c.fname = argv[0];
for ( i = 0; s_oid[ i ].name; i++ ) {
- char *argv[ 3 ];
-
- argv[ 0 ] = "monitor";
argv[ 1 ] = s_oid[ i ].name;
argv[ 2 ] = s_oid[ i ].oid;
- if ( parse_oidm( argv[ 0 ], i, 3, argv, 0, NULL ) != 0 ) {
+ if ( parse_oidm( &c, 0, NULL ) != 0 ) {
Debug( LDAP_DEBUG_ANY,
"monitor_back_initialize: unable to add "
"objectIdentifier \"%s=%s\"\n",
}
/* schema integration */
- for ( i = 0; mat[ i ].name; i++ ) {
- LDAPAttributeType *at;
+ for ( i = 0; mat[ i ].schema; i++ ) {
int code;
- const char *err;
- AttributeDescription **ad;
-
- at = ldap_str2attributetype( mat[ i ].schema, &code,
- &err, LDAP_SCHEMA_ALLOW_ALL );
- if ( !at ) {
- Debug( LDAP_DEBUG_ANY, "monitor_back_db_init: "
- "in AttributeType \"%s\" %s before %s\n",
- mat[ i ].name, ldap_scherr2str(code), err );
- return -1;
- }
+ AttributeDescription **ad =
+ ((AttributeDescription **)&(((char *)mi)[ mat[ i ].offset ]));
- if ( at->at_oid == NULL ) {
- ldap_attributetype_free(at);
- Debug( LDAP_DEBUG_ANY, "monitor_back_db_init: "
- "null OID for attributeType \"%s\"\n",
- mat[ i ].name, 0, 0 );
- return -1;
- }
+ *ad = NULL;
+ code = register_at( mat[ i ].schema, ad, 0 );
- code = at_add(at, 0, NULL, &err);
if ( code ) {
- ldap_attributetype_free(at);
- Debug( LDAP_DEBUG_ANY, "monitor_back_db_init: "
- "%s in attributeType \"%s\"\n",
- scherr2str(code), mat[ i ].name, 0 );
- return -1;
- }
- ldap_memfree(at);
-
- ad = ((AttributeDescription **)&(((char *)mi)[ mat[ i ].offset ]));
- ad[ 0 ] = NULL;
- if ( slap_str2ad( mat[ i ].name, ad, &text ) ) {
Debug( LDAP_DEBUG_ANY,
- "monitor_back_db_init: %s\n", text, 0, 0 );
+ "monitor_back_db_init: register_at failed\n", 0, 0, 0 );
return -1;
}
-
(*ad)->ad_type->sat_flags |= mat[ i ].flags;
}
- for ( i = 0; moc[ i ].name; i++ ) {
- LDAPObjectClass *oc;
+ for ( i = 0; moc[ i ].schema; i++ ) {
int code;
- const char *err;
- ObjectClass *Oc;
-
- oc = ldap_str2objectclass(moc[ i ].schema, &code, &err,
- LDAP_SCHEMA_ALLOW_ALL );
- if ( !oc ) {
- Debug( LDAP_DEBUG_ANY,
- "unable to parse monitor objectclass \"%s\": "
- "%s before %s\n" , moc[ i ].name,
- ldap_scherr2str(code), err );
- return -1;
- }
-
- if ( oc->oc_oid == NULL ) {
- ldap_objectclass_free(oc);
- Debug( LDAP_DEBUG_ANY,
- "objectclass \"%s\" has no OID\n" ,
- moc[ i ].name, 0, 0 );
- return -1;
- }
+ ObjectClass **Oc =
+ ((ObjectClass **)&(((char *)mi)[ moc[ i ].offset ]));
- code = oc_add(oc, 0, NULL, &err);
+ code = register_oc( moc[ i ].schema, Oc, 0 );
if ( code ) {
- ldap_objectclass_free(oc);
Debug( LDAP_DEBUG_ANY,
- "objectclass \"%s\": %s \"%s\"\n" ,
- moc[ i ].name, scherr2str(code), err );
- return -1;
- }
- ldap_memfree(oc);
-
- Oc = oc_find( moc[ i ].name );
- if ( Oc == NULL ) {
- Debug( LDAP_DEBUG_ANY, "monitor_back_db_init: "
- "unable to find objectClass %s "
- "(just added)\n", moc[ i ].name, 0, 0 );
+ "monitor_back_db_init: register_oc failed\n", 0, 0, 0 );
return -1;
}
-
- Oc->soc_flags |= moc[ i ].flags;
-
- ((ObjectClass **)&(((char *)mi)[ moc[ i ].offset ]))[ 0 ] = Oc;
+ (*Oc)->soc_flags |= moc[ i ].flags;
}
bi->bi_controls = controls;
bi->bi_connection_init = 0;
bi->bi_connection_destroy = 0;
+ bi->bi_extra = (void *)&monitor_extra;
+
/*
* configuration objectClasses (fake)
*/
monitor_subsys_t *ms;
- /*
- * register subsys
- */
- for ( ms = known_monitor_subsys; ms->mss_name != NULL; ms++ ) {
- if ( monitor_back_register_subsys( ms ) ) {
- return -1;
- }
- }
-
/*
* database monitor can be defined once only
*/
}
be_monitor = be;
+ /*
+ * register subsys
+ */
+ for ( ms = known_monitor_subsys; ms->mss_name != NULL; ms++ ) {
+ if ( monitor_back_register_subsys( ms ) ) {
+ return -1;
+ }
+ }
+
/* indicate system schema supported */
SLAP_BFLAGS(be) |= SLAP_BFLAG_MONITOR;
for ( ; el; ) {
entry_limbo_t *tmp;
+ int rc;
switch ( el->el_type ) {
case LIMBO_ENTRY:
- monitor_back_register_entry(
+ rc = monitor_back_register_entry(
el->el_e,
el->el_cb,
el->el_mss,
break;
case LIMBO_ENTRY_PARENT:
- monitor_back_register_entry_parent(
+ rc = monitor_back_register_entry_parent(
el->el_e,
el->el_cb,
el->el_mss,
case LIMBO_ATTRS:
- monitor_back_register_entry_attrs(
+ rc = monitor_back_register_entry_attrs(
&el->el_ndn,
el->el_a,
el->el_cb,
break;
case LIMBO_CB:
- monitor_back_register_entry_callback(
+ rc = monitor_back_register_entry_callback(
&el->el_ndn,
el->el_cb,
&el->el_nbase,
&el->el_filter );
break;
+ case LIMBO_BACKEND:
+ rc = monitor_back_register_backend( el->el_bi );
+ break;
+
+ case LIMBO_DATABASE:
+ rc = monitor_back_register_database( el->el_be );
+ break;
+
+ case LIMBO_OVERLAY_INFO:
+ rc = monitor_back_register_overlay_info( el->el_on );
+ break;
+
+ case LIMBO_OVERLAY:
+ rc = monitor_back_register_overlay( el->el_be );
+ break;
+
default:
assert( 0 );
}
if ( !BER_BVISNULL( &el->el_filter ) ) {
ber_memfree( el->el_filter.bv_val );
}
+ if ( el->el_cb && rc != 0 ) {
+ if ( el->el_cb->mc_dispose ) {
+ el->el_cb->mc_dispose( &el->el_cb->mc_private );
+ }
+ ch_free( el->el_cb );
+ }
tmp = el;
el = el->el_next;
projects / openldap / blobdiff