nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-04-10 15:48:06 -05:00
Code Issues Projects Releases Wiki Activity

Move the stderr output of event log messages in verbose mode to the

Browse Source 
general logging module rather than localising it in ssh.c. This
means it should work in other protocols as well (notably Telnet,
where it might actually be useful for debugging negotiations).

[originally from svn r2360]
This commit is contained in:
Simon Tatham 2002-12-19 14:24:28 +00:00
parent 6adef8429a
commit 6c34f06a71
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
logging.c
View File

@ -34,11 +34,21 @@ void logtraffic(void *handle, unsigned char c, int logmode)
}
/*
* Log an Event Log entry (used in SSH packet logging mode).
* Log an Event Log entry. Used in SSH packet logging mode; this is
* also as convenient a place as any to put the output of Event Log
* entries to stderr when a command-line tool is in verbose mode.
* (In particular, this is a better place to put it than in the
* front ends, because it only has to be done once for all
* platforms. Platforms which don't have a meaningful stderr can
* just avoid defining FLAG_STDERR.
*/
void log_eventlog(void *handle, char *event)
{
struct LogContext *ctx = (struct LogContext *)handle;
if ((flags & FLAG_STDERR) && (flags & FLAG_VERBOSE)) {
fprintf(stderr, "%s\n", event);
fflush(stderr);
}
if (cfg.logtype != LGTYP_PACKETS)
return;
if (!ctx->lgfp)

8
ssh.c
View File

@ -638,13 +638,7 @@ struct ssh_tag {
int (*s_rdpkt) (Ssh ssh, unsigned char **data, int *datalen);
};
#define logevent(s) do { \
logevent(ssh->frontend, s); \
if ((flags & FLAG_STDERR) && (flags & FLAG_VERBOSE)) { \
fprintf(stderr, "%s\n", s); \
fflush(stderr); \
} \
} while (0)
#define logevent(s) logevent(ssh->frontend, s)
/* logevent, only printf-formatted. */
void logeventf(Ssh ssh, char *fmt, ...)