- (stevesk) OpenBSD CVS sync X11 localhost display

[openssh.git] / channels.h

diff --git a/channels.h b/channels.h
index 98bba1aedf0667de125bc5e329ce8534b5565c1d..840268fcf85ac00a516fcfb52ec7992881ca857f 100644 (file)
--- a/channels.h
+++ b/channels.h
@@ -32,7 +32,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* RCSID("$OpenBSD: channels.h,v 1.42 2001/06/26 17:27:23 markus Exp $"); */
+/* RCSID("$OpenBSD: channels.h,v 1.53 2001/11/29 21:10:51 stevesk Exp $"); */
 
 #ifndef CHANNEL_H
 #define CHANNEL_H
@@ -56,7 +56,7 @@
 #define SSH_CHANNEL_ZOMBIE             14      /* Almost dead. */
 #define SSH_CHANNEL_MAX_TYPE           15
 
-#define SSH_CHANNEL_PATH_LEN           30
+#define SSH_CHANNEL_PATH_LEN           256
 
 struct Channel;
 typedef struct Channel Channel;
@@ -68,7 +68,6 @@ struct Channel {
        int     type;           /* channel type/state */
        int     self;           /* my own channel identifier */
        int     remote_id;      /* channel identifier for remote peer */
-       /* peer can be reached over encrypted connection, via packet-sent */
        int     istate;         /* input from channel (state of receive half) */
        int     ostate;         /* output to channel  (state of transmit half) */
        int     flags;          /* close sent/rcvd */
@@ -77,6 +76,8 @@ struct Channel {
        int     efd;            /* extended fd */
        int     sock;           /* sock fd */
        int     isatty;         /* rfd is a tty */
+       int     force_drain;    /* force close on iEOF */
+       int     delayed;                /* fdset hack */
        Buffer  input;          /* data read from socket, to be sent over
                                 * encrypted connection */
        Buffer  output;         /* data received over encrypted connection for
@@ -102,7 +103,7 @@ struct Channel {
        channel_callback_fn     *cb_fn;
        void    *cb_arg;
        int     cb_event;
-       channel_callback_fn     *dettach_user;
+       channel_callback_fn     *detach_user;
 
        /* filter */
        channel_filter_fn       *input_filter;
@@ -140,8 +141,9 @@ struct Channel {
 Channel        *channel_lookup(int);
 Channel *channel_new(char *, int, int, int, int, int, int, int, char *, int);
 void    channel_set_fds(int, int, int, int, int, int);
-void     channel_free(Channel *);
-void     channel_free_all(void);
+void    channel_free(Channel *);
+void    channel_free_all(void);
+void    channel_stop_listening(void);
 
 void    channel_send_open(int);
 void    channel_request(int, char *, int);
@@ -150,6 +152,7 @@ void         channel_register_callback(int, int mtype, channel_callback_fn *, void *);
 void    channel_register_cleanup(int, channel_callback_fn *);
 void    channel_register_filter(int, channel_filter_fn *);
 void    channel_cancel_cleanup(int);
+int     channel_close_fd(int *);
 
 /* protocol handler */
 
@@ -167,24 +170,24 @@ void       channel_input_window_adjust(int, int, void *);
 
 /* file descriptor handling (read/write) */
 
-void    channel_prepare_select(fd_set **, fd_set **, 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);
 
 int      channel_not_very_much_buffered_data(void);
 void     channel_close_all(void);
-void     channel_free_all(void);
 int      channel_still_open(void);
 char   *channel_open_message(void);
 int     channel_find_open(void);
 
-/* channel_tcpfwd.c */
+/* tcp forwarding */
+void    channel_set_af(int af);
 void     channel_permit_all_opens(void);
 void    channel_add_permitted_opens(char *, int);
 void    channel_clear_permitted_opens(void);
 void     channel_input_port_forward_request(int, int);
 int     channel_connect_to(const char *, u_short);
-int     channel_connect_by_listen_adress(u_short);
+int     channel_connect_by_listen_address(u_short);
 void    channel_request_remote_forwarding(u_short, const char *, u_short);
 int     channel_request_local_forwarding(u_short, const char *, u_short, int);
 int
@@ -194,8 +197,7 @@ channel_request_forwarding(const char *, u_short, const char *, u_short, int,
 /* x11 forwarding */
 
 int     x11_connect_display(void);
-char   *x11_create_display(int);
-char   *x11_create_display_inet(int, int);
+int     x11_create_display_inet(int, int);
 void     x11_input_open(int, int, void *);
 void     x11_request_forwarding(void);
 void    x11_request_forwarding_with_spoofing(int, const char *, const char *);
@@ -211,7 +213,7 @@ void         auth_input_open_request(int, int, void *);
 
 /* channel close */
 
-int     chan_is_dead(Channel *);
+int     chan_is_dead(Channel *, int);
 void    chan_mark_dead(Channel *);
 void    chan_init_iostates(Channel *);
 void    chan_init(void);