/* $OpenLDAP$ */
/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
#include "portable.h"
#include <ac/stdlib.h>
#include <ac/string.h>
-
+#include <ac/stdarg.h>
#include "lber-int.h"
+char ber_pvt_opt_on; /* used to get a non-NULL address for *_OPT_ON */
+
struct lber_options ber_int_options = {
- LBER_UNINITIALIZED, 0, 0 };
+ LBER_UNINITIALIZED, 0, 0, 0 };
int
ber_get_option(
int option,
void *outvalue)
{
- LDAP_CONST BerElement *ber;
- LDAP_CONST Sockbuf *sb;
+ const BerElement *ber;
+ const Sockbuf *sb;
ber_int_options.lbo_valid = LBER_INITIALIZED;
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;
switch(option) {
case LBER_OPT_BER_OPTIONS:
- assert( BER_VALID( ber ) );
+ assert( LBER_VALID( ber ) );
* (int *) outvalue = ber->ber_options;
return LBER_OPT_SUCCESS;
case LBER_OPT_BER_DEBUG:
- assert( BER_VALID( ber ) );
+ assert( LBER_VALID( ber ) );
* (int *) outvalue = ber->ber_debug;
return LBER_OPT_SUCCESS;
case LBER_OPT_BER_REMAINING_BYTES:
- *((ber_len_t *) outvalue) = ber->ber_end - ber->ber_ptr;
+ assert( LBER_VALID( ber ) );
+ *((ber_len_t *) outvalue) = ber_pvt_ber_remaining(ber);
return LBER_OPT_SUCCESS;
case LBER_OPT_BER_TOTAL_BYTES:
- *((ber_len_t *) outvalue) = ber->ber_end - ber->ber_buf;
+ assert( LBER_VALID( ber ) );
+ *((ber_len_t *) outvalue) = ber_pvt_ber_total(ber);
return LBER_OPT_SUCCESS;
case LBER_OPT_BER_BYTES_TO_WRITE:
- *((ber_len_t *) outvalue) = ber->ber_ptr - ber->ber_buf;
+ assert( LBER_VALID( ber ) );
+ *((ber_len_t *) outvalue) = ber_pvt_ber_write(ber);
return LBER_OPT_SUCCESS;
+ case LBER_OPT_BER_MEMCTX:
+ assert( LBER_VALID( ber ) );
+ *((void **) outvalue) = ber->ber_memctx;
+ return LBER_OPT_SUCCESS;
+
default:
/* bad param */
ber_errno = LBER_ERROR_PARAM;
}
ber_int_memory_fns = (BerMemoryFunctions *)
- (*(f->bmf_malloc))(sizeof(BerMemoryFunctions));
+ (*(f->bmf_malloc))(sizeof(BerMemoryFunctions), NULL);
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;
} 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;
switch(option) {
case LBER_OPT_BER_OPTIONS:
- assert( BER_VALID( ber ) );
+ assert( LBER_VALID( ber ) );
ber->ber_options = * (const int *) invalue;
return LBER_OPT_SUCCESS;
case LBER_OPT_BER_DEBUG:
- assert( BER_VALID( ber ) );
+ assert( LBER_VALID( ber ) );
ber->ber_debug = * (const int *) invalue;
return LBER_OPT_SUCCESS;
case LBER_OPT_BER_REMAINING_BYTES:
+ assert( LBER_VALID( ber ) );
ber->ber_end = &ber->ber_ptr[* (const ber_len_t *) invalue];
return LBER_OPT_SUCCESS;
case LBER_OPT_BER_TOTAL_BYTES:
+ assert( LBER_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( LBER_VALID( ber ) );
ber->ber_ptr = &ber->ber_buf[* (const ber_len_t *) invalue];
return LBER_OPT_SUCCESS;
+ case LBER_OPT_BER_MEMCTX:
+ assert( LBER_VALID( ber ) );
+ ber->ber_memctx = *(void **)invalue;
+ return LBER_OPT_SUCCESS;
+
default:
/* bad param */
ber_errno = LBER_ERROR_PARAM;