=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/channels.h,v retrieving revision 1.70.6.2 retrieving revision 1.71 diff -u -r1.70.6.2 -r1.71 --- src/usr.bin/ssh/channels.h 2004/08/19 22:37:31 1.70.6.2 +++ src/usr.bin/ssh/channels.h 2003/09/23 20:41:11 1.71 @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.h,v 1.70.6.2 2004/08/19 22:37:31 brad Exp $ */ +/* $OpenBSD: channels.h,v 1.71 2003/09/23 20:41:11 markus Exp $ */ /* * Author: Tatu Ylonen @@ -76,7 +76,6 @@ int wfd; /* write fd */ int efd; /* extended fd */ int sock; /* sock fd */ - int ctl_fd; /* control fd (client sharing) */ int isatty; /* rfd is a tty */ int force_drain; /* force close on iEOF */ int delayed; /* fdset hack */ @@ -105,7 +104,6 @@ /* callback */ channel_callback_fn *confirm; channel_callback_fn *detach_user; - void *confirm_ctx; /* filter */ channel_filter_fn *input_filter; @@ -162,11 +160,10 @@ void channel_send_open(int); void channel_request_start(int, char *, int); void channel_register_cleanup(int, channel_callback_fn *); -void channel_register_confirm(int, channel_callback_fn *, void *); +void channel_register_confirm(int, channel_callback_fn *); void channel_register_filter(int, channel_filter_fn *); void channel_cancel_cleanup(int); int channel_close_fd(int *); -void channel_send_window_changes(void); /* protocol handler */ @@ -183,7 +180,7 @@ /* file descriptor handling (read/write) */ -void channel_prepare_select(fd_set **, fd_set **, int *, u_int*, int); +void channel_prepare_select(fd_set **, fd_set **, int *, int*, int); void channel_after_select(fd_set *, fd_set *); void channel_output_poll(void); @@ -202,10 +199,8 @@ int channel_connect_to(const char *, u_short); int channel_connect_by_listen_address(u_short); void channel_request_remote_forwarding(u_short, const char *, u_short); -void channel_request_rforward_cancel(u_short port); int channel_setup_local_fwd_listener(u_short, const char *, u_short, int); int channel_setup_remote_fwd_listener(const char *, u_short, int); -int channel_cancel_rport_listener(const char *, u_short); /* x11 forwarding */