Added connection initialisation and destruction notification. Now backends can regist...

[openldap] / servers / slapd / proto-slap.h

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 72c5b2627a68903baf7bd7ac26a7a3686591bccf..0d461d63b5df9b9ecb6932dec4ad29b69ac7746f 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -3,6 +3,8 @@
 
 #include <ldap_cdefs.h>
 
+LDAP_BEGIN_DECL
+
 /*
  * acl.c
  */
@@ -46,13 +48,14 @@ Attribute * attr_find LDAP_P(( Attribute *a, char *type ));
 int attr_delete LDAP_P(( Attribute **attrs, char *type ));
 int attr_syntax LDAP_P(( char *type ));
 void attr_syntax_config LDAP_P(( char *fname, int lineno, int argc, char **argv ));
-AttributeType * at_find LDAP_P(( char *name ));
+AttributeType * at_find LDAP_P(( const char *name ));
 int at_find_in_list LDAP_P(( AttributeType *sat, AttributeType **list ));
 int at_append_to_list LDAP_P(( AttributeType *sat, AttributeType ***listp ));
 int at_delete_from_list LDAP_P(( int pos, AttributeType ***listp ));
 int at_fake_if_needed LDAP_P(( char *name ));
 int at_schema_info LDAP_P(( Entry *e ));
-int at_add LDAP_P(( LDAP_ATTRIBUTE_TYPE *at, char **err ));
+int at_add LDAP_P(( LDAP_ATTRIBUTE_TYPE *at, const char **err ));
+char * at_canonical_name LDAP_P(( char * a_type ));
 
 /*
  * ava.c
@@ -86,6 +89,9 @@ int be_entry_release_rw LDAP_P(( Backend *be, Entry *e, int rw ));
 
 extern int     backend_unbind LDAP_P((Connection *conn, Operation *op));
 
+extern int     backend_connection_init LDAP_P((Connection *conn));
+extern int     backend_connection_destroy LDAP_P((Connection *conn));
+
 extern int     backend_group LDAP_P((Backend *be,
        Entry *target,
        char *gr_ndn, char *op_ndn,
@@ -95,10 +101,12 @@ extern int backend_group LDAP_P((Backend *be,
  * ch_malloc.c
  */
 
-void * ch_malloc LDAP_P(( unsigned long size ));
-void * ch_realloc LDAP_P(( void *block, unsigned long size ));
-void * ch_calloc LDAP_P(( unsigned long nelem, unsigned long size ));
+void * ch_malloc LDAP_P(( ber_len_t size ));
+void * ch_realloc LDAP_P(( void *block, ber_len_t size ));
+void * ch_calloc LDAP_P(( ber_len_t nelem, ber_len_t size ));
 char * ch_strdup LDAP_P(( const char *string ));
+void   ch_free LDAP_P(( void * ));
+#define free ch_free
 
 /*
  * charray.c
@@ -123,21 +131,22 @@ int read_config LDAP_P(( char *fname ));
 int connections_init LDAP_P((void));
 int connections_shutdown LDAP_P((void));
 int connections_destroy LDAP_P((void));
+int connections_timeout_idle LDAP_P((time_t));
 
 long connection_init LDAP_P((
-       int s,
+       ber_socket_t s,
        const char* name, const char* addr));
 
 void connection_closing LDAP_P(( Connection *c ));
 int connection_state_closing LDAP_P(( Connection *c ));
 
-int connection_write LDAP_P((int s));
-int connection_read LDAP_P((int s));
+int connection_write LDAP_P((ber_socket_t s));
+int connection_read LDAP_P((ber_socket_t s));
 
-long connections_nextid(void);
+unsigned long connections_nextid(void);
 
-Connection* connection_first LDAP_P((int *));
-Connection* connection_next LDAP_P((Connection *, int *));
+Connection* connection_first LDAP_P((ber_socket_t *));
+Connection* connection_next LDAP_P((Connection *, ber_socket_t *));
 void connection_done LDAP_P((Connection *));
 
 /*
@@ -201,8 +210,8 @@ void monitor_info LDAP_P(( Connection *conn, Operation *op ));
 
 void slap_op_free LDAP_P(( Operation *op ));
 Operation * slap_op_alloc LDAP_P((
-       BerElement *ber, unsigned long msgid,
-       unsigned long tag, long id ));
+       BerElement *ber, ber_int_t msgid,
+       ber_tag_t tag, ber_int_t id ));
 
 int slap_op_add LDAP_P(( Operation **olist, Operation *op ));
 int slap_op_remove LDAP_P(( Operation **olist, Operation *op ));
@@ -237,9 +246,14 @@ void send_ldap_search_result LDAP_P(( Connection *conn, Operation *op, int err,
  */
 
 int oc_schema_check LDAP_P(( Entry *e ));
