ITS#897 Internal connection that is closed on one end and about to

[openldap] / libraries / liblber / options.c

diff --git a/libraries/liblber/options.c b/libraries/liblber/options.c
index a323bbee963504ddbb8a36b8ed972748fd6cfc11..d234e98081e9383498d2f8f4d3a6df5547750edc 100644 (file)
--- a/libraries/liblber/options.c
+++ b/libraries/liblber/options.c
@@ -1,20 +1,26 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 #include "portable.h"
 
-#include <stdlib.h>
+#include <ac/stdlib.h>
 #include <ac/string.h>
-
+#include <ac/stdarg.h>
 #include "lber-int.h"
 
+/* bprint.c */
+typedef void (*BER_LOG_FN) LDAP_P((FILE *file, char *subsys, int level, const char *fmt, va_list vl));
+extern void * ber_pvt_err_file;
+extern BER_LOG_FN ber_int_log_proc;
+
 struct lber_options ber_int_options = {
        LBER_UNINITIALIZED, 0, 0 };
 
 int
 ber_get_option(
-       LDAP_CONST void *item,
+       void    *item,
        int             option,
        void    *outvalue)
 {
@@ -25,6 +31,7 @@ ber_get_option(
 
        if(outvalue == NULL) {
                /* no place to get to */
+               ber_errno = LBER_ERROR_PARAM;
                return LBER_OPT_ERROR;
        }
 
@@ -32,8 +39,26 @@ ber_get_option(
                if(option == LBER_OPT_BER_DEBUG) {
                        * (int *) outvalue = ber_int_debug;
                        return LBER_OPT_SUCCESS;
+               } else if(option == LBER_OPT_MEMORY_INUSE) {
+                       /* The memory inuse is a global variable on kernal implementations.
+                        * This means that memory debug is shared by all LDAP processes
+                        * so for this variable to have much meaning, only one LDAP process
+                        * should be running and memory inuse should be initialized to zero
+                        * using the lber_set_option() function during startup.
+                        * The counter is not accurate for multithreaded ldap applications.
+                        */
+#ifdef LDAP_MEMORY_DEBUG
+                       * (int *) outvalue = ber_int_options.lbo_meminuse;
+                       return LBER_OPT_SUCCESS;
+#else
+                       return LBER_OPT_ERROR;
+#endif
+               } else if(option == LBER_OPT_LOG_PRINT_FILE) {
+                       *((FILE**)outvalue) = (FILE*)ber_pvt_err_file;
+                       return LBER_OPT_SUCCESS;
                }
 
+               ber_errno = LBER_ERROR_PARAM;
                return LBER_OPT_ERROR;
        }
 
@@ -51,8 +76,24 @@ ber_get_option(
                * (int *) outvalue = ber->ber_debug;
                return LBER_OPT_SUCCESS;
 
+       case LBER_OPT_BER_REMAINING_BYTES:
+               assert( BER_VALID( ber ) );
+               *((ber_len_t *) outvalue) = ber_pvt_ber_remaining(ber);
+               return LBER_OPT_SUCCESS;
+
+       case LBER_OPT_BER_TOTAL_BYTES:
+               assert( BER_VALID( ber ) );
+               *((ber_len_t *) outvalue) = ber_pvt_ber_total(ber);
+               return LBER_OPT_SUCCESS;
+
+       case LBER_OPT_BER_BYTES_TO_WRITE:
+               assert( BER_VALID( ber ) );
+               *((ber_len_t *) outvalue) = ber_pvt_ber_write(ber);
+               return LBER_OPT_SUCCESS;
+
        default:
                /* bad param */
+               ber_errno = LBER_ERROR_PARAM;
                break;
        }
 
@@ -73,12 +114,14 @@ ber_set_option(
                && ( option == LBER_OPT_MEMORY_FNS )
                && ( invalue != NULL ))
        {
-               BerMemoryFunctions *f = (BerMemoryFunctions *) invalue;
+               const BerMemoryFunctions *f =
+                       (const BerMemoryFunctions *) invalue;
 
                /* make sure all functions are provided */
                if(!( f->bmf_malloc && f->bmf_calloc
                        && f->bmf_realloc && f->bmf_free ))
                {
+                       ber_errno = LBER_ERROR_PARAM;
                        return LBER_OPT_ERROR;
                }
 
@@ -86,10 +129,11 @@ ber_set_option(
                        (*(f->bmf_malloc))(sizeof(BerMemoryFunctions));
 
                if ( ber_int_memory_fns == NULL ) {
+                       ber_errno = LBER_ERROR_MEMORY;
                        return LBER_OPT_ERROR;
                }
 
-               memcpy(ber_int_memory_fns, f, sizeof(BerMemoryFunctions));
+               AC_MEMCPY(ber_int_memory_fns, f, sizeof(BerMemoryFunctions));
 
                ber_int_options.lbo_valid = LBER_INITIALIZED;
                return LBER_OPT_SUCCESS;
@@ -99,19 +143,40 @@ ber_set_option(
 
        if(invalue == NULL) {
                /* no place to set from */
+               ber_errno = LBER_ERROR_PARAM;
                return LBER_OPT_ERROR;
        }
 
        if(item == NULL) {
                if(option == LBER_OPT_BER_DEBUG) {
-                       ber_int_debug = * (int *) invalue;
+                       ber_int_debug = * (const int *) invalue;
                        return LBER_OPT_SUCCESS;
 
                } else if(option == LBER_OPT_LOG_PRINT_FN) {
                        ber_pvt_log_print = (BER_LOG_PRINT_FN) invalue;
                        return LBER_OPT_SUCCESS;
+               } else if(option == LBER_OPT_LOG_PRINT_FILE) {
+                       ber_pvt_err_file = (void *) invalue;
+                       return LBER_OPT_SUCCESS;
+               } else if(option == LBER_OPT_MEMORY_INUSE) {
+                       /* The memory inuse is a global variable on kernal implementations.
+                        * This means that memory debug is shared by all LDAP processes
+                        * so for this variable to have much meaning, only one LDAP process
+                        * should be running and memory inuse should be initialized to zero
+                        * using the lber_set_option() function during startup.
+                        * The counter is not accurate for multithreaded applications.
+                        */
+#ifdef LDAP_MEMORY_DEBUG
+                       ber_int_options.lbo_meminuse = * (int *) invalue;
+                       return LBER_OPT_SUCCESS;
+#else
+                       return LBER_OPT_ERROR;
+#endif
+               } else if(option == LBER_OPT_LOG_PROC) {
+                       ber_int_log_proc = (BER_LOG_FN)invalue;
                }
 
+               ber_errno = LBER_ERROR_PARAM;
                return LBER_OPT_ERROR;
        }
 
@@ -121,16 +186,32 @@ ber_set_option(
        switch(option) {
        case LBER_OPT_BER_OPTIONS:
                assert( BER_VALID( ber ) );
-               ber->ber_options = * (int *) invalue;
+               ber->ber_options = * (const int *) invalue;
                return LBER_OPT_SUCCESS;
 
        case LBER_OPT_BER_DEBUG:
                assert( BER_VALID( ber ) );
-               ber->ber_debug = * (int *) invalue;
+               ber->ber_debug = * (const int *) invalue;
+               return LBER_OPT_SUCCESS;
+
+       case LBER_OPT_BER_REMAINING_BYTES:
+               assert( BER_VALID( ber ) );
+               ber->ber_end = &ber->ber_ptr[* (const ber_len_t *) invalue];
+               return LBER_OPT_SUCCESS;
+
+       case LBER_OPT_BER_TOTAL_BYTES:
+               assert( BER_VALID( ber ) );
+               ber->ber_end = &ber->ber_buf[* (const ber_len_t *) invalue];
+               return LBER_OPT_SUCCESS;
+
+       case LBER_OPT_BER_BYTES_TO_WRITE:
+               assert( BER_VALID( ber ) );
+               ber->ber_ptr = &ber->ber_buf[* (const ber_len_t *) invalue];
                return LBER_OPT_SUCCESS;
 
        default:
                /* bad param */
+               ber_errno = LBER_ERROR_PARAM;
                break;
        }