diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2023-01-06 03:47:18 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2023-01-06 06:23:16 +0100 |
| commit | 2d1ff2b9431393ad99ef496d5e3b9dd0d4f5ac8c (patch) | |
| tree | 3f244d571a85c08ae82b00c079af13b12e49e462 /monitor_wrap.c | |
| parent | upstream: Add channel_set_xtype() (diff) | |
| download | openssh-2d1ff2b9431393ad99ef496d5e3b9dd0d4f5ac8c.tar.xz openssh-2d1ff2b9431393ad99ef496d5e3b9dd0d4f5ac8c.zip | |
upstream: Implement channel inactivity timeouts
This adds a sshd_config ChannelTimeouts directive that allows channels that
have not seen traffic in a configurable interval to be automatically closed.
Different timeouts may be applied to session, X11, agent and TCP forwarding
channels.
Note: this only affects channels over an opened SSH connection and not
the connection itself. Most clients close the connection when their channels
go away, with a notable exception being ssh(1) in multiplexing mode.
ok markus dtucker
OpenBSD-Commit-ID: ae8bba3ed9d9f95ff2e2dc8dcadfa36b48e6c0b8
Diffstat (limited to 'monitor_wrap.c')
| -rw-r--r-- | monitor_wrap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c index b2c85205e..8e379a15c 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monitor_wrap.c,v 1.125 2022/06/15 16:08:25 djm Exp $ */ +/* $OpenBSD: monitor_wrap.c,v 1.126 2023/01/06 02:47:18 djm Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Markus Friedl <markus@openbsd.org> @@ -339,6 +339,7 @@ out: for (i = 0; i < options.num_log_verbose; i++) log_verbose_add(options.log_verbose[i]); process_permitopen(ssh, &options); + process_channel_timeouts(ssh, &options); free(newopts); sshbuf_free(m); |