X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Fliblber%2Fio.c;h=a85f081aa49aba5627a2cf53452c911da6b48959;hb=ae471f78c32d7531c729aa88116b8b413cc200bf;hp=09b8b92c077ae0ccf6543f477c5f22ae9b562a50;hpb=df1381fa3896018e8872678371fcb635adae5bd5;p=openldap
diff --git a/libraries/liblber/io.c b/libraries/liblber/io.c
index 09b8b92c07..a85f081aa4 100644
--- a/libraries/liblber/io.c
+++ b/libraries/liblber/io.c
@@ -1,11 +1,19 @@
/* io.c - ber general i/o routines */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2008 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
+ * .
*/
-/* 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
@@ -15,6 +23,10 @@
* 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"
@@ -35,6 +47,25 @@
#include "lber-int.h"
#include "ldap_log.h"
+ber_slen_t
+ber_skip_data(
+ BerElement *ber,
+ ber_len_t len )
+{
+ ber_len_t actuallen, nleft;
+
+ assert( ber != NULL );
+
+ assert( LBER_VALID( ber ) );
+
+ nleft = ber_pvt_ber_remaining( ber );
+ actuallen = nleft < len ? nleft : len;
+ ber->ber_ptr += actuallen;
+ ber->ber_tag = *(unsigned char *)ber->ber_ptr;
+
+ return( (ber_slen_t) actuallen );
+}
+
ber_slen_t
ber_read(
BerElement *ber,
@@ -72,8 +103,7 @@ ber_write(
if ( nosos || ber->ber_sos == NULL ) {
if ( ber->ber_ptr + len > ber->ber_end ) {
- if ( ber_realloc( ber, len ) != 0 )
- return( -1 );
+ if ( ber_realloc( ber, len ) != 0 ) return( -1 );
}
AC_MEMCPY( ber->ber_ptr, buf, (size_t)len );
ber->ber_ptr += len;
@@ -81,8 +111,7 @@ ber_write(
} else {
if ( ber->ber_sos->sos_ptr + len > ber->ber_end ) {
- if ( ber_realloc( ber, len ) != 0 )
- return( -1 );
+ 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;
@@ -175,25 +204,29 @@ ber_free_buf( BerElement *ber )
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;
}
- if( freebuf )
- ber_free_buf( ber );
+ if( freebuf ) ber_free_buf( ber );
ber_memfree_x( (char *) ber, ber->ber_memctx );
}
int
ber_flush( Sockbuf *sb, BerElement *ber, int freeit )
+{
+ 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;
+ ber_slen_t rc;
assert( sb != NULL );
assert( ber != NULL );
@@ -207,44 +240,32 @@ ber_flush( Sockbuf *sb, BerElement *ber, int freeit )
towrite = ber->ber_ptr - ber->ber_rwptr;
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_TRACE, sb->sb_debug,
- "ber_flush: %ld bytes to sd %ld%s\n",
+ "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->ber_rwptr, towrite );
-#endif
}
while ( towrite > 0 ) {
-#define LBER_TRICKLE
#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 );
#endif
- if (rc<=0) {
+ if ( rc <= 0 ) {
+ if ( freeit & LBER_FLUSH_FREE_ON_ERROR ) ber_free( ber, 1 );
return -1;
}
towrite -= rc;
ber->ber_rwptr += rc;
}
- if ( freeit )
- ber_free( ber, 1 );
+ if ( freeit & LBER_FLUSH_FREE_ON_SUCCESS ) ber_free( ber, 1 );
- return( 0 );
+ return 0;
}
BerElement *
@@ -252,8 +273,6 @@ ber_alloc_t( int options )
{
BerElement *ber;
- ber_int_options.lbo_valid = LBER_INITIALIZED;
-
ber = (BerElement *) LBER_CALLOC( 1, sizeof(BerElement) );
if ( ber == NULL ) {
@@ -305,8 +324,6 @@ 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;
@@ -340,8 +357,6 @@ ber_init( struct berval *bv )
assert( bv != NULL );
- ber_int_options.lbo_valid = LBER_INITIALIZED;
-
if ( bv == NULL ) {
return NULL;
}
@@ -381,8 +396,6 @@ int ber_flatten2(
{
assert( bv != NULL );
- ber_int_options.lbo_valid = LBER_INITIALIZED;
-
if ( bv == NULL ) {
return -1;
}
@@ -420,8 +433,6 @@ int ber_flatten(
assert( bvPtr != NULL );
- ber_int_options.lbo_valid = LBER_INITIALIZED;
-
if(bvPtr == NULL) {
return -1;
}
@@ -477,12 +488,10 @@ ber_get_next(
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
+ 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.
@@ -518,7 +527,7 @@ ber_get_next(
char buf[sizeof(ber->ber_len)-1];
ber_len_t tlen = 0;
- errno = 0;
+ sock_errset(0);
sblen=ber_int_sb_read( sb, ber->ber_rwptr,
((char *)&ber->ber_len + LENSIZE*2 - 1)-ber->ber_rwptr);
if (sblen<=0) return LBER_DEFAULT;
@@ -538,60 +547,67 @@ ber_get_next(
break;
/* Is the tag too big? */
if (i == sizeof(ber_tag_t)-1) {
- errno = ERANGE;
+ sock_errset(ERANGE);
return LBER_DEFAULT;
}
}
/* Did we run out of bytes? */
if ((char *)p == ber->ber_rwptr) {
#if defined( EWOULDBLOCK )
- errno = EWOULDBLOCK;
+ sock_errset(EWOULDBLOCK);
#elif defined( EAGAIN )
- errno = EAGAIN;
+ sock_errset(EAGAIN);
#endif
return LBER_DEFAULT;
}
}
- if (sblen == 1) continue;
-
ber->ber_tag = tag;
ber->ber_ptr = (char *)p;
}
+ if ( ber->ber_ptr == ber->ber_rwptr ) {
+#if defined( EWOULDBLOCK )
+ sock_errset(EWOULDBLOCK);
+#elif defined( EAGAIN )
+ sock_errset(EAGAIN);
+#endif
+ return LBER_DEFAULT;
+ }
+
/* Now look for the length */
if (*ber->ber_ptr & 0x80) { /* multi-byte */
- ber_len_t i;
+ int i;
unsigned char *p = (unsigned char *)ber->ber_ptr;
int llen = *p++ & 0x7f;
if (llen > (int)sizeof(ber_len_t)) {
- errno = ERANGE;
+ sock_errset(ERANGE);
return LBER_DEFAULT;
}
/* Not enough bytes? */
if (ber->ber_rwptr - (char *)p < llen) {
#if defined( EWOULDBLOCK )
- errno = EWOULDBLOCK;
+ sock_errset(EWOULDBLOCK);
#elif defined( EAGAIN )
- errno = EAGAIN;
+ sock_errset(EAGAIN);
#endif
return LBER_DEFAULT;
}
- for (i=0; iber_ptr = p;
+ ber->ber_ptr = (char *)p;
} else {
tlen = *(unsigned char *)ber->ber_ptr++;
}
/* 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)
+ if (ber->ber_rwptr < (char *)&ber->ber_usertag) {
sblen = ber->ber_rwptr - ber->ber_ptr;
- else
+ } else {
sblen = (char *)&ber->ber_usertag - ber->ber_ptr;
+ }
AC_MEMCPY(buf, ber->ber_ptr, sblen);
ber->ber_ptr += sblen;
} else {
@@ -603,21 +619,15 @@ ber_get_next(
/* make sure length is reasonable */
if ( ber->ber_len == 0 ) {
- errno = ERANGE;
+ sock_errset(ERANGE);
return LBER_DEFAULT;
}
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 exceeded "
- "(%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 exceeded "
"(%ld > %ld)\n", ber->ber_len, sb->sb_max_incoming );
-#endif
- errno = ERANGE;
+ sock_errset(ERANGE);
return LBER_DEFAULT;
}
@@ -628,7 +638,7 @@ ber_get_next(
* already read.
*/
if ( ber->ber_len < sblen + l ) {
- errno = ERANGE;
+ sock_errset(ERANGE);
return LBER_DEFAULT;
}
ber->ber_buf = (char *) ber_memalloc_x( ber->ber_len + 1, ber->ber_memctx );
@@ -643,6 +653,7 @@ ber_get_next(
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) {
@@ -659,16 +670,16 @@ ber_get_next(
to_go = ber->ber_end - ber->ber_rwptr;
assert( to_go > 0 );
- errno = 0;
+ sock_errset(0);
res = ber_int_sb_read( sb, ber->ber_rwptr, to_go );
if (res<=0) return LBER_DEFAULT;
ber->ber_rwptr+=res;
if (resber_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);
}