ITS#4780 plug leak

[openldap] / servers / slapd / back-monitor / conn.c

diff --git a/servers/slapd/back-monitor/conn.c b/servers/slapd/back-monitor/conn.c
index a35036237c239044ba00882d99a6bd34846614c3..5f89f8ccd00c174bf707bdcdcb1f0539bbfce92c 100644 (file)
--- a/servers/slapd/back-monitor/conn.c
+++ b/servers/slapd/back-monitor/conn.c
@@ -50,6 +50,7 @@ monitor_subsys_conn_init(
        monitor_info_t  *mi;
        Entry           *e, **ep, *e_conn;
        monitor_entry_t *mp;
+       char            buf[ BACKMONITOR_BUFSIZE ];
        struct berval   bv;
 
        assert( be != NULL );
@@ -71,6 +72,51 @@ monitor_subsys_conn_init(
        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, mi, 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, &bv );
+       
+       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
         */
@@ -86,7 +132,7 @@ monitor_subsys_conn_init(
                return( -1 );
        }
        
-       BER_BVSTR( &bv, "0" );
+       BER_BVSTR( &bv, "-1" );
        attr_merge_one( e, mi->mi_ad_monitorCounter, &bv, &bv );
        
        mp = monitor_entrypriv_create();
@@ -181,7 +227,8 @@ monitor_subsys_conn_update(
 
                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 );
@@ -426,9 +473,6 @@ monitor_subsys_conn_create(
 {
        monitor_info_t  *mi = ( monitor_info_t * )op->o_bd->be_private;
 
-       Connection              *c;
-       int                     connindex;
-       monitor_entry_t         *mp;
        int                     rc = SLAP_CB_CONTINUE;
        monitor_subsys_t        *ms;
 
@@ -441,14 +485,18 @@ monitor_subsys_conn_create(
        *ep = NULL;
 
        if ( ndn == NULL ) {
-               Entry   *e = NULL,
-                       *e_tmp = NULL;
+               Connection      *c;
+               int             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 ) )
                {
+                       monitor_entry_t         *mp;
+
                        if ( conn_create( mi, c, &e, ms ) != SLAP_CB_CONTINUE
                                        || e == NULL )
                        {
@@ -473,6 +521,8 @@ monitor_subsys_conn_create(
                *ep = e;
 
        } else {
+               Connection              *c;
+               int                     connindex;
                unsigned long           connid;
                char                    *next = NULL;
                static struct berval    nconn_bv = BER_BVC( "cn=connection " );