X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Fliblber%2Foptions.c;h=62f4fcf4175924b61167020b732c12673d5bbab8;hb=304a57740a0dbb8c95bbbdada7b7972eee521fa0;hp=54be5c3d2f692505c992617272f66ddb931ec6c1;hpb=88ec459a5f65d394a115fbf5c1c83040670dfd8f;p=openldap

diff --git a/libraries/liblber/options.c b/libraries/liblber/options.c
index 54be5c3d2f..62f4fcf417 100644
--- a/libraries/liblber/options.c
+++ b/libraries/liblber/options.c
@@ -1,52 +1,76 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 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 "lber-int.h"
 
-int lber_int_debug = 0;
+extern void * ber_pvt_err_file;	/* bprint.c */
+
+struct lber_options ber_int_options = {
+	LBER_UNINITIALIZED, 0, 0 };
 
 int
-lber_get_option(
+ber_get_option(
 	void	*item,
 	int		option,
 	void	*outvalue)
 {
-	BerElement *ber;
-	Sockbuf *sb;
+	LDAP_CONST BerElement *ber;
+	LDAP_CONST Sockbuf *sb;
+
+	ber_int_options.lbo_valid = LBER_INITIALIZED;
 
 	if(outvalue == NULL) {
 		/* no place to get to */
+		ber_errno = LBER_ERROR_PARAM;
 		return LBER_OPT_ERROR;
 	}
 
 	if(item == NULL) {
 		if(option == LBER_OPT_BER_DEBUG) {
-			* (int *) outvalue = lber_int_debug;
+			* (int *) outvalue = ber_int_debug;
 			return LBER_OPT_SUCCESS;
 		}
 
+		ber_errno = LBER_ERROR_PARAM;
 		return LBER_OPT_ERROR;
 	}
 
-	ber = (BerElement *) item;
-	sb = (Sockbuf *) item;
+	ber = item;
+	sb = item;
 
 	switch(option) {
 	case LBER_OPT_BER_OPTIONS:
+		assert( BER_VALID( ber ) );
 		* (int *) outvalue = ber->ber_options;
 		return LBER_OPT_SUCCESS;
 
 	case LBER_OPT_BER_DEBUG:
+		assert( BER_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;
+		return LBER_OPT_SUCCESS;
+
+	case LBER_OPT_BER_TOTAL_BYTES:
+		*((ber_len_t *) outvalue) = ber->ber_end - ber->ber_buf;
+		return LBER_OPT_SUCCESS;
+
+	case LBER_OPT_BER_BYTES_TO_WRITE:
+		*((ber_len_t *) outvalue) = ber->ber_ptr - ber->ber_buf;
+		return LBER_OPT_SUCCESS;
+
 	default:
 		/* bad param */
+		ber_errno = LBER_ERROR_PARAM;
 		break;
 	}
 
@@ -54,42 +78,98 @@ lber_get_option(
 }
 
 int
-lber_set_option(
+ber_set_option(
 	void	*item,
 	int		option,
-	void	*invalue)
+	LDAP_CONST void	*invalue)
 {
 	BerElement *ber;
 	Sockbuf *sb;
 
+	if( (ber_int_options.lbo_valid == LBER_UNINITIALIZED)
+		&& ( ber_int_memory_fns == NULL )
+		&& ( option == LBER_OPT_MEMORY_FNS )
+		&& ( invalue != NULL ))
+	{
+		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;
+		}
+
+		ber_int_memory_fns = (BerMemoryFunctions *)
+			(*(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));
+
+		ber_int_options.lbo_valid = LBER_INITIALIZED;
+		return LBER_OPT_SUCCESS;
+	}
+
+	ber_int_options.lbo_valid = LBER_INITIALIZED;
+
 	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) {
-			lber_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;
 		}
 
+		ber_errno = LBER_ERROR_PARAM;
 		return LBER_OPT_ERROR;
 	}
 
-	ber = (BerElement *) item;
-	sb = (Sockbuf *) item;
+	ber = item;
+	sb = item;
 
 	switch(option) {
 	case LBER_OPT_BER_OPTIONS:
-		ber->ber_options = * (int *) invalue;
+		assert( BER_VALID( ber ) );
+		ber->ber_options = * (const int *) invalue;
 		return LBER_OPT_SUCCESS;
 
 	case LBER_OPT_BER_DEBUG:
-		ber->ber_debug = * (int *) invalue;
+		assert( BER_VALID( ber ) );
+		ber->ber_debug = * (const int *) invalue;
+		return LBER_OPT_SUCCESS;
+
+	case LBER_OPT_BER_REMAINING_BYTES:
+		ber->ber_end = &ber->ber_ptr[* (const ber_len_t *) invalue];
+		return LBER_OPT_SUCCESS;
+
+	case LBER_OPT_BER_TOTAL_BYTES:
+		ber->ber_end = &ber->ber_buf[* (const ber_len_t *) invalue];
+		return LBER_OPT_SUCCESS;
+
+	case LBER_OPT_BER_BYTES_TO_WRITE:
+		ber->ber_ptr = &ber->ber_buf[* (const ber_len_t *) invalue];
 		return LBER_OPT_SUCCESS;
 
 	default:
 		/* bad param */
+		ber_errno = LBER_ERROR_PARAM;
 		break;
 	}