extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2025-08-16 16:41:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Sync OpenBSD patchset 819:

Browse Source 
Don't reset the activity timer for unattached sessions every second,
this screws up the choice of most-recently-used. Instead, break the time
update into a little function and do it when the session is attached.

Pointed out by joshe@.
This commit is contained in:
Tiago Cunha
2011-01-03 23:27:54 +00:00
parent 09ef2c9f40
commit d3c04b74ec
8 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server.c
View File

@ -1,4 +1,4 @@
/* $Id: server.c,v 1.250 2010-12-30 22:39:49 tcunha Exp $ */
/* $Id: server.c,v 1.251 2011-01-03 23:27:54 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -495,12 +495,8 @@ server_lock_server(void)
t = time(NULL);
RB_FOREACH(s, sessions, &sessions) {
if (s->flags & SESSION_UNATTACHED) {
if (gettimeofday(&s->activity_time, NULL) != 0)
fatal("gettimeofday failed");
if (s->flags & SESSION_UNATTACHED)
continue;
}
timeout = options_get_number(&s->options, "lock-after-time");
if (timeout <= 0 || t <= s->activity_time.tv_sec + timeout)
return; /* not timed out */
@ -520,12 +516,8 @@ server_lock_sessions(void)
t = time(NULL);
RB_FOREACH(s, sessions, &sessions) {
if (s->flags & SESSION_UNATTACHED) {
if (gettimeofday(&s->activity_time, NULL) != 0)
fatal("gettimeofday failed");
if (s->flags & SESSION_UNATTACHED)
continue;
}
timeout = options_get_number(&s->options, "lock-after-time");
if (timeout > 0 && t > s->activity_time.tv_sec + timeout) {
server_lock_session(s);