src/usr.bin/ssh/monitor.c - diff

Return to monitor.c CVS log

Up to [local] / src / usr.bin / ssh

version 1.214, 2020/08/27 01:07:09

version 1.215, 2020/10/16 13:24:45

Line 354

monitor_read_log(struct monitor *pmonitor)

{

struct sshbuf *logmsg;

u_int len, level;

u_int len, level, line;

char *msg;

char *msg, *file, *func;

u_char *p;

int r;

Line 386

fatal("%s: reserve: %s", __func__, ssh_err(r));

if (atomicio(read, pmonitor->m_log_recvfd, p, len) != len)

fatal("%s: log fd read: %s", __func__, strerror(errno));

if ((r = sshbuf_get_u32(logmsg, &level)) != 0 ||

if ((r = sshbuf_get_cstring(logmsg, &file, NULL)) != 0 ||

(r = sshbuf_get_cstring(logmsg, &func, NULL)) != 0 ||

(r = sshbuf_get_u32(logmsg, &line)) != 0 ||

(r = sshbuf_get_u32(logmsg, &level)) != 0 ||

(r = sshbuf_get_cstring(logmsg, &msg, NULL)) != 0)

fatal("%s: decode: %s", __func__, ssh_err(r));

Line 394

Line 397

if (log_level_name(level) == NULL)

fatal("%s: invalid log level %u (corrupted message?)",

__func__, level);

do_log2(level, "%s [preauth]", msg);

sshlog(file, func, line, 0, level, "%s [preauth]", msg);

sshbuf_free(logmsg);

free(file);

free(func);

free(msg);

return 0;