diff options
author | Damien Miller <djm@mindrot.org> | 2008-05-19 15:35:33 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2008-05-19 15:35:33 +1000 |
commit | 5771ed7d1b5af26bc991151ab977e77bf1e87666 (patch) | |
tree | d24e88330fb1b3b2de2e1ed770ba0f28963c5049 /clientloop.h | |
parent | 7207f64a23a49a719aad3083c068f50e5034ccb8 (diff) |
- djm@cvs.openbsd.org 2008/05/08 13:06:11
[clientloop.c clientloop.h ssh.c]
Use new channel status confirmation callback system to properly deal
with "important" channel requests that fail, in particular command exec,
shell and subsystem requests. Previously we would optimistically assume
that the requests would always succeed, which could cause hangs if they
did not (e.g. when the server runs out of fds) or were unimplemented by
the server (bz #1384)
Also, properly report failing multiplex channel requests via the mux
client stderr (subject to LogLevel in the mux master) - better than
silently failing.
most bits ok markus@ (as part of a larger diff)
Diffstat (limited to 'clientloop.h')
-rw-r--r-- | clientloop.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clientloop.h b/clientloop.h index c7d2233d0..cb2d7c089 100644 --- a/clientloop.h +++ b/clientloop.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: clientloop.h,v 1.17 2007/08/07 07:32:53 djm Exp $ */ | 1 | /* $OpenBSD: clientloop.h,v 1.18 2008/05/08 13:06:11 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -43,7 +43,7 @@ void client_x11_get_proto(const char *, const char *, u_int, | |||
43 | char **, char **); | 43 | char **, char **); |
44 | void client_global_request_reply_fwd(int, u_int32_t, void *); | 44 | void client_global_request_reply_fwd(int, u_int32_t, void *); |
45 | void client_session2_setup(int, int, int, const char *, struct termios *, | 45 | void client_session2_setup(int, int, int, const char *, struct termios *, |
46 | int, Buffer *, char **, dispatch_fn *); | 46 | int, Buffer *, char **); |
47 | int client_request_tun_fwd(int, int, int); | 47 | int client_request_tun_fwd(int, int, int); |
48 | 48 | ||
49 | /* Multiplexing protocol version */ | 49 | /* Multiplexing protocol version */ |