diff options
Diffstat (limited to 'clientloop.c')
-rw-r--r-- | clientloop.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/clientloop.c b/clientloop.c index 367b682ff..0020637e8 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: clientloop.c,v 1.296 2017/05/03 21:08:09 naddy Exp $ */ | 1 | /* $OpenBSD: clientloop.c,v 1.297 2017/05/30 14:23:52 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -459,7 +459,7 @@ client_check_window_change(void) | |||
459 | } | 459 | } |
460 | 460 | ||
461 | static int | 461 | static int |
462 | client_global_request_reply(int type, u_int32_t seq, void *ctxt) | 462 | client_global_request_reply(int type, u_int32_t seq, struct ssh *ssh) |
463 | { | 463 | { |
464 | struct global_confirm *gc; | 464 | struct global_confirm *gc; |
465 | 465 | ||
@@ -1642,7 +1642,7 @@ client_request_tun_fwd(int tun_mode, int local_tun, int remote_tun) | |||
1642 | 1642 | ||
1643 | /* XXXX move to generic input handler */ | 1643 | /* XXXX move to generic input handler */ |
1644 | static int | 1644 | static int |
1645 | client_input_channel_open(int type, u_int32_t seq, void *ctxt) | 1645 | client_input_channel_open(int type, u_int32_t seq, struct ssh *ssh) |
1646 | { | 1646 | { |
1647 | Channel *c = NULL; | 1647 | Channel *c = NULL; |
1648 | char *ctype; | 1648 | char *ctype; |
@@ -1698,7 +1698,7 @@ client_input_channel_open(int type, u_int32_t seq, void *ctxt) | |||
1698 | } | 1698 | } |
1699 | 1699 | ||
1700 | static int | 1700 | static int |
1701 | client_input_channel_req(int type, u_int32_t seq, void *ctxt) | 1701 | client_input_channel_req(int type, u_int32_t seq, struct ssh *ssh) |
1702 | { | 1702 | { |
1703 | Channel *c = NULL; | 1703 | Channel *c = NULL; |
1704 | int exitval, id, reply, success = 0; | 1704 | int exitval, id, reply, success = 0; |
@@ -1706,7 +1706,7 @@ client_input_channel_req(int type, u_int32_t seq, void *ctxt) | |||
1706 | 1706 | ||
1707 | id = packet_get_int(); | 1707 | id = packet_get_int(); |
1708 | c = channel_lookup(id); | 1708 | c = channel_lookup(id); |
1709 | if (channel_proxy_upstream(c, type, seq, ctxt)) | 1709 | if (channel_proxy_upstream(c, type, seq, ssh)) |
1710 | return 0; | 1710 | return 0; |
1711 | rtype = packet_get_string(NULL); | 1711 | rtype = packet_get_string(NULL); |
1712 | reply = packet_get_char(); | 1712 | reply = packet_get_char(); |
@@ -2136,7 +2136,7 @@ client_input_hostkeys(void) | |||
2136 | } | 2136 | } |
2137 | 2137 | ||
2138 | static int | 2138 | static int |
2139 | client_input_global_request(int type, u_int32_t seq, void *ctxt) | 2139 | client_input_global_request(int type, u_int32_t seq, struct ssh *ssh) |
2140 | { | 2140 | { |
2141 | char *rtype; | 2141 | char *rtype; |
2142 | int want_reply; | 2142 | int want_reply; |