diff options
author | markus@openbsd.org <markus@openbsd.org> | 2017-05-30 14:23:52 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-31 10:50:05 +1000 |
commit | 2ae666a8fc20b3b871b2f1b90ad65cc027336ccd (patch) | |
tree | f13f1c949ae60c16160acebbfb680c3dc7b13fe5 /channels.h | |
parent | 94583beb24a6c5fd19cedb9104ab2d2d5cd052b6 (diff) |
upstream commit
protocol handlers all get struct ssh passed; ok djm@
Upstream-ID: 0ca9ea2a5d01a6d2ded94c5024456a930c5bfb5d
Diffstat (limited to 'channels.h')
-rw-r--r-- | channels.h | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/channels.h b/channels.h index fa38a4e71..36e5363aa 100644 --- a/channels.h +++ b/channels.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.h,v 1.125 2017/05/26 19:35:50 markus Exp $ */ | 1 | /* $OpenBSD: channels.h,v 1.126 2017/05/30 14:23:52 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -61,6 +61,7 @@ | |||
61 | 61 | ||
62 | #define CHANNEL_CANCEL_PORT_STATIC -1 | 62 | #define CHANNEL_CANCEL_PORT_STATIC -1 |
63 | 63 | ||
64 | struct ssh; | ||
64 | struct Channel; | 65 | struct Channel; |
65 | typedef struct Channel Channel; | 66 | typedef struct Channel Channel; |
66 | 67 | ||
@@ -232,18 +233,19 @@ void channel_send_window_changes(void); | |||
232 | /* mux proxy support */ | 233 | /* mux proxy support */ |
233 | 234 | ||
234 | int channel_proxy_downstream(Channel *mc); | 235 | int channel_proxy_downstream(Channel *mc); |
235 | int channel_proxy_upstream(Channel *, int, u_int32_t, void *); | 236 | int channel_proxy_upstream(Channel *, int, u_int32_t, struct ssh *); |
236 | 237 | ||
237 | /* protocol handler */ | 238 | /* protocol handler */ |
238 | 239 | ||
239 | int channel_input_data(int, u_int32_t, void *); | 240 | int channel_input_data(int, u_int32_t, struct ssh *); |
240 | int channel_input_extended_data(int, u_int32_t, void *); | 241 | int channel_input_extended_data(int, u_int32_t, struct ssh *); |
241 | int channel_input_ieof(int, u_int32_t, void *); | 242 | int channel_input_ieof(int, u_int32_t, struct ssh *); |
242 | int channel_input_oclose(int, u_int32_t, void *); | 243 | int channel_input_oclose(int, u_int32_t, struct ssh *); |
243 | int channel_input_open_confirmation(int, u_int32_t, void *); | 244 | int channel_input_open_confirmation(int, u_int32_t, struct ssh *); |
244 | int channel_input_open_failure(int, u_int32_t, void *); | 245 | int channel_input_open_failure(int, u_int32_t, struct ssh *); |
245 | int channel_input_window_adjust(int, u_int32_t, void *); | 246 | int channel_input_port_open(int, u_int32_t, struct ssh *); |
246 | int channel_input_status_confirm(int, u_int32_t, void *); | 247 | int channel_input_window_adjust(int, u_int32_t, struct ssh *); |
248 | int channel_input_status_confirm(int, u_int32_t, struct ssh *); | ||
247 | 249 | ||
248 | /* file descriptor handling (read/write) */ | 250 | /* file descriptor handling (read/write) */ |
249 | 251 | ||