X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Fliblber%2Fio.c;h=74abb24fd4d22b1516e1b5dc0b5dfd41af1a75e2;hb=9cfcdc432bd89fe243adb29a91ce1d8fddad459d;hp=7d529500d784c4eed2581d88df30f0a7b186cd8a;hpb=a81ca188454b343e91568d49c0ac408660dcb66c;p=openldap

diff --git a/libraries/liblber/io.c b/libraries/liblber/io.c
index 7d529500d7..74abb24fd4 100644
--- a/libraries/liblber/io.c
+++ b/libraries/liblber/io.c
@@ -1,6 +1,7 @@
 /* io.c - ber general i/o routines */
+/* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* Portions
@@ -18,7 +19,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/errno.h>
@@ -31,117 +33,115 @@
 #endif
 
 #include "lber-int.h"
+#include "ldap_log.h"
 
-#ifdef LDAP_DEBUG
-#include <assert.h>
-#else
-#define assert(cond)
-#endif
-
-static long BerRead LDAP_P(( Sockbuf *sb, char *buf, long len ));
-static int ber_realloc LDAP_P(( BerElement *ber, unsigned long len ));
-
-#define EXBUFSIZ	1024
-
-/* probably far too large... */
-#define MAX_BERBUFSIZE	(128*1024)
-
-#if defined( DOS ) && !defined( _WIN32 ) && (MAX_BERBUFSIZE > 65535)
-# undef MAX_BERBUFSIZE
-# define MAX_BERBUFSIZE 65535
-#endif
-
-static long
-BerRead( Sockbuf *sb, char *buf, long len )
+ber_slen_t
+ber_read(
+	BerElement *ber,
+	char *buf,
+	ber_len_t len )
 {
-	int	c;
-	long	nread = 0;
-
-	while ( len > 0 ) {
-		if ( (c = lber_pvt_sb_read( sb, buf, len )) <= 0 ) {
-			if ( nread > 0 )
-				break;
-			return( c );
-		}
-		buf+= c;
-		nread+=c;
-		len-=c;
-	}
+	ber_len_t	actuallen, nleft;
 
-	return( nread );
-}
+	assert( ber != NULL );
+	assert( buf != NULL );
 
-long
-ber_read( BerElement *ber, char *buf, unsigned long len )
-{
-	unsigned long	actuallen, nleft;
+	assert( LBER_VALID( ber ) );
 
-	nleft = ber->ber_end - ber->ber_ptr;
+	nleft = ber_pvt_ber_remaining( ber );
 	actuallen = nleft < len ? nleft : len;
 
-	SAFEMEMCPY( buf, ber->ber_ptr, (size_t)actuallen );
+	AC_MEMCPY( buf, ber->ber_ptr, actuallen );
 
 	ber->ber_ptr += actuallen;
 
-	return( (long)actuallen );
+	return( (ber_slen_t) actuallen );
 }
 
-long
-ber_write( BerElement *ber, char *buf, unsigned long len, int nosos )
+ber_slen_t
+ber_write(
+	BerElement *ber,
+	LDAP_CONST char *buf,
+	ber_len_t len,
+	int nosos )
 {
+	assert( ber != NULL );
+	assert( buf != NULL );
+
+	assert( LBER_VALID( ber ) );
+
 	if ( nosos || ber->ber_sos == NULL ) {
 		if ( ber->ber_ptr + len > ber->ber_end ) {
 			if ( ber_realloc( ber, len ) != 0 )
 				return( -1 );
 		}
-		SAFEMEMCPY( ber->ber_ptr, buf, (size_t)len );
+		AC_MEMCPY( ber->ber_ptr, buf, (size_t)len );
 		ber->ber_ptr += len;
-		return( len );
+		return( (ber_slen_t) len );
+
 	} else {
 		if ( ber->ber_sos->sos_ptr + len > ber->ber_end ) {
 			if ( ber_realloc( ber, len ) != 0 )
 				return( -1 );
 		}
-		SAFEMEMCPY( ber->ber_sos->sos_ptr, buf, (size_t)len );
+		AC_MEMCPY( ber->ber_sos->sos_ptr, buf, (size_t)len );
 		ber->ber_sos->sos_ptr += len;
 		ber->ber_sos->sos_clen += len;
-		return( len );
+		return( (ber_slen_t) len );
 	}
 }
 
