security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-23 10:29:58 +01:00
Code Activity

* assuan-buffer.c (my_log_prefix): New. Use it for all i/o debug output.

Browse Source
This commit is contained in:
Werner Koch 2002-04-09 18:36:20 +00:00
parent 1943ed5d2c
commit 18c85a72a9
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
assuan/ChangeLog
View File

@ -1,3 +1,8 @@
2002-04-04 Werner Koch <wk@gnupg.org>
* assuan-buffer.c (my_log_prefix): New. Use it for all i/o debug
output.
2002-03-06 Werner Koch <wk@gnupg.org> 2002-03-06 Werner Koch <wk@gnupg.org>
* assuan-client.c (_assuan_read_from_server): Detect END. * assuan-client.c (_assuan_read_from_server): Detect END.

31
assuan/assuan-buffer.c
View File

@ -30,6 +30,21 @@
#endif #endif
#include "assuan-defs.h" #include "assuan-defs.h"
#ifdef HAVE_JNLIB_LOGGING
#include "../jnlib/logging.h"
#endif
static const char *
my_log_prefix (void)
{
#ifdef HAVE_JNLIB_LOGGING
return log_get_prefix (NULL);
#else
return "";
#endif
}
static int static int
writen ( int fd, const char *buffer, size_t length ) writen ( int fd, const char *buffer, size_t length )
@ -132,15 +147,15 @@ _assuan_read_line (ASSUAN_CONTEXT ctx)
if (rc) if (rc)
{ {
if (ctx->log_fp) if (ctx->log_fp)
fprintf (ctx->log_fp, "%p <- [Error: %s]\n", fprintf (ctx->log_fp, "%s[%p] <- [Error: %s]\n",
ctx, strerror (errno)); my_log_prefix (), ctx, strerror (errno));
return ASSUAN_Read_Error; return ASSUAN_Read_Error;
} }
if (!nread) if (!nread)
{ {
assert (ctx->inbound.eof); assert (ctx->inbound.eof);
if (ctx->log_fp) if (ctx->log_fp)
fprintf (ctx->log_fp, "%p <- [EOF]\n", ctx); fprintf (ctx->log_fp, "%s[%p] <- [EOF]\n", my_log_prefix (),ctx);
return -1; return -1;
} }
@ -173,7 +188,7 @@ _assuan_read_line (ASSUAN_CONTEXT ctx)
ctx->inbound.linelen = n; ctx->inbound.linelen = n;
if (ctx->log_fp) if (ctx->log_fp)
{ {
fprintf (ctx->log_fp, "%p <- ", ctx); fprintf (ctx->log_fp, "%s[%p] <- ", my_log_prefix (), ctx);
if (ctx->confidential) if (ctx->confidential)
fputs ("[Confidential data not shown]", ctx->log_fp); fputs ("[Confidential data not shown]", ctx->log_fp);
else else
@ -187,7 +202,7 @@ _assuan_read_line (ASSUAN_CONTEXT ctx)
} }
if (ctx->log_fp) if (ctx->log_fp)
fprintf (ctx->log_fp, "%p <- [Invalid line]\n", ctx); fprintf (ctx->log_fp, "%s[%p] <- [Invalid line]\n", my_log_prefix (), ctx);
*line = 0; *line = 0;
ctx->inbound.linelen = 0; ctx->inbound.linelen = 0;
return ctx->inbound.eof? ASSUAN_Line_Not_Terminated : ASSUAN_Line_Too_Long; return ctx->inbound.eof? ASSUAN_Line_Not_Terminated : ASSUAN_Line_Too_Long;
@ -239,7 +254,7 @@ assuan_write_line (ASSUAN_CONTEXT ctx, const char *line )
/* fixme: we should do some kind of line buffering */ /* fixme: we should do some kind of line buffering */
if (ctx->log_fp) if (ctx->log_fp)
{ {
fprintf (ctx->log_fp, "%p -> ", ctx); fprintf (ctx->log_fp, "%s[%p] -> ", my_log_prefix (), ctx);
if (ctx->confidential) if (ctx->confidential)
fputs ("[Confidential data not shown]", ctx->log_fp); fputs ("[Confidential data not shown]", ctx->log_fp);
else else
@ -310,7 +325,7 @@ _assuan_cookie_write_data (void *cookie, const char *buffer, size_t size)
{ {
if (ctx->log_fp) if (ctx->log_fp)
{ {
fprintf (ctx->log_fp, "%p -> ", ctx); fprintf (ctx->log_fp, "%s[%p] -> ", my_log_prefix (), ctx);
if (ctx->confidential) if (ctx->confidential)
fputs ("[Confidential data not shown]", ctx->log_fp); fputs ("[Confidential data not shown]", ctx->log_fp);
else else
@ -355,7 +370,7 @@ _assuan_cookie_write_flush (void *cookie)
{ {
if (ctx->log_fp) if (ctx->log_fp)
{ {
fprintf (ctx->log_fp, "%p -> ", ctx); fprintf (ctx->log_fp, "%s[%p] -> ", my_log_prefix (), ctx);
if (ctx->confidential) if (ctx->confidential)
fputs ("[Confidential data not shown]", ctx->log_fp); fputs ("[Confidential data not shown]", ctx->log_fp);
else else