/* $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
*/
#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
* 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)
{
* 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 ];
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);
(*ber_pvt_log_print)( buf );
return 1;
}
+
#if 0
static int ber_log_puts(int errlvl, int loglvl, char *buf)
{
return 1;
}
#endif
+
/*
* Print arbitrary stuff, for debugging.
*/
ber_len_t len )
{
static const char hexdig[] = "0123456789abcdef";
-#define BP_OFFSET 8
+#define BP_OFFSET 9
#define BP_GRAPH 60
#define BP_LEN 80
char line[ BP_LEN ];
for ( i = 0 ; i < len ; i++ ) {
int n = i % 16;
- int off;
+ unsigned off;
if( !n ) {
if( i ) (*ber_pvt_log_print)( line );
off = i % 0x0ffffU;
- line[ 2 ] = hexdig[ ( off & 0xf000U ) >> 12 ];
- line[ 3 ] = hexdig[ ( off & 0x0f00U ) >> 8 ];
- line[ 4 ] = hexdig[ ( off & 0x00f0U ) >> 4 ];
- line[ 5 ] = hexdig[ ( off & 0x000fU ) ];
+ 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;
- line[ off ] = hexdig[ ( data[i] & 0xf0U ) >> 4 ];
- line[ off+1 ] = hexdig[ data[i] & 0x0fU ];
+ 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;
+ off = BP_GRAPH + n + ((n >= 8)?1:0);
- if ( isprint( data[i] )) {
+ if ( isprint( (unsigned char) data[i] )) {
line[ BP_GRAPH + n ] = data[i];
} else {
line[ BP_GRAPH + n ] = '.';
(*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(
int errlvl,
int inout )
{
assert( ber != NULL );
- assert( BER_VALID( ber ) );
+ assert( LBER_VALID( ber ) );
if ( !ber_log_check( errlvl, loglvl )) {
return 0;
ber_len_t len;
assert( ber != NULL );
- assert( BER_VALID( ber ) );
+ assert( LBER_VALID( ber ) );
if ( inout == 1 ) {
len = ber_pvt_ber_remaining(ber);
(long) ber->ber_end,
(long) len );
- (*ber_pvt_log_print)( buf );
+ (void) (*ber_pvt_log_print)( buf );
ber_bprint( ber->ber_ptr, len );
}
projects / openldap / blobdiff