-static int
-ber_realloc( BerElement *ber, unsigned long len )
+int
+ber_realloc( BerElement *ber, ber_len_t len )
 {
-	unsigned long	need, have, total;
+	ber_len_t	total;
 	Seqorset	*s;
 	long		off;
 	char		*oldbuf;
 
-	have = (ber->ber_end - ber->ber_buf) / EXBUFSIZ;
-	need = (len < EXBUFSIZ ? 1 : (len + (EXBUFSIZ - 1)) / EXBUFSIZ);
-	total = have * EXBUFSIZ + need * EXBUFSIZ;
+	assert( ber != NULL );
+	assert( len > 0 );
+	assert( LBER_VALID( ber ) );
+
+	total = ber_pvt_ber_total( ber );
+
+#define LBER_EXBUFSIZ	4060 /* a few words less than 2^N for binary buddy */
+#if defined( LBER_EXBUFSIZ ) && LBER_EXBUFSIZ > 0
+# ifndef notdef
+	/* don't realloc by small amounts */
+	total += len < LBER_EXBUFSIZ ? LBER_EXBUFSIZ : len;
+# else
+	{	/* not sure what value this adds */
+		ber_len_t have = (total + (LBER_EXBUFSIZE - 1)) / LBER_EXBUFSIZ;
+		ber_len_t need = (len + (LBER_EXBUFSIZ - 1)) / LBER_EXBUFSIZ;
+		total = ( have + need ) * LBER_EXBUFSIZ;
+	}
+# endif
+#else
+	total += len;	/* realloc just what's needed */
+#endif
 
 	oldbuf = ber->ber_buf;
 
+	ber->ber_buf = (char *) LBER_REALLOC( oldbuf, total );
+	
 	if ( ber->ber_buf == NULL ) {
-		if ( (ber->ber_buf = (char *) malloc( (size_t)total )) == NULL )
-			return( -1 );
-	} else if ( (ber->ber_buf = (char *) realloc( ber->ber_buf,
-	    (size_t)total )) == NULL )
+		ber->ber_buf = oldbuf;
 		return( -1 );
+	}
 
 	ber->ber_end = ber->ber_buf + total;
 
 	/*
 	 * If the stinking thing was moved, we need to go through and
-	 * reset all the sos and ber pointers.  Offsets would've been
+	 * reset all the sos and ber pointers.	Offsets would've been
 	 * a better idea... oh well.
 	 */
 
 	if ( ber->ber_buf != oldbuf ) {
 		ber->ber_ptr = ber->ber_buf + (ber->ber_ptr - oldbuf);
 
-		for ( s = ber->ber_sos; s != NULLSEQORSET; s = s->sos_next ) {
+		for ( s = ber->ber_sos; s != NULL; s = s->sos_next ) {
 			off = s->sos_first - oldbuf;
 			s->sos_first = ber->ber_buf + off;
 
@@ -154,18 +154,52 @@ ber_realloc( BerElement *ber, unsigned long len )
 }
 
 void
-ber_free( BerElement *ber, int freebuf )
+ber_free_buf( BerElement *ber )
 {
-	if ( freebuf && ber->ber_buf != NULL )
-		free( ber->ber_buf );
+	Seqorset *s, *next;
+
+	assert( LBER_VALID( ber ) );
+
+	if ( ber->ber_buf) LBER_FREE( ber->ber_buf );
+
+	for( s = ber->ber_sos ; s != NULL ; s = next ) {
+		next = s->sos_next;
+		LBER_FREE( s );
+	}
+
 	ber->ber_buf = NULL;
-	free( (char *) ber );
+	ber->ber_sos = NULL;
+	ber->ber_valid = LBER_UNINITIALIZED;
+}
+
+void
+ber_free( BerElement *ber, int freebuf )
+{
+#ifdef LDAP_MEMORY_DEBUG
+	assert( ber != NULL );
+#endif
+
+	if( ber == NULL ) {
+		return;
+	}
+
+	if( freebuf )
+		ber_free_buf( ber );
+
+	LBER_FREE( (char *) ber );
 }
 
 int
 ber_flush( Sockbuf *sb, BerElement *ber, int freeit )
 {
-	long	nwritten, towrite, rc;	
+	ber_len_t	towrite;
+	ber_slen_t	rc;	
+
+	assert( sb != NULL );
+	assert( ber != NULL );
+
+	assert( SOCKBUF_VALID( sb ) );
+	assert( LBER_VALID( ber ) );
 
 	if ( ber->ber_rwptr == NULL ) {
 		ber->ber_rwptr = ber->ber_buf;
@@ -173,33 +207,33 @@ ber_flush( Sockbuf *sb, BerElement *ber, int freeit )
 	towrite = ber->ber_ptr - ber->ber_rwptr;
 
 	if ( sb->sb_debug ) {
-		lber_log_printf( LDAP_DEBUG_ANY, sb->sb_debug,
-			"ber_flush: %ld bytes to sd %ld%s\n", towrite,
-		    (long) sb->sb_sd, ber->ber_rwptr != ber->ber_buf ? " (re-flush)"
-		    : "" );
-		lber_log_bprint( LDAP_DEBUG_PACKETS, sb->sb_debug,
+#ifdef NEW_LOGGING
+		LDAP_LOG( BER, DETAIL1,
+			   "ber_flush: %ld bytes to sd %ld%s\n",
+			   towrite, (long)sb->sb_fd,
+			   ber->ber_rwptr != ber->ber_buf ? " (re-flush)" : "" );
+
+		if(LDAP_LOGS_TEST(BER, DETAIL2))
+				BER_DUMP(( "liblber", LDAP_LEVEL_DETAIL2, ber, 1 ));
+
+#else
+		ber_log_printf( LDAP_DEBUG_ANY, sb->sb_debug,
+			"ber_flush: %ld bytes to sd %ld%s\n",
+			towrite, (long) sb->sb_fd,
+			ber->ber_rwptr != ber->ber_buf ?  " (re-flush)" : "" );
+		ber_log_bprint( LDAP_DEBUG_PACKETS, sb->sb_debug,
 			ber->ber_rwptr, towrite );
+#endif
 	}
 
-#if !defined(MACOS) && !defined(DOS)
-	if ( sb->sb_options & (LBER_TO_FILE | LBER_TO_FILE_ONLY) ) {
-		rc = write( sb->sb_fd, ber->ber_rwptr, towrite );
-		if ( sb->sb_options & LBER_TO_FILE_ONLY ) {
-			return( (int)rc );
-		}
-	}
-#endif
-	
-	nwritten = 0;
-	do {
-		rc = lber_pvt_sb_write( sb, ber->ber_rwptr, towrite );
+	while ( towrite > 0 ) {
+		rc = ber_int_sb_write( sb, ber->ber_rwptr, towrite );
 		if (rc<=0) {
 			return -1;
 		}
 		towrite -= rc;
-		nwritten += rc;
 		ber->ber_rwptr += rc;
-	} while ( towrite > 0 );
+	} 
 
 	if ( freeit )
 		ber_free( ber, 1 );
@@ -212,25 +246,33 @@ ber_alloc_t( int options )
 {
 	BerElement	*ber;
 
-	if ( (ber = (BerElement *) calloc( 1, sizeof(BerElement) )) == NULLBER )
-		return( NULLBER );
+    ber_int_options.lbo_valid = LBER_INITIALIZED;
+
+	ber = (BerElement *) LBER_CALLOC( 1, sizeof(BerElement) );
+
+	if ( ber == NULL ) {
+		return NULL;
+	}
+
+	ber->ber_valid = LBER_VALID_BERELEMENT;
 	ber->ber_tag = LBER_DEFAULT;
 	ber->ber_options = options;
-	ber->ber_debug = lber_int_debug;
+	ber->ber_debug = ber_int_debug;
 
-	return( ber );
+	assert( LBER_VALID( ber ) );
+	return ber;
 }
 
 BerElement *
-ber_alloc( void )
+ber_alloc( void )	/* deprecated */
 {
-	return( ber_alloc_t( 0 ) );
+	return ber_alloc_t( 0 );
 }
 
 BerElement *
-der_alloc( void )
+der_alloc( void )	/* deprecated */
 {
-	return( ber_alloc_t( LBER_USE_DER ) );
+	return ber_alloc_t( LBER_USE_DER );
 }
 
 BerElement *
@@ -238,22 +280,47 @@ ber_dup( BerElement *ber )
 {
 	BerElement	*new;
 
-	if ( (new = ber_alloc()) == NULLBER )
-		return( NULLBER );
+	assert( ber != NULL );
+	assert( LBER_VALID( ber ) );
+
+	if ( (new = ber_alloc_t( ber->ber_options )) == NULL ) {
+		return NULL;
+	}
 
 	*new = *ber;
 
+	assert( LBER_VALID( new ) );
 	return( new );
 }
 
 
-/* OLD U-Mich ber_init() */
 void
-ber_init_w_nullc( BerElement *ber, int options )
+ber_init2( BerElement *ber, struct berval *bv, int options )
 {
+	assert( ber != NULL );
+
+	ber_int_options.lbo_valid = LBER_INITIALIZED;
+
 	(void) memset( (char *)ber, '\0', sizeof( BerElement ));
+	ber->ber_valid = LBER_VALID_BERELEMENT;
 	ber->ber_tag = LBER_DEFAULT;
 	ber->ber_options = (char) options;
+	ber->ber_debug = ber_int_debug;
+
+	if ( bv != NULL ) {
+		ber->ber_buf = bv->bv_val;
+		ber->ber_ptr = ber->ber_buf;
+		ber->ber_end = ber->ber_buf + bv->bv_len;
+	}
+
+	assert( LBER_VALID( ber ) );
+}
+
+/* OLD U-Mich ber_init() */
+void
+ber_init_w_nullc( BerElement *ber, int options )
+{
+	ber_init2( ber, NULL, options );
 }
 
 /* New C-API ber_init() */
@@ -265,27 +332,32 @@ ber_init( struct berval *bv )
 {
 	BerElement *ber;
 
+	assert( bv != NULL );
+
+    ber_int_options.lbo_valid = LBER_INITIALIZED;
+
 	if ( bv == NULL ) {
 		return NULL;
 	}
 
 	ber = ber_alloc_t( 0 );
 
-	if( ber == NULLBER ) {
+	if( ber == NULL ) {
 		/* allocation failed */
-		return ( NULL );
+		return NULL;
 	}
 
 	/* copy the data */
-	if ( ( (unsigned int) ber_write ( ber, bv->bv_val, bv->bv_len, 0 )) != bv->bv_len ) {
+	if ( ((ber_len_t) ber_write ( ber, bv->bv_val, bv->bv_len, 0 ))
+		!= bv->bv_len )
+	{
 		/* write failed, so free and return NULL */
 		ber_free( ber, 1 );
-		return( NULL );
+		return NULL;
 	}
 
 	ber_reset( ber, 1 );	/* reset the pointer to the start of the buffer */
-
-	return ( ber );
+	return ber;
 }
 
 /* New C-API ber_flatten routine */
@@ -299,12 +371,17 @@ int ber_flatten(
 {
 	struct berval *bv;
  
+	assert( bvPtr != NULL );
+
+    ber_int_options.lbo_valid = LBER_INITIALIZED;
+
 	if(bvPtr == NULL) {
-		return( -1 );
+		return -1;
 	}
 
-	if ( (bv = malloc( sizeof(struct berval))) == NULL ) {
-		return( -1 );
+	bv = LBER_MALLOC( sizeof(struct berval) );
+	if ( bv == NULL ) {
+		return -1;
 	}
 
 	if ( ber == NULL ) {
@@ -314,28 +391,33 @@ int ber_flatten(
 
 	} else {
 		/* copy the berval */
-		ptrdiff_t len = ber->ber_ptr - ber->ber_buf;
+		ber_len_t len = ber_pvt_ber_write( ber );
 
-		if ( (bv->bv_val = (char *) malloc( len + 1 )) == NULL ) {
-			ber_bvfree( bv );
-			return( -1 );
+		bv->bv_val = (char *) LBER_MALLOC( len + 1 );
+		if ( bv->bv_val == NULL ) {
+			LBER_FREE( bv );
+			return -1;
 		}
 
-		SAFEMEMCPY( bv->bv_val, ber->ber_buf, (size_t)len );
+		AC_MEMCPY( bv->bv_val, ber->ber_buf, len );
 		bv->bv_val[len] = '\0';
 		bv->bv_len = len;
 	}
     
 	*bvPtr = bv;
-	return( 0 );
+	return 0;
 }
 
 void
 ber_reset( BerElement *ber, int was_writing )
 {
+	assert( ber != NULL );
+	assert( LBER_VALID( ber ) );
+
 	if ( was_writing ) {
 		ber->ber_end = ber->ber_ptr;
 		ber->ber_ptr = ber->ber_buf;
+
 	} else {
 		ber->ber_ptr = ber->ber_end;
 	}
@@ -343,57 +425,32 @@ ber_reset( BerElement *ber, int was_writing )
 	ber->ber_rwptr = NULL;
 }
 
-#if 0
-/* return the tag - LBER_DEFAULT returned means trouble */
-static unsigned long
-get_tag( Sockbuf *sb )
-{
-	unsigned char	xbyte;
-	unsigned long	tag;
-	char		*tagp;
-	unsigned int	i;
-
-	if ( lber_pvt_sb_read( sb, (char *) &xbyte, 1 ) != 1 )
-		return( LBER_DEFAULT );
-
-	if ( (xbyte & LBER_BIG_TAG_MASK) != LBER_BIG_TAG_MASK )
-		return( (unsigned long) xbyte );
-
-	tagp = (char *) &tag;
-	tagp[0] = xbyte;
-	for ( i = 1; i < sizeof(long); i++ ) {
-		if ( lber_pvt_sb_read( sb, (char *) &xbyte, 1 ) != 1 )
-			return( LBER_DEFAULT );
-
-		tagp[i] = xbyte;
-
-		if ( ! (xbyte & LBER_MORE_TAG_MASK) )
-			break;
-	}
-
-	/* tag too big! */
-	if ( i == sizeof(long) )
-		return( LBER_DEFAULT );
-
-	/* want leading, not trailing 0's */
-	return( tag >> (sizeof(long) - i - 1) );
-}
-#endif
-
 /*
- * A rewrite of get_get_next that can safely be called multiple times 
- * for the same packet. It will simply continue were it stopped until
+ * A rewrite of ber_get_next that can safely be called multiple times 
+ * for the same packet. It will simply continue where it stopped until
  * a full packet is read.
  */
 
-unsigned long
-ber_get_next( Sockbuf *sb, unsigned long *len, BerElement *ber )
+ber_tag_t
+ber_get_next(
+	Sockbuf *sb,
+	ber_len_t *len,
+	BerElement *ber )
 {
-	if ( ber->ber_debug ) {
-		lber_log_printf( LDAP_DEBUG_TRACE, ber->ber_debug,
-			"ber_get_next\n" );
-	}
-	
+	assert( sb != NULL );
+	assert( len != NULL );
+	assert( ber != NULL );
+
+	assert( SOCKBUF_VALID( sb ) );
+	assert( LBER_VALID( ber ) );
+
+#ifdef NEW_LOGGING
+	LDAP_LOG( BER, ENTRY, "ber_get_next: enter\n", 0, 0, 0 );
+#else
+	ber_log_printf( LDAP_DEBUG_TRACE, ber->ber_debug,
+		"ber_get_next\n" );
+#endif
+
 	/*
 	 * Any ber element looks like this: tag length contents.
 	 * Assuming everything's ok, we return the tag byte (we
@@ -405,106 +462,149 @@ ber_get_next( Sockbuf *sb, unsigned long *len, BerElement *ber )
 	 *	2) definite lengths
 	 *	3) primitive encodings used whenever possible
 	 */
-	
+
 	if (ber->ber_rwptr == NULL) {
-		assert( ber->ber_buf == NULL );
-		ber->ber_rwptr = (char *) &ber->ber_tag;
+		/* XXYYZ
+		 * dtest does like this assert.
+		 */
+		/* assert( ber->ber_buf == NULL ); */
+		ber->ber_rwptr = (char *) &ber->ber_len-1;
+		ber->ber_ptr = ber->ber_rwptr;
 		ber->ber_tag = 0;
 	}
 
-#define PTR_IN_VAR( ptr, var )\
-(((ptr)>=(char *) &(var)) && ((ptr)< (char *) &(var)+sizeof(var)))
-	
-	if (PTR_IN_VAR(ber->ber_rwptr, ber->ber_tag)) {
-		if (ber->ber_rwptr == (char *) &ber->ber_tag) {
-			if (lber_pvt_sb_read( sb, ber->ber_rwptr, 1)<=0)
-				return LBER_DEFAULT;
-			if ((ber->ber_rwptr[0] & LBER_BIG_TAG_MASK)
-				!= LBER_BIG_TAG_MASK) {
-				ber->ber_tag = ber->ber_rwptr[0];
-				ber->ber_rwptr = (char *) &ber->ber_usertag;
-				goto get_lenbyte;
+	while (ber->ber_rwptr > (char *)&ber->ber_tag && ber->ber_rwptr <
+		(char *)(&ber->ber_usertag + 1)) {
+		ber_slen_t i;
+		char buf[sizeof(ber->ber_len)-1];
+		ber_len_t tlen = 0;
+
+		if ((i=ber_int_sb_read( sb, ber->ber_rwptr,
+			(char *)(&ber->ber_usertag+1)-ber->ber_rwptr))<=0) {
+			return LBER_DEFAULT;
+		}
+
+		ber->ber_rwptr += i;
+
+		/* We got at least one byte, try to parse the tag. */
+		if (ber->ber_ptr == (char *)&ber->ber_len-1) {
+			ber_tag_t tag;
+			unsigned char *p = (unsigned char *)ber->ber_ptr;
+			tag = *p++;
+			if ((tag & LBER_BIG_TAG_MASK) == LBER_BIG_TAG_MASK) {
+				for (i=1; (char *)p<ber->ber_rwptr; i++,p++) {
+					tag <<= 8;
+					tag |= *p;
+					if (!(*p & LBER_MORE_TAG_MASK))
+						break;
+					/* Is the tag too big? */
+					if (i == sizeof(ber_tag_t)-1) {
+						errno = ERANGE;
+						return LBER_DEFAULT;
+					}
+				}
+				/* Did we run out of bytes? */
+				if ((char *)p == ber->ber_rwptr) {
+					return LBER_DEFAULT;
+				}
+				p++;
 			}
-			ber->ber_rwptr++;
+			ber->ber_tag = tag;
+			ber->ber_ptr = (char *)p;
 		}
-		do {
-			/* reading the tag... */
-			if (lber_pvt_sb_read( sb, ber->ber_rwptr, 1)<=0)
+
+		if (i == 1) continue;
+
+		/* Now look for the length */
+		if (*ber->ber_ptr & 0x80) {	/* multi-byte */
+			int llen = *(unsigned char *)ber->ber_ptr++ & 0x7f;
+			if (llen > (int)sizeof(ber_len_t)) {
+				errno = ERANGE;
 				return LBER_DEFAULT;
-			if (! (ber->ber_rwptr[0] & LBER_MORE_TAG_MASK) ) {
-				ber->ber_tag>>=sizeof(ber->ber_tag) -
-				  ((char *) &ber->ber_tag - ber->ber_rwptr);
-				ber->ber_rwptr = (char *) &ber->ber_usertag;
-				goto get_lenbyte;
 			}
-		} while (PTR_IN_VAR(ber->ber_rwptr,ber->ber_tag));
-		errno = ERANGE; /* this is a serious error. */
-		return LBER_DEFAULT;
-	}
-get_lenbyte:
-	if (ber->ber_rwptr==(char *) &ber->ber_usertag) {
-		unsigned char c;
-		if (lber_pvt_sb_read( sb, (char *) &c, 1)<=0)
-			return LBER_DEFAULT;
-		if (c & 0x80) {
-			int len = c & 0x7f;
-			if ( (len==0) || ( len>sizeof( ber->ber_len ) ) ) {
-				errno = ERANGE;
+			/* Not enough bytes? */
+			if (ber->ber_rwptr - ber->ber_ptr < llen) {
 				return LBER_DEFAULT;
 			}
-			ber->ber_rwptr = (char *) &ber->ber_len +
-				sizeof(ber->ber_len) - len;
-			ber->ber_len = 0;
+			for (i=0; i<llen && ber->ber_ptr<ber->ber_rwptr; i++,ber->ber_ptr++) {
+				tlen <<=8;
+				tlen |= *(unsigned char *)ber->ber_ptr;
+			}
 		} else {
-			ber->ber_len = c;
-			goto fill_buffer;
+			tlen = *(unsigned char *)ber->ber_ptr++;
 		}
-	}
-	if (PTR_IN_VAR(ber->ber_rwptr, ber->ber_len)) {
-		int res;
-		int to_go;
-		to_go = (char *) &ber->ber_len + sizeof( ber->ber_len ) -
-			ber->ber_rwptr;
-		assert( to_go > 0 );
-		res = lber_pvt_sb_read( sb, ber->ber_rwptr, to_go );
-		if (res <=0)
-			return LBER_DEFAULT;
-		ber->ber_rwptr += res;
-		if (res==to_go) {
-			/* convert length. */
-			ber->ber_len = AC_NTOHL( ber->ber_len );
-			goto fill_buffer;
+		/* Are there leftover data bytes inside ber->ber_len? */
+		if (ber->ber_ptr < (char *)&ber->ber_usertag) {
+			if (ber->ber_rwptr < (char *)&ber->ber_usertag)
+				i = ber->ber_rwptr - ber->ber_ptr;
+			else
+				i = (char *)&ber->ber_usertag - ber->ber_ptr;
+			AC_MEMCPY(buf, ber->ber_ptr, i);
+			ber->ber_ptr += i;
 		} else {
-#if defined( EWOULDBLOCK )
-			errno = EWOULDBLOCK;
-#elif defined( EAGAIN )
-			errno = EAGAIN;
-#endif			
-			return LBER_DEFAULT;
+			i = 0;
 		}
-	}
-fill_buffer:	
-	/* now fill the buffer. */
-	if (ber->ber_buf==NULL) {
-		if (ber->ber_len > MAX_BERBUFSIZE) {
+		ber->ber_len = tlen;
+
+		/* now fill the buffer. */
+
+		/* make sure length is reasonable */
+		if ( ber->ber_len == 0 ) {
 			errno = ERANGE;
 			return LBER_DEFAULT;
-		}
-		ber->ber_buf = (char *) malloc( ber->ber_len );
-		if (ber->ber_buf==NULL)
+		} else if ( sb->sb_max_incoming && ber->ber_len > sb->sb_max_incoming ) {
+#ifdef NEW_LOGGING
+			LDAP_LOG( BER, ERR, 
+				"ber_get_next: sockbuf_max_incoming limit hit "
+				"(%d > %d)\n", ber->ber_len, sb->sb_max_incoming, 0 );
+#else
+			ber_log_printf( LDAP_DEBUG_CONNS, ber->ber_debug,
+				"ber_get_next: sockbuf_max_incoming limit hit "
+				"(%ld > %ld)\n", ber->ber_len, sb->sb_max_incoming );
+#endif
+			errno = ERANGE;
 			return LBER_DEFAULT;
-		ber->ber_rwptr = ber->ber_buf;
-		ber->ber_ptr = ber->ber_buf;
-		ber->ber_end = ber->ber_buf + ber->ber_len;
+		}
+
+		if (ber->ber_buf==NULL) {
+			ber_len_t l = ber->ber_rwptr - ber->ber_ptr;
+			/* ber->ber_ptr is always <= ber->ber->ber_rwptr.
+			 * make sure ber->ber_len agrees with what we've
+			 * already read.
+			 */
+			if ( ber->ber_len < i + l ) {
+				errno = ERANGE;
+				return LBER_DEFAULT;
+			}
+			ber->ber_buf = (char *) LBER_MALLOC( ber->ber_len + 1 );
+			if (ber->ber_buf==NULL) {
+				return LBER_DEFAULT;
+			}
+			ber->ber_end = ber->ber_buf + ber->ber_len;
+			if (i) {
+				AC_MEMCPY(ber->ber_buf, buf, i);
+			}
+			if (l > 0) {
+				AC_MEMCPY(ber->ber_buf + i, ber->ber_ptr, l);
+				i += l;
+			}
+			ber->ber_ptr = ber->ber_buf;
+			ber->ber_usertag = 0;
+			if ((ber_len_t)i == ber->ber_len) {
+				goto done;
+			}
+			ber->ber_rwptr = ber->ber_buf + i;
+		}
 	}
+
 	if ((ber->ber_rwptr>=ber->ber_buf) && (ber->ber_rwptr<ber->ber_end)) {
-		int res;
-		int to_go;
+		ber_slen_t res;
+		ber_slen_t to_go;
 		
 		to_go = ber->ber_end - ber->ber_rwptr;
 		assert( to_go > 0 );
 		
-		res = lber_pvt_sb_read( sb, ber->ber_rwptr, to_go );
+		res = ber_int_sb_read( sb, ber->ber_rwptr, to_go );
 		if (res<=0)
 			return LBER_DEFAULT;
 		ber->ber_rwptr+=res;
@@ -517,58 +617,26 @@ fill_buffer:
 #endif			
 			return LBER_DEFAULT;
 		}
-		
+done:
 		ber->ber_rwptr = NULL;
 		*len = ber->ber_len;
 		if ( ber->ber_debug ) {
-			lber_log_printf( LDAP_DEBUG_TRACE, ber->ber_debug,
+#ifdef NEW_LOGGING
+			LDAP_LOG( BER, DETAIL1, 
+				"ber_get_next: tag 0x%lx len %ld\n", 
+				ber->ber_tag, ber->ber_len, 0  );
+			if(LDAP_LOGS_TEST(BER, DETAIL2))
+					BER_DUMP(( "liblber", LDAP_LEVEL_DETAIL2, ber, 1 ));
+#else
+			ber_log_printf( LDAP_DEBUG_TRACE, ber->ber_debug,
 				"ber_get_next: tag 0x%lx len %ld contents:\n",
 				ber->ber_tag, ber->ber_len );
-			lber_log_dump( LDAP_DEBUG_BER, ber->ber_debug, ber, 1 );
+			ber_log_dump( LDAP_DEBUG_BER, ber->ber_debug, ber, 1 );
+#endif
 		}
 		return (ber->ber_tag);
 	}
+
 	assert( 0 ); /* ber structure is messed up ?*/
 	return LBER_DEFAULT;
 }
-
-void	ber_clear( BerElement *ber, int freebuf )
-{
-	if ((freebuf) && (ber->ber_buf))
-		free( ber->ber_buf );
-	ber->ber_buf = NULL;
-	ber->ber_rwptr = NULL;
-	ber->ber_end = NULL;
-}
-
-Sockbuf *lber_pvt_sb_alloc( void )
-{
-	Sockbuf *sb = calloc(1, sizeof(Sockbuf));
-	lber_pvt_sb_init( sb );
-	return sb;
-}
-
-Sockbuf *lber_pvt_sb_alloc_fd( int fd )
-{
-	Sockbuf *sb = lber_pvt_sb_alloc();
-	lber_pvt_sb_set_desc( sb, fd );
-   	lber_pvt_sb_set_io( sb, &lber_pvt_sb_io_tcp, NULL );
-	return sb;
-}
-
-void lber_pvt_sb_free( Sockbuf *sb )
-{
-	if(sb == NULL) return;
-	lber_pvt_sb_destroy( sb );
-	free(sb);
-}
-
-int lber_pvt_sb_get_option( Sockbuf *sb, int opt, void *outvalue )
-{
-	return LBER_OPT_ERROR;
-}
-
-int lber_pvt_sb_set_option( Sockbuf *sb, int opt, void *invalue )
-{
-	return LBER_OPT_ERROR;
-}