X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Fliblber%2Fbprint.c;h=0535603b0c39df3cb37cb59e2a7c38b526e5c7ae;hb=1702d408bfc09716ed0fbd42ef8c6bd11c51fd3a;hp=bafbdc3740006d7e87ad84a1c181e0173afd8043;hpb=1ef14875dbb240863c14ef14f5a41c7f98908b91;p=openldap diff --git a/libraries/liblber/bprint.c b/libraries/liblber/bprint.c index bafbdc3740..0535603b0c 100644 --- a/libraries/liblber/bprint.c +++ b/libraries/liblber/bprint.c @@ -1,6 +1,6 @@ /* $OpenLDAP$ */ /* - * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ @@ -14,6 +14,10 @@ #include "lber-int.h" +#define ber_log_check(errlvl, loglvl) ((errlvl) & (loglvl)) + +BER_LOG_FN ber_int_log_proc = NULL; + /* * We don't just set ber_pvt_err_file to stderr here, because in NT, * stderr is a symbol imported from a DLL. As such, the compiler @@ -21,12 +25,12 @@ * we set ber_pvt_err_file to stderr later, when it first gets * referenced. */ -FILE *ber_pvt_err_file; +FILE *ber_pvt_err_file = NULL; /* * ber errno */ -BER_ERRNO_FN ber_int_errno_fn; +BER_ERRNO_FN ber_int_errno_fn = NULL; int * ber_errno_addr(void) { @@ -46,16 +50,14 @@ void ber_error_print( LDAP_CONST char *data ) { assert( data != NULL ); - if (!ber_pvt_err_file) - ber_pvt_err_file = stderr; + if (!ber_pvt_err_file) ber_pvt_err_file = stderr; fputs( data, ber_pvt_err_file ); /* Print to both streams */ - if (ber_pvt_err_file != stderr) - { - fputs( data, stderr ); - fflush( stderr ); + if (ber_pvt_err_file != stderr) { + fputs( data, stderr ); + fflush( stderr ); } fflush( ber_pvt_err_file ); @@ -67,11 +69,34 @@ BER_LOG_PRINT_FN ber_pvt_log_print = ber_error_print; * lber log */ -static int ber_log_check( int errlvl, int loglvl ) +int ber_pvt_log_output( + const char *subsystem, + int level, + const char *fmt, + ... ) { - return errlvl & loglvl ? 1 : 0; -} + char buf[ 1024 ]; + va_list vl; + va_start( vl, fmt ); + if ( ber_int_log_proc != NULL ) + { + ber_int_log_proc( ber_pvt_err_file, subsystem, level, fmt, vl ); + } + else + { + int level; + ber_get_option( NULL, LBER_OPT_BER_DEBUG, &level ); + buf[sizeof(buf) - 1] = '\0'; + vsnprintf( buf, sizeof(buf)-1, fmt, vl ); + if ( ber_log_check( LDAP_DEBUG_BER, level ) ) + (*ber_pvt_log_print)( buf ); + } + va_end(vl); + + return 1; +} + int ber_pvt_log_printf( int errlvl, int loglvl, const char *fmt, ... ) { char buf[ 1024 ]; @@ -85,15 +110,8 @@ int ber_pvt_log_printf( int errlvl, int loglvl, const char *fmt, ... ) va_start( ap, fmt ); -#ifdef HAVE_VSNPRINTF buf[sizeof(buf) - 1] = '\0'; vsnprintf( buf, sizeof(buf)-1, fmt, ap ); -#elif HAVE_VSPRINTF - vsprintf( buf, fmt, ap ); /* hope it's not too long */ -#else - /* use doprnt() */ -#error "vsprintf() required." -#endif va_end(ap); @@ -101,6 +119,7 @@ int ber_pvt_log_printf( int errlvl, int loglvl, const char *fmt, ... ) return 1; } +#if 0 static int ber_log_puts(int errlvl, int loglvl, char *buf) { assert( buf != NULL ); @@ -112,6 +131,7 @@ static int ber_log_puts(int errlvl, int loglvl, char *buf) (*ber_pvt_log_print)( buf ); return 1; } +#endif /* * Print arbitrary stuff, for debugging. @@ -138,48 +158,129 @@ ber_bprint( LDAP_CONST char *data, ber_len_t len ) { - static const char hexdig[] = "0123456789abcdef"; -#define BPLEN 48 - char out[ BPLEN ]; - char buf[ BPLEN + sizeof("\t%s\n") ]; - int i = 0; + static const char hexdig[] = "0123456789abcdef"; +#define BP_OFFSET 9 +#define BP_GRAPH 60 +#define BP_LEN 80 + char line[ BP_LEN ]; + ber_len_t i; assert( data != NULL ); - memset( out, '\0', BPLEN ); - for ( ;; ) { - if ( len < 1 ) { - sprintf( buf, "\t%s\n", ( i == 0 ) ? "(end)" : out ); - (*ber_pvt_log_print)( buf ); - break; + /* in case len is zero */ + line[0] = '\n'; + line[1] = '\0'; + + for ( i = 0 ; i < len ; i++ ) { + int n = i % 16; + unsigned off; + + if( !n ) { + if( i ) (*ber_pvt_log_print)( line ); + memset( line, ' ', sizeof(line)-2 ); + line[sizeof(line)-2] = '\n'; + line[sizeof(line)-1] = '\0'; + + off = i % 0x0ffffU; + + line[ 2 ] = hexdig[ 0x0f & (off >> 12) ]; + line[ 3 ] = hexdig[ 0x0f & (off >> 8) ]; + line[ 4 ] = hexdig[ 0x0f & (off >> 4) ]; + line[ 5 ] = hexdig[ 0x0f & off ]; + line[ 6 ] = ':'; + } + + off = BP_OFFSET + n*3 + ((n >= 8)?1:0); + line[ off ] = hexdig[ 0x0f & ( data[i] >> 4 ) ]; + line[ off+1 ] = hexdig[ 0x0f & data[i] ]; + + off = BP_GRAPH + n + ((n >= 8)?1:0); + + if ( isprint( (unsigned char) data[i] )) { + line[ BP_GRAPH + n ] = data[i]; + } else { + line[ BP_GRAPH + n ] = '.'; + } } -#ifndef LDAP_HEX - if ( isgraph( (unsigned char)*data )) { - out[ i ] = ' '; - out[ i+1 ] = *data; - } else { -#endif - out[ i ] = hexdig[ ( *data & 0xf0U ) >> 4 ]; - out[ i+1 ] = hexdig[ *data & 0x0fU ]; -#ifndef LDAP_HEX - } -#endif - i += 2; - len--; - data++; - - if ( i > BPLEN - 2 ) { - char data[128 + BPLEN]; - sprintf( data, "\t%s\n", out ); - (*ber_pvt_log_print)(data); - memset( out, '\0', BPLEN ); - i = 0; - continue; - } - out[ i++ ] = ' '; + (*ber_pvt_log_print)( line ); +} + +#ifdef NEW_LOGGING +int ber_output_dump( + const char *subsys, + int level, + BerElement *ber, + int inout ) +{ + static const char hexdig[] = "0123456789abcdef"; + char buf[132]; + ber_len_t len; + char line[ BP_LEN ]; + ber_len_t i; + char *data = ber->ber_ptr; + + if ( inout == 1 ) { + len = ber_pvt_ber_remaining(ber); + } else { + len = ber_pvt_ber_write(ber); + } + + sprintf( buf, "ber_dump: buf=0x%08lx ptr=0x%08lx end=0x%08lx len=%ld\n", + (long) ber->ber_buf, + (long) ber->ber_ptr, + (long) ber->ber_end, + (long) len ); + + (void) ber_pvt_log_output( subsys, level, "%s", buf ); + +#define BP_OFFSET 9 +#define BP_GRAPH 60 +#define BP_LEN 80 + + assert( data != NULL ); + + /* in case len is zero */ + line[0] = '\n'; + line[1] = '\0'; + + for ( i = 0 ; i < len ; i++ ) { + int n = i % 16; + unsigned off; + + if( !n ) { + if( i ) { + (void) ber_pvt_log_output( subsys, level, "%s", line ); + } + memset( line, ' ', sizeof(line)-2 ); + line[sizeof(line)-2] = '\n'; + line[sizeof(line)-1] = '\0'; + + off = i % 0x0ffffU; + + line[ 2 ] = hexdig[ 0x0f & (off >> 12) ]; + line[ 3 ] = hexdig[ 0x0f & (off >> 8) ]; + line[ 4 ] = hexdig[ 0x0f & (off >> 4) ]; + line[ 5 ] = hexdig[ 0x0f & off ]; + line[ 6 ] = ':'; + } + + off = BP_OFFSET + n*3 + ((n >= 8)?1:0); + line[ off ] = hexdig[ 0x0f & ( data[i] >> 4 ) ]; + line[ off+1 ] = hexdig[ 0x0f & data[i] ]; + + off = BP_GRAPH + n + ((n >= 8)?1:0); + + if ( isprint( (unsigned char) data[i] )) { + line[ BP_GRAPH + n ] = data[i]; + } else { + line[ BP_GRAPH + n ] = '.'; + } } + + return ber_pvt_log_output( subsys, level, "%s", line ); } +#endif int ber_log_dump( @@ -189,7 +290,7 @@ ber_log_dump( int inout ) { assert( ber != NULL ); - assert( BER_VALID( ber ) ); + assert( LBER_VALID( ber ) ); if ( !ber_log_check( errlvl, loglvl )) { return 0; @@ -205,28 +306,26 @@ ber_dump( int inout ) { char buf[132]; + ber_len_t len; assert( ber != NULL ); - assert( BER_VALID( ber ) ); + assert( LBER_VALID( ber ) ); - sprintf( buf, "ber_dump: buf 0x%lx, ptr 0x%lx, end 0x%lx\n", + if ( inout == 1 ) { + len = ber_pvt_ber_remaining(ber); + } else { + len = ber_pvt_ber_write(ber); + } + + sprintf( buf, "ber_dump: buf=0x%08lx ptr=0x%08lx end=0x%08lx len=%ld\n", (long) ber->ber_buf, (long) ber->ber_ptr, - (long) ber->ber_end ); - - (*ber_pvt_log_print)( buf ); + (long) ber->ber_end, + (long) len ); - if ( inout == 1 ) { - sprintf( buf, " current len %ld, contents:\n", - (long) (ber->ber_end - ber->ber_ptr) ); - ber_bprint( ber->ber_ptr, ber->ber_end - ber->ber_ptr ); + (void) (*ber_pvt_log_print)( buf ); - } else { - sprintf( buf, " current len %ld, contents:\n", - (long) (ber->ber_ptr - ber->ber_buf) ); - - ber_bprint( ber->ber_buf, ber->ber_ptr - ber->ber_buf ); - } + ber_bprint( ber->ber_ptr, len ); } int