[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.139 and 1.140

version 1.139, 2022/01/06 21:46:23 version 1.140, 2022/01/06 21:48:38
Line 138 
Line 138 
         int     sock;           /* sock fd */          int     sock;           /* sock fd */
         u_int   io_want;        /* bitmask of SSH_CHAN_IO_* */          u_int   io_want;        /* bitmask of SSH_CHAN_IO_* */
         u_int   io_ready;       /* bitmask of SSH_CHAN_IO_* */          u_int   io_ready;       /* bitmask of SSH_CHAN_IO_* */
           int     pollfd_offset;  /* base offset into pollfd array (or -1) */
         int     ctl_chan;       /* control channel (multiplexed connections) */          int     ctl_chan;       /* control channel (multiplexed connections) */
         int     isatty;         /* rfd is a tty */          int     isatty;         /* rfd is a tty */
         int     client_tty;     /* (client) TTY has been requested */          int     client_tty;     /* (client) TTY has been requested */
         int     force_drain;    /* force close on iEOF */          int     force_drain;    /* force close on iEOF */
         time_t  notbefore;      /* Pause IO until deadline (time_t) */          time_t  notbefore;      /* Pause IO until deadline (time_t) */
         int     delayed;        /* post-select handlers for newly created          int     delayed;        /* post-IO handlers for newly created
                                  * channels are delayed until the first call                                   * channels are delayed until the first call
                                  * to a matching pre-select handler.                                   * to a matching pre-IO handler.
                                  * this way post-select handlers are not                                   * this way post-IO handlers are not
                                  * accidentally called if a FD gets reused */                                   * accidentally called if a FD gets reused */
         int     restore_block;  /* fd mask to restore blocking status */          int     restore_block;  /* fd mask to restore blocking status */
         struct sshbuf *input;   /* data read from socket, to be sent over          struct sshbuf *input;   /* data read from socket, to be sent over
Line 235 
Line 236 
 #define SSH_CHAN_IO_WFD                 0x02  #define SSH_CHAN_IO_WFD                 0x02
 #define SSH_CHAN_IO_EFD_R               0x04  #define SSH_CHAN_IO_EFD_R               0x04
 #define SSH_CHAN_IO_EFD_W               0x08  #define SSH_CHAN_IO_EFD_W               0x08
   #define SSH_CHAN_IO_EFD                 (SSH_CHAN_IO_EFD_R|SSH_CHAN_IO_EFD_W)
 #define SSH_CHAN_IO_SOCK_R              0x10  #define SSH_CHAN_IO_SOCK_R              0x10
 #define SSH_CHAN_IO_SOCK_W              0x20  #define SSH_CHAN_IO_SOCK_W              0x20
   #define SSH_CHAN_IO_SOCK                (SSH_CHAN_IO_SOCK_R|SSH_CHAN_IO_SOCK_W)
   
 /* Read buffer size */  /* Read buffer size */
 #define CHAN_RBUF       (16*1024)  #define CHAN_RBUF       (16*1024)
Line 305 
Line 308 
 int      channel_input_status_confirm(int, u_int32_t, struct ssh *);  int      channel_input_status_confirm(int, u_int32_t, struct ssh *);
   
 /* file descriptor handling (read/write) */  /* file descriptor handling (read/write) */
   struct pollfd;
   
 void     channel_prepare_select(struct ssh *, fd_set **, fd_set **, int *,  void     channel_prepare_poll(struct ssh *, struct pollfd **,
             u_int*, time_t*);              u_int *, u_int *, u_int, time_t *);
 void     channel_after_select(struct ssh *, fd_set *, fd_set *);  void     channel_after_poll(struct ssh *, struct pollfd *, u_int);
 void     channel_output_poll(struct ssh *);  void     channel_output_poll(struct ssh *);
   
 int      channel_not_very_much_buffered_data(struct ssh *);  int      channel_not_very_much_buffered_data(struct ssh *);
Legend:
Removed from v.1.139  
changed lines
  Added in v.1.140