~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mention the negotiated SSH-2 MAC algorithm(s) in the Event Log.
[sgt/putty]
/
logging.c
diff --git
a/logging.c
b/logging.c
index
499747c
..
5302998
100644
(file)
--- a/
logging.c
+++ b/
logging.c
@@
-35,6
+35,16
@@
void logtraffic(void *handle, unsigned char c, int logmode)
}
/*
}
/*
+ * Flush any open log file.
+ */
+void logflush(void *handle) {
+ struct LogContext *ctx = (struct LogContext *)handle;
+ if (ctx->cfg.logtype > 0)
+ if (ctx->lgfp)
+ fflush(ctx->lgfp);
+}
+
+/*
* 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.
* 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.
@@
-43,7
+53,7
@@
void logtraffic(void *handle, unsigned char c, int logmode)
* platforms. Platforms which don't have a meaningful stderr can
* just avoid defining FLAG_STDERR.
*/
* platforms. Platforms which don't have a meaningful stderr can
* just avoid defining FLAG_STDERR.
*/
-void log_eventlog(void *handle, char *event)
+void log_eventlog(void *handle, c
onst c
har *event)
{
struct LogContext *ctx = (struct LogContext *)handle;
if ((flags & FLAG_STDERR) && (flags & FLAG_VERBOSE)) {
{
struct LogContext *ctx = (struct LogContext *)handle;
if ((flags & FLAG_STDERR) && (flags & FLAG_VERBOSE)) {
@@
-163,7
+173,7
@@
void logfclose(void *handle)
void *log_init(void *frontend, Config *cfg)
{
void *log_init(void *frontend, Config *cfg)
{
- struct LogContext *ctx = s
malloc(sizeof(struct LogContext)
);
+ struct LogContext *ctx = s
new(struct LogContext
);
ctx->lgfp = NULL;
ctx->frontend = frontend;
ctx->cfg = *cfg; /* STRUCTURE COPY */
ctx->lgfp = NULL;
ctx->frontend = frontend;
ctx->cfg = *cfg; /* STRUCTURE COPY */