diff options
| author | Damien Miller <djm@mindrot.org> | 2013-06-10 13:07:11 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2013-06-10 13:07:11 +1000 |
| commit | 36187093ea0b2d2240c043417b8949611687e105 (patch) | |
| tree | e399ca31e1573856ddff2f8cdfb6ea051b57ed1d /channels.h | |
| parent | ae133d4b31af05bb232d797419f498f3ae7e9f2d (diff) | |
| download | openssh-git-36187093ea0b2d2240c043417b8949611687e105.tar.gz | |
- dtucker@cvs.openbsd.org 2013/06/07 15:37:52
[channels.c channels.h clientloop.c]
Add an "ABANDONED" channel state and use for mux sessions that are
disconnected via the ~. escape sequence. Channels in this state will
be able to close if the server responds, but do not count as active channels.
This means that if you ~. all of the mux clients when using ControlPersist
on a broken network, the backgrounded mux master will exit when the
Control Persist time expires rather than hanging around indefinitely.
bz#1917, also reported and tested by tedu@. ok djm@ markus@.
Diffstat (limited to 'channels.h')
| -rw-r--r-- | channels.h | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: channels.h,v 1.112 2013/06/02 21:01:51 dtucker Exp $ */ +/* $OpenBSD: channels.h,v 1.113 2013/06/07 15:37:52 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -55,7 +55,8 @@ #define SSH_CHANNEL_ZOMBIE 14 /* Almost dead. */ #define SSH_CHANNEL_MUX_LISTENER 15 /* Listener for mux conn. */ #define SSH_CHANNEL_MUX_CLIENT 16 /* Conn. to mux slave */ -#define SSH_CHANNEL_MAX_TYPE 17 +#define SSH_CHANNEL_ABANDONED 17 /* Abandoned session, eg mux */ +#define SSH_CHANNEL_MAX_TYPE 18 #define CHANNEL_CANCEL_PORT_STATIC -1 |