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

diff --git a/libraries/liblber/io.c b/libraries/liblber/io.c
index 99cc2f3999..74abb24fd4 100644
--- a/libraries/liblber/io.c
+++ b/libraries/liblber/io.c
@@ -1,5 +1,10 @@
 /* io.c - ber general i/o routines */
+/* $OpenLDAP$ */
 /*
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+/* Portions
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
  *
@@ -11,266 +16,132 @@
  * is provided ``as is'' without express or implied warranty.
  */
 
-#include <stdio.h>
-#include <ctype.h>
-
-#if defined( DOS ) || defined( _WIN32 )
-#include "msdos.h"
-#endif /* DOS || _WIN32 */
-
-#ifdef MACOS
-#include <stdlib.h>
-#include "macos.h"
-#else /* MACOS */
-#if defined(NeXT) || defined(VMS)
-#include <stdlib.h>
-#else /* next || vms */
-#ifndef __FreeBSD__
-#include <malloc.h>
-#endif
-#endif /* next || vms */
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#ifdef PCNFS
-#include <tklib.h>
-#endif /* PCNFS */
-#endif /* MACOS */
-
-#ifndef VMS
-#include <memory.h>
-#endif
-#include <string.h>
-#include "lber.h"
+#include "portable.h"
 
-#ifdef _WIN32
-#include <winsock.h>
-#include <io.h>
-#endif /* _WIN32 */
-
-#ifdef NEEDPROTOS
-static int ber_realloc( BerElement *ber, unsigned long len );
-static int ber_filbuf( Sockbuf *sb, long len );
-static long BerRead( Sockbuf *sb, char *buf, long len );
-#ifdef PCNFS
-static int BerWrite( Sockbuf *sb, char *buf, long len );
-#endif /* PCNFS */
-#else
-int ber_filbuf();
-long BerRead();
-static int ber_realloc();
-#endif /* NEEDPROTOS */
-
-#define bergetc( sb, len )    ( sb->sb_ber.ber_end > sb->sb_ber.ber_ptr ? \
-			  (unsigned char)*sb->sb_ber.ber_ptr++ : \
-			  ber_filbuf( sb, len ))
-
-#ifdef MACOS
-/*
- * MacTCP/OpenTransport
- */
-#define read( s, b, l ) tcpread( s, 0, (unsigned char *)b, l, NULL )
-#define MAX_WRITE	65535
-#define BerWrite( sb, b, l )   tcpwrite( sb->sb_sd, (unsigned char *)(b), (l<MAX_WRITE)? l : MAX_WRITE )
-#else /* MACOS */
-#ifdef DOS
-#ifdef PCNFS
-/*
- * PCNFS (under DOS)
- */
-#define read( s, b, l ) recv( s, b, l, 0 )
-#define BerWrite( s, b, l ) send( s->sb_sd, b, (int) l, 0 )
-#endif /* PCNFS */
-#ifdef NCSA
-/*
- * NCSA Telnet TCP/IP stack (under DOS)
- */
-#define read( s, b, l ) nread( s, b, l )
-#define BerWrite( s, b, l ) netwrite( s->sb_sd, b, l )
-#endif /* NCSA */
-#ifdef WINSOCK
-/*
- * Windows Socket API (under DOS/Windows 3.x)
- */
-#define read( s, b, l ) recv( s, b, l, 0 )
-#define BerWrite( s, b, l ) send( s->sb_sd, b, l, 0 )
-#endif /* WINSOCK */
-#else /* DOS */
-#ifdef _WIN32
-/*
- * 32-bit Windows Socket API (under Windows NT or Windows 95)
- */
-#define read( s, b, l )		recv( s, b, l, 0 )
-#define BerWrite( s, b, l )	send( s->sb_sd, b, l, 0 )
-#else /* _WIN32 */
-#ifdef VMS
-/*
- * VMS -- each write must be 64K or smaller
- */
-#define MAX_WRITE 65535
-#define BerWrite( sb, b, l ) write( sb->sb_sd, b, (l<MAX_WRITE)? l : MAX_WRITE)
-#else /* VMS */
-/*
- * everything else (Unix/BSD 4.3 socket API)
- */
-#define BerWrite( sb, b, l )	write( sb->sb_sd, b, l )
-#endif /* VMS */
-#define udp_read( sb, b, l, al ) recvfrom(sb->sb_sd, (char *)b, l, 0, \
-		(struct sockaddr *)sb->sb_fromaddr, \
-		(al = sizeof(struct sockaddr), &al))
-#define udp_write( sb, b, l ) sendto(sb->sb_sd, (char *)(b), l, 0, \
-		(struct sockaddr *)sb->sb_useaddr, sizeof(struct sockaddr))
-#endif /* _WIN32 */
-#endif /* DOS */
-#endif /* MACOS */
-
-#ifndef udp_read
-#define udp_read( sb, b, l, al )	CLDAP NOT SUPPORTED
-#define udp_write( sb, b, l )		CLDAP NOT SUPPORTED
-#endif /* udp_read */
-
-#define EXBUFSIZ	1024
+#include <stdio.h>
 
