refine fix to ITS#4315; apply it to back-meta as well

[openldap] / servers / slapd / back-meta / back-meta.h

diff --git a/servers/slapd/back-meta/back-meta.h b/servers/slapd/back-meta/back-meta.h
index 5a7f92e1c2dca5046f9eb2ea5b250b960f2b8755..4f27415c37a323e92054fc8b56ebd0857d977213 100644 (file)
--- a/servers/slapd/back-meta/back-meta.h
+++ b/servers/slapd/back-meta/back-meta.h
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2005 The OpenLDAP Foundation.
+ * Copyright 1999-2006 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * Portions Copyright 1999-2003 Howard Chu.
  * All rights reserved.
@@ -82,9 +82,6 @@ typedef struct dncookie {
 #endif
 } dncookie;
 
-/* TODO: allow to define it on a per-target basis */
-#define META_BIND_TIMEOUT      10000
-
 int ldap_back_dn_massage(dncookie *dc, struct berval *dn,
        struct berval *res);
 
@@ -177,6 +174,8 @@ typedef struct metasingleconn_t {
 #define META_ANONYMOUS         2
 #endif
 
+       time_t                  msc_time;
+
        struct metainfo_t       *msc_info;
 } metasingleconn_t;
 
@@ -184,6 +183,7 @@ typedef struct metaconn_t {
        struct slap_conn        *mc_conn;
        ldap_pvt_thread_mutex_t mc_mutex;
        unsigned                mc_refcnt;
+       int                     mc_tainted;
        
        struct berval           mc_local_ndn;
        /* NOTE: msc_mscflags is used to recycle the #define
@@ -204,14 +204,6 @@ typedef struct metaconn_t {
         * in one block with the metaconn_t structure */
 } metaconn_t;
 
-enum {
-       META_OP_ADD = 0,
-       META_OP_DELETE,
-       META_OP_MODIFY,
-       META_OP_MODRDN,
-       META_OP_LAST
-};
-
 typedef struct metatarget_t {
        char                    *mt_uri;
        int                     mt_scope;
@@ -235,7 +227,11 @@ typedef struct metatarget_t {
 
        unsigned                mt_flags;
        int                     mt_version;
-       time_t                  mt_timeout[ META_OP_LAST ];
+       time_t                  mt_network_timeout;
+       time_t                  mt_idle_timeout;
+       struct timeval          mt_bind_timeout;
+#define META_BIND_TIMEOUT      10000
+       time_t                  mt_timeout[ LDAP_BACK_OP_LAST ];
 } metatarget_t;
 
 typedef struct metadncache_t {
@@ -243,8 +239,8 @@ typedef struct metadncache_t {
        Avlnode                 *tree;
 
 #define META_DNCACHE_DISABLED   (0)
-#define META_DNCACHE_FOREVER    (-1)
-       long int                ttl;  /* seconds; 0: no cache, -1: no expiry */
+#define META_DNCACHE_FOREVER    ((time_t)(-1))
+       time_t                  ttl;  /* seconds; 0: no cache, -1: no expiry */
 } metadncache_t;
 
 typedef struct metacandidates_t {
@@ -255,7 +251,6 @@ typedef struct metacandidates_t {
 typedef struct metainfo_t {
        int                     mi_ntargets;
        int                     mi_defaulttarget;
-       int                     mi_network_timeout;
 #define META_DEFAULT_TARGET_NONE       (-1)
        int                     mi_nretries;
 
@@ -264,21 +259,24 @@ typedef struct metainfo_t {
 
        metadncache_t           mi_cache;
        
-       ldap_pvt_thread_mutex_t mi_conn_mutex;
-       Avlnode                 *mi_conntree;
+       ldap_avl_info_t         mi_conninfo;
 
-       unsigned                flags;
+       unsigned                mi_flags;
+#define        li_flags                mi_flags
 /* uses flags as defined in <back-ldap/back-ldap.h> */
 #define        META_BACK_F_ONERR_STOP          0x00010000U
 #define        META_BACK_F_DEFER_ROOTDN_BIND   0x00020000U
 
-#define        META_BACK_ONERR_STOP(mi)        ( (mi)->flags & META_BACK_F_ONERR_STOP )
+#define        META_BACK_ONERR_STOP(mi)        ( (mi)->mi_flags & META_BACK_F_ONERR_STOP )
 #define        META_BACK_ONERR_CONTINUE(mi)    ( !META_BACK_ONERR_CONTINUE( (mi) ) )
 
-#define META_BACK_DEFER_ROOTDN_BIND(mi)        ( (mi)->flags & META_BACK_F_DEFER_ROOTDN_BIND )
+#define META_BACK_DEFER_ROOTDN_BIND(mi)        ( (mi)->mi_flags & META_BACK_F_DEFER_ROOTDN_BIND )
 
        int                     mi_version;
-       time_t                  mi_timeout[ META_OP_LAST ];
+       time_t                  mi_network_timeout;
+       time_t                  mi_idle_timeout;
+       struct timeval          mi_bind_timeout;
+       time_t                  mi_timeout[ LDAP_BACK_OP_LAST ];
 } metainfo_t;
 
 typedef enum meta_op_type {
@@ -312,14 +310,16 @@ meta_back_retry(
 
 extern void
 meta_back_conn_free(
-       metaconn_t              *mc );
+       void                    *v_mc );
 
 extern int
 meta_back_init_one_conn(
        Operation               *op,
        SlapReply               *rs,
        metatarget_t            *mt, 
-       metasingleconn_t        *msc,
+       metaconn_t              *mc,
+       int                     candidate,
+       int                     ispriv,
        ldap_back_send_t        sendok );
 
 extern int