Add search no-op support.

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

diff --git a/servers/slapd/back-monitor/sent.c b/servers/slapd/back-monitor/sent.c
index 72e84bba1350cecd77374dbd3d72a56b3599023b..39926e338d25a2f03b2625681e4e4292f6d245b0 100644 (file)
--- a/servers/slapd/back-monitor/sent.c
+++ b/servers/slapd/back-monitor/sent.c
@@ -1,12 +1,9 @@
 /* sent.c - deal with data sent 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 
@@ -51,24 +48,24 @@ monitor_subsys_sent_init(
        Entry                   *e, *e_tmp, *e_sent;
        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_SENT].mss_ndn, &e_sent ) ) {
+                       &monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn, &e_sent ) ) {
 #ifdef NEW_LOGGING
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_sent_init: "
                        "unable to get entry '%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn ));
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_sent_init: "
                        "unable to get entry '%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn, 
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val, 
                        "", "" );
 #endif
                return( -1 );
@@ -81,15 +78,9 @@ monitor_subsys_sent_init(
         */
        snprintf( buf, sizeof( buf ),
                        "dn: cn=Entries,%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: Entries\n",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_dn );
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_dn.bv_val );
 
        e = str2entry( buf );
        if ( e == NULL ) {
@@ -97,19 +88,20 @@ monitor_subsys_sent_init(
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_sent_init: "
                        "unable to create entry 'cn=Entries,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn ));
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_sent_init: "
                        "unable to create entry 'cn=Entries,%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn,
+                       monitor_subsys[SLAPD_MONITOR_SENT].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 );
@@ -125,12 +117,12 @@ monitor_subsys_sent_init(
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_sent_init: "
                        "unable to add entry 'cn=Entries,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn ));
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_sent_init: "
                        "unable to add entry 'cn=Entries,%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn,
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val,
                        "", "" );
 #endif
                return( -1 );
@@ -143,15 +135,9 @@ monitor_subsys_sent_init(
         */
        snprintf( buf, sizeof( buf ),
                        "dn: cn=Referrals,%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: Referrals\n",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_dn );
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_dn.bv_val );
 
        e = str2entry( buf );
        if ( e == NULL ) {
@@ -159,19 +145,19 @@ monitor_subsys_sent_init(
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_sent_init: "
                        "unable to create entry 'cn=Referrals,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn ));
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_sent_init: "
                        "unable to create entry 'cn=Referrals,%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn,
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val,
                        "", "" );
 #endif
                return( -1 );
        }
 
-       val.bv_val = "0";
-       val.bv_len = 1;
+       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 );
@@ -187,12 +173,12 @@ monitor_subsys_sent_init(
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_sent_init: "
                        "unable to add entry 'cn=Referrals,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn ));
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_sent_init: "
                        "unable to add entry 'cn=Referrals,%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn,
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val,
                        "", "" );
 #endif
                return( -1 );
@@ -205,15 +191,9 @@ monitor_subsys_sent_init(
         */
        snprintf( buf, sizeof( buf ),
                        "dn: cn=PDU,%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: PDU\n",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_dn );
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_dn.bv_val );
 
        e = str2entry( buf );
        if ( e == NULL ) {
@@ -221,19 +201,19 @@ monitor_subsys_sent_init(
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_sent_init: "
                        "unable to create entry 'cn=PDU,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn ));
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_sent_init: "
                        "unable to create entry 'cn=PDU,%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn,
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val,
                        "", "" );
 #endif
                return( -1 );
        }
 
-       val.bv_val = "0";
-       val.bv_len = 1;
+       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 );
@@ -249,12 +229,12 @@ monitor_subsys_sent_init(
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_sent_init: "
                        "unable to add entry 'cn=PDU,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn ));
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_sent_init: "
                        "unable to add entry 'cn=PDU,%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn,
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val,
                        "", "" );
 #endif
                return( -1 );
@@ -267,15 +247,9 @@ monitor_subsys_sent_init(
         */
        snprintf( buf, sizeof( buf ),
                        "dn: cn=Bytes,%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: Bytes\n",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_dn );
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_dn.bv_val );
 
        e = str2entry( buf );
        if ( e == NULL ) {
@@ -283,19 +257,19 @@ monitor_subsys_sent_init(
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_sent_init: "
                        "unable to create entry 'cn=Bytes,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn ));
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_sent_init: "
                        "unable to create entry 'cn=Bytes,%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn,
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val,
                        "", "" );
 #endif
                return( -1 );
        }
 
-       val.bv_val = "0";
-       val.bv_len = 1;
+       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 );
@@ -311,12 +285,12 @@ monitor_subsys_sent_init(
                LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
                        "monitor_subsys_sent_init: "
                        "unable to add entry 'cn=Bytes,%s'\n",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn ));
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val ));
 #else
                Debug( LDAP_DEBUG_ANY,
                        "monitor_subsys_sent_init: "
                        "unable to add entry 'cn=Bytes,%s'\n%s%s",
-                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn,
+                       monitor_subsys[SLAPD_MONITOR_SENT].mss_ndn.bv_val,
                        "", "" );
 #endif
                return( -1 );
@@ -378,8 +352,8 @@ monitor_subsys_sent_update(
                }
 
                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 );