Import of OpenSSH 4.7p1

[gssapi-openssh.git] / openssh / channels.h

diff --git a/openssh/channels.h b/openssh/channels.h
index f8dc8249c2a24cb184ce76161da8b8f6540c1bfe..b632a86af3682abfb9b9848f390df4a00e95739e 100644 (file)
--- a/openssh/channels.h
+++ b/openssh/channels.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: channels.h,v 1.74 2004/08/11 21:43:04 avsm Exp $      */
+/* $OpenBSD: channels.h,v 1.89 2007/06/11 09:14:00 markus Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -38,8 +38,6 @@
 #ifndef CHANNEL_H
 #define CHANNEL_H
 
-#include "buffer.h"
-
 /* Definitions for channel types. */
 #define SSH_CHANNEL_X11_LISTENER       1       /* Listening for inet X11 conn. */
 #define SSH_CHANNEL_PORT_LISTENER      2       /* Listening on a port. */
@@ -63,7 +61,8 @@ struct Channel;
 typedef struct Channel Channel;
 
 typedef void channel_callback_fn(int, void *);
-typedef int channel_filter_fn(struct Channel *, char *, int);
+typedef int channel_infilter_fn(struct Channel *, char *, int);
+typedef u_char *channel_outfilter_fn(struct Channel *, u_char **, u_int *);
 
 struct Channel {
        int     type;           /* channel type/state */
@@ -79,6 +78,7 @@ struct Channel {
        int     ctl_fd;         /* control fd (client sharing) */
        int     isatty;         /* rfd is a tty */
        int     wfd_isatty;     /* wfd is a tty */
+       int     client_tty;     /* (client) TTY has been requested */
        int     force_drain;    /* force close on iEOF */
        int     delayed;                /* fdset hack */
        Buffer  input;          /* data read from socket, to be sent over
@@ -105,11 +105,15 @@ struct Channel {
 
        /* callback */
        channel_callback_fn     *confirm;
-       channel_callback_fn     *detach_user;
        void                    *confirm_ctx;
+       channel_callback_fn     *detach_user;
+       int                     detach_close;
 
        /* filter */
-       channel_filter_fn       *input_filter;
+       channel_infilter_fn     *input_filter;
+       channel_outfilter_fn    *output_filter;
+
+       int     datagram;       /* keep boundaries */
 };
 
 #define CHAN_EXTENDED_IGNORE           0
@@ -118,9 +122,9 @@ struct Channel {
 
 /* default window/packet sizes for tcp/x11-fwd-channel */
 #define CHAN_SES_PACKET_DEFAULT        (32*1024)
-#define CHAN_SES_WINDOW_DEFAULT        (4*CHAN_SES_PACKET_DEFAULT)
+#define CHAN_SES_WINDOW_DEFAULT        (64*CHAN_SES_PACKET_DEFAULT)
 #define CHAN_TCP_PACKET_DEFAULT        (32*1024)
-#define CHAN_TCP_WINDOW_DEFAULT        (4*CHAN_TCP_PACKET_DEFAULT)
+#define CHAN_TCP_WINDOW_DEFAULT        (64*CHAN_TCP_PACKET_DEFAULT)
 #define CHAN_X11_PACKET_DEFAULT        (16*1024)
 #define CHAN_X11_WINDOW_DEFAULT        (4*CHAN_X11_PACKET_DEFAULT)
 
@@ -141,6 +145,8 @@ struct Channel {
 #define CHAN_EOF_SENT                  0x04
 #define CHAN_EOF_RCVD                  0x08
 
+#define CHAN_RBUF      16*1024
+
 /* check whether 'efd' is still in use */
 #define CHANNEL_EFD_INPUT_ACTIVE(c) \
        (compat20 && c->extended_usage == CHAN_EXTENDED_READ && \
@@ -148,11 +154,12 @@ struct Channel {
        buffer_len(&c->extended) > 0))
 #define CHANNEL_EFD_OUTPUT_ACTIVE(c) \
        (compat20 && c->extended_usage == CHAN_EXTENDED_WRITE && \
-       ((c->efd != -1 && !(c->flags & (CHAN_EOF_RCVD|CHAN_CLOSE_RCVD))) || \
+       c->efd != -1 && (!(c->flags & (CHAN_EOF_RCVD|CHAN_CLOSE_RCVD)) || \
        buffer_len(&c->extended) > 0))
 
 /* channel management */
 
+Channel        *channel_by_id(int);
 Channel        *channel_lookup(int);
 Channel *channel_new(char *, int, int, int, int, u_int, u_int, int, char *, int);
 void    channel_set_fds(int, int, int, int, int, int, u_int);
@@ -162,9 +169,9 @@ 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_cleanup(int, channel_callback_fn *, int);
 void    channel_register_confirm(int, channel_callback_fn *, void *);
-void    channel_register_filter(int, channel_filter_fn *);
+void    channel_register_filter(int, channel_infilter_fn *, channel_outfilter_fn *);
 void    channel_cancel_cleanup(int);
 int     channel_close_fd(int *);
 void    channel_send_window_changes(void);
@@ -198,22 +205,27 @@ int        channel_find_open(void);
 void    channel_set_af(int af);
 void     channel_permit_all_opens(void);
 void    channel_add_permitted_opens(char *, int);
+int     channel_add_adm_permitted_opens(char *, int);
 void    channel_clear_permitted_opens(void);
-void     channel_input_port_forward_request(int, int);
+void    channel_clear_adm_permitted_opens(void);
+int      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_request_remote_forwarding(const char *, u_short,
+            const char *, u_short);
+int     channel_setup_local_fwd_listener(const char *, u_short,
+            const char *, u_short, int);
+void    channel_request_rforward_cancel(const char *host, u_short port);
 int     channel_setup_remote_fwd_listener(const char *, u_short, int);
 int     channel_cancel_rport_listener(const char *, u_short);
 
 /* x11 forwarding */
 
 int     x11_connect_display(void);
-int     x11_create_display_inet(int, int, int, u_int *);
+int     x11_create_display_inet(int, int, int, u_int *, int **);
 void     x11_input_open(int, u_int32_t, void *);
-void    x11_request_forwarding_with_spoofing(int, const char *, const char *);
+void    x11_request_forwarding_with_spoofing(int, const char *, const char *,
+           const char *);
 void    deny_input_open(int, u_int32_t, void *);
 
 /* agent forwarding */