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

Diff for /src/usr.bin/ssh/channels.c between version 1.281 and 1.282

version 1.281, 2008/06/15 20:06:26 version 1.282, 2008/06/16 13:22:53
Line 217 
Line 217 
  */   */
 static void  static void
 channel_register_fds(Channel *c, int rfd, int wfd, int efd,  channel_register_fds(Channel *c, int rfd, int wfd, int efd,
     int extusage, int nonblock, int isatty)      int extusage, int nonblock, int is_tty)
 {  {
         /* Update the maximum file descriptor value. */          /* Update the maximum file descriptor value. */
         channel_max_fd = MAX(channel_max_fd, rfd);          channel_max_fd = MAX(channel_max_fd, rfd);
Line 233 
Line 233 
         c->efd = efd;          c->efd = efd;
         c->extended_usage = extusage;          c->extended_usage = extusage;
   
         if ((c->isatty = isatty) != 0)          if ((c->isatty = is_tty) != 0)
                 debug2("channel %d: rfd %d isatty", c->self, c->rfd);                  debug2("channel %d: rfd %d isatty", c->self, c->rfd);
   
         /* enable nonblocking mode */          /* enable nonblocking mode */
Line 737 
Line 737 
   
 void  void
 channel_set_fds(int id, int rfd, int wfd, int efd,  channel_set_fds(int id, int rfd, int wfd, int efd,
     int extusage, int nonblock, int isatty, u_int window_max)      int extusage, int nonblock, int is_tty, u_int window_max)
 {  {
         Channel *c = channel_lookup(id);          Channel *c = channel_lookup(id);
   
         if (c == NULL || c->type != SSH_CHANNEL_LARVAL)          if (c == NULL || c->type != SSH_CHANNEL_LARVAL)
                 fatal("channel_activate for non-larval channel %d.", id);                  fatal("channel_activate for non-larval channel %d.", id);
         channel_register_fds(c, rfd, wfd, efd, extusage, nonblock, isatty);          channel_register_fds(c, rfd, wfd, efd, extusage, nonblock, is_tty);
         c->type = SSH_CHANNEL_OPEN;          c->type = SSH_CHANNEL_OPEN;
         c->local_window = c->local_window_max = window_max;          c->local_window = c->local_window_max = window_max;
         packet_start(SSH2_MSG_CHANNEL_WINDOW_ADJUST);          packet_start(SSH2_MSG_CHANNEL_WINDOW_ADJUST);

Legend:
Removed from v.1.281  
changed lines
  Added in v.1.282