Skip to content

Log session length in disconnection message #561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Log session length in disconnection message #561

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion packet.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,9 @@ struct session_state {
u_int32_t rekey_interval; /* how often in seconds */
time_t rekey_time; /* time of last rekeying */

/* Start time of session */
time_t session_start_time;

/* roundup current message to extra_pad bytes */
u_char extra_pad;

Expand Down Expand Up @@ -249,6 +252,7 @@ ssh_alloc_session_state(void)
state->packet_timeout_ms = -1;
state->p_send.packets = state->p_read.packets = 0;
state->initialized = 1;
state->session_start_time = monotime();
/*
* ssh_packet_send2() needs to queue packets until
* we've done the initial key exchange.
Expand Down Expand Up @@ -2008,7 +2012,10 @@ sshpkt_vfatal(struct ssh *ssh, int r, const char *fmt, va_list ap)
ssh->state->server_side ? "from" : "to", remote_id);
case SSH_ERR_DISCONNECTED:
ssh_packet_clear_keys(ssh);
logdie("Disconnected from %s", remote_id);
time_t session_end_time = monotime();
time_t session_length = session_end_time - ssh->state->session_start_time;
logdie("Disconnected from %s. Session length: %lu:%02lu:%02lu", remote_id,
session_length / 3600, (session_length % 3600) / 60, session_length % 60);
case SSH_ERR_SYSTEM_ERROR:
if (errno == ECONNRESET) {
ssh_packet_clear_keys(ssh);
Expand Down
Loading