/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2001-2004 The OpenLDAP Foundation.
+ * Copyright 2001-2006 The OpenLDAP Foundation.
* Portions Copyright 2001-2003 Pierangelo Masarati.
* All rights reserved.
*
#include "portable.h"
#include <stdio.h>
+#include <ac/string.h>
#include "slap.h"
#include "back-monitor.h"
int
monitor_subsys_listener_init(
- BackendDB *be,
- monitorsubsys *ms
+ BackendDB *be,
+ monitor_subsys_t *ms
)
{
- struct monitorinfo *mi;
- Entry *e_listener, **ep;
- int i;
- struct monitorentrypriv *mp;
- Listener **l;
+ monitor_info_t *mi;
+ Entry *e_listener, **ep;
+ int i;
+ monitor_entry_t *mp;
+ Listener **l;
assert( be != NULL );
return( -1 );
}
- mi = ( struct monitorinfo * )be->be_private;
+ mi = ( monitor_info_t * )be->be_private;
- if ( monitor_cache_get( mi,
- &ms->mss_ndn,
- &e_listener ) )
- {
+ if ( monitor_cache_get( mi, &ms->mss_ndn, &e_listener ) ) {
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_listener_init: "
"unable to get entry \"%s\"\n",
return( -1 );
}
- mp = ( struct monitorentrypriv * )e_listener->e_private;
+ mp = ( monitor_entry_t * )e_listener->e_private;
mp->mp_children = NULL;
ep = &mp->mp_children;
- for ( i = 0; l[i]; i++ ) {
+ for ( i = 0; l[ i ]; i++ ) {
char buf[ BACKMONITOR_BUFSIZE ];
Entry *e;
+ struct berval bv;
+
+ bv.bv_len = snprintf( buf, sizeof( buf ),
+ "cn=Listener %d", i );
+ bv.bv_val = buf;
+ e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &bv,
+ mi->mi_oc_monitoredObject, mi, NULL, NULL );
- snprintf( buf, sizeof( buf ),
- "dn: cn=Listener %d,%s\n"
- "objectClass: %s\n"
- "structuralObjectClass: %s\n"
- "cn: Listener %d\n"
- "%s: %s\n"
- "labeledURI: %s\n"
- "creatorsName: %s\n"
- "modifiersName: %s\n"
- "createTimestamp: %s\n"
- "modifyTimestamp: %s\n",
- i,
- ms->mss_dn.bv_val,
- mi->mi_oc_monitoredObject->soc_cname.bv_val,
- mi->mi_oc_monitoredObject->soc_cname.bv_val,
- i,
- mi->mi_ad_monitorConnectionLocalAddress->ad_cname.bv_val,
- l[i]->sl_name.bv_val,
- l[i]->sl_url.bv_val,
- mi->mi_creatorsName.bv_val,
- mi->mi_creatorsName.bv_val,
- mi->mi_startTime.bv_val,
- mi->mi_startTime.bv_val );
-
- e = str2entry( buf );
if ( e == NULL ) {
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_listener_init: "
return( -1 );
}
+ attr_merge_normalize_one( e, mi->mi_ad_monitorConnectionLocalAddress,
+ &l[ i ]->sl_name, NULL );
+
+ attr_merge_normalize_one( e, slap_schema.si_ad_labeledURI,
+ &l[ i ]->sl_url, NULL );
+
#ifdef HAVE_TLS
- if ( l[i]->sl_is_tls ) {
+ if ( l[ i ]->sl_is_tls ) {
struct berval bv;
- bv.bv_val = "TLS";
- bv.bv_len = sizeof("TLS")-1;
-
+ BER_BVSTR( &bv, "TLS" );
attr_merge_normalize_one( e, mi->mi_ad_monitoredInfo,
&bv, NULL );
}
#endif /* HAVE_TLS */
#ifdef LDAP_CONNECTIONLESS
- if ( l[i]->sl_is_udp ) {
+ if ( l[ i ]->sl_is_udp ) {
struct berval bv;
BER_BVSTR( &bv, "UDP" );
}
#endif /* HAVE_TLS */
- mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 );
+ mp = monitor_entrypriv_create();
+ if ( mp == NULL ) {
+ return -1;
+ }
e->e_private = ( void * )mp;
- mp->mp_next = NULL;
- mp->mp_children = NULL;
mp->mp_info = ms;
mp->mp_flags = ms->mss_flags
| MONITOR_F_SUB;