v/tmate-ssh-server
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate-ssh-server.git synced 2020-11-18 19:53:51 -08:00
Code Issues Releases Wiki Activity

Sync OpenBSD patchset 803:

Browse Source 
Dead sessions are never on the active sessions list, so the SESSION_DEAD
flag is effectively unused. Remove it.
This commit is contained in:
Tiago Cunha 2010-12-22 15:31:56 +00:00
parent bb728b89a7
commit a932742a8a
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
session.c
View File

@ -1,4 +1,4 @@
/* $Id: session.c,v 1.79 2010-12-22 15:28:50 tcunha Exp $ */ /* $Id: session.c,v 1.80 2010-12-22 15:31:56 tcunha Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -166,7 +166,6 @@ session_destroy(struct session *s)
} }
if (i == ARRAY_LENGTH(&dead_sessions)) if (i == ARRAY_LENGTH(&dead_sessions))
ARRAY_ADD(&dead_sessions, s); ARRAY_ADD(&dead_sessions, s);
s->flags |= SESSION_DEAD;
} }
/* Find session index. */ /* Find session index. */
@ -187,7 +186,7 @@ session_next_session(struct session *s)
struct session *s2; struct session *s2;
u_int i; u_int i;
if (ARRAY_LENGTH(&sessions) == 0 || session_index(s, &i) != 0) if (ARRAY_LENGTH(&sessions) == 0 || !session_alive(s))
return (NULL); return (NULL);
do { do {
@ -196,7 +195,7 @@ session_next_session(struct session *s)
else else
i++; i++;
s2 = ARRAY_ITEM(&sessions, i); s2 = ARRAY_ITEM(&sessions, i);
} while (s2 == NULL || s2->flags & SESSION_DEAD); } while (s2 == NULL);
return (s2); return (s2);
} }
@ -208,7 +207,7 @@ session_previous_session(struct session *s)
struct session *s2; struct session *s2;
u_int i; u_int i;
if (ARRAY_LENGTH(&sessions) == 0 || session_index(s, &i) != 0) if (ARRAY_LENGTH(&sessions) == 0 || !session_alive(s))
return (NULL); return (NULL);
do { do {
@ -217,7 +216,7 @@ session_previous_session(struct session *s)
else else
i--; i--;
s2 = ARRAY_ITEM(&sessions, i); s2 = ARRAY_ITEM(&sessions, i);
} while (s2 == NULL || s2->flags & SESSION_DEAD); } while (s2 == NULL);
return (s2); return (s2);
} }

3
tmux.h
View File

@ -1,4 +1,4 @@
/* $Id: tmux.h,v 1.589 2010-12-22 15:31:00 tcunha Exp $ */ /* $Id: tmux.h,v 1.590 2010-12-22 15:31:56 tcunha Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -946,7 +946,6 @@ struct session {
struct paste_stack buffers; struct paste_stack buffers;
#define SESSION_UNATTACHED 0x1 /* not attached to any clients */ #define SESSION_UNATTACHED 0x1 /* not attached to any clients */
#define SESSION_DEAD 0x2
int flags; int flags;
struct termios *tio; struct termios *tio;