FILE *lgfp;
char currlogfilename[FILENAME_MAX];
void *frontend;
FILE *lgfp;
char currlogfilename[FILENAME_MAX];
void *frontend;
};
static void xlatlognam(char *d, char *s, char *hostname, struct tm *tm);
};
static void xlatlognam(char *d, char *s, char *hostname, struct tm *tm);
void logtraffic(void *handle, unsigned char c, int logmode)
{
struct LogContext *ctx = (struct LogContext *)handle;
void logtraffic(void *handle, unsigned char c, int logmode)
{
struct LogContext *ctx = (struct LogContext *)handle;
- if (cfg.logtype > 0) {
- if (cfg.logtype == logmode) {
+ if (ctx->cfg.logtype > 0) {
+ if (ctx->cfg.logtype == logmode) {
/* deferred open file from pgm start? */
if (!ctx->lgfp)
logfopen(ctx);
/* deferred open file from pgm start? */
if (!ctx->lgfp)
logfopen(ctx);
fprintf(stderr, "%s\n", event);
fflush(stderr);
}
fprintf(stderr, "%s\n", event);
fflush(stderr);
}
- if (cfg.logtype != LGTYP_PACKETS)
+ if (ctx->cfg.logtype != LGTYP_PACKETS)
return;
if (!ctx->lgfp)
logfopen(ctx);
return;
if (!ctx->lgfp)
logfopen(ctx);
int i, j;
char dumpdata[80], smalldata[5];
int i, j;
char dumpdata[80], smalldata[5];
- if (cfg.logtype != LGTYP_PACKETS)
+ if (ctx->cfg.logtype != LGTYP_PACKETS)
return;
if (!ctx->lgfp)
logfopen(ctx);
return;
if (!ctx->lgfp)
logfopen(ctx);
return;
sprintf(writemod, "wb"); /* default to rewrite */
return;
sprintf(writemod, "wb"); /* default to rewrite */
tm = *localtime(&t);
/* substitute special codes in file name */
tm = *localtime(&t);
/* substitute special codes in file name */
- xlatlognam(ctx->currlogfilename, cfg.logfilename,cfg.host, &tm);
+ xlatlognam(ctx->currlogfilename, ctx->cfg.logfilename,ctx->cfg.host, &tm);
ctx->lgfp = fopen(ctx->currlogfilename, "r"); /* file already present? */
if (ctx->lgfp) {
int i;
fclose(ctx->lgfp);
ctx->lgfp = fopen(ctx->currlogfilename, "r"); /* file already present? */
if (ctx->lgfp) {
int i;
fclose(ctx->lgfp);
- if (cfg.logxfovr != LGXF_ASK) {
- i = ((cfg.logxfovr == LGXF_OVR) ? 2 : 1);
+ if (ctx->cfg.logxfovr != LGXF_ASK) {
+ i = ((ctx->cfg.logxfovr == LGXF_OVR) ? 2 : 1);
} else
i = askappend(ctx->frontend, ctx->currlogfilename);
if (i == 1)
writemod[0] = 'a'; /* set append mode */
else if (i == 0) { /* cancelled */
ctx->lgfp = NULL;
} else
i = askappend(ctx->frontend, ctx->currlogfilename);
if (i == 1)
writemod[0] = 'a'; /* set append mode */
else if (i == 0) { /* cancelled */
ctx->lgfp = NULL;
- cfg.logtype = 0; /* disable logging */
+ ctx->cfg.logtype = 0; /* disable logging */
sprintf(buf, "%s session log (%s mode) to file: ",
(writemod[0] == 'a') ? "Appending" : "Writing new",
sprintf(buf, "%s session log (%s mode) to file: ",
(writemod[0] == 'a') ? "Appending" : "Writing new",
- (cfg.logtype == LGTYP_ASCII ? "ASCII" :
- cfg.logtype == LGTYP_DEBUG ? "raw" :
- cfg.logtype == LGTYP_PACKETS ? "SSH packets" : "<ukwn>"));
+ (ctx->cfg.logtype == LGTYP_ASCII ? "ASCII" :
+ ctx->cfg.logtype == LGTYP_DEBUG ? "raw" :
+ ctx->cfg.logtype == LGTYP_PACKETS ? "SSH packets" : "<ukwn>"));
/* Make sure we do not exceed the output buffer size */
strncat(buf, ctx->currlogfilename, 128);
buf[strlen(buf)] = '\0';
/* Make sure we do not exceed the output buffer size */
strncat(buf, ctx->currlogfilename, 128);
buf[strlen(buf)] = '\0';
-void *log_init(void *frontend)
+void *log_init(void *frontend, Config *cfg)
{
struct LogContext *ctx = smalloc(sizeof(struct LogContext));
ctx->lgfp = NULL;
ctx->frontend = frontend;
{
struct LogContext *ctx = smalloc(sizeof(struct LogContext));
ctx->lgfp = NULL;
ctx->frontend = frontend;
+ ctx->cfg = *cfg; /* STRUCTURE COPY */
+void log_reconfig(void *handle, Config *cfg)
+{
+ struct LogContext *ctx = (struct LogContext *)handle;
+ int reset_logging;
+
+ if (strcmp(ctx->cfg.logfilename, cfg->logfilename) ||
+ ctx->cfg.logtype != cfg->logtype)
+ reset_logging = TRUE;
+ else
+ reset_logging = FALSE;
+
+ if (reset_logging)
+ logfclose(logctx);
+
+ ctx->cfg = *cfg; /* STRUCTURE COPY */
+
+ if (reset_logging)
+ logfopen(logctx);
+}
+
/*
* translate format codes into time/date strings
* and insert them into log file name
/*
* translate format codes into time/date strings
* and insert them into log file name
fprintf(stderr, "Unable to open connection:\n%s", error);
return 1;
}
fprintf(stderr, "Unable to open connection:\n%s", error);
return 1;
}
- logctx = log_init(NULL);
+ logctx = log_init(NULL, &cfg);
back->provide_logctx(backhandle, logctx);
sfree(realhost);
}
back->provide_logctx(backhandle, logctx);
sfree(realhost);
}
fprintf(stderr, "ssh_init: %s\n", err);
return 1;
}
fprintf(stderr, "ssh_init: %s\n", err);
return 1;
}
- logctx = log_init(NULL);
+ logctx = log_init(NULL, &cfg);
back->provide_logctx(backhandle, logctx);
ssh_sftp_init();
if (verbose && realhost != NULL)
back->provide_logctx(backhandle, logctx);
ssh_sftp_init();
if (verbose && realhost != NULL)
/*
* Exports from logging.c.
*/
/*
* Exports from logging.c.
*/
-void *log_init(void *frontend);
+void *log_init(void *frontend, Config *cfg);
+void log_reconfig(void *logctx, Config *cfg);
void logfopen(void *logctx);
void logfclose(void *logctx);
void logtraffic(void *logctx, unsigned char c, int logmode);
void logfopen(void *logctx);
void logfclose(void *logctx);
void logtraffic(void *logctx, unsigned char c, int logmode);
err = back->init(NULL, &backhandle, &cfg, cfg.host, cfg.port, &realhost,0);
if (err != NULL)
bump("ssh_init: %s", err);
err = back->init(NULL, &backhandle, &cfg, cfg.host, cfg.port, &realhost,0);
if (err != NULL)
bump("ssh_init: %s", err);
- logctx = log_init(NULL);
+ logctx = log_init(NULL, &cfg);
back->provide_logctx(backhandle, logctx);
ssh_scp_init();
if (verbose && realhost != NULL)
back->provide_logctx(backhandle, logctx);
ssh_scp_init();
if (verbose && realhost != NULL)
show_mouseptr(inst, 1);
inst->term = term_init(&cfg, inst);
show_mouseptr(inst, 1);
inst->term = term_init(&cfg, inst);
- inst->logctx = log_init(inst);
+ inst->logctx = log_init(inst, &cfg);
term_provide_logctx(inst->term, inst->logctx);
inst->back = &pty_backend;
term_provide_logctx(inst->term, inst->logctx);
inst->back = &pty_backend;
/*
* Start up the connection.
*/
/*
* Start up the connection.
*/
- logctx = log_init(NULL);
+ logctx = log_init(NULL, &cfg);
{
char *error;
char *realhost;
{
char *error;
char *realhost;
hwnd = NULL;
term = term_init(&cfg, NULL);
hwnd = NULL;
term = term_init(&cfg, NULL);
- logctx = log_init(NULL);
+ logctx = log_init(NULL, &cfg);
term_provide_logctx(term, logctx);
cfgtopalette();
term_provide_logctx(term, logctx);
cfgtopalette();
- if (strcmp(prev_cfg.logfilename, cfg.logfilename) ||
- prev_cfg.logtype != cfg.logtype) {
- logfclose(logctx); /* reset logging */
- logfopen(logctx);
- }
+ /* Pass new config data to the logging module */
+ log_reconfig(logctx, &cfg);