diff options
author | Colin Watson <cjwatson@debian.org> | 2017-10-04 11:23:58 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2017-10-04 11:23:58 +0100 |
commit | 62f54f20bf351468e0124f63cc2902ee40d9b0e9 (patch) | |
tree | 3e090f2711b94ca5029d3fa3e8047b1ed1448b1f /clientloop.h | |
parent | 6fabaf6fd9b07cc8bc6a17c9c4a5b76849cfc874 (diff) | |
parent | 66bf74a92131b7effe49fb0eefe5225151869dc5 (diff) |
Import openssh_7.6p1.orig.tar.gz
Diffstat (limited to 'clientloop.h')
-rw-r--r-- | clientloop.h | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/clientloop.h b/clientloop.h index ae83aa8cf..a1975ccc8 100644 --- a/clientloop.h +++ b/clientloop.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: clientloop.h,v 1.33 2016/09/30 09:19:13 markus Exp $ */ | 1 | /* $OpenBSD: clientloop.h,v 1.34 2017/09/12 06:32:07 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -37,28 +37,31 @@ | |||
37 | 37 | ||
38 | #include <termios.h> | 38 | #include <termios.h> |
39 | 39 | ||
40 | struct ssh; | ||
41 | |||
40 | /* Client side main loop for the interactive session. */ | 42 | /* Client side main loop for the interactive session. */ |
41 | int client_loop(int, int, int); | 43 | int client_loop(struct ssh *, int, int, int); |
42 | int client_x11_get_proto(const char *, const char *, u_int, u_int, | 44 | int client_x11_get_proto(struct ssh *, const char *, const char *, |
43 | char **, char **); | 45 | u_int, u_int, char **, char **); |
44 | void client_global_request_reply_fwd(int, u_int32_t, void *); | 46 | void client_global_request_reply_fwd(int, u_int32_t, void *); |
45 | void client_session2_setup(int, int, int, const char *, struct termios *, | 47 | void client_session2_setup(struct ssh *, int, int, int, |
46 | int, Buffer *, char **); | 48 | const char *, struct termios *, int, Buffer *, char **); |
47 | int client_request_tun_fwd(int, int, int); | 49 | int client_request_tun_fwd(struct ssh *, int, int, int); |
48 | void client_stop_mux(void); | 50 | void client_stop_mux(void); |
49 | 51 | ||
50 | /* Escape filter for protocol 2 sessions */ | 52 | /* Escape filter for protocol 2 sessions */ |
51 | void *client_new_escape_filter_ctx(int); | 53 | void *client_new_escape_filter_ctx(int); |
52 | void client_filter_cleanup(int, void *); | 54 | void client_filter_cleanup(struct ssh *, int, void *); |
53 | int client_simple_escape_filter(Channel *, char *, int); | 55 | int client_simple_escape_filter(struct ssh *, Channel *, char *, int); |
54 | 56 | ||
55 | /* Global request confirmation callbacks */ | 57 | /* Global request confirmation callbacks */ |
56 | typedef void global_confirm_cb(int, u_int32_t seq, void *); | 58 | typedef void global_confirm_cb(struct ssh *, int, u_int32_t, void *); |
57 | void client_register_global_confirm(global_confirm_cb *, void *); | 59 | void client_register_global_confirm(global_confirm_cb *, void *); |
58 | 60 | ||
59 | /* Channel request confirmation callbacks */ | 61 | /* Channel request confirmation callbacks */ |
60 | enum confirm_action { CONFIRM_WARN = 0, CONFIRM_CLOSE, CONFIRM_TTY }; | 62 | enum confirm_action { CONFIRM_WARN = 0, CONFIRM_CLOSE, CONFIRM_TTY }; |
61 | void client_expect_confirm(int, const char *, enum confirm_action); | 63 | void client_expect_confirm(struct ssh *, int, const char *, |
64 | enum confirm_action); | ||
62 | 65 | ||
63 | /* Multiplexing protocol version */ | 66 | /* Multiplexing protocol version */ |
64 | #define SSHMUX_VER 4 | 67 | #define SSHMUX_VER 4 |
@@ -73,8 +76,8 @@ void client_expect_confirm(int, const char *, enum confirm_action); | |||
73 | #define SSHMUX_COMMAND_CANCEL_FWD 7 /* Cancel forwarding(s) */ | 76 | #define SSHMUX_COMMAND_CANCEL_FWD 7 /* Cancel forwarding(s) */ |
74 | #define SSHMUX_COMMAND_PROXY 8 /* Open new connection */ | 77 | #define SSHMUX_COMMAND_PROXY 8 /* Open new connection */ |
75 | 78 | ||
76 | void muxserver_listen(void); | 79 | void muxserver_listen(struct ssh *); |
77 | int muxclient(const char *); | 80 | int muxclient(const char *); |
78 | void mux_exit_message(Channel *, int); | 81 | void mux_exit_message(struct ssh *, Channel *, int); |
79 | void mux_tty_alloc_failed(Channel *); | 82 | void mux_tty_alloc_failed(struct ssh *ssh, Channel *); |
80 | 83 | ||