-ObjectClass *oc_find LDAP_P((char *ocname));
-int oc_add LDAP_P((LDAP_OBJECT_CLASS *oc, char **err));
+ObjectClass *oc_find LDAP_P((const char *ocname));
+int oc_add LDAP_P((LDAP_OBJECT_CLASS *oc, const char **err));
+Syntax *syn_find LDAP_P((const char *synname));
+int syn_add LDAP_P((LDAP_SYNTAX *syn, slap_syntax_check_func *check, const char **err));
+MatchingRule *mr_find LDAP_P((const char *mrname));
+int mr_add LDAP_P((LDAP_MATCHING_RULE *mr, slap_mr_normalize_func *normalize, slap_mr_compare_func *compare, const char **err));
 void schema_info LDAP_P((Connection *conn, Operation *op, char **attrs, int attrsonly));
+int schema_init LDAP_P((void));
 
 
 /*
@@ -247,9 +261,9 @@ void schema_info LDAP_P((Connection *conn, Operation *op, char **attrs, int attr
  */
 
 void parse_oc_old LDAP_P(( Backend *be, char *fname, int lineno, int argc, char **argv ));
-void parse_oc LDAP_P(( char *fname, int lineno, char * line ));
+void parse_oc LDAP_P(( char *fname, int lineno, char *line ));
 void parse_at LDAP_P(( char *fname, int lineno, char *line ));
-
+char *scherr2str LDAP_P((int code));
 /*
  * str2filter.c
  */
@@ -294,6 +308,7 @@ extern int          deftime;
 extern int             g_argc;
 extern int             global_default_access;
 extern int             global_lastmod;
+extern int             global_idletimeout;
 extern int             global_schemacheck;
 extern int             lber_debug;
 extern int             ldap_syslog;
@@ -332,13 +347,21 @@ extern int        slap_shutdown LDAP_P((int dbnum));
 extern int     slap_destroy LDAP_P((void));
 
 struct sockaddr_in;
+
+struct slapd_args {
+       struct sockaddr_in *addr;
+       int tcps;
+};
+
+extern int     slapd_daemon LDAP_P((struct slapd_args *args));
 extern int     set_socket LDAP_P((struct sockaddr_in *addr));
-extern int     slapd_daemon LDAP_P((int inetd, int tcps));
 
-extern void slapd_set_write LDAP_P((int s, int wake));
-extern void slapd_clr_write LDAP_P((int s, int wake));
-extern void slapd_set_read LDAP_P((int s, int wake));
-extern void slapd_clr_read LDAP_P((int s, int wake));
+extern void slapd_set_write LDAP_P((ber_socket_t s, int wake));
+extern void slapd_clr_write LDAP_P((ber_socket_t s, int wake));
+extern void slapd_set_read LDAP_P((ber_socket_t s, int wake));
+extern void slapd_clr_read LDAP_P((ber_socket_t s, int wake));
+
+extern void slapd_remove LDAP_P((ber_socket_t s, int wake));
 
 extern void    slap_set_shutdown LDAP_P((int sig));
 extern void    slap_do_nothing   LDAP_P((int sig));
@@ -358,7 +381,9 @@ extern void do_unbind LDAP_P((Connection *conn, Operation *op));
 extern int send_search_entry LDAP_P((Backend *be, Connection *conn, Operation *op, Entry *e, char **attrs, int attrsonly));
 extern int str2result LDAP_P(( char *s, int *code, char **matched, char **info ));
 
-extern int dtblsize;
+extern ber_socket_t dtblsize;
+
+LDAP_END_DECL
 
 #endif /* _proto_slap */