mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

add new ber dump routine (behind NEW_LOGGING)

Browse Source
This commit is contained in:
Gary Williams 2000-10-25 15:33:39 +00:00
parent 3a002e8768
commit ecad3079e5
1 changed files with 85 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
libraries/liblber/bprint.c
View File

@ -16,6 +16,7 @@
typedef void (*BER_LOG_FN) LDAP_P((FILE *file, char *subsys, int level, const char *fmt, va_list vl)); typedef void (*BER_LOG_FN) LDAP_P((FILE *file, char *subsys, int level, const char *fmt, va_list vl));
static int ber_log_check( int errlvl, int loglvl );
BER_LOG_FN ber_int_log_proc = NULL; BER_LOG_FN ber_int_log_proc = NULL;
@ -82,6 +83,8 @@ int ber_pvt_log_output( char *subsystem, int level, const char *fmt, ... )
} }
else else
{ {
int level;
ber_get_option( NULL, LBER_OPT_BER_DEBUG, &level );
#ifdef HAVE_VSNPRINTF #ifdef HAVE_VSNPRINTF
buf[sizeof(buf) - 1] = '\0'; buf[sizeof(buf) - 1] = '\0';
vsnprintf( buf, sizeof(buf)-1, fmt, vl ); vsnprintf( buf, sizeof(buf)-1, fmt, vl );
@ -89,8 +92,9 @@ int ber_pvt_log_output( char *subsystem, int level, const char *fmt, ... )
vsprintf( buf, fmt, vl ); /* hope it's not too long */ vsprintf( buf, fmt, vl ); /* hope it's not too long */
#else #else
/* use doprnt() */ /* use doprnt() */
#error "vsprintf() required." #error "vsprintf() required.";
#endif #endif
if ( ber_log_check( LDAP_DEBUG_BER, level ) )
(*ber_pvt_log_print)( buf ); (*ber_pvt_log_print)( buf );
} }
va_end(vl); va_end(vl);
@ -219,6 +223,80 @@ ber_bprint(
(*ber_pvt_log_print)( line ); (*ber_pvt_log_print)( line );
} }
#ifdef NEW_LOGGING
int ber_output_dump(
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 );
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 ) 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( data[i] )) {
line[ BP_GRAPH + n ] = data[i];
} else {
line[ BP_GRAPH + n ] = '.';
}
}
ber_pvt_log_output( subsys, level, "%s", line );
}
#endif
int int
ber_log_dump( ber_log_dump(
int errlvl, int errlvl,