X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-monitor%2Fconn.c;h=28fc176b87bc72cdef6f314b2a5dc2451e3b808e;hb=6549cfc7d09511de67e113d602c4071599127e2c;hp=ce61417eb480e0046aa1c9981130670b45fa6f40;hpb=55e251e6e83840d33afa500098a61f140ec258fd;p=openldap diff --git a/servers/slapd/back-monitor/conn.c b/servers/slapd/back-monitor/conn.c index ce61417eb4..28fc176b87 100644 --- a/servers/slapd/back-monitor/conn.c +++ b/servers/slapd/back-monitor/conn.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 2001-2004 The OpenLDAP Foundation. + * Copyright 2001-2013 The OpenLDAP Foundation. * Portions Copyright 2001-2003 Pierangelo Masarati. * All rights reserved. * @@ -28,74 +28,120 @@ #include "lutil.h" #include "back-monitor.h" +static int +monitor_subsys_conn_update( + Operation *op, + SlapReply *rs, + Entry *e ); + +static int +monitor_subsys_conn_create( + Operation *op, + SlapReply *rs, + struct berval *ndn, + Entry *e_parent, + Entry **ep ); + int monitor_subsys_conn_init( - BackendDB *be -) + BackendDB *be, + monitor_subsys_t *ms ) { - struct monitorinfo *mi; - - Entry *e, **ep, *e_conn; - struct monitorentrypriv *mp; - char buf[ BACKMONITOR_BUFSIZE ]; - struct berval bv; + monitor_info_t *mi; + Entry *e, **ep, *e_conn; + monitor_entry_t *mp; + char buf[ BACKMONITOR_BUFSIZE ]; + struct berval bv; assert( be != NULL ); - mi = ( struct monitorinfo * )be->be_private; + ms->mss_update = monitor_subsys_conn_update; + ms->mss_create = monitor_subsys_conn_create; + + mi = ( monitor_info_t * )be->be_private; - if ( monitor_cache_get( mi, - &monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn, &e_conn ) ) - { + if ( monitor_cache_get( mi, &ms->mss_ndn, &e_conn ) ) { Debug( LDAP_DEBUG_ANY, "monitor_subsys_conn_init: " "unable to get entry \"%s\"\n", - monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val, 0, 0 ); + ms->mss_ndn.bv_val, 0, 0 ); return( -1 ); } - mp = ( struct monitorentrypriv * )e_conn->e_private; + mp = ( monitor_entry_t * )e_conn->e_private; mp->mp_children = NULL; ep = &mp->mp_children; + /* + * Max file descriptors + */ + BER_BVSTR( &bv, "cn=Max File Descriptors" ); + e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &bv, + mi->mi_oc_monitorCounterObject, NULL, NULL ); + + if ( e == NULL ) { + Debug( LDAP_DEBUG_ANY, + "monitor_subsys_conn_init: " + "unable to create entry \"%s,%s\"\n", + bv.bv_val, ms->mss_ndn.bv_val, 0 ); + return( -1 ); + } + + if ( dtblsize ) { + bv.bv_val = buf; + bv.bv_len = snprintf( buf, sizeof( buf ), "%d", dtblsize ); + + } else { + BER_BVSTR( &bv, "0" ); + } + attr_merge_one( e, mi->mi_ad_monitorCounter, &bv, NULL ); + + mp = monitor_entrypriv_create(); + if ( mp == NULL ) { + return -1; + } + e->e_private = ( void * )mp; + mp->mp_info = ms; + mp->mp_flags = ms->mss_flags \ + | MONITOR_F_SUB | MONITOR_F_PERSISTENT; + mp->mp_flags &= ~MONITOR_F_VOLATILE_CH; + + if ( monitor_cache_add( mi, e ) ) { + Debug( LDAP_DEBUG_ANY, + "monitor_subsys_conn_init: " + "unable to add entry \"cn=Total,%s\"\n", + ms->mss_ndn.bv_val, 0, 0 ); + return( -1 ); + } + + *ep = e; + ep = &mp->mp_next; + /* * Total conns */ - snprintf( buf, sizeof( buf ), - "dn: cn=Total,%s\n" - "objectClass: %s\n" - "structuralObjectClass: %s\n" - "cn: Total\n" - "creatorsName: %s\n" - "modifiersName: %s\n" - "createTimestamp: %s\n" - "modifyTimestamp: %s\n", - monitor_subsys[SLAPD_MONITOR_CONN].mss_dn.bv_val, - mi->mi_oc_monitorCounterObject->soc_cname.bv_val, - mi->mi_oc_monitorCounterObject->soc_cname.bv_val, - mi->mi_creatorsName.bv_val, - mi->mi_creatorsName.bv_val, - mi->mi_startTime.bv_val, - mi->mi_startTime.bv_val ); + BER_BVSTR( &bv, "cn=Total" ); + e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &bv, + mi->mi_oc_monitorCounterObject, NULL, NULL ); - e = str2entry( buf ); if ( e == NULL ) { Debug( LDAP_DEBUG_ANY, "monitor_subsys_conn_init: " "unable to create entry \"cn=Total,%s\"\n", - monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val, 0, 0 ); + ms->mss_ndn.bv_val, 0, 0 ); return( -1 ); } - BER_BVSTR( &bv, "0" ); + BER_BVSTR( &bv, "-1" ); attr_merge_one( e, mi->mi_ad_monitorCounter, &bv, NULL ); - 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 = &monitor_subsys[SLAPD_MONITOR_CONN]; - mp->mp_flags = monitor_subsys[SLAPD_MONITOR_CONN].mss_flags \ + mp->mp_info = ms; + mp->mp_flags = ms->mss_flags \ | MONITOR_F_SUB | MONITOR_F_PERSISTENT; mp->mp_flags &= ~MONITOR_F_VOLATILE_CH; @@ -103,7 +149,7 @@ monitor_subsys_conn_init( Debug( LDAP_DEBUG_ANY, "monitor_subsys_conn_init: " "unable to add entry \"cn=Total,%s\"\n", - monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val, 0, 0 ); + ms->mss_ndn.bv_val, 0, 0 ); return( -1 ); } @@ -113,41 +159,28 @@ monitor_subsys_conn_init( /* * Current conns */ - snprintf( buf, sizeof( buf ), - "dn: cn=Current,%s\n" - "objectClass: %s\n" - "structuralObjectClass: %s\n" - "cn: Current\n" - "creatorsName: %s\n" - "modifiersName: %s\n" - "createTimestamp: %s\n" - "modifyTimestamp: %s\n", - monitor_subsys[SLAPD_MONITOR_CONN].mss_dn.bv_val, - mi->mi_oc_monitorCounterObject->soc_cname.bv_val, - mi->mi_oc_monitorCounterObject->soc_cname.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 ); + BER_BVSTR( &bv, "cn=Current" ); + e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &bv, + mi->mi_oc_monitorCounterObject, NULL, NULL ); + if ( e == NULL ) { Debug( LDAP_DEBUG_ANY, "monitor_subsys_conn_init: " "unable to create entry \"cn=Current,%s\"\n", - monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val, 0, 0 ); + ms->mss_ndn.bv_val, 0, 0 ); return( -1 ); } BER_BVSTR( &bv, "0" ); attr_merge_one( e, mi->mi_ad_monitorCounter, &bv, NULL ); - 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 = &monitor_subsys[SLAPD_MONITOR_CONN]; - mp->mp_flags = monitor_subsys[SLAPD_MONITOR_CONN].mss_flags \ + mp->mp_info = ms; + mp->mp_flags = ms->mss_flags \ | MONITOR_F_SUB | MONITOR_F_PERSISTENT; mp->mp_flags &= ~MONITOR_F_VOLATILE_CH; @@ -155,7 +188,7 @@ monitor_subsys_conn_init( Debug( LDAP_DEBUG_ANY, "monitor_subsys_conn_init: " "unable to add entry \"cn=Current,%s\"\n", - monitor_subsys[SLAPD_MONITOR_CONN].mss_ndn.bv_val, 0, 0 ); + ms->mss_ndn.bv_val, 0, 0 ); return( -1 ); } @@ -167,22 +200,21 @@ monitor_subsys_conn_init( return( 0 ); } -int +static int monitor_subsys_conn_update( Operation *op, - Entry *e -) + SlapReply *rs, + Entry *e ) { - struct monitorinfo *mi = - (struct monitorinfo *)op->o_bd->be_private; + monitor_info_t *mi = ( monitor_info_t * )op->o_bd->be_private; long n = -1; static struct berval total_bv = BER_BVC( "cn=total" ), current_bv = BER_BVC( "cn=current" ); struct berval rdn; - assert( mi ); - assert( e ); + assert( mi != NULL ); + assert( e != NULL ); dnRdn( &e->e_nname, &rdn ); @@ -191,11 +223,12 @@ monitor_subsys_conn_update( } else if ( dn_match( &rdn, ¤t_bv ) ) { Connection *c; - int connindex; + ber_socket_t connindex; for ( n = 0, c = connection_first( &connindex ); c != NULL; - n++, c = connection_next( c, &connindex ) ) { + n++, c = connection_next( c, &connindex ) ) + { /* No Op */ ; } connection_done( c ); @@ -203,7 +236,7 @@ monitor_subsys_conn_update( if ( n != -1 ) { Attribute *a; - char buf[] = "+9223372036854775807L"; + char buf[LDAP_PVT_INTTYPE_CHARS(long)]; ber_len_t len; a = attr_find( e->e_attrs, mi->mi_ad_monitorCounter ); @@ -218,229 +251,216 @@ monitor_subsys_conn_update( } a->a_vals[ 0 ].bv_len = len; AC_MEMCPY( a->a_vals[ 0 ].bv_val, buf, len + 1 ); + + /* FIXME: touch modifyTimestamp? */ } - return( 0 ); + return SLAP_CB_CONTINUE; } static int conn_create( - struct monitorinfo *mi, + monitor_info_t *mi, Connection *c, - Entry **ep -) + Entry **ep, + monitor_subsys_t *ms ) { - struct monitorentrypriv *mp; - struct tm *ltm; - char buf[ BACKMONITOR_BUFSIZE ]; - char buf2[ LDAP_LUTIL_GENTIME_BUFSIZE ]; - char buf3[ LDAP_LUTIL_GENTIME_BUFSIZE ]; - - struct berval bv; + monitor_entry_t *mp; + struct tm tm; + char buf[ BACKMONITOR_BUFSIZE ]; + char buf2[ LDAP_LUTIL_GENTIME_BUFSIZE ]; + char buf3[ LDAP_LUTIL_GENTIME_BUFSIZE ]; - Entry *e; + struct berval bv, ctmbv, mtmbv; + struct berval bv_unknown= BER_BVC("unknown"); - struct tm *ctm; - char ctmbuf[ LDAP_LUTIL_GENTIME_BUFSIZE ]; - struct tm *mtm; - char mtmbuf[ LDAP_LUTIL_GENTIME_BUFSIZE ]; -#ifdef HAVE_GMTIME_R - struct tm tm_buf; -#endif /* HAVE_GMTIME_R */ + Entry *e; assert( c != NULL ); assert( ep != NULL ); -#ifndef HAVE_GMTIME_R - ldap_pvt_thread_mutex_lock( &gmtime_mutex ); -#endif -#ifdef HACK_LOCAL_TIME -# ifdef HAVE_LOCALTIME_R - ctm = localtime_r( &c->c_starttime, &tm_buf ); - lutil_localtime( ctmbuf, sizeof( ctmbuf ), ctm, -timezone ); - mtm = localtime_r( &c->c_activitytime, &tm_buf ); - lutil_localtime( mtmbuf, sizeof( mtmbuf ), mtm, -timezone ); -# else - ctm = localtime( &c->c_starttime ); - lutil_localtime( ctmbuf, sizeof( ctmbuf ), ctm, -timezone ); - mtm = localtime( &c->c_activitytime ); - lutil_localtime( mtmbuf, sizeof( mtmbuf ), mtm, -timezone ); -# endif /* HAVE_LOCALTIME_R */ -#else /* !HACK_LOCAL_TIME */ -# ifdef HAVE_GMTIME_R - ctm = gmtime_r( &c->c_starttime, &tm_buf ); - lutil_gentime( ctmbuf, sizeof( ctmbuf ), ctm ); - mtm = gmtime_r( &c->c_activitytime, &tm_buf ); - lutil_gentime( mtmbuf, sizeof( mtmbuf ), mtm ); -# else - ctm = gmtime( &c->c_starttime ); - lutil_gentime( ctmbuf, sizeof( ctmbuf ), ctm ); - mtm = gmtime( &c->c_activitytime ); - lutil_gentime( mtmbuf, sizeof( mtmbuf ), mtm ); -# endif /* HAVE_GMTIME_R */ -#endif /* !HACK_LOCAL_TIME */ -#ifndef HAVE_GMTIME_R - ldap_pvt_thread_mutex_unlock( &gmtime_mutex ); -#endif - - snprintf( buf, sizeof( buf ), - "dn: cn=Connection %ld,%s\n" - "objectClass: %s\n" - "structuralObjectClass: %s\n" - "cn: Connection %ld\n" - "creatorsName: %s\n" - "modifiersName: %s\n" - "createTimestamp: %s\n" - "modifyTimestamp: %s\n", - c->c_connid, monitor_subsys[SLAPD_MONITOR_CONN].mss_dn.bv_val, - mi->mi_oc_monitorConnection->soc_cname.bv_val, - mi->mi_oc_monitorConnection->soc_cname.bv_val, - c->c_connid, - mi->mi_creatorsName.bv_val, - mi->mi_creatorsName.bv_val, - ctmbuf, - mtmbuf ); - - e = str2entry( buf ); + ldap_pvt_gmtime( &c->c_starttime, &tm ); + + ctmbv.bv_len = lutil_gentime( buf2, sizeof( buf2 ), &tm ); + ctmbv.bv_val = buf2; + + ldap_pvt_gmtime( &c->c_activitytime, &tm ); + mtmbv.bv_len = lutil_gentime( buf3, sizeof( buf3 ), &tm ); + mtmbv.bv_val = buf3; + + bv.bv_len = snprintf( buf, sizeof( buf ), + "cn=Connection %ld", c->c_connid ); + bv.bv_val = buf; + e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &bv, + mi->mi_oc_monitorConnection, &ctmbv, &mtmbv ); if ( e == NULL) { Debug( LDAP_DEBUG_ANY, "monitor_subsys_conn_create: " "unable to create entry " - "\"cn=Connection %ld,%s\" entry\n", + "\"cn=Connection %ld,%s\"\n", c->c_connid, - monitor_subsys[SLAPD_MONITOR_CONN].mss_dn.bv_val, 0 ); + ms->mss_dn.bv_val, 0 ); return( -1 ); } -#ifndef HAVE_GMTIME_R - ldap_pvt_thread_mutex_lock( &gmtime_mutex ); -#endif - -#ifdef HAVE_GMTIME_R - ltm = gmtime_r( &c->c_starttime, &tm_buf ); -#else - ltm = gmtime( &c->c_starttime ); -#endif - lutil_gentime( buf2, sizeof( buf2 ), ltm ); - -#ifdef HAVE_GMTIME_R - ltm = gmtime_r( &c->c_activitytime, &tm_buf ); -#else - ltm = gmtime( &c->c_activitytime ); -#endif - lutil_gentime( buf3, sizeof( buf3 ), ltm ); - -#ifndef HAVE_GMTIME_R - ldap_pvt_thread_mutex_unlock( &gmtime_mutex ); -#endif /* HAVE_GMTIME_R */ - - /* monitored info */ - sprintf( buf, - "%ld " - ": %ld " - ": %ld/%ld/%ld/%ld " - ": %ld/%ld/%ld " - ": %s%s%s%s%s%s " - ": %s " - ": %s " - ": %s " - ": %s " - ": %s " - ": %s " - ": %s", - c->c_connid, - (long) c->c_protocol, - c->c_n_ops_received, c->c_n_ops_executing, - c->c_n_ops_pending, c->c_n_ops_completed, - - /* add low-level counters here */ - c->c_n_get, c->c_n_read, c->c_n_write, - - c->c_currentber ? "r" : "", - c->c_writewaiter ? "w" : "", - 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_dn.bv_len ? c->c_dn.bv_val : SLAPD_ANONYMOUS, - - 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 - ); +#ifdef MONITOR_LEGACY_CONN + /* NOTE: this will disappear, as the exploded data + * has been moved to dedicated attributes */ + bv.bv_len = snprintf( buf, sizeof( buf ), + "%ld " + ": %ld " + ": %ld/%ld/%ld/%ld " + ": %ld/%ld/%ld " + ": %s%s%s%s%s%s " + ": %s " + ": %s " + ": %s " + ": %s " + ": %s " + ": %s " + ": %s", + c->c_connid, + (long) c->c_protocol, + c->c_n_ops_received, c->c_n_ops_executing, + c->c_n_ops_pending, c->c_n_ops_completed, + + /* add low-level counters here */ + c->c_n_get, c->c_n_read, c->c_n_write, + + c->c_currentber ? "r" : "", + c->c_writewaiter ? "w" : "", + 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_dn.bv_len ? c->c_dn.bv_val : SLAPD_ANONYMOUS, + + c->c_listener_url.bv_val, + BER_BVISNULL( &c->c_peer_domain ) + ? "" : c->c_peer_domain.bv_val, + BER_BVISNULL( &c->c_peer_name ) + ? "" : c->c_peer_name.bv_val, + c->c_sock_name.bv_val, + + buf2, + buf3 ); + attr_merge_normalize_one( e, mi->mi_ad_monitoredInfo, &bv, NULL ); +#endif /* MONITOR_LEGACY_CONN */ + + bv.bv_len = snprintf( buf, sizeof( buf ), "%lu", c->c_connid ); + attr_merge_one( e, mi->mi_ad_monitorConnectionNumber, &bv, NULL ); - bv.bv_val = buf; - bv.bv_len = strlen( buf ); - attr_merge_one( e, mi->mi_ad_monitoredInfo, &bv, NULL ); + bv.bv_len = snprintf( buf, sizeof( buf ), "%ld", (long) c->c_protocol ); + attr_merge_normalize_one( e, mi->mi_ad_monitorConnectionProtocol, &bv, NULL ); - /* connection number */ - snprintf( buf, sizeof( buf ), "%ld", c->c_connid ); - bv.bv_val = buf; - bv.bv_len = strlen( buf ); - attr_merge_one( e, mi->mi_ad_monitorConnectionNumber, &bv, NULL ); + bv.bv_len = snprintf( buf, sizeof( buf ), "%ld", c->c_n_ops_received ); + attr_merge_one( e, mi->mi_ad_monitorConnectionOpsReceived, &bv, NULL ); + + bv.bv_len = snprintf( buf, sizeof( buf ), "%ld", c->c_n_ops_executing ); + attr_merge_one( e, mi->mi_ad_monitorConnectionOpsExecuting, &bv, NULL ); + + bv.bv_len = snprintf( buf, sizeof( buf ), "%ld", c->c_n_ops_pending ); + attr_merge_one( e, mi->mi_ad_monitorConnectionOpsPending, &bv, NULL ); + + bv.bv_len = snprintf( buf, sizeof( buf ), "%ld", c->c_n_ops_completed ); + attr_merge_one( e, mi->mi_ad_monitorConnectionOpsCompleted, &bv, NULL ); + + bv.bv_len = snprintf( buf, sizeof( buf ), "%ld", c->c_n_get ); + attr_merge_one( e, mi->mi_ad_monitorConnectionGet, &bv, NULL ); + + bv.bv_len = snprintf( buf, sizeof( buf ), "%ld", c->c_n_read ); + attr_merge_one( e, mi->mi_ad_monitorConnectionRead, &bv, NULL ); + + bv.bv_len = snprintf( buf, sizeof( buf ), "%ld", c->c_n_write ); + attr_merge_one( e, mi->mi_ad_monitorConnectionWrite, &bv, NULL ); + + bv.bv_len = snprintf( buf, sizeof( buf ), "%s%s%s%s%s%s", + c->c_currentber ? "r" : "", + c->c_writewaiter ? "w" : "", + 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" : "" ); + attr_merge_normalize_one( e, mi->mi_ad_monitorConnectionMask, &bv, NULL ); - /* authz DN */ attr_merge_one( e, mi->mi_ad_monitorConnectionAuthzDN, - &c->c_dn, &c->c_ndn ); + &c->c_dn, &c->c_ndn ); - /* local address */ - attr_merge_one( e, mi->mi_ad_monitorConnectionLocalAddress, - &c->c_sock_name, NULL ); + /* NOTE: client connections leave the c_peer_* fields NULL */ + assert( !BER_BVISNULL( &c->c_listener_url ) ); + attr_merge_normalize_one( e, mi->mi_ad_monitorConnectionListener, + &c->c_listener_url, NULL ); - /* peer address */ - attr_merge_one( e, mi->mi_ad_monitorConnectionPeerAddress, - &c->c_peer_name, NULL ); + attr_merge_normalize_one( e, mi->mi_ad_monitorConnectionPeerDomain, + BER_BVISNULL( &c->c_peer_domain ) ? &bv_unknown : &c->c_peer_domain, + NULL ); - mp = ( struct monitorentrypriv * )ch_calloc( sizeof( struct monitorentrypriv ), 1 ); + attr_merge_normalize_one( e, mi->mi_ad_monitorConnectionPeerAddress, + BER_BVISNULL( &c->c_peer_name ) ? &bv_unknown : &c->c_peer_name, + NULL ); + + assert( !BER_BVISNULL( &c->c_sock_name ) ); + attr_merge_normalize_one( e, mi->mi_ad_monitorConnectionLocalAddress, + &c->c_sock_name, NULL ); + + attr_merge_normalize_one( e, mi->mi_ad_monitorConnectionStartTime, &ctmbv, NULL ); + + attr_merge_normalize_one( e, mi->mi_ad_monitorConnectionActivityTime, &mtmbv, NULL ); + + mp = monitor_entrypriv_create(); + if ( mp == NULL ) { + return LDAP_OTHER; + } e->e_private = ( void * )mp; - mp->mp_info = &monitor_subsys[ SLAPD_MONITOR_CONN ]; - mp->mp_children = NULL; + mp->mp_info = ms; mp->mp_flags = MONITOR_F_SUB | MONITOR_F_VOLATILE; *ep = e; - return( 0 ); + return SLAP_CB_CONTINUE; } -int +static int monitor_subsys_conn_create( Operation *op, + SlapReply *rs, struct berval *ndn, Entry *e_parent, - Entry **ep -) + Entry **ep ) { - struct monitorinfo *mi = - (struct monitorinfo *)op->o_bd->be_private; + monitor_info_t *mi = ( monitor_info_t * )op->o_bd->be_private; - Connection *c; - int connindex; - struct monitorentrypriv *mp; - int rc = 0; + int rc = SLAP_CB_CONTINUE; + monitor_subsys_t *ms; assert( mi != NULL ); assert( e_parent != NULL ); assert( ep != NULL ); + ms = (( monitor_entry_t *)e_parent->e_private)->mp_info; + *ep = NULL; if ( ndn == NULL ) { - Entry *e = NULL, - *e_tmp = NULL; + Connection *c; + ber_socket_t connindex; + Entry *e = NULL, + *e_tmp = NULL; /* create all the children of e_parent */ for ( c = connection_first( &connindex ); c != NULL; - c = connection_next( c, &connindex )) { - if ( conn_create( mi, c, &e ) || e == NULL ) { + c = connection_next( c, &connindex ) ) + { + monitor_entry_t *mp; + + if ( conn_create( mi, c, &e, ms ) != SLAP_CB_CONTINUE + || e == NULL ) + { for ( ; e_tmp != NULL; ) { - mp = ( struct monitorentrypriv * )e_tmp->e_private; + mp = ( monitor_entry_t * )e_tmp->e_private; e = mp->mp_next; ch_free( mp ); @@ -449,21 +469,24 @@ monitor_subsys_conn_create( e_tmp = e; } - rc = -1; + rc = rs->sr_err = LDAP_OTHER; break; } - mp = ( struct monitorentrypriv * )e->e_private; + mp = ( monitor_entry_t * )e->e_private; mp->mp_next = e_tmp; e_tmp = e; } - connection_done(c); + connection_done( c ); *ep = e; } else { + Connection *c; + ber_socket_t connindex; unsigned long connid; char *next = NULL; static struct berval nconn_bv = BER_BVC( "cn=connection " ); + rc = LDAP_NO_SUCH_OBJECT; /* create exactly the required entry; * the normalized DN must start with "cn=connection ", @@ -477,22 +500,27 @@ monitor_subsys_conn_create( connid = strtol( &ndn->bv_val[ nconn_bv.bv_len ], &next, 10 ); if ( next[ 0 ] != ',' ) { - return -1; + return ( rs->sr_err = LDAP_OTHER ); } for ( c = connection_first( &connindex ); c != NULL; - c = connection_next( c, &connindex )) { + c = connection_next( c, &connindex ) ) + { if ( c->c_connid == connid ) { - if ( conn_create( mi, c, ep ) || *ep == NULL ) { - rc = -1; + rc = conn_create( mi, c, ep, ms ); + if ( rc != SLAP_CB_CONTINUE ) { + rs->sr_err = rc; + + } else if ( *ep == NULL ) { + rc = rs->sr_err = LDAP_OTHER; } break; } } - connection_done(c); + connection_done( c ); } return rc;