added hasSubordinates to back-monitor

[openldap] / include / lber.h

diff --git a/include/lber.h b/include/lber.h
index e05901d7e6a9f74208813b9d03860e0f7c157622..17088c8e8d55b7f248a9a8a00b8a5303726bdc09 100644 (file)
--- a/include/lber.h
+++ b/include/lber.h
@@ -1,12 +1,13 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2001 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License.  A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.  A copy of this license is available at
+ * http://www.OpenLDAP.org/license.html or in file LICENSE in the
+ * top-level directory of the distribution.
  */
 /* Portions
  * Copyright (c) 1990 Regents of the University of Michigan.
@@ -23,9 +24,6 @@
 #ifndef _LBER_H
 #define _LBER_H
 
-#include <stdio.h>
-#include <ac/stdarg.h>
-
 #include <lber_types.h>
 
 LDAP_BEGIN_DECL
@@ -85,7 +83,6 @@ LDAP_BEGIN_DECL
 
 /* LBER BerElement options */
 #define LBER_USE_DER           0x01
-#define LBER_USE_INDEFINITE_LEN        0x02
 
 /* get/set options for BerElement */
 #define LBER_OPT_BER_OPTIONS                   0x01
@@ -108,8 +105,6 @@ LDAP_BEGIN_DECL
 #define LBER_OPT_MEMORY_INUSE          0x8005  /* for memory debugging */
 #define LBER_OPT_LOG_PROC           0x8006  /* for external logging function */
 
-typedef void (*BER_LOG_FN) LDAP_P((FILE *file, char *subsys, int level, const char *fmt, va_list vl));
-
 typedef int* (*BER_ERRNO_FN) LDAP_P(( void ));
 
 typedef void (*BER_LOG_PRINT_FN) LDAP_P(( LDAP_CONST char *buf ));
@@ -137,8 +132,10 @@ typedef struct lber_memory_fns {
 #define LBER_SB_OPT_DRAIN              10
 #define LBER_SB_OPT_NEEDS_READ         11
 #define LBER_SB_OPT_NEEDS_WRITE                12
+#define LBER_SB_OPT_GET_MAX_INCOMING 13
+#define LBER_SB_OPT_SET_MAX_INCOMING 14
 /* Largest option used by the library */
-#define LBER_SB_OPT_OPT_MAX            12
+#define LBER_SB_OPT_OPT_MAX            14
 
 /* LBER IO operations stacking levels */
 #define LBER_SBIOD_LEVEL_PROVIDER      10
@@ -225,10 +222,6 @@ LBER_F( void )
 ber_sos_dump LDAP_P((
        Seqorset *sos ));
 
-LBER_F( int )
-ber_pvt_log_output LDAP_P((
-       char *subsystem, int level, const char *fmt, ... ));
-
 /*
  * in decode.c:
  */
@@ -505,10 +498,13 @@ ber_sockbuf_ctrl LDAP_P((
        int opt,
        void *arg ));
 
-LBER_F( Sockbuf_IO ) ber_sockbuf_io_tcp;
-LBER_F( Sockbuf_IO ) ber_sockbuf_io_readahead;
-LBER_F( Sockbuf_IO ) ber_sockbuf_io_fd;
-LBER_F( Sockbuf_IO ) ber_sockbuf_io_debug;
+LBER_V( Sockbuf_IO ) ber_sockbuf_io_tcp;
+LBER_V( Sockbuf_IO ) ber_sockbuf_io_readahead;
+LBER_V( Sockbuf_IO ) ber_sockbuf_io_fd;
+LBER_V( Sockbuf_IO ) ber_sockbuf_io_debug;
+#ifdef LDAP_CONNECTIONLESS
+LBER_V( Sockbuf_IO ) ber_sockbuf_io_udp;
+#endif
 
 /*
  * LBER memory.c