-int
-ber_filbuf( Sockbuf *sb, long len )
-{
-	short	rc;
-#ifdef CLDAP
-	int	addrlen;
-#endif /* CLDAP */
-
-	if ( sb->sb_ber.ber_buf == NULL ) {
-		if ( (sb->sb_ber.ber_buf = (char *) malloc( READBUFSIZ )) ==
-		    NULL )
-			return( -1 );
-		sb->sb_ber.ber_ptr = sb->sb_ber.ber_buf;
-		sb->sb_ber.ber_end = sb->sb_ber.ber_buf;
-	}
+#include <ac/stdlib.h>
 
-	if ( sb->sb_naddr > 0 ) {
-#ifdef CLDAP
-		rc = udp_read(sb, sb->sb_ber.ber_buf, READBUFSIZ, addrlen );
-#ifdef LDAP_DEBUG
-		if ( lber_debug ) {
-			fprintf( stderr, "ber_filbuf udp_read %d bytes\n",
-				rc );
-			if ( lber_debug > 1 && rc > 0 )
-				lber_bprint( sb->sb_ber.ber_buf, rc );
-		}
-#endif /* LDAP_DEBUG */
-#else /* CLDAP */
-		rc = -1;
-#endif /* CLDAP */
-	} else {
-		rc = read( sb->sb_sd, sb->sb_ber.ber_buf,
-		    ((sb->sb_options & LBER_NO_READ_AHEAD) &&
-		    (len < READBUFSIZ)) ?
-		    len : READBUFSIZ );
-	}
-
-	if ( rc > 0 ) {
-		sb->sb_ber.ber_ptr = sb->sb_ber.ber_buf + 1;
-		sb->sb_ber.ber_end = sb->sb_ber.ber_buf + rc;
-		return( (unsigned char)*sb->sb_ber.ber_buf );
-	}
+#include <ac/ctype.h>
+#include <ac/errno.h>
+#include <ac/socket.h>
+#include <ac/string.h>
+#include <ac/unistd.h>
 
-	return( -1 );
-}
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
 
+#include "lber-int.h"
+#include "ldap_log.h"
 
-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 = bergetc( sb, len )) < 0 ) {
-			if ( nread > 0 )
-				break;
-			return( c );
-		}
-		*buf++ = c;
-		nread++;
-		len--;
-	}
-
-	return( nread );
-}
+	ber_len_t	actuallen, nleft;
 
+	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;
 
@@ -282,70 +153,87 @@ ber_realloc( BerElement *ber, unsigned long len )
 	return( 0 );
 }
 
+void
+ber_free_buf( BerElement *ber )
+{
+	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;
+	ber->ber_sos = NULL;
+	ber->ber_valid = LBER_UNINITIALIZED;
+}
+
 void
 ber_free( BerElement *ber, int freebuf )
 {
-	if ( freebuf && ber->ber_buf != NULL )
-		free( ber->ber_buf );
-	free( (char *) ber );
+#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;
 	}
 	towrite = ber->ber_ptr - ber->ber_rwptr;
 
-#ifdef LDAP_DEBUG
-	if ( lber_debug ) {
-		fprintf( stderr, "ber_flush: %ld bytes to sd %ld%s\n", towrite,
-		    sb->sb_sd, ber->ber_rwptr != ber->ber_buf ? " (re-flush)"
-		    : "" );
-		if ( lber_debug > 1 )
-			lber_bprint( ber->ber_rwptr, towrite );
-	}
+	if ( 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_buf, towrite );
-		if ( sb->sb_options & LBER_TO_FILE_ONLY ) {
-			return( (int)rc );
-		}
 	}
-#endif
 
