[BACK]Return to channels.h CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/channels.h between version 1.50.2.5 and 1.51

version 1.50.2.5, 2002/06/26 18:22:34 version 1.51, 2001/11/07 22:53:21
Line 1 
Line 1 
 /*      $OpenBSD$       */  
   
 /*  /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>   * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland   * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
Line 12 
Line 10 
  * called by a name other than "ssh" or "Secure Shell".   * called by a name other than "ssh" or "Secure Shell".
  */   */
 /*  /*
  * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl.  All rights reserved.   * Copyright (c) 1999, 2000, 2001 Markus Friedl.  All rights reserved.
  *   *
  * Redistribution and use in source and binary forms, with or without   * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions   * modification, are permitted provided that the following conditions
Line 34 
Line 32 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF   * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */   */
   /* RCSID("$OpenBSD$"); */
   
 #ifndef CHANNEL_H  #ifndef CHANNEL_H
 #define CHANNEL_H  #define CHANNEL_H
Line 69 
Line 68 
         int     type;           /* channel type/state */          int     type;           /* channel type/state */
         int     self;           /* my own channel identifier */          int     self;           /* my own channel identifier */
         int     remote_id;      /* channel identifier for remote peer */          int     remote_id;      /* channel identifier for remote peer */
         u_int   istate;         /* input from channel (state of receive half) */          int     istate;         /* input from channel (state of receive half) */
         u_int   ostate;         /* output to channel  (state of transmit half) */          int     ostate;         /* output to channel  (state of transmit half) */
         int     flags;          /* close sent/rcvd */          int     flags;          /* close sent/rcvd */
         int     rfd;            /* read fd */          int     rfd;            /* read fd */
         int     wfd;            /* write fd */          int     wfd;            /* write fd */
Line 90 
Line 89 
         int     host_port;      /* remote port to connect for forwards */          int     host_port;      /* remote port to connect for forwards */
         char   *remote_name;    /* remote hostname */          char   *remote_name;    /* remote hostname */
   
         u_int   remote_window;          int     remote_window;
         u_int   remote_maxpacket;          int     remote_maxpacket;
         u_int   local_window;          int     local_window;
         u_int   local_window_max;          int     local_window_max;
         u_int   local_consumed;          int     local_consumed;
         u_int   local_maxpacket;          int     local_maxpacket;
         int     extended_usage;          int     extended_usage;
         int     single_connection;  
   
         char   *ctype;          /* type */          char   *ctype;          /* type */
   
         /* callback */          /* callback */
         channel_callback_fn     *confirm;          channel_callback_fn     *cb_fn;
           void    *cb_arg;
           int     cb_event;
         channel_callback_fn     *detach_user;          channel_callback_fn     *detach_user;
   
         /* filter */          /* filter */
