nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 09:58:01 +00:00
Code Issues Projects Releases Wiki Activity

Doofus Award: logfopen is shared between SSH-packet and session-logging modes,

Browse Source 
so of _course_ it has to be mode "wb". Restored, and added \r to all of the
SSH packet logging stuff.

[originally from svn r2289]
This commit is contained in:
Jacob Nevins 2002-12-08 12:10:58 +00:00
parent 3bb2e4568c
commit 242a4872b9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
logging.c
View File

@ -44,7 +44,7 @@ void log_eventlog(void *handle, char *event)
if (!ctx->lgfp) if (!ctx->lgfp)
logfopen(ctx); logfopen(ctx);
if (ctx->lgfp) if (ctx->lgfp)
fprintf(ctx->lgfp, "Event Log: %s\n", event); fprintf(ctx->lgfp, "Event Log: %s\r\n", event);
} }
/* /*
@ -62,11 +62,11 @@ void log_packet(void *handle, int direction, int type,
if (!ctx->lgfp) if (!ctx->lgfp)
logfopen(ctx); logfopen(ctx);
if (ctx->lgfp) { if (ctx->lgfp) {
fprintf(ctx->lgfp, "%s packet type %d / 0x%02x (%s)\n", fprintf(ctx->lgfp, "%s packet type %d / 0x%02x (%s)\r\n",
direction == PKT_INCOMING ? "Incoming" : "Outgoing", direction == PKT_INCOMING ? "Incoming" : "Outgoing",
type, type, texttype); type, type, texttype);
for (i = 0; i < len; i += 16) { for (i = 0; i < len; i += 16) {
sprintf(dumpdata, " %08x%*s\n", i, 1+3*16+2+16, ""); sprintf(dumpdata, " %08x%*s\r\n", i, 1+3*16+2+16, "");
for (j = 0; j < 16 && i+j < len; j++) { for (j = 0; j < 16 && i+j < len; j++) {
int c = ((unsigned char *)data)[i+j]; int c = ((unsigned char *)data)[i+j];
sprintf(smalldata, "%02x", c); sprintf(smalldata, "%02x", c);
@ -74,7 +74,7 @@ void log_packet(void *handle, int direction, int type,
dumpdata[10+2+3*j+1] = smalldata[1]; dumpdata[10+2+3*j+1] = smalldata[1];
dumpdata[10+1+3*16+2+j] = (isprint(c) ? c : '.'); dumpdata[10+1+3*16+2+j] = (isprint(c) ? c : '.');
} }
strcpy(dumpdata + 10+1+3*16+2+j, "\n"); strcpy(dumpdata + 10+1+3*16+2+j, "\r\n");
fputs(dumpdata, ctx->lgfp); fputs(dumpdata, ctx->lgfp);
} }
fflush(ctx->lgfp); fflush(ctx->lgfp);
@ -96,7 +96,7 @@ void logfopen(void *handle)
if (!cfg.logtype) if (!cfg.logtype)
return; return;
sprintf(writemod, "w"); /* default to rewrite */ sprintf(writemod, "wb"); /* default to rewrite */
time(&t); time(&t);
tm = *localtime(&t); tm = *localtime(&t);
@ -124,7 +124,7 @@ void logfopen(void *handle)
fputs("=~=~=~=~=~=~=~=~=~=~=~= PuTTY log ", ctx->lgfp); fputs("=~=~=~=~=~=~=~=~=~=~=~= PuTTY log ", ctx->lgfp);
strftime(buf, 24, "%Y.%m.%d %H:%M:%S", &tm); strftime(buf, 24, "%Y.%m.%d %H:%M:%S", &tm);
fputs(buf, ctx->lgfp); fputs(buf, ctx->lgfp);
fputs(" =~=~=~=~=~=~=~=~=~=~=~=\n", ctx->lgfp); fputs(" =~=~=~=~=~=~=~=~=~=~=~=\r\n", ctx->lgfp);
sprintf(buf, "%s session log (%s mode) to file: ", sprintf(buf, "%s session log (%s mode) to file: ",
(writemod[0] == 'a') ? "Appending" : "Writing new", (writemod[0] == 'a') ? "Appending" : "Writing new",