-	nwritten = 0;
-	do {
-		if (sb->sb_naddr > 0) {
-#ifdef CLDAP
-			rc = udp_write( sb, ber->ber_buf + nwritten,
-			    (size_t)towrite );
-#else /* CLDAP */
-			rc = -1;
-#endif /* CLDAP */
-			if ( rc <= 0 )
-				return( -1 );
-			/* fake error if write was not atomic */
-			if (rc < towrite) {
-#if !defined( MACOS ) && !defined( DOS )
-			    errno = EMSGSIZE;
-#endif
-			    return( -1 );
-			}
-		} else {
-			if ( (rc = BerWrite( sb, ber->ber_rwptr,
-			    (size_t) towrite )) <= 0 ) {
-				return( -1 );
-			}
+	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 );
@@ -358,24 +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 = ber_int_debug;
 
-	return( ber );
+	assert( LBER_VALID( ber ) );
+	return ber;
 }
 
 BerElement *
-ber_alloc()
+ber_alloc( void )	/* deprecated */
 {
-	return( ber_alloc_t( 0 ) );
+	return ber_alloc_t( 0 );
 }
 
 BerElement *
-der_alloc()
+der_alloc( void )	/* deprecated */
 {
-	return( ber_alloc_t( LBER_USE_DER ) );
+	return ber_alloc_t( LBER_USE_DER );
 }
 
 BerElement *
@@ -383,120 +280,175 @@ 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 );
 }
 
 
 void
-ber_init( 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 = options;
-}
+	ber->ber_options = (char) options;
+	ber->ber_debug = ber_int_debug;
 
