diff options
author | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
commit | f38224d546cdde55f45c13d3d8225d273a3f920e (patch) | |
tree | a91a26b88ac90dc72d0ea3767feabb341eaa50a8 /clientloop.h | |
parent | 338146a3fc257e216fe5c10fe40e6896b40d7739 (diff) | |
parent | e90790abaf031e037f444a6658e136e48577ea49 (diff) |
merge 5.9p1
Diffstat (limited to 'clientloop.h')
-rw-r--r-- | clientloop.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/clientloop.h b/clientloop.h index 52115db6e..a259b5e14 100644 --- a/clientloop.h +++ b/clientloop.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: clientloop.h,v 1.25 2010/06/25 23:15:36 djm Exp $ */ | 1 | /* $OpenBSD: clientloop.h,v 1.28 2011/06/22 22:08:42 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -45,6 +45,7 @@ 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 **); | 46 | int, Buffer *, char **); |
47 | int client_request_tun_fwd(int, int, int); | 47 | int client_request_tun_fwd(int, int, int); |
48 | void client_stop_mux(void); | ||
48 | 49 | ||
49 | /* Escape filter for protocol 2 sessions */ | 50 | /* Escape filter for protocol 2 sessions */ |
50 | void *client_new_escape_filter_ctx(int); | 51 | void *client_new_escape_filter_ctx(int); |
@@ -55,6 +56,10 @@ int client_simple_escape_filter(Channel *, char *, int); | |||
55 | typedef void global_confirm_cb(int, u_int32_t seq, void *); | 56 | typedef void global_confirm_cb(int, u_int32_t seq, void *); |
56 | void client_register_global_confirm(global_confirm_cb *, void *); | 57 | void client_register_global_confirm(global_confirm_cb *, void *); |
57 | 58 | ||
59 | /* Channel request confirmation callbacks */ | ||
60 | enum confirm_action { CONFIRM_WARN = 0, CONFIRM_CLOSE, CONFIRM_TTY }; | ||
61 | void client_expect_confirm(int, const char *, enum confirm_action); | ||
62 | |||
58 | /* Multiplexing protocol version */ | 63 | /* Multiplexing protocol version */ |
59 | #define SSHMUX_VER 4 | 64 | #define SSHMUX_VER 4 |
60 | 65 | ||
@@ -64,7 +69,10 @@ void client_register_global_confirm(global_confirm_cb *, void *); | |||
64 | #define SSHMUX_COMMAND_TERMINATE 3 /* Ask master to exit */ | 69 | #define SSHMUX_COMMAND_TERMINATE 3 /* Ask master to exit */ |
65 | #define SSHMUX_COMMAND_STDIO_FWD 4 /* Open stdio fwd (ssh -W) */ | 70 | #define SSHMUX_COMMAND_STDIO_FWD 4 /* Open stdio fwd (ssh -W) */ |
66 | #define SSHMUX_COMMAND_FORWARD 5 /* Forward only, no command */ | 71 | #define SSHMUX_COMMAND_FORWARD 5 /* Forward only, no command */ |
72 | #define SSHMUX_COMMAND_STOP 6 /* Disable mux but not conn */ | ||
67 | 73 | ||
68 | void muxserver_listen(void); | 74 | void muxserver_listen(void); |
69 | void muxclient(const char *); | 75 | void muxclient(const char *); |
70 | void mux_exit_message(Channel *, int); | 76 | void mux_exit_message(Channel *, int); |
77 | void mux_tty_alloc_failed(Channel *); | ||
78 | |||