/* io.c - ber general i/o routines */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2011 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
*/
-/* Portions
- * Copyright (c) 1990 Regents of the University of Michigan.
+/* Portions Copyright (c) 1990 Regents of the University of Michigan.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
* software without specific prior written permission. This software
* is provided ``as is'' without express or implied warranty.
*/
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by the University of Michigan
+ * (as part of U-MICH LDAP).
+ */
#include "portable.h"
#endif
#include "lber-int.h"
+#include "ldap_log.h"
-#define EXBUFSIZ 1024
-
-static ber_slen_t
-BerRead(
- Sockbuf *sb,
- unsigned char *buf,
+ber_slen_t
+ber_skip_data(
+ BerElement *ber,
ber_len_t len )
{
- ber_slen_t c;
- ber_slen_t nread = 0;
-
- assert( sb != NULL );
- assert( buf != NULL );
+ ber_len_t actuallen, nleft;
- assert( SOCKBUF_VALID( sb ) );
+ assert( ber != NULL );
+ assert( LBER_VALID( ber ) );
- while ( len > 0 ) {
- if ( (c = ber_int_sb_read( sb, buf, len )) <= 0 ) {
- if ( nread > 0 )
- break;
- return( c );
- }
- buf+=c;
- nread+=c;
- len-=c;
- }
+ nleft = ber_pvt_ber_remaining( ber );
+ actuallen = nleft < len ? nleft : len;
+ ber->ber_ptr += actuallen;
+ ber->ber_tag = *(unsigned char *)ber->ber_ptr;
- return( nread );
+ return( (ber_slen_t) actuallen );
}
+/*
+ * Read from the ber buffer. The caller must maintain ber->ber_tag.
+ * Do not use to read whole tags. See ber_get_tag() and ber_skip_data().
+ */
ber_slen_t
ber_read(
BerElement *ber,
assert( ber != NULL );
assert( buf != NULL );
+ assert( LBER_VALID( ber ) );
- assert( BER_VALID( ber ) );
-
- nleft = ber->ber_end - ber->ber_ptr;
+ nleft = ber_pvt_ber_remaining( ber );
actuallen = nleft < len ? nleft : len;
AC_MEMCPY( buf, ber->ber_ptr, actuallen );
return( (ber_slen_t) actuallen );
}
+/*
+ * Write to the ber buffer.
+ * Note that ber_start_seqorset/ber_put_seqorset() bypass ber_write().
+ */
ber_slen_t
ber_write(
BerElement *ber,
LDAP_CONST char *buf,
ber_len_t len,
- int nosos )
+ int zero ) /* nonzero is unsupported from OpenLDAP 2.4.18 */
{
+ char **p;
+
assert( ber != NULL );
assert( buf != NULL );
+ assert( LBER_VALID( ber ) );
- assert( BER_VALID( ber ) );
-
- if ( nosos || ber->ber_sos == NULL ) {
- if ( ber->ber_ptr + len > ber->ber_end ) {
- if ( ber_realloc( ber, len ) != 0 )
- return( -1 );
- }
- AC_MEMCPY( ber->ber_ptr, buf, (size_t)len );
- ber->ber_ptr += len;
- return( (ber_slen_t) len );
+ if ( zero != 0 ) {
+ ber_log_printf( LDAP_DEBUG_ANY, ber->ber_debug, "%s",
+ "ber_write: nonzero 4th argument not supported\n" );
+ return( -1 );
+ }
- } else {
- if ( ber->ber_sos->sos_ptr + len > ber->ber_end ) {
- if ( ber_realloc( ber, len ) != 0 )
- return( -1 );
- }
- AC_MEMCPY( ber->ber_sos->sos_ptr, buf, (size_t)len );
- ber->ber_sos->sos_ptr += len;
- ber->ber_sos->sos_clen += len;
- return( (ber_slen_t) len );
+ p = ber->ber_sos_ptr == NULL ? &ber->ber_ptr : &ber->ber_sos_ptr;
+ if ( len > (ber_len_t) (ber->ber_end - *p) ) {
+ if ( ber_realloc( ber, len ) != 0 ) return( -1 );
}
+ AC_MEMCPY( *p, buf, len );
+ *p += len;
+
+ return( (ber_slen_t) len );
}
+/* Resize the ber buffer */
int
ber_realloc( BerElement *ber, ber_len_t len )
{
- ber_len_t need, have, total;
- Seqorset *s;
- long off;
- char *oldbuf;
+ ber_len_t total, offset, sos_offset;
+ char *buf;
assert( ber != NULL );
- assert( len > 0 );
-
- assert( BER_VALID( ber ) );
+ assert( LBER_VALID( ber ) );
- have = (ber->ber_end - ber->ber_buf) / EXBUFSIZ;
- need = (len < EXBUFSIZ ? 1 : (len + (EXBUFSIZ - 1)) / EXBUFSIZ);
- total = have * EXBUFSIZ + need * EXBUFSIZ;
+ /* leave room for ber_flatten() to \0-terminate ber_buf */
+ if ( ++len == 0 ) {
+ return( -1 );
+ }
- oldbuf = ber->ber_buf;
+ 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. reduce fragmentation? */
+ 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
- ber->ber_buf = (char *) LBER_REALLOC( ber->ber_buf, total );
-
- if ( ber->ber_buf == NULL ) {
- ber->ber_buf = oldbuf;
+ if ( total < len || total > (ber_len_t)-1 / 2 /* max ber_slen_t */ ) {
return( -1 );
}
- ber->ber_end = ber->ber_buf + total;
+ buf = ber->ber_buf;
+ offset = ber->ber_ptr - buf;
+ sos_offset = ber->ber_sos_ptr ? ber->ber_sos_ptr - buf : 0;
+ /* if ber_sos_ptr != NULL, it is > ber_buf so that sos_offset > 0 */
- /*
- * If the stinking thing was moved, we need to go through and
- * reset all the sos and ber pointers. Offsets would've been
- * a better idea... oh well.
- */
+ buf = (char *) ber_memrealloc_x( buf, total, ber->ber_memctx );
+ if ( buf == NULL ) {
+ return( -1 );
+ }
- if ( ber->ber_buf != oldbuf ) {
- ber->ber_ptr = ber->ber_buf + (ber->ber_ptr - oldbuf);
+ ber->ber_buf = buf;
+ ber->ber_end = buf + total;
+ ber->ber_ptr = buf + offset;
+ if ( sos_offset )
+ ber->ber_sos_ptr = buf + sos_offset;
- for ( s = ber->ber_sos; s != NULL; s = s->sos_next ) {
- off = s->sos_first - oldbuf;
- s->sos_first = ber->ber_buf + off;
+ return( 0 );
+}
- off = s->sos_ptr - oldbuf;
- s->sos_ptr = ber->ber_buf + off;
- }
- }
+void
+ber_free_buf( BerElement *ber )
+{
+ assert( LBER_VALID( ber ) );
- return( 0 );
+ if ( ber->ber_buf) ber_memfree_x( ber->ber_buf, ber->ber_memctx );
+
+ ber->ber_buf = NULL;
+ ber->ber_sos_ptr = NULL;
+ ber->ber_valid = LBER_UNINITIALIZED;
}
void
ber_free( BerElement *ber, int freebuf )
{
-#ifdef LDAP_MEMORY_DEBUG
- assert( ber != NULL );
-#endif
-
if( ber == NULL ) {
+ LDAP_MEMORY_DEBUG_ASSERT( ber != NULL );
return;
}
- assert( BER_VALID( ber ) );
+ if( freebuf ) ber_free_buf( ber );
- if ( freebuf ) {
- Seqorset *s, *next;
- 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;
-
- LBER_FREE( (char *) ber );
+ ber_memfree_x( (char *) ber, ber->ber_memctx );
}
int
ber_flush( Sockbuf *sb, BerElement *ber, int freeit )
{
- ber_len_t nwritten, towrite;
- ber_slen_t rc;
+ return ber_flush2( sb, ber,
+ freeit ? LBER_FLUSH_FREE_ON_SUCCESS
+ : LBER_FLUSH_FREE_NEVER );
+}
+
+int
+ber_flush2( Sockbuf *sb, BerElement *ber, int freeit )
+{
+ ber_len_t towrite;
+ ber_slen_t rc;
assert( sb != NULL );
assert( ber != NULL );
-
assert( SOCKBUF_VALID( sb ) );
- assert( BER_VALID( ber ) );
+ assert( LBER_VALID( ber ) );
if ( ber->ber_rwptr == NULL ) {
ber->ber_rwptr = ber->ber_buf;
towrite = ber->ber_ptr - ber->ber_rwptr;
if ( sb->sb_debug ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "liblber", LDAP_LEVEL_DETAIL1,
- "ber_flush: %ld bytes to sd %ld%s\n",
- towrite, (long)sb->sb_fd,
- ber->ber_rwptr != ber->ber_buf ? " (re-flush)" : "" ));
- 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",
+ ber_log_printf( LDAP_DEBUG_TRACE, sb->sb_debug,
+ "ber_flush2: %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_log_bprint( LDAP_DEBUG_BER, sb->sb_debug,
ber->ber_rwptr, towrite );
-#endif
}
- nwritten = 0;
- do {
+ while ( towrite > 0 ) {
+#ifdef LBER_TRICKLE
+ sleep(1);
+ rc = ber_int_sb_write( sb, ber->ber_rwptr, 1 );
+#else
rc = ber_int_sb_write( sb, ber->ber_rwptr, towrite );
- if (rc<=0) {
+#endif
+ if ( rc <= 0 ) {
+ if ( freeit & LBER_FLUSH_FREE_ON_ERROR ) ber_free( ber, 1 );
return -1;
}
towrite -= rc;
- nwritten += rc;
ber->ber_rwptr += rc;
- } while ( towrite > 0 );
+ }
- if ( freeit )
- ber_free( ber, 1 );
+ if ( freeit & LBER_FLUSH_FREE_ON_SUCCESS ) ber_free( ber, 1 );
- return( 0 );
+ return 0;
}
BerElement *
{
BerElement *ber;
- ber_int_options.lbo_valid = LBER_INITIALIZED;
-
ber = (BerElement *) LBER_CALLOC( 1, sizeof(BerElement) );
- if ( ber == NULL )
- return( NULL );
+ 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;
- assert( BER_VALID( ber ) );
- return( ber );
+ assert( LBER_VALID( ber ) );
+ return ber;
}
BerElement *
ber_alloc( void ) /* deprecated */
{
- return( ber_alloc_t( 0 ) );
+ return ber_alloc_t( 0 );
}
BerElement *
der_alloc( void ) /* deprecated */
{
- return( ber_alloc_t( LBER_USE_DER ) );
+ return ber_alloc_t( LBER_USE_DER );
}
BerElement *
BerElement *new;
assert( ber != NULL );
- assert( BER_VALID( ber ) );
+ assert( LBER_VALID( ber ) );
if ( (new = ber_alloc_t( ber->ber_options )) == NULL ) {
- return( NULL );
+ return NULL;
}
*new = *ber;
- assert( BER_VALID( new ) );
+ 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;
- assert( BER_VALID( ber ) );
+ 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() */
assert( bv != NULL );
- ber_int_options.lbo_valid = LBER_INITIALIZED;
-
if ( bv == NULL ) {
return NULL;
}
/* 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
+** encoding taken from the ber argument. The bvPtr pointer points to
** the returned berval.
+**
+** ber_flatten2 is the same, but uses a struct berval passed by
+** the caller. If alloc is 0 the returned bv uses the ber buf directly.
*/
-int ber_flatten(
+int ber_flatten2(
BerElement *ber,
- struct berval **bvPtr)
+ struct berval *bv,
+ int alloc )
{
- struct berval *bv;
-
- assert( bvPtr != NULL );
-
- ber_int_options.lbo_valid = LBER_INITIALIZED;
-
- if(bvPtr == NULL) {
- return -1;
- }
+ assert( bv != NULL );
- bv = LBER_MALLOC( sizeof(struct berval));
if ( bv == NULL ) {
return -1;
}
bv->bv_val = NULL;
bv->bv_len = 0;
+ } else if ( ber->ber_sos_ptr != NULL ) {
+ /* unmatched "{" and "}" */
+ return -1;
+
} else {
/* copy the berval */
- ber_len_t len = ber->ber_ptr - ber->ber_buf;
+ 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 ( alloc ) {
+ bv->bv_val = (char *) ber_memalloc_x( len + 1, ber->ber_memctx );
+ if ( bv->bv_val == NULL ) {
+ return -1;
+ }
+ AC_MEMCPY( bv->bv_val, ber->ber_buf, len );
+ bv->bv_val[len] = '\0';
+ } else if ( ber->ber_buf != NULL ) {
+ bv->bv_val = ber->ber_buf;
+ bv->bv_val[len] = '\0';
+ } else {
+ bv->bv_val = "";
}
-
- AC_MEMCPY( bv->bv_val, ber->ber_buf, len );
- bv->bv_val[len] = '\0';
bv->bv_len = len;
}
-
- *bvPtr = bv;
return 0;
}
+int ber_flatten(
+ BerElement *ber,
+ struct berval **bvPtr)
+{
+ struct berval *bv;
+ int rc;
+
+ assert( bvPtr != NULL );
+
+ if(bvPtr == NULL) {
+ return -1;
+ }
+
+ bv = ber_memalloc_x( sizeof(struct berval), ber->ber_memctx );
+ if ( bv == NULL ) {
+ return -1;
+ }
+ rc = ber_flatten2(ber, bv, 1);
+ if (rc == -1) {
+ ber_memfree_x(bv, ber->ber_memctx);
+ } else {
+ *bvPtr = bv;
+ }
+ return rc;
+}
+
void
ber_reset( BerElement *ber, int was_writing )
{
assert( ber != NULL );
- assert( BER_VALID( ber ) );
+ 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;
}
* a full packet is read.
*/
+#define LENSIZE 4
+
ber_tag_t
ber_get_next(
Sockbuf *sb,
assert( sb != NULL );
assert( len != NULL );
assert( ber != NULL );
-
assert( SOCKBUF_VALID( sb ) );
- assert( BER_VALID( ber ) );
+ assert( LBER_VALID( ber ) );
-#ifdef NEW_LOGGING
- LDAP_LOG(( "liblber", LDAP_LEVEL_ENTRY, "ber_get_next: enter\n" ));
-#else
- ber_log_printf( LDAP_DEBUG_TRACE, ber->ber_debug,
- "ber_get_next\n" );
-#endif
+ if ( ber->ber_debug & LDAP_DEBUG_TRACE ) {
+ ber_log_printf( LDAP_DEBUG_TRACE, ber->ber_debug,
+ "ber_get_next\n" );
+ }
/*
* Any ber element looks like this: tag length contents.
* 1) small tags (less than 128)
* 2) definite lengths
* 3) primitive encodings used whenever possible
+ *
+ * The code also handles multi-byte tags. The first few bytes
+ * of the message are read to check for multi-byte tags and
+ * lengths. These bytes are temporarily stored in the ber_tag,
+ * ber_len, and ber_usertag fields of the berelement until
+ * tag/len parsing is complete. After this parsing, any leftover
+ * bytes and the rest of the message are copied into the ber_buf.
+ *
+ * We expect tag and len to be at most 32 bits wide.
*/
-
+
if (ber->ber_rwptr == NULL) {
- /* XXYYZ
- * dtest does like this assert.
- */
- /* assert( ber->ber_buf == NULL ); */
- ber->ber_rwptr = (char *) &ber->ber_tag;
+ assert( ber->ber_buf == NULL );
+ ber->ber_rwptr = (char *) &ber->ber_len-1;
+ ber->ber_ptr = ber->ber_rwptr;
ber->ber_tag = 0;
}
-#undef PTR_IN_VAR
-#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 (ber_int_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_len + LENSIZE*2) {
+ ber_slen_t sblen;
+ char buf[sizeof(ber->ber_len)-1];
+ ber_len_t tlen = 0;
+
+ /* The tag & len can be at most 9 bytes; we try to read up to 8 here */
+ sock_errset(0);
+ sblen=((char *)&ber->ber_len + LENSIZE*2 - 1)-ber->ber_rwptr;
+ /* Trying to read the last len byte of a 9 byte tag+len */
+ if (sblen<1)
+ sblen = 1;
+ sblen=ber_int_sb_read( sb, ber->ber_rwptr, sblen );
+ if (sblen<=0) return LBER_DEFAULT;
+ ber->ber_rwptr += sblen;
+
+ /* 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) {
+ ber_len_t i;
+ for (i=1; (char *)p<ber->ber_rwptr; i++) {
+ tag <<= 8;
+ tag |= *p++;
+ if (!(tag & LBER_MORE_TAG_MASK))
+ break;
+ /* Is the tag too big? */
+ if (i == sizeof(ber_tag_t)-1) {
+ sock_errset(ERANGE);
+ return LBER_DEFAULT;
+ }
+ }
+ /* Did we run out of bytes? */
+ if ((char *)p == ber->ber_rwptr) {
+ sock_errset(EWOULDBLOCK);
+ return LBER_DEFAULT;
+ }
}
- ber->ber_rwptr++;
+ ber->ber_tag = tag;
+ ber->ber_ptr = (char *)p;
+ }
+
+ if ( ber->ber_ptr == ber->ber_rwptr ) {
+ sock_errset(EWOULDBLOCK);
+ return LBER_DEFAULT;
}
- do {
- /* reading the tag... */
- if (ber_int_sb_read( sb, ber->ber_rwptr, 1)<=0) {
+
+ /* Now look for the length */
+ if (*ber->ber_ptr & 0x80) { /* multi-byte */
+ int i;
+ unsigned char *p = (unsigned char *)ber->ber_ptr;
+ int llen = *p++ & 0x7f;
+ if (llen > LENSIZE) {
+ sock_errset(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;
+ /* Not enough bytes? */
+ if (ber->ber_rwptr - (char *)p < llen) {
+ sock_errset(EWOULDBLOCK);
+ return LBER_DEFAULT;
}
- } while( PTR_IN_VAR(ber->ber_rwptr, ber->ber_tag ));
-
- errno = ERANGE; /* this is a serious error. */
- return LBER_DEFAULT;
- }
+ for (i=0; i<llen; i++) {
+ tlen <<=8;
+ tlen |= *p++;
+ }
+ ber->ber_ptr = (char *)p;
+ } else {
+ tlen = *(unsigned char *)ber->ber_ptr++;
+ }
-get_lenbyte:
- if (ber->ber_rwptr==(char *) &ber->ber_usertag) {
- unsigned char c;
- if (ber_int_sb_read( sb, (char *) &c, 1)<=0)
- return LBER_DEFAULT;
- if (c & 0x80U) {
- int len = c & 0x7fU;
- if ( (len==0) || ( len>sizeof( ber->ber_len ) ) ) {
- errno = ERANGE;
- 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) {
+ sblen = ber->ber_rwptr - ber->ber_ptr;
+ } else {
+ sblen = (char *)&ber->ber_usertag - ber->ber_ptr;
}
- ber->ber_rwptr = (char *) &ber->ber_len +
- sizeof(ber->ber_len) - len;
- ber->ber_len = 0;
+ AC_MEMCPY(buf, ber->ber_ptr, sblen);
+ ber->ber_ptr += sblen;
} else {
- ber->ber_len = c;
- goto fill_buffer;
+ sblen = 0;
}
- }
+ ber->ber_len = tlen;
- if (PTR_IN_VAR(ber->ber_rwptr, ber->ber_len)) {
- unsigned char netlen[sizeof(ber_len_t)];
+ /* now fill the buffer. */
- ber_slen_t res;
- ber_slen_t to_go;
- to_go = (char *) &ber->ber_len + sizeof( ber->ber_len ) -
- ber->ber_rwptr;
- assert( to_go > 0 );
- res = BerRead( sb, netlen, to_go );
- if (res <= 0) {
+ /* make sure length is reasonable */
+ if ( ber->ber_len == 0 ) {
+ sock_errset(ERANGE);
return LBER_DEFAULT;
}
- ber->ber_rwptr += res;
- /* convert length. */
- for( to_go = 0; to_go < res ; to_go++ ) {
- ber->ber_len <<= 8;
- ber->ber_len |= netlen[to_go];
- }
- if (PTR_IN_VAR(ber->ber_rwptr, ber->ber_len))
+ if ( sb->sb_max_incoming && ber->ber_len > sb->sb_max_incoming ) {
+ ber_log_printf( LDAP_DEBUG_CONNS, ber->ber_debug,
+ "ber_get_next: sockbuf_max_incoming exceeded "
+ "(%ld > %ld)\n", ber->ber_len, sb->sb_max_incoming );
+ sock_errset(ERANGE);
return LBER_DEFAULT;
- }
+ }
-fill_buffer:
- /* now fill the buffer. */
- if (ber->ber_len==0) {
- errno = ERANGE;
- return LBER_DEFAULT;
- }
- if (ber->ber_buf==NULL) {
- ber->ber_buf = (char *) LBER_MALLOC( ber->ber_len );
if (ber->ber_buf==NULL) {
- return LBER_DEFAULT;
+ 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 < sblen + l ) {
+ sock_errset(ERANGE);
+ return LBER_DEFAULT;
+ }
+ ber->ber_buf = (char *) ber_memalloc_x( ber->ber_len + 1, ber->ber_memctx );
+ if (ber->ber_buf==NULL) {
+ return LBER_DEFAULT;
+ }
+ ber->ber_end = ber->ber_buf + ber->ber_len;
+ if (sblen) {
+ AC_MEMCPY(ber->ber_buf, buf, sblen);
+ }
+ if (l > 0) {
+ AC_MEMCPY(ber->ber_buf + sblen, ber->ber_ptr, l);
+ sblen += l;
+ }
+ *ber->ber_end = '\0';
+ ber->ber_ptr = ber->ber_buf;
+ ber->ber_usertag = 0;
+ if ((ber_len_t)sblen == ber->ber_len) {
+ goto done;
+ }
+ ber->ber_rwptr = ber->ber_buf + sblen;
}
- ber->ber_rwptr = ber->ber_buf;
- ber->ber_ptr = ber->ber_buf;
- ber->ber_end = ber->ber_buf + ber->ber_len;
}
if ((ber->ber_rwptr>=ber->ber_buf) && (ber->ber_rwptr<ber->ber_end)) {
to_go = ber->ber_end - ber->ber_rwptr;
assert( to_go > 0 );
+ sock_errset(0);
res = ber_int_sb_read( sb, ber->ber_rwptr, to_go );
- if (res<=0)
- return LBER_DEFAULT;
+ 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
+ sock_errset(EWOULDBLOCK);
return LBER_DEFAULT;
}
-
+done:
ber->ber_rwptr = NULL;
*len = ber->ber_len;
if ( ber->ber_debug ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "liblber", LDAP_LEVEL_DETAIL1,
- "ber_get_next: tag 0x%lx len %ld\n",
- ber->ber_tag, ber->ber_len ));
- 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);
}
+
assert( 0 ); /* ber structure is messed up ?*/
return LBER_DEFAULT;
}
+
+char *
+ber_start( BerElement* ber )
+{
+ return ber->ber_buf;
+}
+
+int
+ber_len( BerElement* ber )
+{
+ return ( ber->ber_end - ber->ber_buf );
+}
+
+int
+ber_ptrlen( BerElement* ber )
+{
+ return ( ber->ber_ptr - ber->ber_buf );
+}
+
+void
+ber_rewind ( BerElement * ber )
+{
+ ber->ber_rwptr = NULL;
+ ber->ber_sos_ptr = NULL;
+ ber->ber_end = ber->ber_ptr;
+ ber->ber_ptr = ber->ber_buf;
+#if 0 /* TODO: Should we add this? */
+ ber->ber_tag = LBER_DEFAULT;
+ ber->ber_usertag = 0;
+#endif
+}
+
+int
+ber_remaining( BerElement * ber )
+{
+ return ber_pvt_ber_remaining( ber );
+}
projects / openldap / blobdiff