-
-void
-ber_reset( BerElement *ber, int was_writing )
-{
-	if ( was_writing ) {
-		ber->ber_end = ber->ber_ptr;
+	if ( bv != NULL ) {
+		ber->ber_buf = bv->bv_val;
 		ber->ber_ptr = ber->ber_buf;
-	} else {
-		ber->ber_ptr = ber->ber_end;
+		ber->ber_end = ber->ber_buf + bv->bv_len;
 	}
 
-	ber->ber_rwptr = NULL;
+	assert( LBER_VALID( ber ) );
 }
 
-
-#ifdef LDAP_DEBUG
-
+/* OLD U-Mich ber_init() */
 void
-ber_dump( BerElement *ber, int inout )
+ber_init_w_nullc( BerElement *ber, int options )
 {
-	fprintf( stderr, "ber_dump: buf 0x%lx, ptr 0x%lx, end 0x%lx\n",
-	    ber->ber_buf, ber->ber_ptr, ber->ber_end );
-	if ( inout == 1 ) {
-		fprintf( stderr, "          current len %ld, contents:\n",
-		    ber->ber_end - ber->ber_ptr );
-		lber_bprint( ber->ber_ptr, ber->ber_end - ber->ber_ptr );
-	} else {
-		fprintf( stderr, "          current len %ld, contents:\n",
-		    ber->ber_ptr - ber->ber_buf );
-		lber_bprint( ber->ber_buf, ber->ber_ptr - ber->ber_buf );
-	}
+	ber_init2( ber, NULL, options );
 }
 
-void
-ber_sos_dump( Seqorset *sos )
+/* New C-API ber_init() */
+/* This function constructs a BerElement containing a copy
+** of the data in the bv argument.
+*/
+BerElement *
+ber_init( struct berval *bv )
 {
-	fprintf( stderr, "*** sos dump ***\n" );
-	while ( sos != NULLSEQORSET ) {
-		fprintf( stderr, "ber_sos_dump: clen %ld first 0x%lx ptr 0x%lx\n",
-		    sos->sos_clen, sos->sos_first, sos->sos_ptr );
-		fprintf( stderr, "              current len %ld contents:\n",
-		    sos->sos_ptr - sos->sos_first );
-		lber_bprint( sos->sos_first, sos->sos_ptr - sos->sos_first );
-
-		sos = sos->sos_next;
+	BerElement *ber;
+
+	assert( bv != NULL );
+
+    ber_int_options.lbo_valid = LBER_INITIALIZED;
+
+	if ( bv == NULL ) {
+		return NULL;
 	}
-	fprintf( stderr, "*** end dump ***\n" );
-}
 
-#endif
+	ber = ber_alloc_t( 0 );
+
+	if( ber == NULL ) {
+		/* allocation failed */
+		return NULL;
+	}
 
-/* return the tag - LBER_DEFAULT returned means trouble */
-static unsigned long
-get_tag( Sockbuf *sb )
+	/* copy the data */
+	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;
+	}
+
+	ber_reset( ber, 1 );	/* reset the pointer to the start of the buffer */
+	return ber;
+}
+
+/* New C-API ber_flatten routine */
+/* This routine allocates a struct berval whose contents are a BER
+** encoding taken from the ber argument.  The bvPtr pointer pointers to
+** the returned berval.
+*/
+int ber_flatten(
+	BerElement *ber,
+	struct berval **bvPtr)
 {
-	unsigned char	xbyte;
-	unsigned long	tag;
-	char		*tagp;
-	int		i;
+	struct berval *bv;
+ 
+	assert( bvPtr != NULL );
 
-	if ( BerRead( sb, (char *) &xbyte, 1 ) != 1 )
-		return( LBER_DEFAULT );
+    ber_int_options.lbo_valid = LBER_INITIALIZED;
 
-	if ( (xbyte & LBER_BIG_TAG_MASK) != LBER_BIG_TAG_MASK )
-		return( (unsigned long) xbyte );
+	if(bvPtr == NULL) {
+		return -1;
+	}
 
-	tagp = (char *) &tag;
-	tagp[0] = xbyte;
-	for ( i = 1; i < sizeof(long); i++ ) {
-		if ( BerRead( sb, (char *) &xbyte, 1 ) != 1 )
-			return( LBER_DEFAULT );
+	bv = LBER_MALLOC( sizeof(struct berval) );
+	if ( bv == NULL ) {
+		return -1;
+	}
+
+	if ( ber == NULL ) {
+		/* ber is null, create an empty berval */
+		bv->bv_val = NULL;
+		bv->bv_len = 0;
 
-		tagp[i] = xbyte;
+	} else {
+		/* copy the berval */
+		ber_len_t len = ber_pvt_ber_write( ber );
+
+		bv->bv_val = (char *) LBER_MALLOC( len + 1 );
+		if ( bv->bv_val == NULL ) {
+			LBER_FREE( bv );
+			return -1;
+		}
 
-		if ( ! (xbyte & LBER_MORE_TAG_MASK) )
-			break;
+		AC_MEMCPY( bv->bv_val, ber->ber_buf, len );
+		bv->bv_val[len] = '\0';
+		bv->bv_len = len;
 	}
+    
+	*bvPtr = bv;
+	return 0;
+}
+
+void
+ber_reset( BerElement *ber, int was_writing )
+{
+	assert( ber != NULL );
+	assert( LBER_VALID( ber ) );
 
-	/* tag too big! */
-	if ( i == sizeof(long) )
-		return( LBER_DEFAULT );
+	if ( was_writing ) {
+		ber->ber_end = ber->ber_ptr;
+		ber->ber_ptr = ber->ber_buf;
 
-	/* want leading, not trailing 0's */
-	return( tag >> (sizeof(long) - i - 1) );
+	} else {
+		ber->ber_ptr = ber->ber_end;
+	}
+
+	ber->ber_rwptr = NULL;
 }
 
-unsigned long
-ber_get_next( Sockbuf *sb, unsigned long *len, BerElement *ber )
+/*
+ * 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.
+ */
+
+ber_tag_t
+ber_get_next(
+	Sockbuf *sb,
+	ber_len_t *len,
+	BerElement *ber )
 {
-	unsigned long	tag, netlen, toread;
-	unsigned char	lc;
-	long		rc;
-	int		noctets, diff;
-
-#ifdef LDAP_DEBUG
-	if ( lber_debug )
-		fprintf( stderr, "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
 
 	/*
@@ -511,93 +463,180 @@ ber_get_next( Sockbuf *sb, unsigned long *len, BerElement *ber )
 	 *	3) primitive encodings used whenever possible
 	 */
 
-	/*
-	 * first time through - malloc the buffer, set up ptrs, and
-	 * read the tag and the length and as much of the rest as we can
-	 */
-
-	if ( ber->ber_rwptr == NULL ) {
-		/*
-		 * First, we read the tag.
+	if (ber->ber_rwptr == NULL) {
+		/* 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;
+	}
 
-		if ( (tag = get_tag( sb )) == LBER_DEFAULT ) {
-			return( LBER_DEFAULT );
-		}
-		ber->ber_tag = tag;
-
-		/*
-		 * Next, read the length.  The first byte contains the length
-		 * of the length.  If bit 8 is set, the length is the long
-		 * form, otherwise it's the short form.  We don't allow a
-		 * length that's greater than what we can hold in an unsigned
-		 * long.
-		 */
+	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;
 
-		*len = netlen = 0;
-		if ( BerRead( sb, (char *) &lc, 1 ) != 1 ) {
-			return( LBER_DEFAULT );
+		if ((i=ber_int_sb_read( sb, ber->ber_rwptr,
+			(char *)(&ber->ber_usertag+1)-ber->ber_rwptr))<=0) {
+			return LBER_DEFAULT;
 		}
-		if ( lc & 0x80 ) {
-			noctets = (lc & 0x7f);
-			if ( noctets > sizeof(unsigned long) )
-				return( LBER_DEFAULT );
-			diff = sizeof(unsigned long) - noctets;
-			if ( BerRead( sb, (char *) &netlen + diff, noctets ) !=
-			    noctets ) {
-				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++;
 			}
-			*len = LBER_NTOHL( netlen );
-		} else {
-			*len = lc;
+			ber->ber_tag = tag;
+			ber->ber_ptr = (char *)p;
 		}
-		ber->ber_len = *len;
 
-		/*
-		 * Finally, malloc a buffer for the contents and read it in.
-		 * It's this buffer that's passed to all the other ber decoding
-		 * routines.
-		 */
+		if (i == 1) continue;
 
-#if defined( DOS ) && !defined( _WIN32 )
-		if ( *len > 65535 ) {	/* DOS can't allocate > 64K */
-		    return( LBER_DEFAULT );
+		/* 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;
+			}
+			/* Not enough bytes? */
+			if (ber->ber_rwptr - ber->ber_ptr < llen) {
+				return LBER_DEFAULT;
+			}
+			for (i=0; i<llen && ber->ber_ptr<ber->ber_rwptr; i++,ber->ber_ptr++) {
+				tlen <<=8;
+				tlen |= *(unsigned char *)ber->ber_ptr;
+			}
+		} else {
+			tlen = *(unsigned char *)ber->ber_ptr++;
 		}
-#endif /* DOS && !_WIN32 */
-
-		if ( ( sb->sb_options & LBER_MAX_INCOMING_SIZE ) &&
-		    *len > sb->sb_max_incoming ) {
-			return( LBER_DEFAULT );
+		/* 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 {
+			i = 0;
+		}
+		ber->ber_len = tlen;
+
+		/* now fill the buffer. */
+
+		/* make sure length is reasonable */
+		if ( ber->ber_len == 0 ) {
+			errno = ERANGE;
+			return LBER_DEFAULT;
+		} 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;
 		}
 
-		if ( (ber->ber_buf = (char *) malloc( (size_t)*len )) == NULL ) {
-			return( LBER_DEFAULT );
+		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;
 		}
-		ber->ber_ptr = ber->ber_buf;
-		ber->ber_end = ber->ber_buf + *len;
-		ber->ber_rwptr = ber->ber_buf;
 	}
 
-	toread = (unsigned long)ber->ber_end - (unsigned long)ber->ber_rwptr;
-	do {
-		if ( (rc = BerRead( sb, ber->ber_rwptr, (long)toread )) <= 0 ) {
-			return( LBER_DEFAULT );
+	if ((ber->ber_rwptr>=ber->ber_buf) && (ber->ber_rwptr<ber->ber_end)) {
+		ber_slen_t res;
+		ber_slen_t to_go;
+		
+		to_go = ber->ber_end - ber->ber_rwptr;
+		assert( to_go > 0 );
+		
+		res = ber_int_sb_read( sb, ber->ber_rwptr, to_go );
+		if (res<=0)
+			return LBER_DEFAULT;
+		ber->ber_rwptr+=res;
+		
+		if (res<to_go) {
+#if defined( EWOULDBLOCK )
+			errno = EWOULDBLOCK;
+#elif defined( EAGAIN )
+			errno = EAGAIN;
+#endif			
+			return LBER_DEFAULT;
 		}
-
-		toread -= rc;
-		ber->ber_rwptr += rc;
-	} while ( toread > 0 );
-
-#ifdef LDAP_DEBUG
-	if ( lber_debug ) {
-		fprintf( stderr, "ber_get_next: tag 0x%lx len %ld contents:\n",
-		    tag, ber->ber_len );
-		if ( lber_debug > 1 )
-			ber_dump( ber, 1 );
-	}
+done:
+		ber->ber_rwptr = NULL;
+		*len = ber->ber_len;
+		if ( 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 );
+			ber_log_dump( LDAP_DEBUG_BER, ber->ber_debug, ber, 1 );
 #endif
+		}
+		return (ber->ber_tag);
+	}
 
-	*len = ber->ber_len;
-	ber->ber_rwptr = NULL;
-	return( ber->ber_tag );
+	assert( 0 ); /* ber structure is messed up ?*/
+	return LBER_DEFAULT;
 }