publish updateref...

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

diff --git a/servers/slapd/back-monitor/sent.c b/servers/slapd/back-monitor/sent.c
index 6c8615c2419385ed8e50be713e829c81270fb6b3..6600ee6ae13b0a438a7149d284b1482186025150 100644 (file)
--- a/servers/slapd/back-monitor/sent.c
+++ b/servers/slapd/back-monitor/sent.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2001-2004 The OpenLDAP Foundation.
+ * Copyright 2001-2005 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -50,18 +50,18 @@ struct monitor_sent_t {
 int
 monitor_subsys_sent_init(
        BackendDB               *be,
-       monitorsubsys           *ms
+       monitor_subsys_t        *ms
 )
 {
-       struct monitorinfo      *mi;
+       monitor_info_t  *mi;
        
-       Entry                   **ep, *e_sent;
-       struct monitorentrypriv *mp;
+       Entry           **ep, *e_sent;
+       monitor_entry_t *mp;
        int                     i;
 
        assert( be != NULL );
 
-       mi = ( struct monitorinfo * )be->be_private;
+       mi = ( monitor_info_t * )be->be_private;
 
        if ( monitor_cache_get( mi, &ms->mss_ndn, &e_sent ) ) {
                Debug( LDAP_DEBUG_ANY,
@@ -71,7 +71,7 @@ monitor_subsys_sent_init(
                return( -1 );
        }
 
-       mp = ( struct monitorentrypriv * )e_sent->e_private;
+       mp = ( monitor_entry_t * )e_sent->e_private;
        mp->mp_children = NULL;
        ep = &mp->mp_children;
 
@@ -89,11 +89,11 @@ monitor_subsys_sent_init(
                                "modifiersName: %s\n"
                                "createTimestamp: %s\n"
                                "modifyTimestamp: %s\n",
-                               monitor_sent[i].rdn.bv_val,
+                               monitor_sent[ i ].rdn.bv_val,
                                ms->mss_dn.bv_val,
                                mi->mi_oc_monitorCounterObject->soc_cname.bv_val,
                                mi->mi_oc_monitorCounterObject->soc_cname.bv_val,
-                               &monitor_sent[i].rdn.bv_val[STRLENOF( "cn=" )],
+                               &monitor_sent[ i ].rdn.bv_val[ STRLENOF( "cn=" ) ],
                                mi->mi_creatorsName.bv_val,
                                mi->mi_creatorsName.bv_val,
                                mi->mi_startTime.bv_val,
@@ -104,22 +104,23 @@ monitor_subsys_sent_init(
                        Debug( LDAP_DEBUG_ANY,
                                "monitor_subsys_sent_init: "
                                "unable to create entry \"%s,%s\"\n",
-                               monitor_sent[i].rdn.bv_val,
+                               monitor_sent[ i ].rdn.bv_val,
                                ms->mss_ndn.bv_val, 0 );
                        return( -1 );
                }
 
                /* steal normalized RDN */
                dnRdn( &e->e_nname, &nrdn );
-               ber_dupbv( &monitor_sent[i].nrdn, &nrdn );
+               ber_dupbv( &monitor_sent[ i ].nrdn, &nrdn );
        
                BER_BVSTR( &bv, "0" );
-               attr_merge_one( e, mi->mi_ad_monitorCounter, &bv, NULL );
+               attr_merge_one( e, mi->mi_ad_monitorCounter, &bv, &bv );
        
-               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 | MONITOR_F_PERSISTENT;
@@ -128,7 +129,7 @@ monitor_subsys_sent_init(
                        Debug( LDAP_DEBUG_ANY,
                                "monitor_subsys_sent_init: "
                                "unable to add entry \"%s,%s\"\n",
-                               monitor_sent[i].rdn.bv_val,
+                               monitor_sent[ i ].rdn.bv_val,
                                ms->mss_ndn.bv_val, 0 );
                        return( -1 );
                }
@@ -145,11 +146,10 @@ monitor_subsys_sent_init(
 int
 monitor_subsys_sent_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;
        
        struct berval           nrdn;
        ldap_pvt_mp_t           n;
@@ -162,13 +162,13 @@ monitor_subsys_sent_update(
        dnRdn( &e->e_nname, &nrdn );
 
        for ( i = 0; i < MONITOR_SENT_LAST; i++ ) {
-               if ( dn_match( &nrdn, &monitor_sent[i].nrdn ) ) {
+               if ( dn_match( &nrdn, &monitor_sent[ i ].nrdn ) ) {
                        break;
                }
        }
 
        if ( i == MONITOR_SENT_LAST ) {
-               return 0;
+               return SLAP_CB_CONTINUE;
        }
 
        ldap_pvt_thread_mutex_lock(&slap_counters.sc_sent_mutex);
@@ -201,6 +201,8 @@ monitor_subsys_sent_update(
        UI2BV( &a->a_vals[ 0 ], n );
        ldap_pvt_mp_clear( n );
 
-       return 0;
+       /* FIXME: touch modifyTimestamp? */
+
+       return SLAP_CB_CONTINUE;
 }