Line 114 
Line 114 
 #define CHAN_EXTENDED_WRITE             2  #define CHAN_EXTENDED_WRITE             2
   
 /* default window/packet sizes for tcp/x11-fwd-channel */  /* default window/packet sizes for tcp/x11-fwd-channel */
 #define CHAN_SES_PACKET_DEFAULT (32*1024)  #define CHAN_SES_WINDOW_DEFAULT (32*1024)
 #define CHAN_SES_WINDOW_DEFAULT (4*CHAN_SES_PACKET_DEFAULT)  #define CHAN_SES_PACKET_DEFAULT (CHAN_SES_WINDOW_DEFAULT/2)
 #define CHAN_TCP_PACKET_DEFAULT (32*1024)  #define CHAN_TCP_WINDOW_DEFAULT (32*1024)
 #define CHAN_TCP_WINDOW_DEFAULT (4*CHAN_TCP_PACKET_DEFAULT)  #define CHAN_TCP_PACKET_DEFAULT (CHAN_TCP_WINDOW_DEFAULT/2)
 #define CHAN_X11_PACKET_DEFAULT (16*1024)  #define CHAN_X11_WINDOW_DEFAULT (4*1024)
 #define CHAN_X11_WINDOW_DEFAULT (4*CHAN_X11_PACKET_DEFAULT)  #define CHAN_X11_PACKET_DEFAULT (CHAN_X11_WINDOW_DEFAULT/2)
   
 /* possible input states */  /* possible input states */
 #define CHAN_INPUT_OPEN                 0  #define CHAN_INPUT_OPEN                 0x01
 #define CHAN_INPUT_WAIT_DRAIN           1  #define CHAN_INPUT_WAIT_DRAIN           0x02
 #define CHAN_INPUT_WAIT_OCLOSE          2  #define CHAN_INPUT_WAIT_OCLOSE          0x04
 #define CHAN_INPUT_CLOSED               3  #define CHAN_INPUT_CLOSED               0x08
   
 /* possible output states */  /* possible output states */
 #define CHAN_OUTPUT_OPEN                0  #define CHAN_OUTPUT_OPEN                0x10
 #define CHAN_OUTPUT_WAIT_DRAIN          1  #define CHAN_OUTPUT_WAIT_DRAIN          0x20
 #define CHAN_OUTPUT_WAIT_IEOF           2  #define CHAN_OUTPUT_WAIT_IEOF           0x40
 #define CHAN_OUTPUT_CLOSED              3  #define CHAN_OUTPUT_CLOSED              0x80
   
 #define CHAN_CLOSE_SENT                 0x01  #define CHAN_CLOSE_SENT                 0x01
 #define CHAN_CLOSE_RCVD                 0x02  #define CHAN_CLOSE_RCVD                 0x02
 #define CHAN_EOF_SENT                   0x04  
 #define CHAN_EOF_RCVD                   0x08  
   
 /* check whether 'efd' is still in use */  
 #define CHANNEL_EFD_INPUT_ACTIVE(c) \  
         (compat20 && c->extended_usage == CHAN_EXTENDED_READ && \  
         (c->efd != -1 || \  
         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))) || \  
         buffer_len(&c->extended) > 0))  
   
 /* channel management */  /* channel management */
   
 Channel *channel_lookup(int);  Channel *channel_lookup(int);
 Channel *channel_new(char *, int, int, int, int, u_int, u_int, int, char *, int);  Channel *channel_new(char *, int, int, int, int, int, int, int, char *, int);
 void     channel_set_fds(int, int, int, int, int, int, u_int);  void     channel_set_fds(int, int, int, int, int, int);
 void     channel_free(Channel *);  void     channel_free(Channel *);
 void     channel_free_all(void);  void     channel_free_all(void);
 void     channel_stop_listening(void);  void     channel_stop_listening(void);
   
 void     channel_send_open(int);  void     channel_send_open(int);
   void     channel_request(int, char *, int);
 void     channel_request_start(int, char *, int);  void     channel_request_start(int, char *, int);
   void     channel_register_callback(int, int mtype, channel_callback_fn *, void *);
 void     channel_register_cleanup(int, channel_callback_fn *);  void     channel_register_cleanup(int, channel_callback_fn *);
 void     channel_register_confirm(int, channel_callback_fn *);  
 void     channel_register_filter(int, channel_filter_fn *);  void     channel_register_filter(int, channel_filter_fn *);
 void     channel_cancel_cleanup(int);  void     channel_cancel_cleanup(int);
 int      channel_close_fd(int *);  int      channel_close_fd(int *);
   
 /* protocol handler */  /* protocol handler */
   
 void     channel_input_close(int, u_int32_t, void *);  void     channel_input_channel_request(int, int, void *);
 void     channel_input_close_confirmation(int, u_int32_t, void *);  void     channel_input_close(int, int, void *);
 void     channel_input_data(int, u_int32_t, void *);  void     channel_input_close_confirmation(int, int, void *);
 void     channel_input_extended_data(int, u_int32_t, void *);  void     channel_input_data(int, int, void *);
 void     channel_input_ieof(int, u_int32_t, void *);  void     channel_input_extended_data(int, int, void *);
 void     channel_input_oclose(int, u_int32_t, void *);  void     channel_input_ieof(int, int, void *);
 void     channel_input_open_confirmation(int, u_int32_t, void *);  void     channel_input_oclose(int, int, void *);
 void     channel_input_open_failure(int, u_int32_t, void *);  void     channel_input_open_confirmation(int, int, void *);
 void     channel_input_port_open(int, u_int32_t, void *);  void     channel_input_open_failure(int, int, void *);
 void     channel_input_window_adjust(int, u_int32_t, void *);  void     channel_input_port_open(int, int, void *);
   void     channel_input_window_adjust(int, int, void *);
   
 /* file descriptor handling (read/write) */  /* file descriptor handling (read/write) */
   
Line 199 
Line 189 
 int      channel_connect_to(const char *, u_short);  int      channel_connect_to(const char *, u_short);
 int      channel_connect_by_listen_address(u_short);  int      channel_connect_by_listen_address(u_short);
 void     channel_request_remote_forwarding(u_short, const char *, u_short);  void     channel_request_remote_forwarding(u_short, const char *, u_short);
 int      channel_setup_local_fwd_listener(u_short, const char *, u_short, int);  int      channel_request_local_forwarding(u_short, const char *, u_short, int);
 int      channel_setup_remote_fwd_listener(const char *, u_short, int);  int
   channel_request_forwarding(const char *, u_short, const char *, u_short, int,
       int);
   
 /* x11 forwarding */  /* x11 forwarding */
   
 int      x11_connect_display(void);  int      x11_connect_display(void);
 int      x11_create_display_inet(int, int, int, u_int *);  char    *x11_create_display(int);
 void     x11_input_open(int, u_int32_t, void *);  char    *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 *);  void     x11_request_forwarding_with_spoofing(int, const char *, const char *);
 void     deny_input_open(int, u_int32_t, void *);  void     deny_input_open(int, int, void *);
   
 /* agent forwarding */  /* agent forwarding */
   
 void     auth_request_forwarding(void);  void     auth_request_forwarding(void);
 void     auth_input_open_request(int, u_int32_t, void *);  char    *auth_get_socket_name(void);
   void     auth_sock_cleanup_proc(void *);
   int      auth_input_request_forwarding(struct passwd *);
   void     auth_input_open_request(int, int, void *);
   
 /* channel close */  /* channel close */
   
 int      chan_is_dead(Channel *, int);  int      chan_is_dead(Channel *, int);
 void     chan_mark_dead(Channel *);  void     chan_mark_dead(Channel *);
   void     chan_init_iostates(Channel *);
   void     chan_init(void);
   
 /* channel events */  typedef void    chan_event_fn(Channel *);
   
 void     chan_rcvd_oclose(Channel *);  /* for the input state */
 void     chan_read_failed(Channel *);  extern chan_event_fn    *chan_rcvd_oclose;
 void     chan_ibuf_empty(Channel *);  extern chan_event_fn    *chan_read_failed;
   extern chan_event_fn    *chan_ibuf_empty;
   
 void     chan_rcvd_ieof(Channel *);  /* for the output state */
 void     chan_write_failed(Channel *);  extern chan_event_fn    *chan_rcvd_ieof;
 void     chan_obuf_empty(Channel *);  extern chan_event_fn    *chan_write_failed;
   extern chan_event_fn    *chan_obuf_empty;
   
 #endif  #endif
Legend:
Removed from v.1.50.2.5  
changed lines
  Added in v.1.51