[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.115 and 1.116

version 1.115, 2001/05/09 22:51:57 version 1.116, 2001/05/16 22:09:20
Line 893 
Line 893 
         char buf[16*1024];          char buf[16*1024];
         int len;          int len;
   
         if (c->rfd != -1 &&          if (c->istate == CHAN_INPUT_OPEN &&
             FD_ISSET(c->rfd, readset)) {              FD_ISSET(c->rfd, readset)) {
                 len = read(c->rfd, buf, sizeof(buf));                  len = read(c->rfd, buf, sizeof(buf));
                 if (len < 0 && (errno == EINTR || errno == EAGAIN))                  if (len < 0 && (errno == EINTR || errno == EAGAIN))
Line 932 
Line 932 
         int len;          int len;
   
         /* Send buffered output data to the socket. */          /* Send buffered output data to the socket. */
         if (c->wfd != -1 &&          if ((c->ostate == CHAN_OUTPUT_OPEN ||
               c->ostate == CHAN_OUTPUT_WAIT_DRAIN) &&
             FD_ISSET(c->wfd, writeset) &&              FD_ISSET(c->wfd, writeset) &&
             buffer_len(&c->output) > 0) {              buffer_len(&c->output) > 0) {
                 len = write(c->wfd, buffer_ptr(&c->output),                  len = write(c->wfd, buffer_ptr(&c->output),
Legend:
Removed from v.1.115  
changed lines
  Added in v.1.116