diff options
Diffstat (limited to 'channels.c')
-rw-r--r-- | channels.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/channels.c b/channels.c index 48479c456..287e16d10 100644 --- a/channels.c +++ b/channels.c | |||
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: channels.c,v 1.68 2000/09/07 20:40:29 markus Exp $"); | 43 | RCSID("$OpenBSD: channels.c,v 1.69 2000/09/21 11:25:33 markus Exp $"); |
44 | 44 | ||
45 | #include "ssh.h" | 45 | #include "ssh.h" |
46 | #include "packet.h" | 46 | #include "packet.h" |
@@ -998,7 +998,7 @@ channel_output_poll() | |||
998 | */ | 998 | */ |
999 | 999 | ||
1000 | void | 1000 | void |
1001 | channel_input_data(int type, int plen) | 1001 | channel_input_data(int type, int plen, void *ctxt) |
1002 | { | 1002 | { |
1003 | int id; | 1003 | int id; |
1004 | char *data; | 1004 | char *data; |
@@ -1043,7 +1043,7 @@ channel_input_data(int type, int plen) | |||
1043 | xfree(data); | 1043 | xfree(data); |
1044 | } | 1044 | } |
1045 | void | 1045 | void |
1046 | channel_input_extended_data(int type, int plen) | 1046 | channel_input_extended_data(int type, int plen, void *ctxt) |
1047 | { | 1047 | { |
1048 | int id; | 1048 | int id; |
1049 | int tcode; | 1049 | int tcode; |
@@ -1113,7 +1113,7 @@ channel_not_very_much_buffered_data() | |||
1113 | } | 1113 | } |
1114 | 1114 | ||
1115 | void | 1115 | void |
1116 | channel_input_ieof(int type, int plen) | 1116 | channel_input_ieof(int type, int plen, void *ctxt) |
1117 | { | 1117 | { |
1118 | int id; | 1118 | int id; |
1119 | Channel *c; | 1119 | Channel *c; |
@@ -1128,7 +1128,7 @@ channel_input_ieof(int type, int plen) | |||
1128 | } | 1128 | } |
1129 | 1129 | ||
1130 | void | 1130 | void |
1131 | channel_input_close(int type, int plen) | 1131 | channel_input_close(int type, int plen, void *ctxt) |
1132 | { | 1132 | { |
1133 | int id; | 1133 | int id; |
1134 | Channel *c; | 1134 | Channel *c; |
@@ -1167,7 +1167,7 @@ channel_input_close(int type, int plen) | |||
1167 | 1167 | ||
1168 | /* proto version 1.5 overloads CLOSE_CONFIRMATION with OCLOSE */ | 1168 | /* proto version 1.5 overloads CLOSE_CONFIRMATION with OCLOSE */ |
1169 | void | 1169 | void |
1170 | channel_input_oclose(int type, int plen) | 1170 | channel_input_oclose(int type, int plen, void *ctxt) |
1171 | { | 1171 | { |
1172 | int id = packet_get_int(); | 1172 | int id = packet_get_int(); |
1173 | Channel *c = channel_lookup(id); | 1173 | Channel *c = channel_lookup(id); |
@@ -1178,7 +1178,7 @@ channel_input_oclose(int type, int plen) | |||
1178 | } | 1178 | } |
1179 | 1179 | ||
1180 | void | 1180 | void |
1181 | channel_input_close_confirmation(int type, int plen) | 1181 | channel_input_close_confirmation(int type, int plen, void *ctxt) |
1182 | { | 1182 | { |
1183 | int id = packet_get_int(); | 1183 | int id = packet_get_int(); |
1184 | Channel *c = channel_lookup(id); | 1184 | Channel *c = channel_lookup(id); |
@@ -1194,7 +1194,7 @@ channel_input_close_confirmation(int type, int plen) | |||
1194 | } | 1194 | } |
1195 | 1195 | ||
1196 | void | 1196 | void |
1197 | channel_input_open_confirmation(int type, int plen) | 1197 | channel_input_open_confirmation(int type, int plen, void *ctxt) |
1198 | { | 1198 | { |
1199 | int id, remote_id; | 1199 | int id, remote_id; |
1200 | Channel *c; | 1200 | Channel *c; |
@@ -1228,7 +1228,7 @@ channel_input_open_confirmation(int type, int plen) | |||
1228 | } | 1228 | } |
1229 | 1229 | ||
1230 | void | 1230 | void |
1231 | channel_input_open_failure(int type, int plen) | 1231 | channel_input_open_failure(int type, int plen, void *ctxt) |
1232 | { | 1232 | { |
1233 | int id; | 1233 | int id; |
1234 | Channel *c; | 1234 | Channel *c; |
@@ -1256,7 +1256,7 @@ channel_input_open_failure(int type, int plen) | |||
1256 | } | 1256 | } |
1257 | 1257 | ||
1258 | void | 1258 | void |
1259 | channel_input_channel_request(int type, int plen) | 1259 | channel_input_channel_request(int type, int plen, void *ctxt) |
1260 | { | 1260 | { |
1261 | int id; | 1261 | int id; |
1262 | Channel *c; | 1262 | Channel *c; |
@@ -1281,7 +1281,7 @@ debug("cb_fn %p cb_event %d", c->cb_fn , c->cb_event); | |||
1281 | } | 1281 | } |
1282 | 1282 | ||
1283 | void | 1283 | void |
1284 | channel_input_window_adjust(int type, int plen) | 1284 | channel_input_window_adjust(int type, int plen, void *ctxt) |
1285 | { | 1285 | { |
1286 | Channel *c; | 1286 | Channel *c; |
1287 | int id, adjust; | 1287 | int id, adjust; |
@@ -1659,7 +1659,7 @@ channel_connect_to(const char *host, u_short host_port) | |||
1659 | */ | 1659 | */ |
1660 | 1660 | ||
1661 | void | 1661 | void |
1662 | channel_input_port_open(int type, int plen) | 1662 | channel_input_port_open(int type, int plen, void *ctxt) |
1663 | { | 1663 | { |
1664 | u_short host_port; | 1664 | u_short host_port; |
1665 | char *host, *originator_string; | 1665 | char *host, *originator_string; |
@@ -2000,7 +2000,7 @@ x11_connect_display(void) | |||
2000 | */ | 2000 | */ |
2001 | 2001 | ||
2002 | void | 2002 | void |
2003 | x11_input_open(int type, int plen) | 2003 | x11_input_open(int type, int plen, void *ctxt) |
2004 | { | 2004 | { |
2005 | int remote_channel, sock = 0, newch; | 2005 | int remote_channel, sock = 0, newch; |
2006 | char *remote_host; | 2006 | char *remote_host; |
@@ -2215,7 +2215,7 @@ auth_input_request_forwarding(struct passwd * pw) | |||
2215 | /* This is called to process an SSH_SMSG_AGENT_OPEN message. */ | 2215 | /* This is called to process an SSH_SMSG_AGENT_OPEN message. */ |
2216 | 2216 | ||
2217 | void | 2217 | void |
2218 | auth_input_open_request(int type, int plen) | 2218 | auth_input_open_request(int type, int plen, void *ctxt) |
2219 | { | 2219 | { |
2220 | int remch, sock, newch; | 2220 | int remch, sock, newch; |
2221 | char *dummyname; | 2221 | char *dummyname; |