diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2011-12-04 19:14:29 +0000 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2011-12-04 19:14:29 +0000 |
| commit | ca974d7f6171a70c5484420bd6c59919383105a6 (patch) | |
| tree | 874b9e25781f2174f45f53eee32236a78bdae83a /lib | |
| parent | bd3166176fdb7ed96211eb539316f47843e0faa7 (diff) | |
Debug output tweaks: Try to send everything to stderr, and add ifdef to
enable printing of all SSL traffic.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl_gnutls.c | 6 | ||||
| -rw-r--r-- | lib/xmltree.c | 18 |
2 files changed, 13 insertions, 11 deletions
diff --git a/lib/ssl_gnutls.c b/lib/ssl_gnutls.c index d72b17f5..ccab8aca 100644 --- a/lib/ssl_gnutls.c +++ b/lib/ssl_gnutls.c @@ -44,6 +44,8 @@ static gboolean initialized = FALSE; #define GNUTLS_STUPID_CAST (int) #endif +#define SSLDEBUG 0 + struct scd { ssl_input_function func; @@ -197,7 +199,7 @@ int ssl_read( void *conn, char *buf, int len ) if( st == GNUTLS_E_AGAIN || st == GNUTLS_E_INTERRUPTED ) ssl_errno = SSL_AGAIN; - if( 0 && getenv( "BITLBEE_DEBUG" ) && st > 0 ) len = write( 1, buf, st ); + if( SSLDEBUG && getenv( "BITLBEE_DEBUG" ) && st > 0 ) len = write( 2, buf, st ); return st; } @@ -218,7 +220,7 @@ int ssl_write( void *conn, const char *buf, int len ) if( st == GNUTLS_E_AGAIN || st == GNUTLS_E_INTERRUPTED ) ssl_errno = SSL_AGAIN; - if( 0 && getenv( "BITLBEE_DEBUG" ) && st > 0 ) len = write( 1, buf, st ); + if( SSLDEBUG && getenv( "BITLBEE_DEBUG" ) && st > 0 ) len = write( 2, buf, st ); return st; } diff --git a/lib/xmltree.c b/lib/xmltree.c index 7dd7b6a3..e2654579 100644 --- a/lib/xmltree.c +++ b/lib/xmltree.c @@ -329,16 +329,16 @@ void xt_print( struct xt_node *node ) /* Indentation */ for( c = node; c->parent; c = c->parent ) - printf( " " ); + fprintf( stderr, " " ); /* Start the tag */ - printf( "<%s", node->name ); + fprintf( stderr, "<%s", node->name ); /* Print the attributes */ for( i = 0; node->attr[i].key; i ++ ) { char *v = g_markup_escape_text( node->attr[i].value, -1 ); - printf( " %s=\"%s\"", node->attr[i].key, v ); + fprintf( stderr, " %s=\"%s\"", node->attr[i].key, v ); g_free( v ); } @@ -347,13 +347,13 @@ void xt_print( struct xt_node *node ) /* If this tag doesn't have any content at all... */ if( node->text == NULL && node->children == NULL ) { - printf( "/>\n" ); + fprintf( stderr, "/>\n" ); return; /* Then we're finished! */ } /* Otherwise... */ - printf( ">" ); + fprintf( stderr, ">" ); /* Only print the text if it contains more than whitespace (TEST). */ if( node->text_len > 0 ) @@ -362,23 +362,23 @@ void xt_print( struct xt_node *node ) if( node->text[i] ) { char *v = g_markup_escape_text( node->text, -1 ); - printf( "%s", v ); + fprintf( stderr, "%s", v ); g_free( v ); } } if( node->children ) - printf( "\n" ); + fprintf( stderr, "\n" ); for( c = node->children; c; c = c->next ) xt_print( c ); if( node->children ) for( c = node; c->parent; c = c->parent ) - printf( " " ); + fprintf( stderr, " " ); /* Non-empty tag is now finished. */ - printf( "</%s>\n", node->name ); + fprintf( stderr, "</%s>\n", node->name ); } struct xt_node *xt_dup( struct xt_node *node ) |