Merge 3.9p1 to the trunk.

1 files changed, 8 insertions, 3 deletions

diff --git a/channels.h b/channels.h
index 7d981479b..f8dc8249c 100644
--- a/channels.h
+++ b/channels.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: channels.h,v 1.71 2003/09/23 20:41:11 markus Exp $    */
+/*      $OpenBSD: channels.h,v 1.74 2004/08/11 21:43:04 avsm Exp $      */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -76,6 +76,7 @@ struct Channel {
         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     wfd_isatty;     /* wfd is a tty */
         int     force_drain;    /* force close on iEOF */
@@ -105,6 +106,7 @@ struct Channel {
         /* callback */
         channel_callback_fn     *confirm;
         channel_callback_fn     *detach_user;
+        void                    *confirm_ctx;
 
         /* filter */
         channel_filter_fn       *input_filter;
@@ -161,10 +163,11 @@ void	 channel_stop_listening(void);
 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     channel_register_confirm(int, channel_callback_fn *, void *);
 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 */
 
@@ -181,7 +184,7 @@ void	 channel_input_window_adjust(int, u_int32_t, void *);
 
 /* file descriptor handling (read/write) */
 
-void     channel_prepare_select(fd_set **, fd_set **, int *, int*, int);
+void     channel_prepare_select(fd_set **, fd_set **, int *, u_int*, int);
 void     channel_after_select(fd_set *, fd_set *);
 void     channel_output_poll(void);
 
@@ -200,8 +203,10 @@ void     channel_input_port_forward_request(int, int);
 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 */